remove virtual system mapping from DatabaseSnapshot (#29023)

this is unused GitOrigin-RevId: 046227b817f49b7a60df8dfa2f2c4a814e959179
get-convex · Aug 20, 2024 · 8fd1ba7 · 8fd1ba7
1 parent 4944563
commit 8fd1ba7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 39 deletions.
diff --git a/crates/database/src/database.rs b/crates/database/src/database.rs
@@ -448,13 +448,11 @@ impl<RT: Runtime> DatabaseSnapshot<RT> {
         table_mapping: TableMapping,
         table_states: OrdMap<TabletId, TableState>,
         index_registry: &IndexRegistry,
-        virtual_system_mapping: VirtualSystemMapping,
     ) -> anyhow::Result<TableRegistry> {
         let table_registry = TableRegistry::bootstrap(
             table_mapping,
             table_states,
             persistence_snapshot.persistence().version(),
-            virtual_system_mapping,
         )?;
         Self::verify_invariants(&table_registry, index_registry)?;
         Ok(table_registry)
@@ -527,7 +525,6 @@ impl<RT: Runtime> DatabaseSnapshot<RT> {
         persistence: Arc<dyn PersistenceReader>,
         snapshot: RepeatableTimestamp,
         retention_validator: Arc<dyn RetentionValidator>,
-        virtual_system_mapping: VirtualSystemMapping,
     ) -> anyhow::Result<Self> {
         let repeatable_persistence: RepeatablePersistence =
             RepeatablePersistence::new(persistence.clone(), snapshot, retention_validator.clone());
@@ -588,7 +585,6 @@ impl<RT: Runtime> DatabaseSnapshot<RT> {
             table_mapping,
             table_states,
             &index_registry,
-            virtual_system_mapping,
         )
         .await?;
 
@@ -747,7 +743,6 @@ impl<RT: Runtime> Database<RT> {
             reader.clone(),
             snapshot_ts,
             Arc::new(follower_retention_manager.clone()),
-            virtual_system_mapping.clone(),
         )
         .await?;
         let max_ts = DatabaseSnapshot::<RT>::max_ts(&*reader).await?;

diff --git a/crates/database/src/table_registry.rs b/crates/database/src/table_registry.rs
@@ -18,10 +18,6 @@ use common::{
         TabletId,
         TabletIdAndTableNumber,
     },
-    virtual_system_mapping::{
-        all_tables_number_to_name,
-        VirtualSystemMapping,
-    },
 };
 use imbl::OrdMap;
 use indexing::index_registry::IndexRegistry;
@@ -45,9 +41,6 @@ pub struct TableRegistry {
     tablet_states: OrdMap<TabletId, TableState>,
     table_mapping: TableMapping,
     persistence_version: PersistenceVersion,
-
-    /// Mapping from virtual table name to corresponding system table name.
-    virtual_system_mapping: VirtualSystemMapping,
 }
 
 impl TableRegistry {
@@ -58,14 +51,12 @@ impl TableRegistry {
         table_mapping: TableMapping,
         table_states: OrdMap<TabletId, TableState>,
         persistence_version: PersistenceVersion,
-        virtual_system_mapping: VirtualSystemMapping,
     ) -> anyhow::Result<Self> {
         let _timer = bootstrap_table_registry_timer();
         Ok(Self {
             table_mapping,
             tablet_states: table_states,
             persistence_version,
-            virtual_system_mapping,
         })
     }
 
@@ -201,21 +192,11 @@ impl TableRegistry {
             .namespace(namespace)
             .name_by_number_if_exists(table_number)
         {
-            if self.virtual_system_mapping.is_virtual_table(table_name)
-                && self
-                    .virtual_system_mapping
-                    .virtual_to_system_table(table_name)?
-                    == existing_table
-            {
-                // A virtual table can share a table number with its physical
-                // table.
-            } else {
-                anyhow::ensure!(
-                    existing_table == table_name,
-                    "Cannot add a table {table_name} with table number {table_number} since it \
-                     already exists in the table mapping as {existing_table}"
-                );
-            }
+            anyhow::ensure!(
+                existing_table == table_name,
+                "Cannot add a table {table_name} with table number {table_number} since it \
+                 already exists in the table mapping as {existing_table}"
+            );
         }
         Ok(())
     }
@@ -259,14 +240,6 @@ impl TableRegistry {
         &self.tablet_states
     }
 
-    pub fn all_tables_number_to_name(
-        &mut self,
-        namespace: TableNamespace,
-    ) -> impl Fn(TableNumber) -> anyhow::Result<TableName> + '_ {
-        let table_mapping = self.table_mapping().namespace(namespace);
-        all_tables_number_to_name(&table_mapping, &self.virtual_system_mapping)
-    }
-
     pub fn persistence_version(&self) -> PersistenceVersion {
         self.persistence_version
     }

diff --git a/crates/database/src/tests/mod.rs b/crates/database/src/tests/mod.rs
@@ -1911,7 +1911,6 @@ async fn test_index_write(rt: TestRuntime) -> anyhow::Result<()> {
         tp.reader(),
         unchecked_repeatable_ts(ts),
         retention_validator,
-        VirtualSystemMapping::default(),
     )
     .await?;
     let index_metadata = database_snapshot.index_registry().clone();

diff --git a/crates/function_runner/src/in_memory_indexes.rs b/crates/function_runner/src/in_memory_indexes.rs
@@ -288,7 +288,6 @@ impl<RT: Runtime> InMemoryIndexCache<RT> {
             table_mapping.clone(),
             table_states,
             persistence_snapshot.persistence().version(),
-            virtual_system_mapping(),
         )?;
         DatabaseSnapshot::<RT>::verify_invariants(&table_registry, &index_registry)?;
         let in_memory_indexes = FunctionRunnerInMemoryIndexes {