remove the indices store

akaladarshi · akaladarshi · commit 51357fe19d99 · 2025-12-09T19:54:05.000+05:30
diff --git a/src/chain/store/chain_store.rs b/src/chain/store/chain_store.rs
@@ -6,7 +6,7 @@ use super::{
     index::{ChainIndex, ResolveNullTipset},
     tipset_tracker::TipsetTracker,
 };
-use crate::db::{EthMappingsStore, EthMappingsStoreExt, IndicesStore, IndicesStoreExt};
+use crate::db::{EthMappingsStore, EthMappingsStoreExt};
 use crate::interpreter::{BlockMessages, VMTrace};
 use crate::libp2p_bitswap::{BitswapStoreRead, BitswapStoreReadWrite};
 use crate::message::{ChainMessage, Message as MessageTrait, SignedMessage};
@@ -82,9 +82,6 @@ pub struct ChainStore<DB> {
     /// Ethereum mappings store
     eth_mappings: Arc<dyn EthMappingsStore + Sync + Send>,
 
-    /// Indices store
-    indices: Arc<dyn IndicesStore + Sync + Send>,
-
     /// Needed by the Ethereum mapping.
     chain_config: Arc<ChainConfig>,
 }
@@ -121,7 +118,6 @@ where
         db: Arc<DB>,
         heaviest_tipset_key_provider: Arc<dyn HeaviestTipsetKeyProvider + Sync + Send>,
         eth_mappings: Arc<dyn EthMappingsStore + Sync + Send>,
-        indices: Arc<dyn IndicesStore + Sync + Send>,
         chain_config: Arc<ChainConfig>,
         genesis_block_header: CachingBlockHeader,
     ) -> anyhow::Result<Self> {
@@ -139,7 +135,6 @@ where
             genesis_block_header,
             validated_blocks,
             eth_mappings,
-            indices,
             chain_config,
         };
 
@@ -204,15 +199,6 @@ where
             .map(|(cid, _)| cid))
     }
 
-    pub fn put_index<V: Serialize>(&self, key: &Cid, value: &V) -> Result<(), Error> {
-        self.indices.write_obj(key, value)?;
-        Ok(())
-    }
-
-    pub fn get_tipset_key_by_events_root(&self, key: &Cid) -> Result<Option<TipsetKey>, Error> {
-        Ok(self.indices.read_obj(key)?)
-    }
-
     /// Expands tipset to tipset with all other headers in the same epoch using
     /// the tipset tracker.
     fn expand_tipset(&self, header: CachingBlockHeader) -> Result<Tipset, Error> {
@@ -754,15 +740,8 @@ mod tests {
             message_receipts: Cid::new_v1(DAG_CBOR, MultihashCode::Identity.digest(&[])),
             ..Default::default()
         });
-        let cs = ChainStore::new(
-            db.clone(),
-            db.clone(),
-            db.clone(),
-            db,
-            chain_config,
-            gen_block.clone(),
-        )
-        .unwrap();
+        let cs =
+            ChainStore::new(db.clone(), db.clone(), db, chain_config, gen_block.clone()).unwrap();
 
         assert_eq!(cs.genesis_block_header(), &gen_block);
     }
@@ -776,15 +755,7 @@ mod tests {
             ..Default::default()
         });
 
-        let cs = ChainStore::new(
-            db.clone(),
-            db.clone(),
-            db.clone(),
-            db,
-            chain_config,
-            gen_block,
-        )
-        .unwrap();
+        let cs = ChainStore::new(db.clone(), db.clone(), db, chain_config, gen_block).unwrap();
 
         let cid = Cid::new_v1(DAG_CBOR, MultihashCode::Blake2b256.digest(&[1, 2, 3]));
         assert!(!cs.is_block_validated(&cid));
diff --git a/src/chain_sync/chain_follower.rs b/src/chain_sync/chain_follower.rs
@@ -918,7 +918,6 @@ mod tests {
                 db.clone(),
                 db.clone(),
                 db.clone(),
-                db.clone(),
                 Default::default(),
                 genesis_header.clone().into(),
             )
diff --git a/src/daemon/context.rs b/src/daemon/context.rs
@@ -245,7 +245,6 @@ async fn create_state_manager(
         Arc::clone(db),
         Arc::new(db.clone()),
         eth_mappings,
-        db.writer().clone(),
         chain_config.clone(),
         genesis_header.clone(),
     )?);
diff --git a/src/daemon/db_util.rs b/src/daemon/db_util.rs
@@ -329,14 +329,9 @@ where
     let epoch = ts.epoch();
     let tsk = ts.key().clone();
 
