Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e56df8a
refactor(query): iceberg catalog support information_shcema/system da…
TCeason Apr 28, 2025
485018d
try optimize external sys table query, no need to check privilege
TCeason Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/query/management/src/procedure/procedure_mgr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl ProcedureMgr {
Ok(dropped)
}

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

#[fastrace::trace]
pub async fn list_procedures(
&self,
Expand Down
2 changes: 1 addition & 1 deletion src/query/service/src/catalogs/default/database_catalog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,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();
Expand Down
18 changes: 11 additions & 7 deletions src/query/service/src/catalogs/default/immutable_catalog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,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),
Expand Down Expand Up @@ -472,8 +480,6 @@ impl Catalog for ImmutableCatalog {
))
}

// Table index

#[async_backtrace::framed]
async fn create_index(&self, _req: CreateIndexReq) -> Result<CreateIndexReply> {
unimplemented!()
Expand Down Expand Up @@ -512,8 +518,6 @@ impl Catalog for ImmutableCatalog {
unimplemented!()
}

// Virtual column

#[async_backtrace::framed]
async fn create_virtual_column(&self, _req: CreateVirtualColumnReq) -> Result<()> {
unimplemented!()
Expand Down
Loading
Loading