silverweed/rntviewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove some more stuff

Browse source
This commit is contained in:
silverweed 2024-10-30 17:29:20 +01:00
parent 388a469e23
commit e8092a54f2
2 changed files with 1 additions and 17 deletions

12
src/rntuple.cpp
View file

@ -427,7 +427,7 @@ RNTuple_Data get_rntuple_data(Arena *arena, const Inspected_File &file, String8
{ {
RNTuple_Data rndata {}; RNTuple_Data rndata {};
// TODO: proper error handling // TODO: avoid this call to GetNTupleProper altogether. Use the anchor from get_tfile_data() instead.
RMicroFileReader file_reader { file.name.c() }; RMicroFileReader file_reader { file.name.c() };
RNTuple_File_Info file_info = file_reader.GetNTupleProper(ntpl_name.c()); RNTuple_File_Info file_info = file_reader.GetNTupleProper(ntpl_name.c());
if (!file_info.failed) { if (!file_info.failed) {
@ -435,17 +435,7 @@ RNTuple_Data get_rntuple_data(Arena *arena, const Inspected_File &file, String8
rndata.version.major = file_info.anchor.fVersionMajor; rndata.version.major = file_info.anchor.fVersionMajor;
rndata.version.minor = file_info.anchor.fVersionMinor; rndata.version.minor = file_info.anchor.fVersionMinor;
rndata.version.patch = file_info.anchor.fVersionPatch; rndata.version.patch = file_info.anchor.fVersionPatch;
rndata.rng_header.start = file_info.anchor.fSeekHeader;
rndata.rng_header.len = file_info.anchor.fNBytesHeader;
rndata.header_is_compressed = file_info.anchor.fNBytesHeader != file_info.anchor.fLenHeader; rndata.header_is_compressed = file_info.anchor.fNBytesHeader != file_info.anchor.fLenHeader;
rndata.rng_footer.start = file_info.anchor.fSeekFooter;
rndata.rng_footer.len = file_info.anchor.fNBytesFooter;
rndata.rng_anchor.start = file_info.anchor_seek;
rndata.rng_anchor.len = file_info.anchor_nbytes;
rndata.rng_anchor_key.start = file_info.anchor_key_seek;
rndata.rng_anchor_key.len = file_info.anchor_key_nbytes;
rndata.rng_tkeys_list.start = file_info.tkeys_list_seek;
rndata.rng_tkeys_list.len = file_info.tkeys_list_nbytes;
if (!ntpl_name.size) { if (!ntpl_name.size) {
ntpl_name = push_str8f(arena, "%s", file_info.ntuple_name.c_str()); ntpl_name = push_str8f(arena, "%s", file_info.ntuple_name.c_str());
} }

6
src/rntuple.h
View file

@ -122,12 +122,6 @@ struct RNTuple_Data {
u16 epoch, major, minor, patch; u16 epoch, major, minor, patch;
} version; } version;
Byte_Range rng_anchor;
Byte_Range rng_anchor_key;
Byte_Range rng_header;
Byte_Range rng_footer;
Byte_Range rng_tkeys_list;
b8 header_is_compressed; b8 header_is_compressed;
Page_Info_Node *pages; Page_Info_Node *pages;