diff --git a/client-adapter/README.md b/client-adapter/README.md index b3d92c77..0ca50b9b 100644 --- a/client-adapter/README.md +++ b/client-adapter/README.md @@ -41,7 +41,7 @@ canal.conf: flatMessage: true # 扁平message开关, 是否以json字符串形式投递数据, 仅在kafka/rocketMQ模式下有效 canalInstances: # canal实例组, 如果是tcp模式可配置此项 - instance: example # 对应canal destination - adapterGroups: # 对应适配器分组, 分组间的适配器并行运行 + groups: # 对应适配器分组, 分组间的适配器并行运行 - outAdapters: # 适配器列表, 分组内的适配串行运行 - name: logger # 适配器SPI名 - name: hbase diff --git a/client-adapter/common/pom.xml b/client-adapter/common/pom.xml index eb3a21a3..e62fc386 100644 --- a/client-adapter/common/pom.xml +++ b/client-adapter/common/pom.xml @@ -1,11 +1,9 @@ - + canal.client-adapter com.alibaba.otter - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT 4.0.0 com.alibaba.otter @@ -16,7 +14,7 @@ com.alibaba.otter canal.protocol - ${canal_version} + 1.1.2-SNAPSHOT joda-time diff --git a/client-adapter/hbase/pom.xml b/client-adapter/hbase/pom.xml index b3d274e4..623d919b 100644 --- a/client-adapter/hbase/pom.xml +++ b/client-adapter/hbase/pom.xml @@ -1,11 +1,9 @@ - + canal.client-adapter com.alibaba.otter - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT 4.0.0 com.alibaba.otter diff --git a/client-adapter/launcher/pom.xml b/client-adapter/launcher/pom.xml index 8159bb66..1a79ed21 100644 --- a/client-adapter/launcher/pom.xml +++ b/client-adapter/launcher/pom.xml @@ -1,11 +1,9 @@ - + canal.client-adapter com.alibaba.otter - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT 4.0.0 com.alibaba.otter @@ -34,7 +32,7 @@ com.alibaba.otter canal.client - ${canal_version} + 1.1.2-SNAPSHOT org.yaml @@ -134,14 +132,14 @@ - + - + - + - + diff --git a/client-adapter/logger/pom.xml b/client-adapter/logger/pom.xml index af7ec379..bca319f1 100644 --- a/client-adapter/logger/pom.xml +++ b/client-adapter/logger/pom.xml @@ -1,11 +1,9 @@ - + canal.client-adapter com.alibaba.otter - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT 4.0.0 com.alibaba.otter diff --git a/client-adapter/pom.xml b/client-adapter/pom.xml index aafe6395..e2be0d35 100644 --- a/client-adapter/pom.xml +++ b/client-adapter/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 com.alibaba.otter canal.client-adapter - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT pom canal client adapter module for otter ${project.version} diff --git a/client/pom.xml b/client/pom.xml index 370d1854..c12447c9 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -3,7 +3,7 @@ com.alibaba.otter canal - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT ../pom.xml com.alibaba.otter @@ -180,8 +180,7 @@ - + diff --git a/common/pom.xml b/common/pom.xml index 1f2ece8b..9a3c3b22 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -3,7 +3,7 @@ com.alibaba.otter canal - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT ../pom.xml canal.common @@ -83,6 +83,10 @@ org.springframework spring-orm + + com.google.code.findbugs + jsr305 + org.springframework spring-test diff --git a/common/src/main/java/com/alibaba/otter/canal/common/utils/BooleanMutex.java b/common/src/main/java/com/alibaba/otter/canal/common/utils/BooleanMutex.java index d729ad01..660181ce 100644 --- a/common/src/main/java/com/alibaba/otter/canal/common/utils/BooleanMutex.java +++ b/common/src/main/java/com/alibaba/otter/canal/common/utils/BooleanMutex.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.AbstractQueuedSynchronizer; /** - * 实现一个互斥实现,基于Cocurrent中的{@linkplain AbstractQueuedSynchronizer}实现了自己的sync
+ * 实现一个互斥实现,基于Cocurrent中的AbstractQueuedSynchronizer实现了自己的sync
* 应用场景:系统初始化/授权控制,没权限时阻塞等待。有权限时所有线程都可以快速通过 * *
diff --git a/dbsync/pom.xml b/dbsync/pom.xml
index ac606af4..9aa0fa68 100644
--- a/dbsync/pom.xml
+++ b/dbsync/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../pom.xml
 	
 	com.alibaba.otter
diff --git a/deployer/pom.xml b/deployer/pom.xml
index 690b8c91..25d0c6e3 100644
--- a/deployer/pom.xml
+++ b/deployer/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../pom.xml
 	
 	com.alibaba.otter
diff --git a/deployer/src/main/resources/example/instance.properties b/deployer/src/main/resources/example/instance.properties
index 25bab241..0caef6d2 100644
--- a/deployer/src/main/resources/example/instance.properties
+++ b/deployer/src/main/resources/example/instance.properties
@@ -31,12 +31,12 @@ canal.instance.tsdb.enable=true
 
 # username/password
 canal.instance.dbUsername=canal
