Use GlobalConfig.

RinChanNOWWW · RinChanNOWWW · commit e34ae242b355 · 2022-12-07T17:21:35.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/query/catalog/src/catalog/interface.rs b/src/query/catalog/src/catalog/interface.rs
@@ -177,7 +177,6 @@ pub trait Catalog: DynClone + Send + Sync {
         &self,
         _func_name: &str,
         _tbl_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         Err(ErrorCode::Unimplemented(
             "'get_table_function' not implemented",
diff --git a/src/query/service/src/catalogs/default/database_catalog.rs b/src/query/service/src/catalogs/default/database_catalog.rs
@@ -474,9 +474,8 @@ impl Catalog for DatabaseCatalog {
         &self,
         func_name: &str,
         tbl_args: TableArgs,
-        conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
-        self.table_function_factory.get(func_name, tbl_args, conf)
+        self.table_function_factory.get(func_name, tbl_args)
     }
 
     fn get_table_engines(&self) -> Vec<StorageDescription> {
diff --git a/src/query/service/src/sessions/query_ctx.rs b/src/query/service/src/sessions/query_ctx.rs
@@ -95,12 +95,11 @@ impl QueryContext {
         table_args: Option<Vec<DataValue>>,
     ) -> Result<Arc<dyn Table>> {
         let catalog = self.get_catalog(catalog_name)?;
-        let conf = self.get_config();
         if table_args.is_none() {
             catalog.get_table_by_info(table_info)
         } else {
             Ok(catalog
-                .get_table_function(&table_info.name, table_args, &conf)?
+                .get_table_function(&table_info.name, table_args)?
                 .as_table())
         }
     }
diff --git a/src/query/service/src/table_functions/async_crash_me.rs b/src/query/service/src/table_functions/async_crash_me.rs
@@ -55,7 +55,6 @@ impl AsyncCrashMeTable {
         _table_func_name: &str,
         table_id: u64,
         table_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         let mut panic_message = None;
         if let Some(args) = &table_args {
diff --git a/src/query/service/src/table_functions/numbers/numbers_table.rs b/src/query/service/src/table_functions/numbers/numbers_table.rs
@@ -59,7 +59,6 @@ impl NumbersTable {
         table_func_name: &str,
         table_id: u64,
         table_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         let mut total = None;
         if let Some(args) = &table_args {
diff --git a/src/query/service/src/table_functions/sync_crash_me.rs b/src/query/service/src/table_functions/sync_crash_me.rs
@@ -55,7 +55,6 @@ impl SyncCrashMeTable {
         _table_func_name: &str,
         table_id: u64,
         table_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         let mut panic_message = None;
         if let Some(args) = &table_args {
diff --git a/src/query/service/src/table_functions/table_function_factory.rs b/src/query/service/src/table_functions/table_function_factory.rs
@@ -15,7 +15,6 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use common_config::Config;
 use common_datavalues::DataValue;
 use common_exception::ErrorCode;
 use common_exception::Result;
@@ -45,13 +44,12 @@ pub trait TableFunctionCreator: Send + Sync {
         tbl_func_name: &str,
         tbl_id: MetaId,
         arg: TableArgs,
-        conf: &Config,
     ) -> Result<Arc<dyn TableFunction>>;
 }
 
 impl<T> TableFunctionCreator for T
 where
-    T: Fn(&str, &str, MetaId, TableArgs, &Config) -> Result<Arc<dyn TableFunction>>,
+    T: Fn(&str, &str, MetaId, TableArgs) -> Result<Arc<dyn TableFunction>>,
     T: Send + Sync,
 {
     fn try_create(
@@ -60,9 +58,8 @@ where
         tbl_func_name: &str,
         tbl_id: MetaId,
         arg: TableArgs,
-        conf: &Config,
     ) -> Result<Arc<dyn TableFunction>> {
-        self(db_name, tbl_func_name, tbl_id, arg, conf)
+        self(db_name, tbl_func_name, tbl_id, arg)
     }
 }
 
@@ -145,18 +142,13 @@ impl TableFunctionFactory {
         }
     }
 
-    pub fn get(
-        &self,
-        func_name: &str,
-        tbl_args: TableArgs,
-        conf: &Config,
-    ) -> Result<Arc<dyn TableFunction>> {
+    pub fn get(&self, func_name: &str, tbl_args: TableArgs) -> Result<Arc<dyn TableFunction>> {
         let lock = self.creators.read();
         let func_name = func_name.to_lowercase();
         let (id, factory) = lock.get(&func_name).ok_or_else(|| {
             ErrorCode::UnknownTable(format!("Unknown table function {}", func_name))
         })?;
-        let func = factory.try_create("", &func_name, *id, tbl_args, conf)?;
+        let func = factory.try_create("", &func_name, *id, tbl_args)?;
         Ok(func)
     }
 }
diff --git a/src/query/service/tests/it/storages/fuse/table_test_fixture.rs b/src/query/service/tests/it/storages/fuse/table_test_fixture.rs
@@ -350,13 +350,7 @@ pub async fn test_drive_with_args_and_ctx(
     tbl_args: TableArgs,
     ctx: Arc<QueryContext>,
 ) -> Result<SendableDataBlockStream> {
-    let func = FuseSnapshotTable::create(
-        "system",
-        "fuse_snapshot",
-        1,
-        tbl_args,
-        &common_config::Config::default(),
-    )?;
+    let func = FuseSnapshotTable::create("system", "fuse_snapshot", 1, tbl_args)?;
     let source_plan = func
         .clone()
         .as_table()
@@ -372,13 +366,7 @@ pub async fn test_drive_clustering_information(
     tbl_args: TableArgs,
     ctx: Arc<QueryContext>,
 ) -> Result<SendableDataBlockStream> {
-    let func = ClusteringInformationTable::create(
-        "system",
-        "clustering_information",
-        1,
-        tbl_args,
-        &common_config::Config::default(),
-    )?;
+    let func = ClusteringInformationTable::create("system", "clustering_information", 1, tbl_args)?;
     let source_plan = func
         .clone()
         .as_table()
diff --git a/src/query/service/tests/it/table_functions/numbers_table.rs b/src/query/service/tests/it/table_functions/numbers_table.rs
@@ -36,13 +36,7 @@ use crate::tests::TestGlobalServices;
 async fn test_number_table() -> Result<()> {
     let tbl_args = Some(vec![DataValue::UInt64(8)]);
     let (_guard, ctx) = crate::tests::create_query_context().await?;
-    let table = NumbersTable::create(
-        "system",
-        "numbers_mt",
-        1,
-        tbl_args,
-        &common_config::Config::default(),
-    )?;
+    let table = NumbersTable::create("system", "numbers_mt", 1, tbl_args)?;
 
     let source_plan = table
         .clone()
diff --git a/src/query/sql/src/planner/binder/table.rs b/src/query/sql/src/planner/binder/table.rs
@@ -229,16 +229,13 @@ impl<'a> Binder {
 
                 let table_args = Some(expressions);
 
-                let conf = self.ctx.get_config();
-
                 // Table functions always reside is default catalog
                 let table_meta: Arc<dyn TableFunction> = self
                     .catalogs
                     .get_catalog(CATALOG_DEFAULT)?
                     .get_table_function(
                         &normalize_identifier(name, &self.name_resolution_ctx).name,
                         table_args,
-                        &conf,
                     )?;
                 let table = table_meta.as_table();
                 let table_alias_name = if let Some(table_alias) = alias {
diff --git a/src/query/storages/fuse/fuse/src/table_functions/clustering_informations/clustering_information_table.rs b/src/query/storages/fuse/fuse/src/table_functions/clustering_informations/clustering_information_table.rs
@@ -59,7 +59,6 @@ impl ClusteringInformationTable {
         table_func_name: &str,
         table_id: u64,
         table_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         let (arg_database_name, arg_table_name) = parse_func_table_args(&table_args)?;
 
diff --git a/src/query/storages/fuse/fuse/src/table_functions/fuse_blocks/fuse_block_table.rs b/src/query/storages/fuse/fuse/src/table_functions/fuse_blocks/fuse_block_table.rs
@@ -57,7 +57,6 @@ impl FuseBlockTable {
         table_func_name: &str,
         table_id: u64,
         table_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         let (arg_database_name, arg_table_name, arg_snapshot_id) =
             parse_func_table_args(&table_args)?;
diff --git a/src/query/storages/fuse/fuse/src/table_functions/fuse_segments/fuse_segment_table.rs b/src/query/storages/fuse/fuse/src/table_functions/fuse_segments/fuse_segment_table.rs
@@ -57,7 +57,6 @@ impl FuseSegmentTable {
         table_func_name: &str,
         table_id: u64,
         table_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         let (arg_database_name, arg_table_name, arg_snapshot_id) =
             parse_func_history_args(&table_args)?;
diff --git a/src/query/storages/fuse/fuse/src/table_functions/fuse_snapshots/fuse_snapshot_table.rs b/src/query/storages/fuse/fuse/src/table_functions/fuse_snapshots/fuse_snapshot_table.rs
@@ -56,7 +56,6 @@ impl FuseSnapshotTable {
         table_func_name: &str,
         table_id: u64,
         table_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         let (arg_database_name, arg_table_name) = parse_func_history_args(&table_args)?;
 
diff --git a/src/query/storages/fuse/fuse/src/table_functions/fuse_statistics/fuse_statistic_table.rs b/src/query/storages/fuse/fuse/src/table_functions/fuse_statistics/fuse_statistic_table.rs
@@ -56,7 +56,6 @@ impl FuseStatisticTable {
         table_func_name: &str,
         table_id: u64,
         table_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         let (arg_database_name, arg_table_name) = parse_func_history_args(&table_args)?;
 
diff --git a/src/query/storages/hive/hive/Cargo.toml b/src/query/storages/hive/hive/Cargo.toml
@@ -15,7 +15,6 @@ test = false
 common-arrow = { path = "../../../../common/arrow" }
 common-base = { path = "../../../../common/base" }
 common-catalog = { path = "../../../catalog" }
-common-config = { path = "../../../config" }
 common-datablocks = { path = "../../../datablocks" }
 common-datavalues = { path = "../../../datavalues" }
 common-exception = { path = "../../../../common/exception" }
diff --git a/src/query/storages/hive/hive/src/hive_catalog.rs b/src/query/storages/hive/hive/src/hive_catalog.rs
@@ -406,7 +406,6 @@ impl Catalog for HiveCatalog {
         &self,
         _func_name: &str,
         _tbl_args: TableArgs,
-        _conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
         unimplemented!()
     }
diff --git a/src/query/storages/parquet/src/table_function/read.rs b/src/query/storages/parquet/src/table_function/read.rs
@@ -17,6 +17,7 @@ use std::sync::Arc;
 use common_catalog::plan::DataSourcePlan;
 use common_catalog::plan::Projection;
 use common_catalog::plan::PushDownInfo;
+use common_config::GlobalConfig;
 use common_datavalues::DataSchemaRef;
 use common_exception::Result;
 use common_pipeline_core::Pipeline;
@@ -97,7 +98,7 @@ impl ParquetTable {
         ctx: &Arc<dyn TableContext>,
         projection: &Projection,
     ) -> Result<usize> {
-        let conf = ctx.get_config();
+        let conf = GlobalConfig::instance();
         let mut max_memory_usage = ctx.get_settings().get_max_memory_usage()? as usize;
         if conf.query.table_cache_enabled {
             // Removing bloom index memory size.
diff --git a/src/query/storages/parquet/src/table_function/table.rs b/src/query/storages/parquet/src/table_function/table.rs
@@ -31,6 +31,7 @@ use common_catalog::plan::PushDownInfo;
 use common_catalog::table::Table;
 use common_catalog::table_args::TableArgs;
 use common_catalog::table_function::TableFunction;
+use common_config::GlobalConfig;
 use common_datavalues::DataSchema;
 use common_datavalues::DataValue;
 use common_exception::ErrorCode;
@@ -62,9 +63,8 @@ impl ParquetTable {
         table_func_name: &str,
         table_id: u64,
         table_args: TableArgs,
-        conf: &common_config::Config,
     ) -> Result<Arc<dyn TableFunction>> {
-        if !conf.storage.allow_insecure {
+        if !GlobalConfig::instance().storage.allow_insecure {
             return Err(ErrorCode::StorageInsecure(
                 "Should enable `allow_insecure` to use table function `read_parquet`",
             ));

Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,11 @@ impl QueryContext {`
`95`	`95`	`table_args: Option<Vec<DataValue>>,`
`96`	`96`	`) -> Result<Arc<dyn Table>> {`
`97`	`97`	`let catalog = self.get_catalog(catalog_name)?;`
`98`		`- let conf = self.get_config();`
`99`	`98`	`if table_args.is_none() {`
`100`	`99`	`catalog.get_table_by_info(table_info)`
`101`	`100`	`} else {`
`102`	`101`	`Ok(catalog`
`103`		`- .get_table_function(&table_info.name, table_args, &conf)?`
	`102`	`+ .get_table_function(&table_info.name, table_args)?`
`104`	`103`	`.as_table())`
`105`	`104`	`}`
`106`	`105`	`}`