Gaussdb parser ddl support to group/node clause

alibaba · Feb 13, 2025 · a6b202e · a6b202e
1 parent 1aea5ae
commit a6b202e
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 2 deletions.
diff --git a/...main/java/com/alibaba/druid/sql/dialect/gaussdb/ast/stmt/GaussDbCreateTableStatement.java b/...main/java/com/alibaba/druid/sql/dialect/gaussdb/ast/stmt/GaussDbCreateTableStatement.java
@@ -1,6 +1,7 @@
 package com.alibaba.druid.sql.dialect.gaussdb.ast.stmt;
 
 import com.alibaba.druid.DbType;
+import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.dialect.gaussdb.ast.GaussDbDistributeBy;
 import com.alibaba.druid.sql.dialect.gaussdb.ast.GaussDbObject;
@@ -9,6 +10,8 @@
 
 public class GaussDbCreateTableStatement extends SQLCreateTableStatement implements GaussDbObject {
     protected GaussDbDistributeBy distributeBy;
+    protected SQLExpr toGroup;
+    protected SQLExpr toNode;
 
     public GaussDbCreateTableStatement() {
         super(DbType.gaussdb);
@@ -25,6 +28,28 @@ public GaussDbDistributeBy getDistributeBy() {
         return distributeBy;
     }
 
+    public void setToGroup(SQLExpr toGroup) {
+        if (toGroup != null) {
+            toGroup.setParent(this);
+        }
+        this.toGroup = toGroup;
+    }
+
+    public SQLExpr getToGroup() {
+        return toGroup;
+    }
+
+    public void setToNode(SQLExpr toNode) {
+        if (toNode != null) {
+            toNode.setParent(this);
+        }
+        this.toNode = toNode;
+    }
+
+    public SQLExpr getToNode() {
+        return toNode;
+    }
+
     @Override
     public void accept0(SQLASTVisitor v) {
         if (v instanceof GaussDbASTVisitor) {

diff --git a/.../src/main/java/com/alibaba/druid/sql/dialect/gaussdb/parser/GaussDbCreateTableParser.java b/.../src/main/java/com/alibaba/druid/sql/dialect/gaussdb/parser/GaussDbCreateTableParser.java
@@ -63,6 +63,18 @@ protected void parseCreateTableRest(SQLCreateTableStatement stmt) {
         if (distributeByClause != null) {
             gdStmt.setDistributeBy(distributeByClause);
         }
+
+        if (lexer.nextIf(Token.TO)) {
+            if (lexer.nextIf(Token.GROUP)) {
+                SQLExpr group = this.exprParser.expr();
+                gdStmt.setToGroup(group);
+            }
+            if (lexer.nextIfIdentifier(FnvHash.Constants.NODE)) {
+                SQLExpr node = this.exprParser.expr();
+                gdStmt.setToNode(node);
+            }
+        }
+
         if (lexer.nextIf(Token.COMMENT)) {
             lexer.nextIf(Token.EQ);
             SQLExpr comment = this.exprParser.expr();

diff --git a/core/src/main/java/com/alibaba/druid/sql/dialect/gaussdb/visitor/GaussDbOutputVisitor.java b/core/src/main/java/com/alibaba/druid/sql/dialect/gaussdb/visitor/GaussDbOutputVisitor.java
@@ -57,6 +57,14 @@ public boolean visit(GaussDbCreateTableStatement x) {
             printDistributeBy(x.getDistributeBy());
         }
 
+        if (x.getToGroup() != null) {
+            printToGroup(x);
+        }
+
+        if (x.getToNode() != null) {
+            printToNode(x);
+        }
+
         printComment(x.getComment());
         return false;
     }
@@ -65,6 +73,18 @@ public void printDistributeBy(GaussDbDistributeBy x) {
         x.accept(this);
     }
 
+    public void printToGroup(GaussDbCreateTableStatement x) {
+        println();
+        print0(ucase ? "TO GROUP " : "to group ");
+        x.getToGroup().accept(this);
+    }
+
+    public void printToNode(GaussDbCreateTableStatement x) {
+        println();
+        print0(ucase ? "TO NODE " : "to node ");
+        x.getToNode().accept(this);
+    }
+
     @Override
     public boolean visit(SQLPartitionByRange x) {
         print0(ucase ? "RANGE" : "range");

diff --git a/core/src/test/resources/bvt/parser/gaussdb/0.txt b/core/src/test/resources/bvt/parser/gaussdb/0.txt
@@ -7,7 +7,8 @@ CREATE UNLOGGED TABLE lineitem (
 WITH (
 	'orientation' = column
 )
-DISTRIBUTE BY hash (L_ORDERKEY);
+DISTRIBUTE BY hash (L_ORDERKEY)
+TO GROUP group1;
 --------------------
 CREATE UNLOGGED TABLE lineitem (
 	L_ORDERKEY BIGINT NOT NULL,
@@ -18,15 +19,18 @@ CREATE UNLOGGED TABLE lineitem (
 WITH (
 	'orientation' = column
 )
-DISTRIBUTE BY hash (L_ORDERKEY);
+DISTRIBUTE BY hash (L_ORDERKEY)
+TO GROUP group1;
 ------------------------------------------------------------------------------------------------------------------------
 CREATE GLOBAL TABLE test_global (
 	L_ORDERKEY BIGINT NOT NULL
 )
+TO NODE node01;
 --------------------
 CREATE GLOBAL TABLE test_global (
 	L_ORDERKEY BIGINT NOT NULL
 )
+TO NODE node01;
 ------------------------------------------------------------------------------------------------------------------------
 CREATE LOCAL TABLE test_local (
 	L_ORDERKEY BIGINT NOT NULL