-canal.instance.dbPassword=cZozNf1mzW6EQLGO2q9u99619xbZLO0fbua3EX08r4BWNXb8lAt1aHrTEOBttd6UY8Vnuc0easlVXZDdLtt8BQ==
-canal.instance.pwdPublicKey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALK4BUxdDltRRE5/zXpVEVPUgunvscYFtEip3pmLlhrWpacX7y7GCMo2/JM6LeHmiiNdH1FWgGCpUfircSwlWKUCAwEAAQ==
+canal.instance.dbPassword=canal
 canal.instance.connectionCharset = UTF-8
 canal.instance.defaultDatabaseName =test
 # enable druid Decrypt database password
-canal.instance.enableDruid=true
+canal.instance.enableDruid=false
+#canal.instance.pwdPublicKey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALK4BUxdDltRRE5/zXpVEVPUgunvscYFtEip3pmLlhrWpacX7y7GCMo2/JM6LeHmiiNdH1FWgGCpUfircSwlWKUCAwEAAQ==
 
 # table regex
 canal.instance.filter.regex=.*\\..*
diff --git a/driver/pom.xml b/driver/pom.xml
index 692475db..b7db03fe 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../pom.xml
 	
 	com.alibaba.otter
diff --git a/example/pom.xml b/example/pom.xml
index 679bfb1d..ae040df6 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../pom.xml
 	
 	com.alibaba.otter
diff --git a/filter/pom.xml b/filter/pom.xml
index 95c77f8f..e9a2f60c 100644
--- a/filter/pom.xml
+++ b/filter/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../pom.xml
 	
 	com.alibaba.otter
diff --git a/instance/core/pom.xml b/instance/core/pom.xml
index 1a73fc8a..c96d8ce5 100644
--- a/instance/core/pom.xml
+++ b/instance/core/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../../pom.xml
 	
 	canal.instance.core
diff --git a/instance/manager/pom.xml b/instance/manager/pom.xml
index ec85fa2c..0710dbd1 100644
--- a/instance/manager/pom.xml
+++ b/instance/manager/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../../pom.xml
 	
 	com.alibaba.otter
diff --git a/instance/pom.xml b/instance/pom.xml
index a73b43fe..3ccf7ebd 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../pom.xml
 	
 	com.alibaba.otter
diff --git a/instance/spring/pom.xml b/instance/spring/pom.xml
index 929fc273..3d5526d4 100644
--- a/instance/spring/pom.xml
+++ b/instance/spring/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../../pom.xml
 	
 	com.alibaba.otter
diff --git a/meta/pom.xml b/meta/pom.xml
index 98788116..8683e8e7 100644
--- a/meta/pom.xml
+++ b/meta/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../pom.xml
 	
 	com.alibaba.otter
diff --git a/parse/pom.xml b/parse/pom.xml
index 8e47215b..d610838d 100644
--- a/parse/pom.xml
+++ b/parse/pom.xml
@@ -3,7 +3,7 @@
 	
 		com.alibaba.otter
 		canal
-		1.1.1-SNAPSHOT
+		1.1.2-SNAPSHOT
 		../pom.xml
 	
 	canal.parse
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
index 7f83b6d2..df9c952c 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
@@ -35,12 +35,12 @@ import com.taobao.tddl.dbsync.binlog.LogEvent;
 
 /**
  * 基于向mysql server复制binlog实现
- * 
+ *
  * 
  * 1. 自身不控制mysql主备切换,由ha机制来控制. 比如接入tddl/cobar/自身心跳包成功率
  * 2. 切换机制
  * 
- * + * * @author jianghang 2012-6-21 下午04:06:32 * @version 1.0.0 */ @@ -202,7 +202,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE /** * 心跳信息 - * + * * @author jianghang 2012-7-6 下午02:50:15 * @version 1.0.0 */ @@ -352,7 +352,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE return logPosition.getPostion(); } - if (StringUtils.isNotEmpty(masterPosition.getGtid())) { + if (masterPosition!=null && StringUtils.isNotEmpty(masterPosition.getGtid())) { return masterPosition; } } diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java index 70eab24c..bf0deafe 100644 --- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java +++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java @@ -19,6 +19,8 @@ public class FastsqlSchemaTest { public void testSimple() throws FileNotFoundException, IOException { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); String sql = "create table yushitai_test.card_record ( id bigint auto_increment, name varchar(32) DEFAULT NULL) auto_increment=256 " + + "ALTER TABLE yushitai_test.card_record ADD COLUMN remark2 varchar(255) DEFAULT NULL , ALGORITHM=inplace,LOCK=NONE;" + + "ALTER TABLE yushitai_test.card_record modify COLUMN name varchar(64) DEFAULT NULL , ALGORITHM=copy,LOCK=SHARED; " + "alter table yushitai_test.card_record add index index_name(name) ;" + "alter table yushitai_test.card_record add index index_name(name) ;" + "alter table yushitai_test.card_record add Constraint pk_id PRIMARY KEY (id);" diff --git a/pom.xml b/pom.xml index 27038086..5cb51eac 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ canal pom canal module for otter ${project.version} - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT https://github.com/alibaba/canal org.sonatype.oss @@ -246,7 +246,7 @@ com.alibaba.fastsql fastsql - 2.0.0_preview_630 + 2.0.0_preview_644 com.alibaba @@ -297,7 +297,11 @@ 5.1.40 - + + com.google.code.findbugs + jsr305 + 3.0.2 + @@ -367,6 +371,24 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + ${file_encoding} + ${file_encoding} + -Xdoclint:none + +