-    let state_output = state_manager
+    state_manager
         .compute_tipset_state(ts.clone(), NO_CALLBACK, VMTrace::NotTraced)
         .await?;
-    for events_root in state_output.events_roots.iter().flatten() {
-        tracing::trace!("Indexing events root @{epoch}: {events_root}");
-
-        state_manager.chain_store().put_index(events_root, &tsk)?;
-    }
 
     delegated_messages.append(
         &mut state_manager
diff --git a/src/db/car/many.rs b/src/db/car/many.rs
@@ -11,8 +11,8 @@
 use super::{AnyCar, ZstdFrameCache};
 use crate::blocks::TipsetKey;
 use crate::db::{
-    BlockstoreWriteOpsSubscribable, EthMappingsStore, IndicesStore, MemoryDB, PersistentStore,
-    SettingsStore, SettingsStoreExt,
+    BlockstoreWriteOpsSubscribable, EthMappingsStore, MemoryDB, PersistentStore, SettingsStore,
+    SettingsStoreExt,
 };
 use crate::libp2p_bitswap::BitswapStoreReadWrite;
 use crate::rpc::eth::types::EthHash;
@@ -251,20 +251,6 @@ impl<WriterT: EthMappingsStore> EthMappingsStore for ManyCar<WriterT> {
     }
 }
 
