enhance holo-parser

alibaba · Aug 6, 2024 · 6be4b90 · 6be4b90
1 parent be9bbdb
commit 6be4b90
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 40 deletions.
diff --git a/core/src/main/java/com/alibaba/druid/sql/dialect/hologres/parser/HologresExprParser.java b/core/src/main/java/com/alibaba/druid/sql/dialect/hologres/parser/HologresExprParser.java
@@ -1,9 +1,6 @@
 package com.alibaba.druid.sql.dialect.hologres.parser;
 
 import com.alibaba.druid.DbType;
-import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.SQLObject;
-import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
 import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser;
 import com.alibaba.druid.sql.parser.Lexer;
 import com.alibaba.druid.sql.parser.SQLParserFeature;
@@ -21,8 +18,4 @@ public HologresExprParser(Lexer lexer) {
         dbType = DbType.hologres;
     }
 
-    @Override
-    protected void parseAssignItemOnComma(SQLExpr sqlExpr, SQLAssignItem item, SQLObject parent) {
-        item.setValue(sqlExpr);
-    }
 }
diff --git a/core/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java b/core/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java
@@ -31,12 +31,34 @@ public PGCreateTableParser(SQLExprParser exprParser) {
     }
 
     protected void parseCreateTableRest(SQLCreateTableStatement stmt) {
+        // For partition of/by for PG
+        for (int i = 0; i < 2; i++) {
+            if (lexer.token() == Token.PARTITION) {
+                Lexer.SavePoint mark = lexer.mark();
+                lexer.nextToken();
+                if (Token.OF.equals(lexer.token())) {
+                    lexer.reset(mark);
+                    SQLPartitionOf partitionOf = parsePartitionOf();
+                    stmt.setPartitionOf(partitionOf);
+                } else if (Token.BY.equals(lexer.token())) {
+                    lexer.reset(mark);
+                    SQLPartitionBy partitionClause = parsePartitionBy();
+                    stmt.setPartitionBy(partitionClause);
+                }
+            }
+        }
+
         if (lexer.nextIf(Token.WITH)) {
             accept(Token.LPAREN);
             parseAssignItems(stmt.getTableOptions(), stmt, false);
             accept(Token.RPAREN);
         }
-        super.parseCreateTableRest(stmt);
+
+        if (lexer.nextIf(Token.TABLESPACE)) {
+            stmt.setTablespace(
+                    this.exprParser.name()
+            );
+        }
     }
 
     public SQLPartitionBy parsePartitionBy() {

diff --git a/core/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java b/core/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java
@@ -21,9 +21,7 @@
 import com.alibaba.druid.sql.ast.SQLDataType;
 import com.alibaba.druid.sql.ast.SQLDataTypeImpl;
 import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.SQLObject;
 import com.alibaba.druid.sql.ast.expr.*;
-import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
 import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem;
 import com.alibaba.druid.sql.dialect.postgresql.ast.expr.*;
 import com.alibaba.druid.sql.parser.Lexer;
@@ -223,24 +221,6 @@ protected void parseDataTypeDouble(StringBuilder typeName) {
         lexer.nextToken();
     }
 
-    @Override
-    protected void parseAssignItemOnComma(SQLExpr sqlExpr, SQLAssignItem item, SQLObject parent) {
-        if (lexer.token() == Token.COMMA) {
-            SQLListExpr listExpr = new SQLListExpr();
-            listExpr.addItem(sqlExpr);
-            sqlExpr.setParent(listExpr);
-            do {
-                lexer.nextToken();
-                SQLExpr listItem = this.expr();
-                listItem.setParent(listExpr);
-                listExpr.addItem(listItem);
-            } while (lexer.token() == Token.COMMA);
-            item.setValue(listExpr);
-        } else {
-            item.setValue(sqlExpr);
-        }
-    }
-
     @Override
     protected SQLExpr parseSelectItemRest(String ident, long hash_lower) {
         SQLExpr expr;

diff --git a/core/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java b/core/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java
@@ -2880,4 +2880,15 @@ protected void printTableOptionsPrefix(SQLCreateTableStatement x) {
     protected boolean legacyCube() {
         return true;
     }
+
+    protected void printTableOption(SQLExpr name, SQLExpr value, int index) {
+        if (index != 0) {
+            print(",");
+            println();
+        }
+        String key = name.toString();
+        print0(key);
+        print0(" = ");
+        value.accept(this);
+    }
 }
diff --git a/core/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java b/core/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java
@@ -177,12 +177,7 @@ protected void createTableAfter(SQLCreateTableStatement stmt) {
     }
 
     protected void parseCreateTableRest(SQLCreateTableStatement stmt) {
-        if (lexer.nextIf(Token.TABLESPACE)) {
-            stmt.setTablespace(
-                    this.exprParser.name()
-            );
-        }
-
+        // For partition of for PG
         if (lexer.token() == Token.PARTITION) {
             Lexer.SavePoint mark = lexer.mark();
             lexer.nextToken();
@@ -196,7 +191,7 @@ protected void parseCreateTableRest(SQLCreateTableStatement stmt) {
                 stmt.setPartitionBy(partitionClause);
             }
         }
-
+        // For partition by
         if (lexer.token() == Token.PARTITION) {
             Lexer.SavePoint mark = lexer.mark();
             lexer.nextToken();
@@ -210,6 +205,12 @@ protected void parseCreateTableRest(SQLCreateTableStatement stmt) {
                 stmt.setPartitionBy(partitionClause);
             }
         }
+
+        if (lexer.nextIf(Token.TABLESPACE)) {
+            stmt.setTablespace(
+                    this.exprParser.name()
+            );
+        }
     }
 
     public SQLPartitionBy parsePartitionBy() {

diff --git a/core/src/test/resources/bvt/parser/hologres/0.txt b/core/src/test/resources/bvt/parser/hologres/0.txt
@@ -20,10 +20,10 @@ CREATE TABLE public.tb0 (
 	PRIMARY KEY (id)
 )
 WITH (
-	'orientation' = 'column',
-	'clustering_key' = 'class',
-	'bitmap_columns' = 'name',
-	'event_time_column' = 'in_time'
+	orientation = 'column',
+	clustering_key = 'class',
+	bitmap_columns = 'name',
+	event_time_column = 'in_time'
 );
 ------------------------------------------------------------------------------------------------------------------------
 ALTER SCHEMA oldschema RENAME TO newschema;

diff --git a/core/src/test/resources/bvt/parser/hologres/1.txt b/core/src/test/resources/bvt/parser/hologres/1.txt
@@ -0,0 +1,30 @@
+CREATE TABLE replicated_orders (
+  order_id BIGINT NOT NULL,
+  customer_id INTEGER,
+  order_date DATE,
+  product_id INTEGER,
+  quantity INTEGER,
+  price DECIMAL(10, 2),
+  PRIMARY KEY (order_date, customer_id, order_id)
+)
+PARTITION BY LIST(order_date)
+WITH (orientation='column',
+distribution_key='order_date',
+clustering_key='order_date'
+);
+--------------------
+CREATE TABLE replicated_orders (
+	order_id BIGINT NOT NULL,
+	customer_id INTEGER,
+	order_date DATE,
+	product_id INTEGER,
+	quantity INTEGER,
+	price DECIMAL(10, 2),
+	PRIMARY KEY (order_date, customer_id, order_id)
+)
+PARTITION BY LIST (order_date)
+WITH (
+	orientation = 'column',
+	distribution_key = 'order_date',
+	clustering_key = 'order_date'
+);
diff --git a/core/src/test/resources/bvt/parser/postgresql/1.txt b/core/src/test/resources/bvt/parser/postgresql/1.txt
@@ -16,6 +16,20 @@ CREATE TABLE IF NOT EXISTS test_dim_segment (
 )
 PARTITION BY LIST (ds);
 ------------------------------------------------------------------------------------------------------------------------
+CREATE TABLE distributors (
+    did     integer,
+    name    varchar(40)
+)
+WITH (fillfactor=70);
+--------------------
+CREATE TABLE distributors (
+	did integer,
+	name varchar(40)
+)
+WITH (
+	fillfactor = 70
+);
+------------------------------------------------------------------------------------------------------------------------
 MERGE INTO CustomerAccount CA
 USING (Select CustomerId, TransactionValue From RecentTransactions) AS T
 ON CA.CustomerId = T.CustomerId

diff --git a/core/src/test/resources/bvt/parser/postgresql/17.txt b/core/src/test/resources/bvt/parser/postgresql/17.txt
@@ -373,7 +373,7 @@ CREATE TABLE "public"."city" (
 	"name" varchar(32) NOT NULL
 )
 WITH (
-	'OIDS' = false
+	OIDS = false
 );
 ------------------------------------------------------------------------------------------------------------------------
 CREATE TABLE KTV.KTV_FUNCTION_ROLE_20151211 (