Skip to content

Commit

Permalink
Gaussdb ddl parser support partition by clause
Browse files Browse the repository at this point in the history
  • Loading branch information
@woyumen4597 @wenshao
woyumen4597 authored and wenshao committed Feb 21, 2025
1 parent 2c5a7f1 commit 1425180
Show file tree
Hide file tree
Showing 4 changed files with 283 additions and 28 deletions.
9 changes: 9 additions & 0 deletions ...main/java/com/alibaba/druid/sql/dialect/gaussdb/ast/stmt/GaussDbCreateTableStatement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public class GaussDbCreateTableStatement extends SQLCreateTableStatement impleme
protected SQLExpr toNode;
private SQLExpr onCommitExpr;
private SQLExpr compressType;
private SQLExpr rowMovementType;

public GaussDbCreateTableStatement() {
super(DbType.gaussdb);
Expand Down Expand Up @@ -87,4 +88,12 @@ public SQLExpr getCompressType() {
public void setCompressType(SQLExpr compressType) {
this.compressType = compressType;
}

public SQLExpr getRowMovementType() {
return rowMovementType;
}

public void setRowMovementType(SQLExpr rowMovementType) {
this.rowMovementType = rowMovementType;
}
}
94 changes: 94 additions & 0 deletions .../src/main/java/com/alibaba/druid/sql/dialect/gaussdb/parser/GaussDbCreateTableParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.alibaba.druid.sql.dialect.gaussdb.ast.GaussDbDistributeBy;
import com.alibaba.druid.sql.dialect.gaussdb.ast.stmt.GaussDbCreateTableStatement;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGCreateTableParser;
import com.alibaba.druid.sql.parser.ParserException;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.Token;
import com.alibaba.druid.util.FnvHash;
Expand Down Expand Up @@ -86,12 +87,105 @@ protected void parseCreateTableRest(SQLCreateTableStatement stmt) {
}
}

SQLPartitionBy partitionClause = parsePartitionBy();
if (partitionClause != null) {
gdStmt.setPartitionBy(partitionClause);
}

parseRowMovement(gdStmt);

if (lexer.nextIf(Token.COMMENT)) {
lexer.nextIf(Token.EQ);
SQLExpr comment = this.exprParser.expr();
gdStmt.setComment(comment);
}
}
public void parseRowMovement(GaussDbCreateTableStatement stmt) {
if (lexer.token() == Token.ENABLE || lexer.token() == Token.DISABLE) {
stmt.setRowMovementType(exprParser.name());
accept(Token.ROW);
acceptIdentifier("MOVEMENT");
}
}

public SQLPartitionBy parsePartitionBy() {
if (lexer.nextIf(Token.PARTITION)) {
accept(Token.BY);
if (lexer.nextIfIdentifier(FnvHash.Constants.HASH)) {
SQLPartitionBy hashPartition = new SQLPartitionByHash();
if (lexer.nextIf(Token.LPAREN)) {
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException("expect identifier. " + lexer.info());
}
for (; ; ) {
hashPartition.addColumn(this.exprParser.name());
if (lexer.token() == Token.COMMA) {
lexer.nextToken();
continue;
}
break;
}
accept(Token.RPAREN);
return hashPartition;
}
} else if (lexer.nextIfIdentifier(FnvHash.Constants.RANGE)) {
return partitionByRange();
} else if (lexer.nextIfIdentifier(FnvHash.Constants.LIST)) {
return partitionByList();
}
}
return null;
}

protected SQLPartitionByRange partitionByRange() {
SQLPartitionByRange rangePartition = new SQLPartitionByRange();
accept(Token.LPAREN);
for (; ; ) {
rangePartition.addColumn(this.exprParser.name());
if (lexer.token() == Token.COMMA) {
lexer.nextToken();
continue;
}
break;
}
accept(Token.RPAREN);
accept(Token.LPAREN);
for (; ; ) {
rangePartition.addPartition(this.getExprParser().parsePartition());
if (lexer.token() == Token.COMMA) {
lexer.nextToken();
continue;
}
break;
}
accept(Token.RPAREN);
return rangePartition;
}

