-
Notifications
You must be signed in to change notification settings - Fork 256
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Datastore revamp 2: serialization & formatting (#1735)
- Loading branch information
Showing
11 changed files
with
291 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ | |
|
|
||
| mod arrow_util; | ||
| mod store; | ||
| mod store_arrow; | ||
| mod store_format; | ||
| mod store_gc; | ||
| mod store_read; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,197 @@ | ||
| use std::collections::BTreeMap; | ||
|
|
||
| use arrow2::{array::Array, chunk::Chunk, datatypes::Schema}; | ||
| use nohash_hasher::IntMap; | ||
| use re_log_types::{ | ||
| ComponentName, DataCellColumn, DataTable, DataTableResult, RowId, Timeline, COLUMN_INSERT_ID, | ||
| COLUMN_NUM_INSTANCES, COLUMN_ROW_ID, | ||
| }; | ||
|
|
||
| use crate::store::{IndexedBucket, IndexedBucketInner, PersistentIndexedTable}; | ||
|
|
||
| // --- | ||
|
|
||
| impl IndexedBucket { | ||
| /// Serializes the entire bucket into an arrow payload and schema. | ||
| /// | ||
| /// Column order: | ||
| /// - `insert_id` | ||
| /// - `row_id` | ||
| /// - `time` | ||
| /// - `num_instances` | ||
| /// - `$cluster_key` | ||
| /// - rest of component columns in ascending lexical order | ||
| pub fn serialize(&self) -> DataTableResult<(Schema, Chunk<Box<dyn Array>>)> { | ||
| crate::profile_function!(); | ||
|
|
||
| let Self { | ||
| timeline, | ||
| cluster_key, | ||
| inner, | ||
| } = self; | ||
|
|
||
| let IndexedBucketInner { | ||
| is_sorted: _, | ||
| time_range: _, | ||
| col_time, | ||
| col_insert_id, | ||
| col_row_id, | ||
| col_num_instances, | ||
| columns, | ||
| total_size_bytes: _, | ||
| } = &*inner.read(); | ||
|
|
||
| serialize( | ||
| cluster_key, | ||
| Some((*timeline, col_time)), | ||
| col_insert_id, | ||
| col_row_id, | ||
| col_num_instances, | ||
| columns, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| impl PersistentIndexedTable { | ||
| /// Serializes the entire table into an arrow payload and schema. | ||
| /// | ||
| /// Column order: | ||
| /// - `insert_id` | ||
| /// - `row_id` | ||
| /// - `time` | ||
| /// - `num_instances` | ||
| /// - `$cluster_key` | ||
| /// - rest of component columns in ascending lexical order | ||
| pub fn serialize(&self) -> DataTableResult<(Schema, Chunk<Box<dyn Array>>)> { | ||
| crate::profile_function!(); | ||
|
|
||
| let Self { | ||
| ent_path: _, | ||
| cluster_key, | ||
| col_insert_id, | ||
| col_row_id, | ||
| col_num_instances, | ||
| columns, | ||
| total_size_bytes: _, | ||
| } = self; | ||
|
|
||
| serialize( | ||
| cluster_key, | ||
| None, | ||
| col_insert_id, | ||
| col_row_id, | ||
| col_num_instances, | ||
| columns, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| // --- | ||
|
|
||
| fn serialize( | ||
| cluster_key: &ComponentName, | ||
| col_time: Option<(Timeline, &[i64])>, | ||
| col_insert_id: &[u64], | ||
| col_row_id: &[RowId], | ||
| col_num_instances: &[u32], | ||
| table: &IntMap<ComponentName, DataCellColumn>, | ||
| ) -> DataTableResult<(Schema, Chunk<Box<dyn Array>>)> { | ||
| crate::profile_function!(); | ||
|
|
||
| let mut schema = Schema::default(); | ||
| let mut columns = Vec::new(); | ||
|
|
||
| { | ||
| let (control_schema, control_columns) = | ||
| serialize_control_columns(col_time, col_insert_id, col_row_id, col_num_instances)?; | ||
| schema.fields.extend(control_schema.fields); | ||
| schema.metadata.extend(control_schema.metadata); | ||
| columns.extend(control_columns.into_iter()); | ||
| } | ||
|
|
||
| { | ||
| let (data_schema, data_columns) = serialize_data_columns(cluster_key, table)?; | ||
| schema.fields.extend(data_schema.fields); | ||
| schema.metadata.extend(data_schema.metadata); | ||
| columns.extend(data_columns.into_iter()); | ||
| } | ||
|
|
||
| Ok((schema, Chunk::new(columns))) | ||
| } | ||
|
|
||
| fn serialize_control_columns( | ||
| col_time: Option<(Timeline, &[i64])>, | ||
| col_insert_id: &[u64], | ||
| col_row_id: &[RowId], | ||
| col_num_instances: &[u32], | ||
| ) -> DataTableResult<(Schema, Vec<Box<dyn Array>>)> { | ||
| crate::profile_function!(); | ||
|
|
||
| let mut schema = Schema::default(); | ||
| let mut columns = Vec::new(); | ||
|
|
||
| // NOTE: ordering is taken into account! | ||
| // - insert_id | ||
| // - row_id | ||
| // - time | ||
| // - num_instances | ||
|
|
||
| let (insert_id_field, insert_id_column) = | ||
| DataTable::serialize_primitive_column(COLUMN_INSERT_ID, col_insert_id, None)?; | ||
| schema.fields.push(insert_id_field); | ||
| columns.push(insert_id_column); | ||
|
|
||
| let (row_id_field, row_id_column) = | ||
| DataTable::serialize_control_column(COLUMN_ROW_ID, col_row_id)?; | ||
| schema.fields.push(row_id_field); | ||
| columns.push(row_id_column); | ||
|
|
||
| if let Some((timeline, col_time)) = col_time { | ||
| let (time_field, time_column) = DataTable::serialize_primitive_column( | ||
| timeline.name(), | ||
| col_time, | ||
| timeline.datatype().into(), | ||
| )?; | ||
| schema.fields.push(time_field); | ||
| columns.push(time_column); | ||
| } | ||
|
|
||
| let (num_instances_field, num_instances_column) = | ||
| DataTable::serialize_primitive_column(COLUMN_NUM_INSTANCES, col_num_instances, None)?; | ||
| schema.fields.push(num_instances_field); | ||
| columns.push(num_instances_column); | ||
|
|
||
| Ok((schema, columns)) | ||
| } | ||
|
|
||
| fn serialize_data_columns( | ||
| cluster_key: &ComponentName, | ||
| table: &IntMap<ComponentName, DataCellColumn>, | ||
| ) -> DataTableResult<(Schema, Vec<Box<dyn Array>>)> { | ||
| crate::profile_function!(); | ||
|
|
||
| let mut schema = Schema::default(); | ||
| let mut columns = Vec::new(); | ||
|
|
||
| // NOTE: ordering is taken into account! | ||
| let mut table: BTreeMap<_, _> = table.iter().collect(); | ||
|
|
||
| // Cluster column first and foremost! | ||
| // | ||
| // NOTE: cannot fail, the cluster key _has_ to be there by definition | ||
| let cluster_column = table.remove(&cluster_key).unwrap(); | ||
| { | ||
| let (field, column) = | ||
| DataTable::serialize_data_column(cluster_key.as_str(), cluster_column)?; | ||
| schema.fields.push(field); | ||
| columns.push(column); | ||
| } | ||
|
|
||
| for (component, column) in table { | ||
| let (field, column) = DataTable::serialize_data_column(component.as_str(), column)?; | ||
| schema.fields.push(field); | ||
| columns.push(column); | ||
| } | ||
|
|
||
| Ok((schema, columns)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.