feat(query): Independent system/information_schema database in different catalogs (#17863)

Author: TCeason

Cargo.lock

@@ -15,6 +15,7 @@
 use std::any::Any;
 use std::fmt::Debug;
 use std::sync::Arc;
+use std::unimplemented;
 
 use databend_common_ast::ast::Engine;
 use databend_common_exception::ErrorCode;

src/query/catalog/src/catalog/interface.rs

@@ -103,7 +103,7 @@ impl ProcedureMgr {
         Ok(dropped)
     }
 
-    //#[fastrace::trace]
+    #[fastrace::trace]
     pub async fn get_procedure(
         &self,
         req: &GetProcedureReq,
@@ -121,6 +121,7 @@ impl ProcedureMgr {
             procedure_meta: seq_meta.data,
         }))
     }
+
     #[fastrace::trace]
     pub async fn list_procedures(
         &self,

src/query/management/src/procedure/procedure_mgr.rs

@@ -136,7 +136,7 @@ impl Debug for DatabaseCatalog {
 impl DatabaseCatalog {
     #[async_backtrace::framed]
     pub async fn try_create_with_config(conf: InnerConfig) -> Result<DatabaseCatalog> {
-        let immutable_catalog = ImmutableCatalog::try_create_with_config(&conf).await?;
+        let immutable_catalog = ImmutableCatalog::try_create_with_config(Some(&conf), None)?;
         let mutable_catalog = MutableCatalog::try_create_with_config(conf).await?;
         let session_catalog = SessionCatalog::create(mutable_catalog, SessionState::default());
         let table_function_factory = TableFunctionFactory::create();

src/query/service/src/catalogs/default/database_catalog.rs

@@ -117,14 +117,22 @@ impl Debug for ImmutableCatalog {
 
 impl ImmutableCatalog {
     #[async_backtrace::framed]
-    pub async fn try_create_with_config(conf: &InnerConfig) -> Result<Self> {
+    pub fn try_create_with_config(
+        conf: Option<&InnerConfig>,
+        catalog_name: Option<&String>,
+    ) -> Result<Self> {
         // The global db meta.
         let mut sys_db_meta = InMemoryMetas::create(SYS_DB_ID_BEGIN, SYS_TBL_ID_BEGIN);
         sys_db_meta.init_db("system");
         sys_db_meta.init_db("information_schema");
 
-        let sys_db = SystemDatabase::create(&mut sys_db_meta, conf);
-        let info_schema_db = InformationSchemaDatabase::create(&mut sys_db_meta);
+        let catalog_name = if let Some(ctl_name) = catalog_name {
+            ctl_name
+        } else {
+            "default"
+        };
+        let sys_db = SystemDatabase::create(&mut sys_db_meta, conf, catalog_name);
+        let info_schema_db = InformationSchemaDatabase::create(&mut sys_db_meta, catalog_name);
 
         Ok(Self {
             info_schema_db: Arc::new(info_schema_db),
@@ -467,8 +475,6 @@ impl Catalog for ImmutableCatalog {
         ))
     }
 
-    // Table index
-
     #[async_backtrace::framed]
     async fn create_index(&self, _req: CreateIndexReq) -> Result<CreateIndexReply> {
         unimplemented!()