Revert "temp, use for test"

This reverts commit 5696744.

Author: dqhl76

src/query/service/src/global_services.rs

@@ -166,7 +166,9 @@ impl GlobalServices {
             DummyResourcesManagement::init()?;
         }
 
-        GlobalQueriesExecutor::init()?;
+        if config.query.enable_queries_executor {
+            GlobalQueriesExecutor::init()?;
+        }
 
         Self::init_workload_mgr(config).await?;
 

src/query/service/src/pipelines/executor/executor_settings.rs

@@ -16,6 +16,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use databend_common_catalog::table_context::TableContext;
+use databend_common_config::GlobalConfig;
 use databend_common_exception::Result;
 
 #[derive(Clone)]
@@ -34,11 +35,15 @@ impl ExecutorSettings {
         let max_threads = settings.get_max_threads()?;
         let max_execute_time_in_seconds = settings.get_max_execute_time_in_seconds()?;
 
-        // let config_enable_queries_executor = GlobalConfig::instance().query.enable_queries_executor;
-        // let setting_use_legacy_query_executor = settings.get_use_legacy_query_executor()?;
+        let config_enable_queries_executor = GlobalConfig::instance().query.enable_queries_executor;
+        let setting_use_legacy_query_executor = settings.get_use_legacy_query_executor()?;
         // If `use_legacy_query_executor` is set to 1, we disable the queries executor
         // Otherwise, we all follow configuration
-        let enable_queries_executor = true;
+        let enable_queries_executor = if setting_use_legacy_query_executor {
+            false
+        } else {
+            config_enable_queries_executor
+        };
 
         Ok(ExecutorSettings {
             enable_queries_executor,