-impl<WriterT: IndicesStore> IndicesStore for ManyCar<WriterT> {
-    fn read_bin(&self, key: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
-        IndicesStore::read_bin(self.writer(), key)
-    }
-
-    fn write_bin(&self, key: &Cid, value: &[u8]) -> anyhow::Result<()> {
-        IndicesStore::write_bin(self.writer(), key, value)
-    }
-
-    fn exists(&self, key: &Cid) -> anyhow::Result<bool> {
-        IndicesStore::exists(self.writer(), key)
-    }
-}
-
 impl<T: Blockstore + SettingsStore> super::super::HeaviestTipsetKeyProvider for ManyCar<T> {
     fn heaviest_tipset_key(&self) -> anyhow::Result<TipsetKey> {
         match SettingsStoreExt::read_obj::<TipsetKey>(self, crate::db::setting_keys::HEAD_KEY)? {
diff --git a/src/db/memory.rs b/src/db/memory.rs
@@ -3,7 +3,7 @@
 
 use super::{EthMappingsStore, SettingsStore, SettingsStoreExt};
 use crate::blocks::TipsetKey;
-use crate::db::{IndicesStore, PersistentStore};
+use crate::db::PersistentStore;
 use crate::libp2p_bitswap::{BitswapStoreRead, BitswapStoreReadWrite};
 use crate::rpc::eth::types::EthHash;
 use crate::utils::db::car_stream::CarBlock;
@@ -21,7 +21,6 @@ pub struct MemoryDB {
     blockchain_persistent_db: RwLock<HashMap<Cid, Vec<u8>>>,
     settings_db: RwLock<HashMap<String, Vec<u8>>>,
     pub eth_mappings_db: RwLock<HashMap<EthHash, Vec<u8>>>,
-    pub indices_db: RwLock<HashMap<Cid, Vec<u8>>>,
 }
 
 impl MemoryDB {
@@ -110,23 +109,6 @@ impl EthMappingsStore for MemoryDB {
     }
 }
 
-impl IndicesStore for MemoryDB {
-    fn read_bin(&self, key: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
-        Ok(self.indices_db.read().get(key).cloned())
-    }
-
-    fn write_bin(&self, key: &Cid, value: &[u8]) -> anyhow::Result<()> {
-        self.indices_db
-            .write()
-            .insert(key.to_owned(), value.to_vec());
-        Ok(())
-    }
-
-    fn exists(&self, key: &Cid) -> anyhow::Result<bool> {
-        Ok(self.indices_db.read().contains_key(key))
-    }
-}
-
 impl Blockstore for MemoryDB {
     fn get(&self, k: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
         Ok(self.blockchain_db.read().get(k).cloned().or(self
diff --git a/src/db/mod.rs b/src/db/mod.rs
@@ -191,47 +191,6 @@ impl<T: ?Sized + EthMappingsStore> EthMappingsStoreExt for T {
     }
 }
 
-pub trait IndicesStore {
-    fn read_bin(&self, key: &Cid) -> anyhow::Result<Option<Vec<u8>>>;
-
-    fn write_bin(&self, key: &Cid, value: &[u8]) -> anyhow::Result<()>;
-
-    #[allow(dead_code)]
-    fn exists(&self, key: &Cid) -> anyhow::Result<bool>;
-}
-
-impl<T: IndicesStore> IndicesStore for Arc<T> {
-    fn read_bin(&self, key: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
-        IndicesStore::read_bin(self.as_ref(), key)
-    }
-
-    fn write_bin(&self, key: &Cid, value: &[u8]) -> anyhow::Result<()> {
-        IndicesStore::write_bin(self.as_ref(), key, value)
-    }
-
-    fn exists(&self, key: &Cid) -> anyhow::Result<bool> {
-        IndicesStore::exists(self.as_ref(), key)
-    }
-}
-
-pub trait IndicesStoreExt {
-    fn read_obj<V: DeserializeOwned>(&self, key: &Cid) -> anyhow::Result<Option<V>>;
-    fn write_obj<V: Serialize>(&self, key: &Cid, value: &V) -> anyhow::Result<()>;
-}
-
-impl<T: ?Sized + IndicesStore> IndicesStoreExt for T {
-    fn read_obj<V: DeserializeOwned>(&self, key: &Cid) -> anyhow::Result<Option<V>> {
-        match self.read_bin(key)? {
-            Some(bytes) => Ok(Some(fvm_ipld_encoding::from_slice(&bytes)?)),
-            None => Ok(None),
-        }
-    }
-
-    fn write_obj<V: Serialize>(&self, key: &Cid, value: &V) -> anyhow::Result<()> {
-        self.write_bin(key, &fvm_ipld_encoding::to_vec(value)?)
-    }
-}
-
 /// Traits for collecting DB stats
 pub trait DBStatistics {
     fn get_statistics(&self) -> Option<String> {
diff --git a/src/db/parity_db.rs b/src/db/parity_db.rs
@@ -1,7 +1,7 @@
 // Copyright 2019-2025 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use super::{EthMappingsStore, IndicesStore, PersistentStore, SettingsStore};
+use super::{EthMappingsStore, PersistentStore, SettingsStore};
 use crate::blocks::TipsetKey;
 use crate::db::{DBStatistics, parity_db_config::ParityDbConfig};
 use crate::libp2p_bitswap::{BitswapStoreRead, BitswapStoreReadWrite};
@@ -39,8 +39,6 @@ pub enum DbColumn {
     /// Anything stored in this column can be considered permanent, unless manually
     /// deleted.
     PersistentGraph,
-    /// Column for storing indexed values.
-    Indices,
 }
 
 impl DbColumn {
@@ -77,12 +75,6 @@ impl DbColumn {
                         compression,
                         ..Default::default()
                     },
-                    DbColumn::Indices => parity_db::ColumnOptions {
-                        preimage: false,
-                        btree_index: false,
-                        compression,
-                        ..Default::default()
-                    },
                 }
             })
             .collect()
@@ -229,23 +221,6 @@ impl EthMappingsStore for ParityDb {
     }
 }
 
-impl IndicesStore for ParityDb {
-    fn read_bin(&self, key: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
-        self.read_from_column(key.to_bytes(), DbColumn::Indices)
-    }
-
-    fn write_bin(&self, key: &Cid, value: &[u8]) -> anyhow::Result<()> {
-        self.write_to_column(key.to_bytes(), value, DbColumn::Indices)
-    }
-
-    fn exists(&self, key: &Cid) -> anyhow::Result<bool> {
-        self.db
-            .get_size(DbColumn::Indices as u8, &key.to_bytes())
-            .map(|size| size.is_some())
-            .context("error checking if key exists")
-    }
-}
-
 fn has_subscribers<T>(tx: &tokio::sync::broadcast::Sender<T>) -> bool {
     tx.closed().now_or_never().is_none()
 }
@@ -463,7 +438,6 @@ mod test {
                 DbColumn::Settings => panic!("invalid column for IPLD data"),
                 DbColumn::EthMappings => panic!("invalid column for IPLD data"),
                 DbColumn::PersistentGraph => panic!("invalid column for GC enabled IPLD data"),
-                DbColumn::Indices => panic!("invalid indices column for IPLD data"),
             };
             let actual = db.read_from_column(cid.to_bytes(), other_column).unwrap();
             assert!(actual.is_none());
diff --git a/src/libp2p/chain_exchange/provider.rs b/src/libp2p/chain_exchange/provider.rs
@@ -176,7 +176,6 @@ mod tests {
 
         let response = make_chain_exchange_response(
             &ChainStore::new(
-                db.clone(),
                 db.clone(),
                 db.clone(),
                 db,
diff --git a/src/rpc/methods/chain.rs b/src/rpc/methods/chain.rs
@@ -1611,7 +1611,6 @@ mod tests {
                 db,
                 Arc::new(MemoryDB::default()),
                 Arc::new(MemoryDB::default()),
-                Arc::new(MemoryDB::default()),
                 Arc::new(ChainConfig::calibnet()),
                 genesis_block_header,
             )
diff --git a/src/rpc/methods/eth/filter/mod.rs b/src/rpc/methods/eth/filter/mod.rs
@@ -280,8 +280,7 @@ impl EthEventHandler {
 
         let messages = ctx.chain_store().messages_for_tipset(tipset)?;
 
-        let StateEvents { events, .. } =
-            ctx.state_manager.tipset_state_events(tipset, None).await?;
+        let StateEvents { events, .. } = ctx.state_manager.tipset_state_events(tipset).await?;
 
         ensure!(
             messages.len() == events.len(),
diff --git a/src/rpc/methods/sync.rs b/src/rpc/methods/sync.rs
@@ -187,15 +187,7 @@ mod tests {
         });
 
         let cs_arc = Arc::new(
-            ChainStore::new(
-                db.clone(),
-                db.clone(),
-                db.clone(),
-                db,
-                chain_config,
-                genesis_header,
-            )
-            .unwrap(),
+            ChainStore::new(db.clone(), db.clone(), db, chain_config, genesis_header).unwrap(),
         );
 
         let state_manager = Arc::new(StateManager::new(cs_arc.clone()).unwrap());
diff --git a/src/state_manager/mod.rs b/src/state_manager/mod.rs
@@ -492,15 +492,10 @@ where
                 let state_output = self
                     .compute_tipset_state(tipset.clone(), NO_CALLBACK, VMTrace::NotTraced)
                     .await?;
-                for events_root in state_output.events_roots.iter().flatten() {
-                    trace!("Indexing events root @{}: {}", tipset.epoch(), events_root);
-                    self.chain_store().put_index(events_root, key)?;
-                }
 
                 self.update_cache_with_state_output(key, &state_output);
 
                 let ts_state = state_output.into();
-                trace!("Completed tipset state calculation {:?}", tipset.cids());
 
                 Ok(ts_state)
             })
@@ -555,7 +550,6 @@ where
     pub async fn tipset_state_events(
         self: &Arc<Self>,
         tipset: &Tipset,
-        _events_root: Option<&Cid>,
     ) -> anyhow::Result<StateEvents> {
         let key = tipset.key();
         let ts = tipset.clone();
diff --git a/src/state_manager/tests.rs b/src/state_manager/tests.rs
@@ -62,7 +62,6 @@ fn setup_chain_with_tipsets() -> TestChainSetup {
             db.clone(),
             db.clone(),
             db.clone(),
-            db.clone(),
             chain_config.clone(),
             genesis_header.clone().into(),
         )
diff --git a/src/tool/offline_server/server.rs b/src/tool/offline_server/server.rs
@@ -94,7 +94,6 @@ pub async fn start_offline_server(
         db.clone(),
         db.clone(),
         db.clone(),
-        db.clone(),
         chain_config,
         genesis_header.clone(),
     )?);
diff --git a/src/tool/subcommands/api_cmd/api_compare_tests.rs b/src/tool/subcommands/api_cmd/api_compare_tests.rs
@@ -2274,7 +2274,6 @@ async fn revalidate_chain(db: Arc<ManyCar>, n_ts_to_validate: usize) -> anyhow::
         db.clone(),
         db.clone(),
         db.clone(),
-        db.clone(),
         chain_config,
         genesis_header.clone(),
     )?);
diff --git a/src/tool/subcommands/api_cmd/generate_test_snapshot.rs b/src/tool/subcommands/api_cmd/generate_test_snapshot.rs
diff --git a/src/tool/subcommands/api_cmd/test_snapshot.rs b/src/tool/subcommands/api_cmd/test_snapshot.rs
diff --git a/src/tool/subcommands/index_cmd.rs b/src/tool/subcommands/index_cmd.rs
diff --git a/src/tool/subcommands/state_compute_cmd.rs b/src/tool/subcommands/state_compute_cmd.rs

Original file line number	Diff line number	Diff line change
`@@ -918,7 +918,6 @@ mod tests {`
`918`	`918`	`db.clone(),`
`919`	`919`	`db.clone(),`
`920`	`920`	`db.clone(),`
`921`		`- db.clone(),`
`922`	`921`	`Default::default(),`
`923`	`922`	`genesis_header.clone().into(),`
`924`	`923`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1611,7 +1611,6 @@ mod tests {`
`1611`	`1611`	`db,`
`1612`	`1612`	`Arc::new(MemoryDB::default()),`
`1613`	`1613`	`Arc::new(MemoryDB::default()),`
`1614`		`- Arc::new(MemoryDB::default()),`
`1615`	`1614`	`Arc::new(ChainConfig::calibnet()),`
`1616`	`1615`	`genesis_block_header,`
`1617`	`1616`	`)`