From 499be8bd8ccc8f29d3e5f771b5c3b1beae143739 Mon Sep 17 00:00:00 2001 From: agapple Date: Tue, 13 Mar 2018 16:28:08 +0800 Subject: [PATCH] upgrade druid to fastsql --- parse/pom.xml | 4 ++ .../inbound/mysql/ddl/DruidDdlParser.java | 58 +++++++++---------- .../inbound/mysql/tsdb/DatabaseTableMeta.java | 2 +- .../inbound/mysql/tsdb/MemoryTableMeta.java | 47 ++++++++------- pom.xml | 5 ++ 5 files changed, 62 insertions(+), 54 deletions(-) diff --git a/parse/pom.xml b/parse/pom.xml index efdb57f2..5173ae82 100644 --- a/parse/pom.xml +++ b/parse/pom.xml @@ -49,6 +49,10 @@ com.alibaba druid + + com.alibaba.fastsql + fastsql + mysql mysql-connector-java diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java index 64ddc722..eda66921 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java @@ -4,35 +4,35 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -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.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddIndex; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropKey; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableRename; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLConstraint; -import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement; -import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; -import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement; -import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; -import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; -import com.alibaba.druid.sql.ast.statement.SQLTableSource; -import com.alibaba.druid.sql.ast.statement.SQLTruncateStatement; -import com.alibaba.druid.sql.ast.statement.SQLUnique; -import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement.Item; -import com.alibaba.druid.sql.parser.ParserException; -import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastsql.sql.SQLUtils; +import com.alibaba.fastsql.sql.ast.SQLExpr; +import com.alibaba.fastsql.sql.ast.SQLStatement; +import com.alibaba.fastsql.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.fastsql.sql.ast.expr.SQLPropertyExpr; +import com.alibaba.fastsql.sql.ast.statement.SQLAlterTableAddConstraint; +import com.alibaba.fastsql.sql.ast.statement.SQLAlterTableAddIndex; +import com.alibaba.fastsql.sql.ast.statement.SQLAlterTableDropConstraint; +import com.alibaba.fastsql.sql.ast.statement.SQLAlterTableDropIndex; +import com.alibaba.fastsql.sql.ast.statement.SQLAlterTableDropKey; +import com.alibaba.fastsql.sql.ast.statement.SQLAlterTableItem; +import com.alibaba.fastsql.sql.ast.statement.SQLAlterTableRename; +import com.alibaba.fastsql.sql.ast.statement.SQLAlterTableStatement; +import com.alibaba.fastsql.sql.ast.statement.SQLConstraint; +import com.alibaba.fastsql.sql.ast.statement.SQLCreateIndexStatement; +import com.alibaba.fastsql.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.fastsql.sql.ast.statement.SQLDeleteStatement; +import com.alibaba.fastsql.sql.ast.statement.SQLDropIndexStatement; +import com.alibaba.fastsql.sql.ast.statement.SQLDropTableStatement; +import com.alibaba.fastsql.sql.ast.statement.SQLExprTableSource; +import com.alibaba.fastsql.sql.ast.statement.SQLInsertStatement; +import com.alibaba.fastsql.sql.ast.statement.SQLTableSource; +import com.alibaba.fastsql.sql.ast.statement.SQLTruncateStatement; +import com.alibaba.fastsql.sql.ast.statement.SQLUnique; +import com.alibaba.fastsql.sql.ast.statement.SQLUpdateStatement; +import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement; +import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement.Item; +import com.alibaba.fastsql.sql.parser.ParserException; +import com.alibaba.fastsql.util.JdbcConstants; import com.alibaba.otter.canal.protocol.CanalEntry.EventType; /** diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java index 4b917f2f..585f1de9 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java @@ -18,9 +18,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; -import com.alibaba.druid.sql.repository.Schema; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastsql.sql.repository.Schema; import com.alibaba.otter.canal.filter.CanalEventFilter; import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetPacket; import com.alibaba.otter.canal.parse.exception.CanalParseException; diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta.java index 2cfa1e2f..f5621f51 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta.java @@ -10,29 +10,29 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLNullExpr; -import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.ast.statement.SQLColumnConstraint; -import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; -import com.alibaba.druid.sql.ast.statement.SQLColumnPrimaryKey; -import com.alibaba.druid.sql.ast.statement.SQLColumnUniqueKey; -import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLNotNullConstraint; -import com.alibaba.druid.sql.ast.statement.SQLNullConstraint; -import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; -import com.alibaba.druid.sql.ast.statement.SQLTableElement; -import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey; -import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique; -import com.alibaba.druid.sql.repository.Schema; -import com.alibaba.druid.sql.repository.SchemaObject; -import com.alibaba.druid.sql.repository.SchemaRepository; -import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastsql.sql.ast.SQLDataType; +import com.alibaba.fastsql.sql.ast.SQLDataTypeImpl; +import com.alibaba.fastsql.sql.ast.SQLExpr; +import com.alibaba.fastsql.sql.ast.SQLStatement; +import com.alibaba.fastsql.sql.ast.expr.SQLCharExpr; +import com.alibaba.fastsql.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.fastsql.sql.ast.expr.SQLNullExpr; +import com.alibaba.fastsql.sql.ast.expr.SQLPropertyExpr; +import com.alibaba.fastsql.sql.ast.statement.SQLColumnConstraint; +import com.alibaba.fastsql.sql.ast.statement.SQLColumnDefinition; +import com.alibaba.fastsql.sql.ast.statement.SQLColumnPrimaryKey; +import com.alibaba.fastsql.sql.ast.statement.SQLColumnUniqueKey; +import com.alibaba.fastsql.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.fastsql.sql.ast.statement.SQLNotNullConstraint; +import com.alibaba.fastsql.sql.ast.statement.SQLNullConstraint; +import com.alibaba.fastsql.sql.ast.statement.SQLSelectOrderByItem; +import com.alibaba.fastsql.sql.ast.statement.SQLTableElement; +import com.alibaba.fastsql.sql.dialect.mysql.ast.MySqlPrimaryKey; +import com.alibaba.fastsql.sql.dialect.mysql.ast.MySqlUnique; +import com.alibaba.fastsql.sql.repository.Schema; +import com.alibaba.fastsql.sql.repository.SchemaObject; +import com.alibaba.fastsql.sql.repository.SchemaRepository; +import com.alibaba.fastsql.util.JdbcConstants; import com.alibaba.otter.canal.parse.inbound.TableMeta; import com.alibaba.otter.canal.parse.inbound.TableMeta.FieldMeta; import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DruidDdlParser; @@ -247,7 +247,6 @@ public class MemoryTableMeta implements TableMetaTSDB { return sqlName.toString(); } } - public SchemaRepository getRepository() { return repository; diff --git a/pom.xml b/pom.xml index 2dfc5c71..cadbfcfa 100644 --- a/pom.xml +++ b/pom.xml @@ -251,6 +251,11 @@ ibatis-sqlmap 2.3.4.726 + + com.alibaba.fastsql + fastsql + 2.0.0_preview_135 + com.alibaba druid