fix: changes required for migrate dev to main

src/catalog/Cargo.toml

@@ -37,6 +37,7 @@ test = []
 async-trait = { workspace = true }
 common_types = { workspace = true }
 generic_error = { workspace = true }
+lazy_static = { workspace = true }
 logger = { workspace = true }
 macros = { workspace = true }
 snafu = { workspace = true }

src/catalog/src/consts.rs

@@ -17,8 +17,13 @@
 
 //! Catalog constants
 
-/// Default catalog name
-pub const DEFAULT_CATALOG: &str = "horaedb";
+use lazy_static::lazy_static;
+
+lazy_static! {
+    /// Default catalog name
+    pub static ref DEFAULT_CATALOG: String =
+        std::env::var("HORAEDB_DEFAULT_CATALOG").unwrap_or_else(|_| "horaedb".to_string());
+}
 /// Default schema name
 pub const DEFAULT_SCHEMA: &str = "public";
 /// Catalog name of the sys catalog

src/catalog_impls/src/table_based.rs

@@ -114,7 +114,7 @@ pub struct TableBasedManager {
 
 impl Manager for TableBasedManager {
     fn default_catalog_name(&self) -> NameRef {
-        consts::DEFAULT_CATALOG
+        &consts::DEFAULT_CATALOG
     }
 
     fn default_schema_name(&self) -> NameRef {
@@ -255,7 +255,7 @@ impl TableBasedManager {
 
     async fn maybe_create_default_catalog(&mut self) -> Result<()> {
         // Try to get default catalog, create it if not exists.
-        let catalog = match self.catalogs.get(consts::DEFAULT_CATALOG) {
+        let catalog = match self.catalogs.get(consts::DEFAULT_CATALOG.as_str()) {
             Some(v) => v.clone(),
             None => {
                 // Only system catalog should exists.

src/catalog_impls/src/volatile.rs

@@ -71,7 +71,7 @@ impl ManagerImpl {
 
 impl Manager for ManagerImpl {
     fn default_catalog_name(&self) -> NameRef {
-        consts::DEFAULT_CATALOG
+        &consts::DEFAULT_CATALOG
     }
 
     fn default_schema_name(&self) -> NameRef {
@@ -96,7 +96,11 @@ impl ManagerImpl {
     fn maybe_create_default_catalog(&mut self) {
         // TODO: we should delegate this operation to the [TableManager].
         // Try to get default catalog, create it if not exists.
-        if self.catalogs.get(consts::DEFAULT_CATALOG).is_none() {
+        if self
+            .catalogs
+            .get(consts::DEFAULT_CATALOG.as_str())
+            .is_none()
+        {
             // Default catalog is not exists, create and store it.
             self.create_catalog(consts::DEFAULT_CATALOG.to_string());
         };

src/query_frontend/src/planner.rs

@@ -1389,7 +1389,7 @@ fn ensure_column_default_value_valid<P: MetaProvider>(
 // TODO: support catalog/schema
 pub fn get_table_ref(table_name: &str) -> TableReference {
     TableReference::from(ResolvedTableReference {
-        catalog: Cow::from(DEFAULT_CATALOG),
+        catalog: Cow::from(DEFAULT_CATALOG.as_str()),
         schema: Cow::from(DEFAULT_SCHEMA),
         table: Cow::from(table_name),
     })

src/query_frontend/src/tests.rs

@@ -93,7 +93,7 @@ impl Default for MockMetaProvider {
 
 impl MetaProvider for MockMetaProvider {
     fn default_catalog_name(&self) -> &str {
-        DEFAULT_CATALOG
+        &DEFAULT_CATALOG
     }
 
     fn default_schema_name(&self) -> &str {

src/server/src/session.rs

@@ -54,7 +54,7 @@ pub type SessionRef = Arc<Session>;
 impl Session {
     pub fn new(addr: Option<SocketAddr>, channel: Channel) -> Self {
         Session {
-            catalog: ArcSwap::new(Arc::new(DEFAULT_CATALOG.into())),
+            catalog: ArcSwap::new(Arc::new(DEFAULT_CATALOG.clone())),
             schema: ArcSwap::new(Arc::new(DEFAULT_SCHEMA.into())),
             conn_info: ConnInfo::new(addr, channel),
         }
@@ -166,7 +166,7 @@ pub fn parse_catalog_and_schema_from_db_string(db: &str) -> (&str, &str) {
     if parts.len() == 2 {
         (parts[0], parts[1])
     } else {
-        (DEFAULT_CATALOG, db)
+        (&DEFAULT_CATALOG, db)
     }
 }
 
@@ -177,7 +177,7 @@ mod tests {
 
     /// Build db name from catalog and schema string
     fn build_db_string(catalog: &str, schema: &str) -> String {
-        if catalog == DEFAULT_CATALOG {
+        if catalog == DEFAULT_CATALOG.as_str() {
             schema.to_string()
         } else {
             format!("{catalog}-{schema}")
@@ -186,14 +186,14 @@ mod tests {
 
     #[test]
     fn test_db_string() {
-        assert_eq!("test", build_db_string(DEFAULT_CATALOG, "test"));
+        assert_eq!("test", build_db_string(&DEFAULT_CATALOG, "test"));
         assert_eq!("a0b1c2d3-test", build_db_string("a0b1c2d3", "test"));
     }
 
     #[test]
     fn test_parse_catalog_and_schema() {
         assert_eq!(
-            (DEFAULT_CATALOG, "fullschema"),
+            (DEFAULT_CATALOG.as_str(), "fullschema"),
             parse_catalog_and_schema_from_db_string("fullschema")
         );