--wip-- [skip ci]

databendlabs · Jun 14, 2022 · 029ce52 · 029ce52
1 parent bd1908e
commit 029ce52
Show file tree

Hide file tree

Showing 22 changed files with 551 additions and 41 deletions.
diff --git a/common/ast/tests/it/testdata/statement.txt b/common/ast/tests/it/testdata/statement.txt
@@ -957,6 +957,8 @@ AlterView(
 
 
 ---------- Input ----------
+<<<<<<< HEAD
+=======
 drop view v;
 ---------- Output ---------
 DROP VIEW v
@@ -976,6 +978,7 @@ DropView(
 
 
 ---------- Input ----------
+>>>>>>> bd1908e88f21ad35a2041d5273b82c485877dff1
 rename table d.t to e.s;
 ---------- Output ---------
 RENAME TABLE d.t TO e.s

diff --git a/common/planners/src/plan_table_alter_cluster_key.rs b/common/planners/src/plan_table_alter_cluster_key.rs
@@ -17,15 +17,13 @@ use std::sync::Arc;
 use common_datavalues::DataSchema;
 use common_datavalues::DataSchemaRef;
 
-use crate::Expression;
-
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq)]
 pub struct AlterTableClusterKeyPlan {
     pub tenant: String,
     pub catalog: String,
     pub database: String,
     pub table: String,
-    pub cluster_keys: Vec<Expression>,
+    pub cluster_keys: Vec<String>,
 }
 
 impl AlterTableClusterKeyPlan {

diff --git a/query/src/interpreters/interpreter_cluster_key_alter.rs b/query/src/interpreters/interpreter_cluster_key_alter.rs
@@ -17,8 +17,6 @@ use std::sync::Arc;
 use common_exception::Result;
 use common_meta_types::GrantObject;
 use common_meta_types::UserPrivilegeType;
-use common_planners::validate_clustering;
-use common_planners::validate_expression;
 use common_planners::AlterTableClusterKeyPlan;
 use common_streams::DataBlockStream;
 use common_streams::SendableDataBlockStream;
@@ -71,16 +69,7 @@ impl Interpreter for AlterTableClusterKeyInterpreter {
             .get_table(tenant.as_str(), &plan.database, &plan.table)
             .await?;
 
-        let schema = table.schema();
-        let cluster_keys = plan.cluster_keys.clone();
-        // Let's validate the expressions firstly.
-        for expr in cluster_keys.iter() {
-            validate_expression(expr, &schema)?;
-            validate_clustering(expr)?;
-        }
-
-        let cluster_key_vec: Vec<String> = cluster_keys.iter().map(|e| e.column_name()).collect();
-        let cluster_key_str = format!("({})", cluster_key_vec.join(", "));
+        let cluster_key_str = format!("({})", plan.cluster_keys.join(", "));
 
         table
             .alter_table_cluster_keys(self.ctx.clone(), &self.plan.catalog, cluster_key_str)

diff --git a/query/src/interpreters/interpreter_factory_v2.rs b/query/src/interpreters/interpreter_factory_v2.rs
@@ -39,15 +39,29 @@ impl InterpreterFactoryV2 {
                 | DfStatement::List(_)
                 | DfStatement::DropStage(_)
                 | DfStatement::RemoveStage(_)
+                // TODO (andylokandy)
+                // | DfStatement::ShowDatabases(_)
+                // | DfStatement::ShowCreateDatabase(_)
+                // | DfStatement::ShowTables(_)
+                // | DfStatement::ShowCreateTable(_)
+                // | DfStatement::DescribeTable(_)
+                // | DfStatement::ShowTablesStatus(_)
                 | DfStatement::CreateTable(_)
                 | DfStatement::CreateView(_)
                 | DfStatement::AlterView(_)
+                | DfStatement::DropTable(_)
+                | DfStatement::UndropTable(_)
+                | DfStatement::AlterTable(_)
+                | DfStatement::RenameTable(_)
+                | DfStatement::TruncateTable(_)
+                | DfStatement::OptimizeTable(_)
                 | DfStatement::DropView(_)
                 | DfStatement::ShowMetrics(_)
                 | DfStatement::ShowProcessList(_)
                 | DfStatement::ShowSettings(_)
                 | DfStatement::CreateDatabase(_)
                 | DfStatement::DropDatabase(_)
+                | DfStatement::CreateUser(_)
                 | DfStatement::AlterDatabase(_)
         )
     }
@@ -73,6 +87,12 @@ impl InterpreterFactoryV2 {
             Plan::ShowSettings => ShowSettingsInterpreter::try_create(ctx),
 
             // Databases
+            Plan::ShowDatabases(show_databases) => {
+                ShowDatabasesInterpreter::try_create(ctx, *show_databases.clone())
+            }
+            Plan::ShowCreateDatabase(show_create_database) => {
+                ShowCreateDatabaseInterpreter::try_create(ctx, *show_create_database.clone())
+            }
             Plan::CreateDatabase(create_database) => {
                 CreateDatabaseInterpreter::try_create(ctx, *create_database.clone())
             }
@@ -84,9 +104,42 @@ impl InterpreterFactoryV2 {
             }
 
             // Tables
+            Plan::ShowTables(show_tables) => {
+                ShowTablesInterpreter::try_create(ctx, *show_tables.clone())
+            }
+            Plan::ShowCreateTable(show_create_table) => {
+                ShowCreateTableInterpreter::try_create(ctx, *show_create_table.clone())
+            }
+            Plan::DescribeTable(describe_table) => {
+                DescribeTableInterpreter::try_create(ctx, *describe_table.clone())
+            }
+            Plan::ShowTablesStatus(show_tables_status) => {
+                ShowTablesStatusInterpreter::try_create(ctx, *show_tables_status.clone())
+            }
             Plan::CreateTable(create_table) => {
                 CreateTableInterpreter::try_create(ctx, *create_table.clone())
             }
+            Plan::DropTable(drop_table) => {
+                DropTableInterpreter::try_create(ctx, *drop_table.clone())
+            }
+            Plan::UndropTable(undrop_table) => {
+                UndropTableInterpreter::try_create(ctx, *undrop_table.clone())
+            }
+            Plan::RenameTable(rename_table) => {
+                RenameTableInterpreter::try_create(ctx, *rename_table.clone())
+            }
+            Plan::AlterTableClusterKey(alter_table_cluster_key) => {
+                AlterTableClusterKeyInterpreter::try_create(ctx, *alter_table_cluster_key.clone())
+            }
+            Plan::DropTableClusterKey(drop_table_cluster_key) => {
+                DropTableClusterKeyInterpreter::try_create(ctx, *drop_table_cluster_key.clone())
+            }
+            Plan::TruncateTable(truncate_table) => {
+                TruncateTableInterpreter::try_create(ctx, *truncate_table.clone())
+            }
+            Plan::OptimizeTable(optimize_table) => {
+                OptimizeTableInterpreter::try_create(ctx, *optimize_table.clone())
+            }
 
             // Views
             Plan::CreateView(create_view) => {