support polardb-x sql syntax

src/main/java/com/alibaba/druid/sql/ast/SQLPartition.java

@@ -46,6 +46,20 @@ public class SQLPartition extends OracleSegmentAttributesImpl implements OracleS
 
     private SQLObject lobStorage;
 
+    private SQLExpr locality;
+
+
+    public SQLExpr getLocality() {
+        return locality;
+    }
+
+    public void setLocality(SQLExpr x) {
+        if (x != null) {
+            x.setParent(this);
+        }
+        this.locality = x;
+    }
+
     public SQLName getName() {
         return name;
     }

src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java

@@ -71,6 +71,7 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
 
     protected boolean replace = false;
     protected boolean ignore = false;
+    protected boolean single = false; // polardbx
     protected boolean                          dimension;
     protected SQLExpr                          engine;
 
@@ -1297,6 +1298,14 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS
         this.ignore = ignore;
     }
 
+    public boolean isSingle() {
+        return single;
+    }
+
+    public void setSingle(boolean single) {
+        this.single = single;
+    }
+
     public SQLExpr getStoredAs() {
         return storedAs;
     }

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java

@@ -709,6 +709,10 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
             if (lexer.identifierEquals(FnvHash.Constants.TABLEGROUP)) {
                 lexer.nextToken();
 
+                if (lexer.token() == Token.EQ) {
+                    lexer.nextToken();
+                }
+
                 SQLName tableGroup = this.exprParser.name();
                 stmt.setTableGroup(tableGroup);
                 continue;
@@ -1012,6 +1016,9 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
         } else if (lexer.identifierEquals("IGNORE")) {
             lexer.nextToken();
             stmt.setIgnore(true);
+        } else if (lexer.identifierEquals("SINGLE")) { // for polardb-x
+            lexer.nextToken();
+            stmt.setSingle(true);
         }
 
         if (lexer.token() == (Token.AS)) {
@@ -1177,7 +1184,8 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
         if (lexer.token() == Token.LPAREN) {
             lexer.nextToken();
             for (;;) {
-                SQLPartition partitionDef = this.getExprParser().parsePartition();
+                SQLPartition partitionDef = this.getExprParser()
+                        .parsePartition();
 
                 partitionClause.addPartition(partitionDef);
 
@@ -1534,6 +1542,15 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
             return true;
         }
 
+        if (lexer.identifierEquals("LOCALITY")) {
+            lexer.nextToken();
+            if (lexer.token() == Token.EQ) {
+                lexer.nextToken();
+            }
+            stmt.addOption("LOCALITY", this.exprParser.expr());
+            return true;
+        }
+
         return false;
     }
 

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java

@@ -1782,6 +1782,14 @@ public class MySqlExprParser extends SQLExprParser {
             
             accept(Token.RPAREN);
         }
+
+        if (lexer.identifierEquals("LOCALITY")) {
+            lexer.nextToken();
+            accept(Token.EQ);
+            SQLExpr locality = this.expr();
+            partitionDef.setLocality(locality);
+        }
+
         return partitionDef;
     }
 

src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java

@@ -7284,6 +7284,12 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
             print(')');
         }
 
+        SQLExpr locality = x.getLocality();
+        if (locality != null) {
+            print(ucase ? " LOCALITY = " : " locality =");
+            locality.accept(this);
+        }
+
         return false;
     }
 

src/test/java/com/alibaba/druid/bvt/sql/polardbx/PolarDBXTest.java

@@ -0,0 +1,77 @@
+package com.alibaba.druid.bvt.sql.polardbx;
+
+import com.alibaba.druid.sql.repository.SchemaObject;
+import com.alibaba.druid.sql.repository.SchemaRepository;
+import com.alibaba.druid.util.JdbcConstants;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+public class PolarDBXTest extends TestCase {
+    public void test_polardb_x_1() throws Throwable {
+        SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL);
+        String sql1 = "CREATE TABLE `test1` (\n"
+                + "  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,\n"
+                + "  `serialNo` varchar(64) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',\n"
+                + "  `user_id` int(11) DEFAULT NULL COMMENT '用户id',\n"
+                + "  PRIMARY KEY (`id`)\n"
+                + ") ENGINE = InnoDB  PARTITION BY KEY(`tenant_id`,`id`)\n"
+                + "PARTITIONS 21 tablegroup = `tg_p_msg`";
+        repository.console(sql1);
+//        repository.setDefaultSchema("test1");
+        SchemaObject table = repository.findTable("test1");
+        Assert.assertTrue(table != null);
+    }
+
+    public void test_polardb_x_2() throws Throwable {
+        SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL);
+        String sql2 = "CREATE TABLE `test2` (\n"
+                + "  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,\n"
+                + "  `serialNo` varchar(64) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',\n"
+                + "  `user_id` int(11) DEFAULT NULL COMMENT '用户id',\n" + "  PRIMARY KEY (`id`)\n"
+                + ") ENGINE = InnoDB single";
+        repository.console(sql2);
+//        repository.setDefaultSchema("test2");
+        SchemaObject table =repository.findTable("test2");
+        Assert.assertTrue(table != null);
+
+    }
+
+    public void test_polardb_x_3() throws Throwable {
+        SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL);
+        String sql3 = "CREATE TABLE `test3` (\n"
+                + "  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,\n"
+                + "  `serialNo` varchar(64) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',\n"
+                + "  `user_id` int(11) DEFAULT NULL COMMENT '用户id',\n" + "  PRIMARY KEY (`id`)\n"
+                + ") ENGINE = InnoDB locality = 'dn=polardbx-ng28-dn-1,polardbx-ng28-dn-2'";
+        repository.console(sql3);
+//        repository.setDefaultSchema("test3");
+        SchemaObject table = repository.findTable("test3");
+        Assert.assertTrue(table != null);
+    }
+
+    public void test_polardb_x_4() throws Throwable {
+        SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL);
+        String sql4 = "CREATE TABLE test4(\n"
+                + " order_id int AUTO_INCREMENT primary key,\n"
+                + " customer_id int,\n"
+                + " country varchar(64),\n"
+                + " city varchar(64),\n"
+                + " order_time datetime not null)\n"
+                + "PARTITION BY LIST COLUMNS(country,city)\n"
+                + "(\n"
+                + "  PARTITION p1 VALUES IN (('China','Shanghai')) LOCALITY = 'dn=polardbx-ng28-dn-2',\n"
+                + "  PARTITION p2 VALUES IN (('China','Beijing')) LOCALITY = 'dn=polardbx-ng28-dn-2',\n"
+                + "  PARTITION p3 VALUES IN (('China','Hangzhou')) ,\n"
+                + "  PARTITION p4 VALUES IN (('China','Nanjing')) ,\n"
+                + "  PARTITION p5 VALUES IN (('China','Guangzhou')) ,\n"
+                + "  PARTITION p6 VALUES IN (('China','Shenzhen')) ,\n"
+                + "  PARTITION p7 VALUES IN (('China','Wuhan')) ,\n"
+                + "  PARTITION p8 VALUES IN (('America','New York'))\n"
+                + ") LOCALITY = 'dn=polardbx-ng28-dn-0,polardbx-ng28-dn-1';";
+        repository.console(sql4);
+//        repository.setDefaultSchema("test4");
+        SchemaObject table = repository.findTable("test4");
+        Assert.assertTrue(table != null);
+        System.out.println(table.getStatement());
+    }
+}