QueryWithSetting rename to StatementWithSettings

databendlabs · Oct 30, 2024 · 4d0f921 · 4d0f921
1 parent 09f4e84
commit 4d0f921
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 25 deletions.
diff --git a/src/query/ast/src/ast/statements/statement.rs b/src/query/ast/src/ast/statements/statement.rs
@@ -39,9 +39,9 @@ use crate::ast::Query;
 #[derive(Debug, Clone, PartialEq, Drive, DriveMut)]
 pub enum Statement {
     Query(Box<Query>),
-    QueryWithSetting {
+    StatementWithSettings {
         settings: Option<Settings>,
-        query: Box<Statement>,
+        stmt: Box<Statement>,
     },
     Explain {
         kind: ExplainKind,
@@ -418,7 +418,7 @@ impl Display for Statement {
                 }
                 write!(f, " {query}")?;
             }
-            Statement::QueryWithSetting { settings, query } => {
+            Statement::StatementWithSettings { settings, stmt } => {
                 if let Some(setting) = settings {
                     write!(f, "SETTINGS (")?;
                     let ids = &setting.identifiers;
@@ -433,7 +433,7 @@ impl Display for Statement {
                     }
                     write!(f, ") ")?;
                 }
-                write!(f, "{query}")?;
+                write!(f, "{stmt}")?;
             }
             Statement::ExplainAnalyze {
                 partial,

diff --git a/src/query/ast/src/parser/statement.rs b/src/query/ast/src/parser/statement.rs
@@ -91,9 +91,9 @@ pub fn statement_body(i: Input) -> IResult<Statement> {
             SETTINGS ~ #query_statement_setting? ~ #statement_body
         },
         |(_, opt_settings, statement)| {
-            Ok(Statement::QueryWithSetting {
+            Ok(Statement::StatementWithSettings {
                 settings: opt_settings,
-                query: Box::new(statement),
+                stmt: Box::new(statement),
             })
         },
     );
@@ -2821,16 +2821,6 @@ pub fn query_statement_setting(i: Input) -> IResult<Settings> {
                 identifiers: ids,
                 values: SetValues::Expr(values.into_iter().map(|x| x.into()).collect()),
             }
-            // let (ids, values): (Vec<Identifier>, Vec<Expr>) = query_setting
-            // .iter()
-            // .map(|(id, value)| (id.clone(), value.clone()))
-            // .unzip();
-            //
-            // Ok(Settings {
-            // set_type: SetType::SettingsQuery,
-            // identifiers: ids,
-            // values: SetValues::Expr(values.into_iter().map(Into::into).collect()),
-            // })
         },
     );
     rule!(#query_set: "(SETTING_NAME = VALUE, ...)")(i)

diff --git a/src/query/sql/src/planner/binder/binder.rs b/src/query/sql/src/planner/binder/binder.rs
@@ -207,8 +207,8 @@ impl<'a> Binder {
                 }
             }
 
-            Statement::QueryWithSetting { settings, query} => {
-                self.bind_query_setting(bind_context, settings, query).await?
+            Statement::StatementWithSettings { settings, stmt } => {
+                self.bind_statement_settings(bind_context, settings, stmt).await?
             }
 
             Statement::Explain { query, options, kind } => {

diff --git a/src/query/sql/src/planner/binder/mod.rs b/src/query/sql/src/planner/binder/mod.rs
@@ -39,7 +39,6 @@ mod presign;
 mod project;
 mod project_set;
 mod qualify;
-mod query_setting;
 mod replace;
 mod scalar;
 mod scalar_common;
@@ -48,6 +47,7 @@ mod set;
 mod set_priority;
 mod show;
 mod sort;
+mod statement_settings;
 mod stream_column_factory;
 mod system;
 mod table;

diff --git a/...y/sql/src/planner/binder/query_setting.rs → .../src/planner/binder/statement_settings.rs b/...y/sql/src/planner/binder/query_setting.rs → .../src/planner/binder/statement_settings.rs
@@ -33,17 +33,17 @@ use crate::Binder;
 use crate::TypeChecker;
 
 impl Binder {
-    pub async fn bind_query_setting(
+    pub async fn bind_statement_settings(
         &mut self,
         bind_context: &mut BindContext,
         settings: &Option<Settings>,
         inner: &Statement,
     ) -> Result<Plan> {
-        if let Statement::QueryWithSetting { .. } = inner {
+        if let Statement::StatementWithSettings { .. } = inner {
             return Err(ErrorCode::SyntaxException("Invalid statement"));
         }
 
-        let mut query_settings: HashMap<String, String> = HashMap::new();
+        let mut statement_settings: HashMap<String, String> = HashMap::new();
         if let Some(settings) = settings {
             let Settings {
                 set_type,
@@ -117,7 +117,7 @@ impl Binder {
                             })?;
                         }
 
-                        query_settings.entry(var.to_string()).or_insert(value);
+                        statement_settings.entry(var.to_string()).or_insert(value);
                     }
                 }
                 _ => {
@@ -126,7 +126,7 @@ impl Binder {
             }
             self.ctx
                 .get_shared_settings()
-                .set_batch_settings(&query_settings, true)?;
+                .set_batch_settings(&statement_settings, true)?;
             self.bind_statement(bind_context, inner).await
         } else {
             self.bind_statement(bind_context, inner).await

diff --git a/src/query/sql/src/planner/planner.rs b/src/query/sql/src/planner/planner.rs
@@ -329,7 +329,7 @@ impl Planner {
 pub fn get_query_kind(stmt: &Statement) -> QueryKind {
     match stmt {
         Statement::Query { .. } => QueryKind::Query,
-        Statement::QueryWithSetting { query, .. } => get_query_kind(query),
+        Statement::StatementWithSettings { stmt, .. } => get_query_kind(stmt),
         Statement::CopyIntoTable(_) => QueryKind::CopyIntoTable,
         Statement::CopyIntoLocation(_) => QueryKind::CopyIntoLocation,
         Statement::Explain { .. } => QueryKind::Explain,