throw error when increment column doesn't exist and fix additional ; (#1510)

PanternBao · yanhuqing666 · commit 211c3e51fabf · 2019-11-20T14:04:41.000+08:00
diff --git a/src/main/java/com/actiontech/dble/manager/dump/DumpFileContext.java b/src/main/java/com/actiontech/dble/manager/dump/DumpFileContext.java
@@ -49,11 +49,11 @@ public void setSchema(String schema) {
         this.schema = schema;
     }
 
-    public void skipCurrentContext() {
-        this.isSkip = true;
+    public void setSkipContext(boolean skip) {
+        this.isSkip = skip;
     }
 
-    public boolean isSkip() {
+    public boolean isSkipContext() {
         return this.isSkip;
     }
 
@@ -93,6 +93,9 @@ public void setTable(String table) throws DumpException {
         if (this.tableConfig == null && this.defaultDataNode == null) {
             throw new DumpException("schema " + schema + " has no default node.");
         }
+        if (this.tableConfig != null && this.tableConfig.getParentTC() != null) {
+            throw new DumpException("can't process child table, skip.");
+        }
     }
 
     public boolean isPushDown() {
diff --git a/src/main/java/com/actiontech/dble/manager/dump/DumpFileExecutor.java b/src/main/java/com/actiontech/dble/manager/dump/DumpFileExecutor.java
@@ -74,9 +74,10 @@ public void run() {
                 if (ServerParse.DDL == type || ServerParse.CREATE_DATABASE == type || ServerParse.USE == (0xff & type)) {
                     stmt = stmt.replace("/*!", "/*#");
                     statement = RouteStrategyFactory.getRouteStrategy().parserSQL(stmt);
+                    context.setSkipContext(false);
                 }
                 // if ddl is wrong，the following statement is skip.
-                if (context.isSkip()) {
+                if (context.isSkipContext()) {
                     continue;
                 }
                 if (ServerParse.INSERT == type && !context.isPushDown()) {
@@ -89,7 +90,7 @@ public void run() {
                 handler.handle(context, statement);
             } catch (DumpException | SQLSyntaxErrorException e) {
                 String currentStmt = context.getStmt().length() <= 1024 ? context.getStmt() : context.getStmt().substring(0, 1024);
-                context.skipCurrentContext();
+                context.setSkipContext(true);
                 LOGGER.warn("current stmt[" + currentStmt + "] error,because:" + e.getMessage());
                 context.addError("current stmt[" + currentStmt + "] error,because:" + e.getMessage());
             } catch (InterruptedException ie) {
@@ -119,7 +120,7 @@ private boolean preHandle(DumpFileWriter writer, int type, String stmt) throws I
         }
         // skip view
         if ((ServerParse.MYSQL_CMD_COMMENT == type || ServerParse.MYSQL_COMMENT == type) && skipView(stmt)) {
-            context.skipCurrentContext();
+            context.setSkipContext(true);
             return true;
         }
         // footer
diff --git a/src/main/java/com/actiontech/dble/manager/dump/handler/CreateTableHandler.java b/src/main/java/com/actiontech/dble/manager/dump/handler/CreateTableHandler.java
@@ -7,8 +7,6 @@
 import com.actiontech.dble.util.StringUtil;
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLStatement;
-import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
-import com.alibaba.druid.sql.ast.expr.SQLNullExpr;
 import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
 import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
 import com.alibaba.druid.sql.ast.statement.SQLTableElement;
@@ -34,34 +32,28 @@ public boolean preHandle(DumpFileContext context, SQLStatement sqlStatement) thr
             checkColumns(context, columns);
             // partition column check
             if (tableConfig.getPartitionColumn() != null && context.getPartitionColumnIndex() == -1) {
-                throw new DumpException("table[" + context.getTable() + "] can't find partition column in create.");
+                throw new DumpException("can't find partition column in create.");
+            }
+            // increment column check
+            if (tableConfig.isAutoIncrement() && context.getIncrementColumnIndex() == -1) {
+                throw new DumpException("can't find increment column in create.");
             }
         }
         return false;
     }
 
     @Override
-    public void handle(DumpFileContext context, SQLStatement sqlStatement) throws InterruptedException {
+    public void handle(DumpFileContext context, SQLStatement sqlStatement) throws DumpException, InterruptedException {
         boolean isChanged = false;
         List<SQLTableElement> columns = ((MySqlCreateTableStatement) sqlStatement).getTableElementList();
         TableConfig tableConfig = context.getTableConfig();
-        if (tableConfig.isAutoIncrement()) {
-            // add increment column if not exists
-            if (context.getIncrementColumnIndex() == -1) {
-                SQLColumnDefinition column = new SQLColumnDefinition();
+        if (context.getIncrementColumnIndex() != -1) {
+            // check data type of increment column
+            SQLColumnDefinition column = (SQLColumnDefinition) columns.get(context.getIncrementColumnIndex());
+            if (!column.getDataType().getName().equals("bigint")) {
+                context.addError("data type of increment column isn't bigint, dble replaced it by itself.");
                 column.setDataType(new SQLCharacterDataType("bigint"));
-                column.setDefaultExpr(new SQLNullExpr());
-                column.setName(new SQLIdentifierExpr(tableConfig.getTrueIncrementColumn()));
-                columns.add(column);
-                context.setPartitionColumnIndex(columns.size());
                 isChanged = true;
-            } else {
-                SQLColumnDefinition column = (SQLColumnDefinition) columns.get(context.getIncrementColumnIndex());
-                if (!column.getDataType().getName().equals("bigint")) {
-                    context.addError("data type of increment column isn't bigint, dble replaced it by itself.");
-                    column.setDataType(new SQLCharacterDataType("bigint"));
-                    isChanged = true;
-                }
             }
         }
 
diff --git a/src/main/java/com/actiontech/dble/manager/dump/handler/GlobalTableInsertHandler.java b/src/main/java/com/actiontech/dble/manager/dump/handler/GlobalTableInsertHandler.java
@@ -11,27 +11,10 @@ public class GlobalTableInsertHandler extends InsertHandler {
 
     private long time = new Date().getTime();
 
-    @Override
-    public void preProcess(DumpFileContext context) throws InterruptedException {
-        if (insertHeader == null) {
-            return;
-        }
-        for (String dataNode : context.getTableConfig().getDataNodes()) {
-            context.getWriter().write(dataNode, insertHeader.toString(), true, false);
-        }
-    }
-
     @Override
     public void process(DumpFileContext context, SQLInsertStatement.ValuesClause valueClause, boolean isFirst) throws InterruptedException, SQLNonTransientException {
         valueClause.addValue(new SQLIntegerExpr(time));
         super.process(context, valueClause, isFirst);
     }
 
-    @Override
-    public void postProcess(DumpFileContext context) throws InterruptedException {
-        for (String dataNode : context.getTableConfig().getDataNodes()) {
-            context.getWriter().write(dataNode, ";", false, false);
-        }
-        super.postProcess(context);
-    }
 }
diff --git a/src/main/java/com/actiontech/dble/manager/dump/handler/InsertHandler.java b/src/main/java/com/actiontech/dble/manager/dump/handler/InsertHandler.java
@@ -9,7 +9,6 @@
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLStatement;
-import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
 import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement;
@@ -22,7 +21,7 @@ public class InsertHandler extends DefaultHandler {
     protected StringBuilder insertHeader;
 
     @Override
-    public boolean preHandle(DumpFileContext context, SQLStatement sqlStatement) throws DumpException, InterruptedException {
+    public boolean preHandle(DumpFileContext context, SQLStatement sqlStatement) throws DumpException {
         MySqlInsertStatement insert = (MySqlInsertStatement) sqlStatement;
         // check columns from insert columns
         checkColumns(context, insert.getColumns());
@@ -64,11 +63,6 @@ private void handleIncrementColumn(DumpFileContext context, List<SQLExpr> values
 
         String tableKey = StringUtil.getFullName(context.getSchema(), context.getTable());
         long val = SequenceManager.getHandler().nextId(tableKey);
-        if (incrementIndex == values.size()) {
-            values.add(new SQLIntegerExpr(val));
-            return;
-        }
-
         SQLExpr value = values.get(incrementIndex);
         if (!StringUtil.isEmpty(SQLUtils.toMySqlString(value)) && !context.isNeedSkipError()) {
             context.addError("For table using global sequence, dble has set increment column values for you.");
@@ -96,22 +90,17 @@ private void checkColumns(DumpFileContext context, List<SQLExpr> columns) throws
                     partitionColumnIndex = i;
                 }
             }
-            if (tableConfig.isAutoIncrement() && incrementColumnIndex == -1) {
-                // add increment column
-                columns.add(new SQLCharExpr(tableConfig.getTrueIncrementColumn()));
-                incrementColumnIndex = columns.size();
-                // if increment column is same with partition column
-                if (tableConfig.getTrueIncrementColumn().equalsIgnoreCase(tableConfig.getPartitionColumn())) {
-                    partitionColumnIndex = incrementColumnIndex;
-                }
-            }
-
+            // partition column check
             if (tableConfig.getPartitionColumn() != null && partitionColumnIndex == -1) {
                 throw new DumpException("can't find partition column in insert.");
             }
+            // increment column check
+            if (tableConfig.isAutoIncrement() && incrementColumnIndex == -1) {
+                throw new DumpException("can't find increment column in insert.");
+            }
+            context.setIncrementColumnIndex(incrementColumnIndex);
+            context.setPartitionColumnIndex(partitionColumnIndex);
         }
-        context.setIncrementColumnIndex(incrementColumnIndex);
-        context.setPartitionColumnIndex(partitionColumnIndex);
     }
 
     protected String toString(List<SQLExpr> values, boolean isFirst) {
@@ -131,9 +120,18 @@ protected String toString(List<SQLExpr> values, boolean isFirst) {
     }
 
     public void preProcess(DumpFileContext context) throws InterruptedException {
+        if (insertHeader == null) {
+            return;
+        }
+        for (String dataNode : context.getTableConfig().getDataNodes()) {
+            context.getWriter().write(dataNode, insertHeader.toString(), true, false);
+        }
     }
 
     public void postProcess(DumpFileContext context) throws InterruptedException {
+        for (String dataNode : context.getTableConfig().getDataNodes()) {
+            context.getWriter().write(dataNode, ";", false, false);
+        }
         insertHeader = null;
     }
 
diff --git a/src/main/java/com/actiontech/dble/manager/dump/handler/ShardingTableInsertHandler.java b/src/main/java/com/actiontech/dble/manager/dump/handler/ShardingTableInsertHandler.java
@@ -18,6 +18,7 @@ public class ShardingTableInsertHandler extends InsertHandler {
 
     private Map<String, LongPtr> dataNodes = new HashMap<>(64);
 
+    @Override
     public void preProcess(DumpFileContext context) {
         if (!dataNodes.isEmpty()) {
             dataNodes.clear();
@@ -29,7 +30,7 @@ public void postProcess(DumpFileContext context) throws InterruptedException {
         for (String dataNode : dataNodes.keySet()) {
             context.getWriter().write(dataNode, ";", false, false);
         }
-        super.postProcess(context);
+        insertHeader = null;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,11 @@ public void setSchema(String schema) {`
`49`	`49`	`this.schema = schema;`
`50`	`50`	`}`
`51`	`51`
`52`		`- public void skipCurrentContext() {`
`53`		`- this.isSkip = true;`
	`52`	`+ public void setSkipContext(boolean skip) {`
	`53`	`+ this.isSkip = skip;`
`54`	`54`	`}`
`55`	`55`
`56`		`- public boolean isSkip() {`
	`56`	`+ public boolean isSkipContext() {`
`57`	`57`	`return this.isSkip;`
`58`	`58`	`}`
`59`	`59`
`@@ -93,6 +93,9 @@ public void setTable(String table) throws DumpException {`
`93`	`93`	`if (this.tableConfig == null && this.defaultDataNode == null) {`
`94`	`94`	`throw new DumpException("schema " + schema + " has no default node.");`
`95`	`95`	`}`
	`96`	`+ if (this.tableConfig != null && this.tableConfig.getParentTC() != null) {`
	`97`	`+ throw new DumpException("can't process child table, skip.");`
	`98`	`+ }`
`96`	`99`	`}`
`97`	`100`
`98`	`101`	`public boolean isPushDown() {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public class ShardingTableInsertHandler extends InsertHandler {`
`18`	`18`
`19`	`19`	`private Map<String, LongPtr> dataNodes = new HashMap<>(64);`
`20`	`20`
	`21`	`+ @Override`
`21`	`22`	`public void preProcess(DumpFileContext context) {`
`22`	`23`	`if (!dataNodes.isEmpty()) {`
`23`	`24`	`dataNodes.clear();`
`@@ -29,7 +30,7 @@ public void postProcess(DumpFileContext context) throws InterruptedException {`
`29`	`30`	`for (String dataNode : dataNodes.keySet()) {`
`30`	`31`	`context.getWriter().write(dataNode, ";", false, false);`
`31`	`32`	`}`
`32`		`- super.postProcess(context);`
	`33`	`+ insertHeader = null;`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`@Override`