snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-11 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

move Network route types to meilisearch_types and prefix existing ones by Db

Browse Source
This commit is contained in:
Louis Dureuil
2025-09-23 16:32:34 +02:00
parent 7313cefd74
commit 0f3ef8de73
11 changed files with 84 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/index-scheduler/src/features.rs
View File

@@ -1,6 +1,6 @@
use std::sync::{Arc, RwLock};
use meilisearch_types::enterprise_edition::network::Network;
use meilisearch_types::enterprise_edition::network::DbNetwork;
use meilisearch_types::features::{InstanceTogglableFeatures, RuntimeTogglableFeatures};
use meilisearch_types::heed::types::{SerdeJson, Str};
use meilisearch_types::heed::{Database, Env, RwTxn, WithoutTls};
@@ -24,7 +24,7 @@ mod db_keys {
pub(crate) struct FeatureData {
persisted: Database<Str, SerdeJson<RuntimeTogglableFeatures>>,
runtime: Arc<RwLock<RuntimeTogglableFeatures>>,
network: Arc<RwLock<Network>>,
network: Arc<RwLock<DbNetwork>>,
}
#[derive(Debug, Clone, Copy)]
@@ -197,8 +197,8 @@ impl FeatureData {
}));
// Once this is stabilized, network should be stored along with webhooks in index-scheduler's persisted database
let network_db = runtime_features_db.remap_data_type::<SerdeJson<Network>>();
let network: Network = network_db.get(wtxn, db_keys::NETWORK)?.unwrap_or_default();
let network_db = runtime_features_db.remap_data_type::<SerdeJson<DbNetwork>>();
let network: DbNetwork = network_db.get(wtxn, db_keys::NETWORK)?.unwrap_or_default();
Ok(Self {
persisted: runtime_features_db,
@@ -234,8 +234,8 @@ impl FeatureData {
RoFeatures::new(self)
}
pub fn put_network(&self, mut wtxn: RwTxn, new_network: Network) -> Result<()> {
self.persisted.remap_data_type::<SerdeJson<Network>>().put(
pub fn put_network(&self, mut wtxn: RwTxn, new_network: DbNetwork) -> Result<()> {
self.persisted.remap_data_type::<SerdeJson<DbNetwork>>().put(
&mut wtxn,
db_keys::NETWORK,
&new_network,
@@ -247,7 +247,7 @@ impl FeatureData {
Ok(())
}
pub fn network(&self) -> Network {
Network::clone(&*self.network.read().unwrap())
pub fn network(&self) -> DbNetwork {
DbNetwork::clone(&*self.network.read().unwrap())
}
}

6
crates/index-scheduler/src/lib.rs
View File

@@ -54,7 +54,7 @@ pub use features::RoFeatures;
use flate2::bufread::GzEncoder;
use flate2::Compression;
use meilisearch_types::batches::Batch;
use meilisearch_types::enterprise_edition::network::Network;
use meilisearch_types::enterprise_edition::network::DbNetwork;
use meilisearch_types::features::{
ChatCompletionSettings, InstanceTogglableFeatures, RuntimeTogglableFeatures,
};
@@ -892,13 +892,13 @@ impl IndexScheduler {
Ok(())
}
pub fn put_network(&self, network: Network) -> Result<()> {
pub fn put_network(&self, network: DbNetwork) -> Result<()> {
let wtxn = self.env.write_txn().map_err(Error::HeedTransaction)?;
self.features.put_network(wtxn, network)?;
Ok(())
}
pub fn network(&self) -> Network {
pub fn network(&self) -> DbNetwork {
self.features.network()
}