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

remove Cluster_Info_Node for now

Browse source
This commit is contained in:
silverweed 2024-07-23 09:53:58 +02:00
parent 9bc533c65a
commit fe77a32306
2 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rntuple.cpp
View file

@ -92,7 +92,6 @@ void gather_ntuple_metadata(Arena *arena, RMicroFileReader &reader, const RNTupl
Page_Info_Node *pinfo_head = nullptr, *pinfo_tail = nullptr; Page_Info_Node *pinfo_head = nullptr, *pinfo_tail = nullptr;
Page_Info_Node *last_inserted_pinfo = nullptr; Page_Info_Node *last_inserted_pinfo = nullptr;
Cluster_Info_Node *clinfo_head = nullptr, *clinfo_tail = nullptr;
u64 n_clusters = 0; u64 n_clusters = 0;
chr::time_point start_t = chr::high_resolution_clock::now(); chr::time_point start_t = chr::high_resolution_clock::now();
@ -100,13 +99,6 @@ void gather_ntuple_metadata(Arena *arena, RMicroFileReader &reader, const RNTupl
// gather clusters and pages metadata // gather clusters and pages metadata
for (const RClusterDescriptor &cluster_desc : descriptor.GetClusterIterable()) { for (const RClusterDescriptor &cluster_desc : descriptor.GetClusterIterable()) {
if (!clinfo_head) {
clinfo_head = clinfo_tail = arena_push<Cluster_Info_Node>(arena);
} else {
Cluster_Info_Node *clinfo = arena_push<Cluster_Info_Node>(arena);
clinfo_tail->next = clinfo;
clinfo_tail = clinfo;
}
++n_clusters; ++n_clusters;
for (const RClusterDescriptor::RColumnRange &col_range : cluster_desc.GetColumnRangeIterable()) { for (const RClusterDescriptor::RColumnRange &col_range : cluster_desc.GetColumnRangeIterable()) {
@ -213,7 +205,6 @@ void gather_ntuple_metadata(Arena *arena, RMicroFileReader &reader, const RNTupl
assert(!chunks_tail->next); assert(!chunks_tail->next);
assert(!pinfo_tail->next); assert(!pinfo_tail->next);
assert(!clinfo_tail->next);
rndata.pages = pinfo_head; rndata.pages = pinfo_head;
rndata.page_groups = groups; rndata.page_groups = groups;
@ -226,7 +217,6 @@ void gather_ntuple_metadata(Arena *arena, RMicroFileReader &reader, const RNTupl
rndata.cluster_groups = cluster_groups; rndata.cluster_groups = cluster_groups;
rndata.n_cluster_groups = cg_idx; rndata.n_cluster_groups = cg_idx;
rndata.tot_page_list_size = tot_page_list_size; rndata.tot_page_list_size = tot_page_list_size;
rndata.clusters = clinfo_head;
rndata.n_clusters = n_clusters; rndata.n_clusters = n_clusters;
} }

5
src/rntuple.h
View file

@ -36,10 +36,6 @@ struct Page_Info_Chunk {
u32 first_group; u32 first_group;
}; };
struct Cluster_Info_Node {
Cluster_Info_Node *next;
};
struct Cluster_Group_Info { struct Cluster_Group_Info {
Byte_Range rng_page_list; Byte_Range rng_page_list;
}; };
@ -80,7 +76,6 @@ struct RNTuple_Data {
u64 n_cluster_groups; u64 n_cluster_groups;
u64 tot_page_list_size; u64 tot_page_list_size;
Cluster_Info_Node *clusters;
u64 n_clusters; u64 n_clusters;
Page_Info_Group *page_groups; Page_Info_Group *page_groups;