diff --git a/crates/index-scheduler/src/features.rs b/crates/index-scheduler/src/features.rs index 143b96857..e69362513 100644 --- a/crates/index-scheduler/src/features.rs +++ b/crates/index-scheduler/src/features.rs @@ -8,11 +8,15 @@ use crate::error::FeatureNotEnabledError; use crate::Result; /// The number of database used by features -const NUMBER_OF_DATABASES: u32 = 2; +const NUMBER_OF_DATABASES: u32 = 1; /// Database const names for the `FeatureData`. mod db_name { pub const EXPERIMENTAL_FEATURES: &str = "experimental-features"; - const NETWORK: &str = "network"; +} + +mod db_keys { + pub const EXPERIMENTAL_FEATURES: &str = "experimental-features"; + pub const NETWORK: &str = "network"; } #[derive(Clone)] @@ -104,7 +108,7 @@ impl FeatureData { env.create_database(wtxn, Some(db_name::EXPERIMENTAL_FEATURES))?; let persisted_features: RuntimeTogglableFeatures = - runtime_features_db.get(wtxn, db_name::EXPERIMENTAL_FEATURES)?.unwrap_or_default(); + runtime_features_db.get(wtxn, db_keys::EXPERIMENTAL_FEATURES)?.unwrap_or_default(); let InstanceTogglableFeatures { metrics, logs_route, contains_filter } = instance_features; let runtime = Arc::new(RwLock::new(RuntimeTogglableFeatures { metrics: metrics || persisted_features.metrics, @@ -114,7 +118,7 @@ impl FeatureData { })); let network_db = runtime_features_db.remap_data_type::>(); - let network: Network = network_db.get(&txn, db_name::NETWORK)?.unwrap_or_default(); + let network: Network = network_db.get(wtxn, db_keys::NETWORK)?.unwrap_or_default(); Ok(Self { persisted: runtime_features_db, @@ -128,7 +132,7 @@ impl FeatureData { mut wtxn: RwTxn, features: RuntimeTogglableFeatures, ) -> Result<()> { - self.persisted.put(&mut wtxn, db_name::EXPERIMENTAL_FEATURES, &features)?; + self.persisted.put(&mut wtxn, db_keys::EXPERIMENTAL_FEATURES, &features)?; wtxn.commit()?; // safe to unwrap, the lock will only fail if: @@ -153,7 +157,7 @@ impl FeatureData { pub fn put_network(&self, mut wtxn: RwTxn, new_network: Network) -> Result<()> { self.persisted.remap_data_type::>().put( &mut wtxn, - db_name::NETWORK, + db_keys::NETWORK, &new_network, )?; wtxn.commit()?;