TimesPerTimeline -> TimeHistogramPerTimeline (#7084)

Replace O(n) TimesPerTimeline with O(log n) TimeHistogramPerTimeline for efficient time navigation. Adds prev_key() method to Int64Histogram
and TimelineTimes helper struct to bundle timeline metadata
with histograms.

Author: joelreymont

.cargo/config.toml

@@ -12,17 +12,6 @@ run-wasm = "run --release --package run_wasm --"
 # so that we don't run them on cargo publish or on users machines.
 IS_IN_RERUN_WORKSPACE = "yes"
 
-# Depending on the pixi environment, we get different `CONDA_PREFIX` values.
-# This means that changing the pixi environment (or not using it in the first place) will cause rebuilds.
-# To avoid unnecessary rebuilds, we set a fixed value here.
-# For details see:
-# https://pyo3.rs/main/building-and-distribution.html#configuring-the-python-version
-PYO3_PYTHON = "python"
-
-# TODO(rust-lang/stacker#127): Work around until wasm build on mac is resolved
-[target.osx-arm64.activation.env]
-AR = "llvm-ar"
-
 # `web_sys_unstable_apis` is required to enable the web_sys clipboard API which egui_web uses.
 # https://wasm-bindgen.github.io/wasm-bindgen/api/web_sys/struct.Clipboard.html
 # https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html

.github/workflows/contrib_rerun_py.yml

@@ -58,7 +58,7 @@ jobs:
 
       - name: Copy rerun-cli to wheel foldcer
         run: |
-          cp target/release/rerun rerun_py/rerun_sdk/rerun_cli
+          cp target_pixi/release/rerun rerun_py/rerun_sdk/rerun_cli
 
       - name: Build the wheel
         run: |

.github/workflows/reusable_build_and_upload_rerun_c.yml

@@ -167,7 +167,7 @@ jobs:
       - name: "Upload rerun_c (commit)"
         uses: google-github-actions/upload-cloud-storage@v2
         with:
-          path: "./target/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.LIB_NAME }}"
+          path: "./target_pixi/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.LIB_NAME }}"
           destination: "rerun-builds/commit/${{ steps.get-sha.outputs.sha }}/rerun_c/${{ inputs.PLATFORM }}"
           parent: false
           process_gcloudignore: false
@@ -176,7 +176,7 @@ jobs:
         if: ${{ inputs.ADHOC_NAME != '' }}
         uses: google-github-actions/upload-cloud-storage@v2
         with:
-          path: "./target/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.LIB_NAME }}"
+          path: "./target_pixi/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.LIB_NAME }}"
           destination: "rerun-builds/adhoc/${{inputs.ADHOC_NAME}}/rerun_c/${{ inputs.PLATFORM }}"
           parent: false
           process_gcloudignore: false

.github/workflows/reusable_build_and_upload_rerun_cli.yml

@@ -176,7 +176,7 @@ jobs:
       - name: Compare man page to CLI docs
         if: runner.os == 'Linux'
         run: |
-          pixi run ./scripts/ci/check_cli_docs.py --rerun-exe "./target/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.BIN_NAME }}"
+          pixi run ./scripts/ci/check_cli_docs.py --rerun-exe "./target_pixi/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.BIN_NAME }}"
 
       - name: Get sha
         id: get-sha
@@ -187,7 +187,7 @@ jobs:
       - name: "Upload rerun-cli (commit)"
         uses: google-github-actions/upload-cloud-storage@v2
         with:
-          path: "./target/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.BIN_NAME }}"
+          path: "./target_pixi/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.BIN_NAME }}"
           destination: "rerun-builds/commit/${{ steps.get-sha.outputs.sha }}/rerun-cli/${{ inputs.PLATFORM }}"
           parent: false
           process_gcloudignore: false
@@ -196,7 +196,7 @@ jobs:
         if: ${{ inputs.ADHOC_NAME != '' }}
         uses: google-github-actions/upload-cloud-storage@v2
         with:
-          path: "./target/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.BIN_NAME }}"
+          path: "./target_pixi/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.BIN_NAME }}"
           destination: "rerun-builds/adhoc/${{inputs.ADHOC_NAME}}/rerun-cli/${{ inputs.PLATFORM }}"
           parent: false
           process_gcloudignore: false

Cargo.lock

@@ -8410,7 +8410,6 @@ dependencies = [
  "base64 0.22.1",
  "directories",
  "ehttp",
- "getrandom 0.3.3",
  "http",
  "indicatif",
  "js-sys",
@@ -8420,14 +8419,12 @@ dependencies = [
  "saturating_cast",
  "serde",
  "serde_json",
- "sha2",
  "thiserror 2.0.17",
  "tiny_http",
  "tokio",
  "tonic",
  "tower",
  "url",
- "uuid",
  "wasm-bindgen",
  "web-sys",
  "webbrowser",
@@ -9309,7 +9306,6 @@ dependencies = [
  "egui",
  "futures",
  "itertools 0.14.0",
- "js-sys",
  "re_auth",
  "re_component_ui",
  "re_dataframe_ui",
@@ -9323,12 +9319,7 @@ dependencies = [
  "re_uri",
  "re_viewer_context",
  "serde",
- "serde_json",
  "url",
- "uuid",
- "wasm-bindgen",
- "web-sys",
- "webbrowser",
 ]
 
 [[package]]
@@ -10400,14 +10391,11 @@ version = "0.27.0-alpha.8+dev"
 dependencies = [
  "ahash",
  "arrow",
- "criterion",
  "egui",
  "egui_tiles",
  "itertools 0.14.0",
- "mimalloc",
  "nohash-hasher",
  "parking_lot",
- "rand 0.9.2",
  "re_chunk",
  "re_chunk_store",
  "re_entity_db",

crates/store/re_entity_db/src/entity_db.rs

@@ -21,7 +21,7 @@ use re_query::{
 };
 use re_smart_channel::SmartChannelSource;
 
-use crate::{Error, TimesPerTimeline, ingestion_statistics::IngestionStatistics};
+use crate::{Error, ingestion_statistics::IngestionStatistics};
 
 // ----------------------------------------------------------------------------
 
@@ -86,17 +86,9 @@ pub struct EntityDb {
     /// In many places we just store the hashes, so we need a way to translate back.
     entity_path_from_hash: IntMap<EntityPathHash, EntityPath>,
 
-    /// The global-scope time tracker.
-    ///
-    /// For each timeline, keeps track of what times exist, recursively across all
-    /// entities/components.
-    ///
-    /// Used for time control.
-    ///
-    /// TODO(#7084): Get rid of [`TimesPerTimeline`] and implement time-stepping with [`crate::TimeHistogram`] instead.
-    times_per_timeline: TimesPerTimeline,
-
     /// A time histogram of all entities, for every timeline.
+    ///
+    /// Used for time control and gap detection.
     time_histogram_per_timeline: crate::TimeHistogramPerTimeline,
 
     /// A tree-view (split on path components) of the entities.
@@ -146,7 +138,6 @@ impl EntityDb {
             last_modified_at: web_time::Instant::now(),
             latest_row_id: None,
             entity_path_from_hash: Default::default(),
-            times_per_timeline: Default::default(),
             tree: crate::EntityTree::root(),
             time_histogram_per_timeline: Default::default(),
             storage_engine,
@@ -460,10 +451,6 @@ impl EntityDb {
         self.storage_engine().store().timelines()
     }
 
-    pub fn times_per_timeline(&self) -> &TimesPerTimeline {
-        &self.times_per_timeline
-    }
-
     pub fn has_any_data_on_timeline(&self, timeline: &TimelineName) -> bool {
         self.time_histogram_per_timeline
             .get(timeline)
@@ -483,6 +470,11 @@ impl EntityDb {
         self.time_histogram_per_timeline.get(timeline)
     }
 
+    /// Histogram of all entities and events
+    pub fn time_histogram_per_timeline(&self) -> &crate::TimeHistogramPerTimeline {
+        &self.time_histogram_per_timeline
+    }
+
     #[inline]
     pub fn num_rows(&self) -> u64 {
         self.storage_engine.read().store().stats().total().num_rows
@@ -600,7 +592,6 @@ impl EntityDb {
 
         {
             // Update our internal views by notifying them of resulting [`ChunkStoreEvent`]s.
-            self.times_per_timeline.on_events(&store_events);
             self.time_histogram_per_timeline.on_events(&store_events);
             self.tree.on_store_additions(&store_events);
 
@@ -675,7 +666,6 @@ impl EntityDb {
         );
 
         Self::on_store_deletions(
-            &mut self.times_per_timeline,
             &mut self.time_histogram_per_timeline,
             &mut self.tree,
             engine,
@@ -699,7 +689,6 @@ impl EntityDb {
 
         let store_events = engine.store().drop_time_range(timeline, drop_range);
         Self::on_store_deletions(
-            &mut self.times_per_timeline,
             &mut self.time_histogram_per_timeline,
             &mut self.tree,
             engine,
@@ -721,7 +710,6 @@ impl EntityDb {
 
         let store_events = engine.store().drop_entity_path(entity_path);
         Self::on_store_deletions(
-            &mut self.times_per_timeline,
             &mut self.time_histogram_per_timeline,
             &mut self.tree,
             engine,
@@ -749,14 +737,12 @@ impl EntityDb {
     // NOTE: Parameters deconstructed instead of taking `self`, because borrowck cannot understand
     // partial borrows on methods.
     fn on_store_deletions(
-        times_per_timeline: &mut TimesPerTimeline,
         time_histogram_per_timeline: &mut crate::TimeHistogramPerTimeline,
         tree: &mut crate::EntityTree,
         mut engine: StorageEngineWriteGuard<'_>,
         store_events: &[ChunkStoreEvent],
     ) {
         engine.cache().on_events(store_events);
-        times_per_timeline.on_events(store_events);
         time_histogram_per_timeline.on_events(store_events);
 
         let engine = engine.downgrade();

crates/store/re_entity_db/src/lib.rs

@@ -10,7 +10,6 @@ mod ingestion_statistics;
 mod instance_path;
 mod store_bundle;
 mod time_histogram_per_timeline;
-mod times_per_timeline;
 mod versioned_instance_path;
 
 pub use self::{
@@ -20,7 +19,6 @@ pub use self::{
     instance_path::{InstancePath, InstancePathHash},
     store_bundle::{StoreBundle, StoreLoadError},
     time_histogram_per_timeline::{TimeHistogram, TimeHistogramPerTimeline},
-    times_per_timeline::{TimeCounts, TimelineStats, TimesPerTimeline},
     versioned_instance_path::{VersionedInstancePath, VersionedInstancePathHash},
 };
 

crates/store/re_entity_db/src/time_histogram_per_timeline.rs

@@ -149,10 +149,10 @@ impl ChunkStoreSubscriber for TimeHistogramPerTimeline {
                 .collect_vec();
             match event.kind {
                 ChunkStoreDiffKind::Addition => {
-                    self.add(&times, event.num_components() as _);
+                    self.add(&times, 1);
                 }
                 ChunkStoreDiffKind::Deletion => {
-                    self.remove(&times, event.num_components() as _);
+                    self.remove(&times, 1);
                 }
             }
         }