Skip to content

Commit 8fd1ba7

Browse files
ldanilekConvex, Inc.
authored and
Convex, Inc.
committed
remove virtual system mapping from DatabaseSnapshot (#29023)
this is unused GitOrigin-RevId: 046227b817f49b7a60df8dfa2f2c4a814e959179
1 parent 4944563 commit 8fd1ba7

File tree

4 files changed

+5
-39
lines changed

4 files changed

+5
-39
lines changed

crates/database/src/database.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,13 +448,11 @@ impl<RT: Runtime> DatabaseSnapshot<RT> {
448448
table_mapping: TableMapping,
449449
table_states: OrdMap<TabletId, TableState>,
450450
index_registry: &IndexRegistry,
451-
virtual_system_mapping: VirtualSystemMapping,
452451
) -> anyhow::Result<TableRegistry> {
453452
let table_registry = TableRegistry::bootstrap(
454453
table_mapping,
455454
table_states,
456455
persistence_snapshot.persistence().version(),
457-
virtual_system_mapping,
458456
)?;
459457
Self::verify_invariants(&table_registry, index_registry)?;
460458
Ok(table_registry)
@@ -527,7 +525,6 @@ impl<RT: Runtime> DatabaseSnapshot<RT> {
527525
persistence: Arc<dyn PersistenceReader>,
528526
snapshot: RepeatableTimestamp,
529527
retention_validator: Arc<dyn RetentionValidator>,
530-
virtual_system_mapping: VirtualSystemMapping,
531528
) -> anyhow::Result<Self> {
532529
let repeatable_persistence: RepeatablePersistence =
533530
RepeatablePersistence::new(persistence.clone(), snapshot, retention_validator.clone());
@@ -588,7 +585,6 @@ impl<RT: Runtime> DatabaseSnapshot<RT> {
588585
table_mapping,
589586
table_states,
590587
&index_registry,
591-
virtual_system_mapping,
592588
)
593589
.await?;
594590

@@ -747,7 +743,6 @@ impl<RT: Runtime> Database<RT> {
747743
reader.clone(),
748744
snapshot_ts,
749745
Arc::new(follower_retention_manager.clone()),
750-
virtual_system_mapping.clone(),
751746
)
752747
.await?;
753748
let max_ts = DatabaseSnapshot::<RT>::max_ts(&*reader).await?;

crates/database/src/table_registry.rs

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ use common::{
1818
TabletId,
1919
TabletIdAndTableNumber,
2020
},
21-
virtual_system_mapping::{
22-
all_tables_number_to_name,
23-
VirtualSystemMapping,
24-
},
2521
};
2622
use imbl::OrdMap;
2723
use indexing::index_registry::IndexRegistry;
@@ -45,9 +41,6 @@ pub struct TableRegistry {
4541
tablet_states: OrdMap<TabletId, TableState>,
4642
table_mapping: TableMapping,
4743
persistence_version: PersistenceVersion,
48-
49-
/// Mapping from virtual table name to corresponding system table name.
50-
virtual_system_mapping: VirtualSystemMapping,
5144
}
5245

5346
impl TableRegistry {
@@ -58,14 +51,12 @@ impl TableRegistry {
5851
table_mapping: TableMapping,
5952
table_states: OrdMap<TabletId, TableState>,
6053
persistence_version: PersistenceVersion,
61-
virtual_system_mapping: VirtualSystemMapping,
6254
) -> anyhow::Result<Self> {
6355
let _timer = bootstrap_table_registry_timer();
6456
Ok(Self {
6557
table_mapping,
6658
tablet_states: table_states,
6759
persistence_version,
68-
virtual_system_mapping,
6960
})
7061
}
7162

@@ -201,21 +192,11 @@ impl TableRegistry {
201192
.namespace(namespace)
202193
.name_by_number_if_exists(table_number)
203194
{
204-
if self.virtual_system_mapping.is_virtual_table(table_name)
205-
&& self
206-
.virtual_system_mapping
207-
.virtual_to_system_table(table_name)?
208-
== existing_table
209-
{
210-
// A virtual table can share a table number with its physical
211-
// table.
212-
} else {
213-
anyhow::ensure!(
214-
existing_table == table_name,
215-
"Cannot add a table {table_name} with table number {table_number} since it \
216-
already exists in the table mapping as {existing_table}"
217-
);
218-
}
195+
anyhow::ensure!(
196+
existing_table == table_name,
197+
"Cannot add a table {table_name} with table number {table_number} since it \
198+
already exists in the table mapping as {existing_table}"
199+
);
219200
}
220201
Ok(())
221202
}
@@ -259,14 +240,6 @@ impl TableRegistry {
259240
&self.tablet_states
260241
}
261242

262-
pub fn all_tables_number_to_name(
263-
&mut self,
264-
namespace: TableNamespace,
265-
) -> impl Fn(TableNumber) -> anyhow::Result<TableName> + '_ {
266-
let table_mapping = self.table_mapping().namespace(namespace);
267-
all_tables_number_to_name(&table_mapping, &self.virtual_system_mapping)
268-
}
269-
270243
pub fn persistence_version(&self) -> PersistenceVersion {
271244
self.persistence_version
272245
}

crates/database/src/tests/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1911,7 +1911,6 @@ async fn test_index_write(rt: TestRuntime) -> anyhow::Result<()> {
19111911
tp.reader(),
19121912
unchecked_repeatable_ts(ts),
19131913
retention_validator,
1914-
VirtualSystemMapping::default(),
19151914
)
19161915
.await?;
19171916
let index_metadata = database_snapshot.index_registry().clone();

crates/function_runner/src/in_memory_indexes.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ impl<RT: Runtime> InMemoryIndexCache<RT> {
288288
table_mapping.clone(),
289289
table_states,
290290
persistence_snapshot.persistence().version(),
291-
virtual_system_mapping(),
292291
)?;
293292
DatabaseSnapshot::<RT>::verify_invariants(&table_registry, &index_registry)?;
294293
let in_memory_indexes = FunctionRunnerInMemoryIndexes {

0 commit comments

Comments
 (0)