rename PrimaryExtraConfig to PrimaryConfig

Author: MarinPostma

libsql-server/src/lib.rs

@@ -972,7 +972,7 @@ where
         migration_scheduler_handle: SchedulerHandle,
         scripted_backup: Option<ScriptBackupManager>,
     ) {
-        let primary_config = PrimaryExtraConfig {
+        let primary_config = PrimaryConfig {
             max_log_size: self.db_config.max_log_size,
             max_log_duration: self.db_config.max_log_duration.map(Duration::from_secs_f32),
             bottomless_replication: self.db_config.bottomless_replication.clone(),

libsql-server/src/namespace/configurator/fork.rs

@@ -20,7 +20,7 @@ use crate::replication::{LogReadError, ReplicationLogger};
 use crate::{BLOCKING_RT, LIBSQL_PAGE_SIZE};
 
 use super::helpers::make_bottomless_options;
-use super::{NamespaceName, NamespaceStore, PrimaryExtraConfig, RestoreOption};
+use super::{NamespaceName, NamespaceStore, PrimaryConfig, RestoreOption};
 
 type Result<T> = crate::Result<T, ForkError>;
 
@@ -31,7 +31,7 @@ pub(super) async fn fork(
     to_config: MetaStoreHandle,
     timestamp: Option<NaiveDateTime>,
     store: NamespaceStore,
-    primary_config: &PrimaryExtraConfig,
+    primary_config: &PrimaryConfig,
     base_path: Arc<Path>,
 ) -> crate::Result<Namespace> {
     let from_config = from_config.get();

libsql-server/src/namespace/configurator/helpers.rs

@@ -31,14 +31,14 @@ use crate::replication::{FrameNo, ReplicationLogger};
 use crate::stats::Stats;
 use crate::{StatsSender, BLOCKING_RT, DB_CREATE_TIMEOUT, DEFAULT_AUTO_CHECKPOINT};
 
-use super::{BaseNamespaceConfig, PrimaryExtraConfig};
+use super::{BaseNamespaceConfig, PrimaryConfig};
 
 const WASM_TABLE_CREATE: &str =
     "CREATE TABLE libsql_wasm_func_table (name text PRIMARY KEY, body text) WITHOUT ROWID;";
 
 #[tracing::instrument(skip_all)]
 pub(super) async fn make_primary_connection_maker(
-    primary_config: &PrimaryExtraConfig,
+    primary_config: &PrimaryConfig,
     base_config: &BaseNamespaceConfig,
     meta_store_handle: &MetaStoreHandle,
     db_path: &Path,
@@ -422,7 +422,7 @@ async fn run_storage_monitor(
 
 pub(super) async fn cleanup_primary(
     base: &BaseNamespaceConfig,
-    primary_config: &PrimaryExtraConfig,
+    primary_config: &PrimaryConfig,
     namespace: &NamespaceName,
     db_config: &DatabaseConfig,
     prune_all: bool,

libsql-server/src/namespace/configurator/mod.rs

@@ -48,7 +48,7 @@ pub struct BaseNamespaceConfig {
 }
 
 #[derive(Clone)]
-pub struct PrimaryExtraConfig {
+pub struct PrimaryConfig {
     pub(crate) max_log_size: u64,
     pub(crate) max_log_duration: Option<Duration>,
     pub(crate) bottomless_replication: Option<bottomless::replicator::Options>,