Renaming

Signed-off-by: Xuanwo <github@xuanwo.io>

Author: Xuanwo

src/query/service/src/interpreters/interpreter_factory_v2.rs renamed to src/query/service/src/interpreters/interpreter_factory.rs

@@ -34,11 +34,11 @@ use crate::sql::plans::Plan;
 use crate::sql::DfStatement;
 
 /// InterpreterFactory is the entry of Interpreter.
-pub struct InterpreterFactoryV2;
+pub struct InterpreterFactory;
 
-/// InterpreterFactoryV2 provides `get` method which transforms `Plan` into the corresponding interpreter.
+/// InterpreterFactory provides `get` method which transforms `Plan` into the corresponding interpreter.
 /// Such as: Plan::Query -> InterpreterSelectV2
-impl InterpreterFactoryV2 {
+impl InterpreterFactory {
     /// Check if statement is supported by InterpreterFactoryV2
     pub fn check(stmt: &DfStatement) -> bool {
         matches!(stmt, DfStatement::SeeYouAgain)
@@ -52,7 +52,7 @@ impl InterpreterFactoryV2 {
             e
         })?;
 
-        let inner = InterpreterFactoryV2::create_interpreter(ctx.clone(), plan)?;
+        let inner = InterpreterFactory::create_interpreter(ctx.clone(), plan)?;
 
         Ok(Arc::new(InterceptorInterpreter::create(
             ctx,

src/query/service/src/interpreters/mod.rs

@@ -32,8 +32,8 @@ mod interpreter_delete;
 mod interpreter_empty;
 mod interpreter_explain;
 mod interpreter_explain_v2;
+mod interpreter_factory;
 mod interpreter_factory_interceptor;
-mod interpreter_factory_v2;
 mod interpreter_insert;
 mod interpreter_insert_v2;
 mod interpreter_kill;
@@ -109,8 +109,8 @@ pub use interpreter_delete::DeleteInterpreter;
 pub use interpreter_empty::EmptyInterpreter;
 pub use interpreter_explain::ExplainInterpreter;
 pub use interpreter_explain_v2::ExplainInterpreterV2;
+pub use interpreter_factory::InterpreterFactory;
 pub use interpreter_factory_interceptor::InterceptorInterpreter;
-pub use interpreter_factory_v2::InterpreterFactoryV2;
 pub use interpreter_insert::InsertInterpreter;
 pub use interpreter_insert_v2::InsertInterpreterV2;
 pub use interpreter_kill::KillInterpreter;

src/query/service/src/servers/http/clickhouse_handler.rs

@@ -44,7 +44,7 @@ use serde::Serialize;
 use tracing::error;
 use tracing::info;
 
-use crate::interpreters::InterpreterFactoryV2;
+use crate::interpreters::InterpreterFactory;
 use crate::interpreters::InterpreterPtr;
 use crate::pipelines::processors::port::OutputPort;
 use crate::pipelines::processors::StreamSource;
@@ -213,7 +213,7 @@ pub async fn clickhouse_handler_get(
     let format = get_format_from_plan(&plan, format)?;
 
     context.attach_query_str(&sql);
-    let interpreter = InterpreterFactoryV2::get(context.clone(), &plan)
+    let interpreter = InterpreterFactory::get(context.clone(), &plan)
         .await
         .map_err(BadRequest)?;
     execute(context, interpreter, plan.schema(), format, None, params)
@@ -269,7 +269,7 @@ pub async fn clickhouse_handler_post(
     let format = get_format_with_default(fmt, default_format)?;
     let format = get_format_from_plan(&plan, format)?;
     ctx.attach_query_str(&sql);
-    let interpreter = InterpreterFactoryV2::get(ctx.clone(), &plan)
+    let interpreter = InterpreterFactory::get(ctx.clone(), &plan)
         .await
         .map_err(BadRequest)?;
 

src/query/service/src/servers/http/v1/load.rs

@@ -33,7 +33,7 @@ use serde::Serialize;
 use tracing::error;
 
 use super::HttpQueryContext;
-use crate::interpreters::InterpreterFactoryV2;
+use crate::interpreters::InterpreterFactory;
 use crate::servers::http::v1::multipart_format::MultipartFormat;
 use crate::sessions::QueryContext;
 use crate::sessions::SessionType;
@@ -54,7 +54,7 @@ pub struct LoadResponse {
 #[allow(clippy::manual_async_fn)]
 fn execute_query(context: Arc<QueryContext>, plan: Plan) -> impl Future<Output = Result<()>> {
     async move {
-        let interpreter = InterpreterFactoryV2::get(context.clone(), &plan).await?;
+        let interpreter = InterpreterFactory::get(context.clone(), &plan).await?;
 
         if let Err(cause) = interpreter.start().await {
             error!("interpreter.start error: {:?}", cause);

src/query/service/src/servers/http/v1/query/execute_state.rs

@@ -37,7 +37,7 @@ use tracing::error;
 use ExecuteState::*;
 
 use crate::interpreters::Interpreter;
-use crate::interpreters::InterpreterFactoryV2;
+use crate::interpreters::InterpreterFactory;
 use crate::interpreters::InterpreterQueryLog;
 use crate::pipelines::executor::ExecutorSettings;
 use crate::pipelines::executor::PipelineCompleteExecutor;
@@ -235,7 +235,7 @@ impl ExecuteState {
         let mut planner = Planner::new(ctx.clone());
         let (plan, _, _) = planner.plan_sql(sql).await?;
         let is_select = matches!(&plan, Plan::Query { .. });
-        let interpreter = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+        let interpreter = InterpreterFactory::get(ctx.clone(), &plan).await?;
 
         if is_select {
             let _ = interpreter

src/query/service/src/servers/mysql/mysql_interactive_worker.rs

@@ -41,7 +41,7 @@ use tracing::info;
 use tracing::Instrument;
 
 use crate::interpreters::Interpreter;
-use crate::interpreters::InterpreterFactoryV2;
+use crate::interpreters::InterpreterFactory;
 use crate::interpreters::InterpreterQueryLog;
 use crate::servers::mysql::writers::DFInitResultWriter;
 use crate::servers::mysql::writers::DFQueryResultWriter;
@@ -332,7 +332,7 @@ impl<W: AsyncWrite + Send + Unpin> InteractiveWorkerBase<W> {
 
                 let mut planner = Planner::new(context.clone());
                 let plan = planner.plan_sql(query).await?;
-                let interpreter = InterpreterFactoryV2::get(context.clone(), &plan.0).await;
+                let interpreter = InterpreterFactory::get(context.clone(), &plan.0).await;
                 let has_result_set = has_result_set_by_plan(&plan.0);
 
                 match interpreter {

src/query/service/tests/it/api/http/status.rs

@@ -21,7 +21,7 @@ use common_users::UserApiProvider;
 use databend_query::api::http::v1::instance_status::instance_status_handler;
 use databend_query::api::http::v1::instance_status::InstanceStatus;
 use databend_query::interpreters::Interpreter;
-use databend_query::interpreters::InterpreterFactoryV2;
+use databend_query::interpreters::InterpreterFactory;
 use databend_query::sessions::QueryContext;
 use databend_query::sessions::SessionType;
 use databend_query::sessions::TableContext;
@@ -63,7 +63,7 @@ async fn run_query(query_ctx: &Arc<QueryContext>) -> Result<Arc<dyn Interpreter>
     query_ctx.set_current_user(user);
     let mut planner = Planner::new(query_ctx.clone());
     let (plan, _, _) = planner.plan_sql(sql).await?;
-    InterpreterFactoryV2::get(query_ctx.clone(), &plan).await
+    InterpreterFactory::get(query_ctx.clone(), &plan).await
 }
 
 #[tokio::test]

src/query/service/tests/it/interpreters/access/management_mode_access.rs

@@ -14,7 +14,7 @@
 
 use common_base::base::tokio;
 use common_exception::Result;
-use databend_query::interpreters::InterpreterFactoryV2;
+use databend_query::interpreters::InterpreterFactory;
 use databend_query::sql::Planner;
 
 // ref: https://github.com/datafuselabs/databend/issues/6901
@@ -159,15 +159,15 @@ async fn test_management_mode_access() -> Result<()> {
         for test in group.tests {
             let (plan, _, _) = planner.plan_sql(test.query).await?;
             if test.is_err {
-                let res = InterpreterFactoryV2::get(ctx.clone(), &plan).await;
+                let res = InterpreterFactory::get(ctx.clone(), &plan).await;
                 assert_eq!(
                     test.is_err,
                     res.is_err(),
                     "in test case:{:?}",
                     (group.name, test.name)
                 );
             } else {
-                let interpreter = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+                let interpreter = InterpreterFactory::get(ctx.clone(), &plan).await?;
                 interpreter.execute(ctx.clone()).await?;
             }
         }

src/query/service/tests/it/interpreters/async_insert_queue.rs

@@ -51,7 +51,7 @@ async fn test_async_insert_queue() -> Result<()> {
     {
         let query = "create table default.test(a int, b String) Engine = Memory;";
         let (plan, _, _) = planner.plan_sql(query).await?;
-        let executor = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+        let executor = InterpreterFactory::get(ctx.clone(), &plan).await?;
         let _ = executor.execute(ctx.clone()).await?;
     }
 
@@ -134,7 +134,7 @@ async fn test_async_insert_queue() -> Result<()> {
     {
         let query = "select * from default.test";
         let (plan, _, _) = planner.plan_sql(query).await?;
-        let executor = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+        let executor = InterpreterFactory::get(ctx.clone(), &plan).await?;
         let stream = executor.execute(ctx.clone()).await?;
         let result = stream.try_collect::<Vec<_>>().await?;
         let expected = vec![
@@ -170,7 +170,7 @@ async fn test_async_insert_queue_max_data_size() -> Result<()> {
     {
         let query = "create table default.test(a int, b String) Engine = Memory;";
         let (plan, _, _) = planner.plan_sql(query).await?;
-        let executor = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+        let executor = InterpreterFactory::get(ctx.clone(), &plan).await?;
         let _ = executor.execute(ctx.clone()).await?;
     }
 
@@ -220,7 +220,7 @@ async fn test_async_insert_queue_busy_timeout() -> Result<()> {
     {
         let query = "create table default.test(a int, b String) Engine = Memory;";
         let (plan, _, _) = planner.plan_sql(query).await?;
-        let executor = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+        let executor = InterpreterFactory::get(ctx.clone(), &plan).await?;
         let _ = executor.execute(ctx.clone()).await?;
     }
 
@@ -271,7 +271,7 @@ async fn test_async_insert_queue_stale_timeout() -> Result<()> {
     {
         let query = "create table default.test(a int, b String) Engine = Memory;";
         let (plan, _, _) = planner.plan_sql(query).await?;
-        let executor = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+        let executor = InterpreterFactory::get(ctx.clone(), &plan).await?;
         let _ = executor.execute(ctx.clone()).await?;
     }
 
@@ -321,7 +321,7 @@ async fn test_async_insert_queue_wait_timeout() -> Result<()> {
     {
         let query = "create table default.test(a int, b String) Engine = Memory;";
         let (plan, _, _) = planner.plan_sql(query).await?;
-        let executor = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+        let executor = InterpreterFactory::get(ctx.clone(), &plan).await?;
         let _ = executor.execute(ctx.clone()).await?;
     }
 
@@ -364,7 +364,7 @@ async fn test_async_insert_queue_no_wait() -> Result<()> {
     {
         let query = "create table default.test(a int, b String) Engine = Memory;";
         let (plan, _, _) = planner.plan_sql(query).await?;
-        let executor = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+        let executor = InterpreterFactory::get(ctx.clone(), &plan).await?;
         let _ = executor.execute(ctx.clone()).await?;
     }
 
@@ -390,7 +390,7 @@ async fn test_async_insert_queue_no_wait() -> Result<()> {
     {
         let query = "select * from default.test";
         let (plan, _, _) = planner.plan_sql(query).await?;
-        let executor = InterpreterFactoryV2::get(ctx.clone(), &plan).await?;
+        let executor = InterpreterFactory::get(ctx.clone(), &plan).await?;
         let stream = executor.execute(ctx.clone()).await?;
         let result = stream.try_collect::<Vec<_>>().await?;
         let expected = vec![