Refactor show

Signed-off-by: Jin Hai <[email protected]>
infiniflow · Oct 10, 2024 · 50681c7 · 50681c7
1 parent afbd1b6
commit 50681c7
Show file tree

Hide file tree

Showing 10 changed files with 265 additions and 281 deletions.
diff --git a/src/executor/explain_physical_plan.cpp b/src/executor/explain_physical_plan.cpp
diff --git a/src/executor/operator/physical_show.cpp b/src/executor/operator/physical_show.cpp
diff --git a/src/executor/operator/physical_show.cppm b/src/executor/operator/physical_show.cppm
@@ -32,13 +32,14 @@ import data_type;
 import variables;
 import data_block;
 import logger;
+import show_statement;
 
 namespace infinity {
 
 export class PhysicalShow : public PhysicalOperator {
 public:
     explicit PhysicalShow(u64 id,
-                          ShowType type,
+                          ShowStmtType type,
                           String db_name,
                           String object_name,
                           u64 table_index,
@@ -70,7 +71,7 @@ public:
         return 0;
     }
 
-    inline ShowType show_type() const { return show_type_; }
+    inline ShowStmtType show_type() const { return show_type_; }
 
     inline const String &db_name() const { return db_name_; };
 
@@ -156,7 +157,7 @@ private:
     void ExecuteShowMemoryAllocation(QueryContext *query_context, ShowOperatorState *operator_state);
 
 private:
-    ShowType show_type_{ShowType::kInvalid};
+    ShowStmtType show_type_{ShowStmtType::kInvalid};
     String db_name_{};
     String object_name_{};
     u64 table_index_{};

diff --git a/src/parser/statement/show_statement.cpp b/src/parser/statement/show_statement.cpp
@@ -20,6 +20,10 @@ namespace infinity {
 std::string ShowStatement::ToString() const {
     std::stringstream ss;
     switch (show_type_) {
+        case ShowStmtType::kInvalid: {
+            ParserError("Invalid show statement");
+            break;
+        }
         case ShowStmtType::kDatabase: {
             ss << "Show database, database: " << schema_name_;
             break;

diff --git a/src/parser/statement/show_statement.h b/src/parser/statement/show_statement.h
@@ -20,6 +20,7 @@
 namespace infinity {
 
 enum class ShowStmtType {
+    kInvalid,
     kDatabase,
     kTable,
     kIndex,

diff --git a/src/planner/explain_ast.cpp b/src/planner/explain_ast.cpp
@@ -727,6 +727,10 @@ Status ExplainAST::BuildShow(const ShowStatement *show_statement, SharedPtr<Vect
             result->emplace_back(MakeShared<String>("SHOW FUNCTION"));
             break;
         }
+        case ShowStmtType::kInvalid: {
+            String error_message = "Invalid show statement type";
+            UnrecoverableError(error_message);
+        }
     }
     return Status::OK();
 }