Skip to content

Commit c9b561e

Browse files
goffrieConvex, Inc.
authored andcommitted
Remove table_mapping/index_registry from IndexBackfill (#40101)
GitOrigin-RevId: 40e92d149f39276c86f8c0fed9c1b34f0e1e0d93
1 parent a7800ae commit c9b561e

File tree

1 file changed

+0
-16
lines changed
  • crates/database/src/database_index_workers

1 file changed

+0
-16
lines changed

crates/database/src/database_index_workers/mod.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ use common::{
3535
runtime::Runtime,
3636
types::{
3737
IndexId,
38-
PersistenceVersion,
3938
RepeatableTimestamp,
4039
TabletIndexName,
4140
},
4241
};
4342
use futures::FutureExt;
4443
use hashlink::LinkedHashSet;
45-
use indexing::index_registry::IndexRegistry;
4644
use keybroker::Identity;
4745
use tokio::{
4846
select,
@@ -55,7 +53,6 @@ use tokio_util::task::JoinMap;
5553
use value::{
5654
DeveloperDocumentId,
5755
ResolvedDocumentId,
58-
TableMapping,
5956
TableNamespace,
6057
TabletId,
6158
};
@@ -90,7 +87,6 @@ pub struct IndexWorker<RT: Runtime> {
9087
concurrency_limiter: Arc<Semaphore>,
9188
work_pool: JoinMap<IndexBackfill, anyhow::Result<()>>,
9289
database: Database<RT>,
93-
persistence_version: PersistenceVersion,
9490
index_writer: IndexWriter<RT>,
9591
backoff: Backoff,
9692
runtime: RT,
@@ -102,8 +98,6 @@ pub struct IndexWorker<RT: Runtime> {
10298
pub struct IndexBackfill {
10399
pub tablet_id: TabletId,
104100
pub index_ids: Vec<IndexId>,
105-
pub table_mapping: TableMapping,
106-
pub index_registry: IndexRegistry,
107101
}
108102

109103
impl Hash for IndexBackfill {
@@ -135,7 +129,6 @@ impl<RT: Runtime> IndexWorker<RT> {
135129
concurrency_limiter: Arc::new(Semaphore::new(*INDEX_BACKFILL_CONCURRENCY)),
136130
work_pool: JoinMap::new(),
137131
database,
138-
persistence_version: reader.version(),
139132
index_writer,
140133
backoff: Backoff::new(*INDEX_WORKERS_INITIAL_BACKOFF, *INDEX_WORKERS_MAX_BACKOFF),
141134
runtime,
@@ -183,7 +176,6 @@ impl<RT: Runtime> IndexWorker<RT> {
183176
concurrency_limiter: Arc::new(Semaphore::new(10)),
184177
work_pool: JoinMap::new(),
185178
database,
186-
persistence_version: reader.version(),
187179
index_writer,
188180
backoff: Backoff::new(*INDEX_WORKERS_INITIAL_BACKOFF, *INDEX_WORKERS_MAX_BACKOFF),
189181
runtime,
@@ -237,12 +229,6 @@ impl<RT: Runtime> IndexWorker<RT> {
237229
tx.begin_timestamp()
238230
);
239231

240-
let index_registry = IndexRegistry::bootstrap(
241-
tx.table_mapping(),
242-
index_documents.into_iter().map(|doc| (*doc).clone()),
243-
self.persistence_version,
244-
)?;
245-
246232
for (tablet_id, index_ids) in to_backfill_by_tablet {
247233
let mut to_backfill = Vec::new();
248234
for index_id in index_ids {
@@ -255,8 +241,6 @@ impl<RT: Runtime> IndexWorker<RT> {
255241
backfill_queue.push(IndexBackfill {
256242
tablet_id,
257243
index_ids: to_backfill,
258-
table_mapping: tx.table_mapping().clone(),
259-
index_registry: index_registry.clone(),
260244
});
261245
}
262246

0 commit comments

Comments
 (0)