private SQLPartitionByList partitionByList() {
SQLPartitionByList listPartition = new SQLPartitionByList();
accept(Token.LPAREN);
for (; ; ) {
listPartition.addColumn(this.exprParser.name());
if (lexer.token() == Token.COMMA) {
lexer.nextToken();
continue;
}
break;
}
accept(Token.RPAREN);
accept(Token.LPAREN);
for (; ; ) {
listPartition.addPartition(this.getExprParser().parsePartition());
if (lexer.token() == Token.COMMA) {
lexer.nextToken();
continue;
}
break;
}
accept(Token.RPAREN);
return listPartition;
}

protected void createTableBefore(SQLCreateTableStatement createTable) {
parseTableType(createTable);
Expand Down
71 changes: 43 additions & 28 deletions core/src/main/java/com/alibaba/druid/sql/dialect/gaussdb/visitor/GaussDbOutputVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,52 +53,67 @@ public boolean visit(GaussDbCreateTableStatement x) {

printTableOptions(x);

if (x.getOnCommitExpr() != null) {
printOnCommit(x);
}
printOnCommit(x);

if (x.getCompressType() != null) {
println();
x.getCompressType().accept(this);
}
printCompressType(x);

if (x.getDistributeBy() != null) {
printDistributeBy(x.getDistributeBy());
}
printDistributeBy(x);

if (x.getToGroup() != null) {
printToGroup(x);
}
printToGroup(x);

if (x.getToNode() != null) {
printToNode(x);
}
printToNode(x);

printPartitionBy(x);

printRowMovement(x);

printComment(x.getComment());
return false;
}

public void printRowMovement(GaussDbCreateTableStatement x) {
if (x.getRowMovementType() != null) {
println();
x.getRowMovementType().accept(this);
print(ucase ? " ROW MOVEMENT" : " row movement");
}
}

public void printCompressType(GaussDbCreateTableStatement x) {
if (x.getCompressType() != null) {
println();
x.getCompressType().accept(this);
}
}
public void printOnCommit(GaussDbCreateTableStatement x) {
println();
print0(ucase ? "ON COMMIT " : "on commit ");
x.getOnCommitExpr().accept(this);
print0(ucase ? " ROWS" : " rows");
if (x.getOnCommitExpr() != null) {
println();
print0(ucase ? "ON COMMIT " : "on commit ");
x.getOnCommitExpr().accept(this);
print0(ucase ? " ROWS" : " rows");
}
}

public void printDistributeBy(GaussDbDistributeBy x) {
x.accept(this);
public void printDistributeBy(GaussDbCreateTableStatement x) {
if (x.getDistributeBy() != null) {
x.getDistributeBy().accept(this);
}
}

public void printToGroup(GaussDbCreateTableStatement x) {
println();
print0(ucase ? "TO GROUP " : "to group ");
x.getToGroup().accept(this);
if (x.getToGroup() != null) {
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);
if (x.getToNode() != null) {
println();
print0(ucase ? "TO NODE " : "to node ");
x.getToNode().accept(this);
}
}

@Override
Expand Down
137 changes: 137 additions & 0 deletions core/src/test/resources/bvt/parser/gaussdb/5.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
CREATE TABLE customer_address_SE
(
ca_address_sk INTEGER NOT NULL ,
ca_address_id CHARACTER(16) NOT NULL ,
ca_street_number CHARACTER(10) ,
ca_street_name CHARACTER varying(60) ,
ca_street_type CHARACTER(15) ,
ca_suite_number CHARACTER(10)
)
WITH (ORIENTATION = COLUMN)
DISTRIBUTE BY HASH (ca_address_sk)
PARTITION BY RANGE(ca_address_sk)
(
PARTITION p1 START(1) END(1000) EVERY(200),
PARTITION p2 END(2000),
PARTITION p3 START(2000) END(5000)
)
--------------------
CREATE TABLE customer_address_SE (
ca_address_sk INTEGER NOT NULL,
ca_address_id CHARACTER(16) NOT NULL,
ca_street_number CHARACTER(10),
ca_street_name CHARACTER varying(60),
ca_street_type CHARACTER(15),
ca_suite_number CHARACTER(10)
)
WITH (
ORIENTATION = COLUMN
)
DISTRIBUTE BY HASH (ca_address_sk)
PARTITION BY RANGE (ca_address_sk) (
PARTITION p1 START (1) END (1000) EVERY (200),
PARTITION p2 END (2000),
PARTITION p3 START (2000) END (5000)
)
------------------------------------------------------------------------------------------------------------------------
CREATE TABLE customer_address
(
ca_address_sk INTEGER NOT NULL ,
ca_address_id CHARACTER(16) NOT NULL ,
ca_street_number CHARACTER(10) ,
ca_street_name CHARACTER varying(60) ,
ca_street_type CHARACTER(15) ,
ca_suite_number CHARACTER(10)
)
DISTRIBUTE BY HASH (ca_address_sk)
PARTITION BY RANGE(ca_address_sk)
(
PARTITION P1 VALUES LESS THAN(2450815),
PARTITION P2 VALUES LESS THAN(2451179),
PARTITION P3 VALUES LESS THAN(2451544),
PARTITION P4 VALUES LESS THAN(MAXVALUE)
);
--------------------
CREATE TABLE customer_address (
ca_address_sk INTEGER NOT NULL,
ca_address_id CHARACTER(16) NOT NULL,
ca_street_number CHARACTER(10),
ca_street_name CHARACTER varying(60),
ca_street_type CHARACTER(15),
ca_suite_number CHARACTER(10)
)
DISTRIBUTE BY HASH (ca_address_sk)
PARTITION BY RANGE (ca_address_sk) (
PARTITION P1 VALUES LESS THAN (2450815),
PARTITION P2 VALUES LESS THAN (2451179),
PARTITION P3 VALUES LESS THAN (2451544),
PARTITION P4 VALUES LESS THAN (MAXVALUE)
);
------------------------------------------------------------------------------------------------------------------------
CREATE TABLE data_list
(
id int,
time int,
sarlay decimal(12,2)
)
PARTITION BY LIST (time)
(
PARTITION P1 VALUES (202209),
PARTITION P2 VALUES (202210,202208),
PARTITION P3 VALUES (202211),
PARTITION P4 VALUES (202212),
PARTITION P5 VALUES (202301)
);
--------------------
CREATE TABLE data_list (
id int,
time int,
sarlay decimal(12, 2)
)
PARTITION BY LIST (time) (
PARTITION P1 VALUES (202209),
PARTITION P2 VALUES ((202210, 202208)),
PARTITION P3 VALUES (202211),
PARTITION P4 VALUES (202212),
PARTITION P5 VALUES (202301)
);
------------------------------------------------------------------------------------------------------------------------
CREATE TABLE cold_hot_table
(
W_WAREHOUSE_ID CHAR(16) NOT NULL,
W_WAREHOUSE_NAME VARCHAR(20) ,
W_STREET_NUMBER CHAR(10) ,
W_STREET_NAME VARCHAR(60) ,
W_STREET_ID CHAR(15) ,
W_SUITE_NUMBER CHAR(10)
)
WITH (ORIENTATION = COLUMN, storage_policy = 'LMT:30')
DISTRIBUTE BY HASH (W_WAREHOUSE_ID)
PARTITION BY RANGE(W_STREET_ID)
(
PARTITION P1 VALUES LESS THAN(100000),
PARTITION P2 VALUES LESS THAN(200000),
PARTITION P3 VALUES LESS THAN(300000),
PARTITION P4 VALUES LESS THAN(MAXVALUE)
) DISABLE ROW MOVEMENT;
--------------------
CREATE TABLE cold_hot_table (
W_WAREHOUSE_ID CHAR(16) NOT NULL,
W_WAREHOUSE_NAME VARCHAR(20),
W_STREET_NUMBER CHAR(10),
W_STREET_NAME VARCHAR(60),
W_STREET_ID CHAR(15),
W_SUITE_NUMBER CHAR(10)
)
WITH (
ORIENTATION = COLUMN,
storage_policy = 'LMT:30'
)
DISTRIBUTE BY HASH (W_WAREHOUSE_ID)
PARTITION BY RANGE (W_STREET_ID) (
PARTITION P1 VALUES LESS THAN (100000),
PARTITION P2 VALUES LESS THAN (200000),
PARTITION P3 VALUES LESS THAN (300000),
PARTITION P4 VALUES LESS THAN (MAXVALUE)
)
DISABLE ROW MOVEMENT;

0 comments on commit 1425180

Please # to comment.