getChildren(final String path, final boolean watch) throws KeeperException,
- InterruptedException {
- return _zk.getChildren(path, watch);
- }
-
- public byte[] readData(String path, Stat stat, boolean watch) throws KeeperException, InterruptedException {
- return _zk.getData(path, watch, stat);
- }
-
- public void writeData(String path, byte[] data) throws KeeperException, InterruptedException {
- writeData(path, data, -1);
- }
-
- public void writeData(String path, byte[] data, int version) throws KeeperException, InterruptedException {
- _zk.setData(path, data, version);
- }
-
- public States getZookeeperState() {
- return _zk != null ? _zk.getState() : null;
- }
-
- public ZooKeeper getZookeeper() {
- return _zk;
- }
-
- public long getCreateTime(String path) throws KeeperException, InterruptedException {
- Stat stat = _zk.exists(path, false);
- if (stat != null) {
- return stat.getCtime();
- }
- return -1;
- }
-
- public String getServers() {
- return StringUtils.join(_servers, SERVER_COMMA);
- }
-
// ===============================
public void configMutliCluster(ZooKeeper zk) {
- if (_servers.size() == 1) {
+ if (_serversList.size() == 1) {
return;
}
- String cluster1 = _servers.get(0);
+ String cluster1 = _serversList.get(0);
try {
- if (_servers.size() > 1) {
+ if (_serversList.size() > 1) {
// 强制的声明accessible
ReflectionUtils.makeAccessible(clientCnxnField);
ReflectionUtils.makeAccessible(hostProviderField);
ReflectionUtils.makeAccessible(serverAddressesField);
// 添加第二组集群列表
- for (int i = 1; i < _servers.size(); i++) {
- String cluster = _servers.get(i);
+ for (int i = 1; i < _serversList.size(); i++) {
+ String cluster = _serversList.get(i);
// 强制获取zk中的地址信息
ClientCnxn cnxn = (ClientCnxn) ReflectionUtils.getField(clientCnxnField, zk);
HostProvider hostProvider = (HostProvider) ReflectionUtils.getField(hostProviderField, cnxn);
diff --git a/dbsync/pom.xml b/dbsync/pom.xml
index f3d7f62a..1f274e82 100644
--- a/dbsync/pom.xml
+++ b/dbsync/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
diff --git a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/JsonConversion.java b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/JsonConversion.java
index 251e458f..020591f7 100644
--- a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/JsonConversion.java
+++ b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/JsonConversion.java
@@ -363,12 +363,12 @@ public class JsonConversion {
buf.append('"').append(text).append('"');
} else {
text = m_data.getFixString((int) m_length, charsetName);
- buf.append('"').append(text).append('"');
+ buf.append('"').append(escapse(text)).append('"');
}
break;
case STRING:
- buf.append('"').append(m_string_value).append('"');
+ buf.append('"').append(escapse(m_string_value)).append('"');
break;
case ERROR:
throw new IllegalArgumentException("illegal json data");
@@ -378,6 +378,21 @@ public class JsonConversion {
}
}
+ private static StringBuilder escapse(String data) {
+ StringBuilder sb = new StringBuilder(data.length());
+ int endIndex = data.length();
+ for (int i = 0; i < endIndex; ++i) {
+ char c = data.charAt(i);
+ if (c == '"') {
+ sb.append('\\');
+ } else if (c == '\\') {
+ sb.append("\\");
+ }
+ sb.append(c);
+ }
+ return sb;
+ }
+
public static enum Json_enum_type {
OBJECT, ARRAY, STRING, INT, UINT, DOUBLE, LITERAL_NULL, LITERAL_TRUE, LITERAL_FALSE, OPAQUE, ERROR
}
diff --git a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogBuffer.java b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogBuffer.java
index f81660fa..be61c99f 100644
--- a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogBuffer.java
+++ b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogBuffer.java
@@ -20,6 +20,7 @@ public class LogBuffer {
protected int origin, limit;
protected int position;
+ protected int semival;
protected LogBuffer(){
}
diff --git a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogDecoder.java b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogDecoder.java
index 95a57424..34cb70c5 100644
--- a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogDecoder.java
+++ b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogDecoder.java
@@ -104,9 +104,14 @@ public final class LogDecoder {
try {
/* Decoding binary-log to event */
event = decode(buffer, header, context);
+ if (event != null) {
+ event.setSemival(buffer.semival);
+ }
} catch (IOException e) {
- if (logger.isWarnEnabled()) logger.warn("Decoding " + LogEvent.getTypeName(header.getType())
- + " failed from: " + context.getLogPosition(), e);
+ if (logger.isWarnEnabled()) {
+ logger.warn("Decoding " + LogEvent.getTypeName(header.getType()) + " failed from: "
+ + context.getLogPosition(), e);
+ }
throw e;
} finally {
buffer.limit(limit); /* Restore limit */
diff --git a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogEvent.java b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogEvent.java
index 4dba80ee..806b34f7 100644
--- a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogEvent.java
+++ b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogEvent.java
@@ -359,8 +359,28 @@ public abstract class LogEvent {
protected static final Log logger = LogFactory.getLog(LogEvent.class);
protected final LogHeader header;
+
+ /**
+ * mysql半同步semi标识
+ *
+ *
+ * 0不需要semi ack 给mysql
+ * 1需要semi ack给mysql
+ *
+ */
+ protected int semival;
+
+
- protected LogEvent(LogHeader header){
+ public int getSemival() {
+ return semival;
+ }
+
+ public void setSemival(int semival) {
+ this.semival = semival;
+ }
+
+ protected LogEvent(LogHeader header){
this.header = header;
}
diff --git a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/RowsLogBuffer.java b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/RowsLogBuffer.java
index 2456f358..459da9cc 100644
--- a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/RowsLogBuffer.java
+++ b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/RowsLogBuffer.java
@@ -949,8 +949,28 @@ public final class RowsLogBuffer {
break;
}
case LogEvent.MYSQL_TYPE_JSON: {
- len = buffer.getUint16();
- buffer.forward(meta - 2);
+ switch (meta) {
+ case 1: {
+ len = buffer.getUint8();
+ break;
+ }
+ case 2: {
+ len = buffer.getUint16();
+ break;
+ }
+ case 3: {
+ len = buffer.getUint24();
+ break;
+ }
+ case 4: {
+ len = (int) buffer.getUint32();
+ break;
+ }
+ default:
+ throw new IllegalArgumentException("!! Unknown JSON packlen = " + meta);
+ }
+ // len = buffer.getUint16();
+ // buffer.forward(meta - 4);
int position = buffer.position();
Json_Value jsonValue = JsonConversion.parse_value(buffer.getUint8(), buffer, len - 1, charsetName);
StringBuilder builder = new StringBuilder();
diff --git a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/mariadb/MariaGtidLogEvent.java b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/mariadb/MariaGtidLogEvent.java
index 9dc22b39..7c5ed4e5 100644
--- a/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/mariadb/MariaGtidLogEvent.java
+++ b/dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/mariadb/MariaGtidLogEvent.java
@@ -13,9 +13,30 @@ import com.taobao.tddl.dbsync.binlog.event.LogHeader;
*/
public class MariaGtidLogEvent extends IgnorableLogEvent {
+ private long gtid;
+
+ /**
+ *
+ * mariadb gtidlog event format
+ * uint<8> GTID sequence
+ * uint<4> Replication Domain ID
+ * uint<1> Flags
+ *
+ * if flag & FL_GROUP_COMMIT_ID
+ * uint<8> commit_id
+ * else
+ * uint<6> 0
+ *
+ */
+
public MariaGtidLogEvent(LogHeader header, LogBuffer buffer, FormatDescriptionLogEvent descriptionEvent){
super(header, buffer, descriptionEvent);
+ gtid = buffer.getUlong64().longValue();
// do nothing , just ignore log event
}
+ public long getGtid() {
+ return gtid;
+ }
+
}
diff --git a/deployer/pom.xml b/deployer/pom.xml
index 4c20ff43..5fa2efc8 100644
--- a/deployer/pom.xml
+++ b/deployer/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
index a5ff5b8f..dff994cb 100644
--- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
+++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
@@ -149,6 +149,11 @@ public class CanalController {
public void handleNewSession() throws Exception {
initCid(path);
}
+
+ @Override
+ public void handleSessionEstablishmentError(Throwable error) throws Exception {
+ logger.error("failed to connect to zookeeper", error);
+ }
});
}
} finally {
@@ -383,6 +388,11 @@ public class CanalController {
public void handleNewSession() throws Exception {
initCid(path);
}
+
+ @Override
+ public void handleSessionEstablishmentError(Throwable error) throws Exception {
+ logger.error("failed to connect to zookeeper", error);
+ }
});
}
// 优先启动embeded服务
diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java
index e0d5d7ab..e66a5a9b 100644
--- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java
+++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java
@@ -4,7 +4,6 @@ import java.io.FileInputStream;
import java.util.Properties;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,6 +20,10 @@ public class CanalLauncher {
public static void main(String[] args) throws Throwable {
try {
+ logger.info("## set default uncaught exception handler");
+ setGlobalUncaughtExceptionHandler();
+
+ logger.info("## load canal configurations");
String conf = System.getProperty("canal.conf", "classpath:canal.properties");
Properties properties = new Properties();
if (conf.startsWith(CLASSPATH_URL_PREFIX)) {
@@ -41,8 +44,7 @@ public class CanalLauncher {
logger.info("## stop the canal server");
controller.stop();
} catch (Throwable e) {
- logger.warn("##something goes wrong when stopping canal Server:\n{}",
- ExceptionUtils.getFullStackTrace(e));
+ logger.warn("##something goes wrong when stopping canal Server:", e);
} finally {
logger.info("## canal server is down.");
}
@@ -50,9 +52,17 @@ public class CanalLauncher {
});
} catch (Throwable e) {
- logger.error("## Something goes wrong when starting up the canal Server:\n{}",
- ExceptionUtils.getFullStackTrace(e));
+ logger.error("## Something goes wrong when starting up the canal Server:", e);
System.exit(0);
}
}
+
+ private static void setGlobalUncaughtExceptionHandler() {
+ Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+ @Override
+ public void uncaughtException(Thread t, Throwable e) {
+ logger.error("UnCaughtException", e);
+ }
+ });
+ }
}
diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java
index 864753ab..3483324d 100644
--- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java
+++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java
@@ -13,7 +13,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.Assert;
@@ -186,7 +185,7 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
logger.info("auto notify start {} successful.", destination);
} catch (Throwable e) {
- logger.error("scan add found[{}] but start failed", destination, ExceptionUtils.getFullStackTrace(e));
+ logger.error(String.format("scan add found[%s] but start failed", destination), e);
}
}
@@ -197,7 +196,7 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
lastFiles.remove(destination);
logger.info("auto notify stop {} successful.", destination);
} catch (Throwable e) {
- logger.error("scan delete found[{}] but stop failed", destination, ExceptionUtils.getFullStackTrace(e));
+ logger.error(String.format("scan delete found[%s] but stop failed", destination), e);
actions.put(destination, action);// 再重新加回去，下一次scan时再执行删除
}
}
@@ -209,9 +208,7 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
action.reload(destination);
logger.info("auto notify reload {} successful.", destination);
} catch (Throwable e) {
- logger.error("scan reload found[{}] but reload failed",
- destination,
- ExceptionUtils.getFullStackTrace(e));
+ logger.error(String.format("scan reload found[%s] but reload failed", destination), e);
}
}
}
@@ -314,5 +311,4 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
}
}
-
}
diff --git a/deployer/src/main/resources/canal.properties b/deployer/src/main/resources/canal.properties
index df6f49e2..f765e71b 100644
--- a/deployer/src/main/resources/canal.properties
+++ b/deployer/src/main/resources/canal.properties
@@ -36,6 +36,7 @@ canal.instance.network.sendBufferSize = 16384
canal.instance.network.soTimeout = 30
# binlog filter config
+canal.instance.filter.druid.ddl = true
canal.instance.filter.query.dcl = false
canal.instance.filter.query.dml = false
canal.instance.filter.query.ddl = false
@@ -59,9 +60,13 @@ canal.conf.dir = ../conf
canal.auto.scan = true
canal.auto.scan.interval = 5
+canal.instance.tsdb.spring.xml=classpath:spring/tsdb/h2-tsdb.xml
+#canal.instance.tsdb.spring.xml=classpath:spring/tsdb/mysql-tsdb.xml
+
canal.instance.global.mode = spring
canal.instance.global.lazy = false
#canal.instance.global.manager.address = 127.0.0.1:1099
+#canal.instance.global.spring.xml = classpath:spring/local-instance.xml
#canal.instance.global.spring.xml = classpath:spring/memory-instance.xml
canal.instance.global.spring.xml = classpath:spring/file-instance.xml
#canal.instance.global.spring.xml = classpath:spring/default-instance.xml
diff --git a/deployer/src/main/resources/example/instance.properties b/deployer/src/main/resources/example/instance.properties
index 2bdfffb2..22357e1f 100644
--- a/deployer/src/main/resources/example/instance.properties
+++ b/deployer/src/main/resources/example/instance.properties
@@ -1,27 +1,33 @@
#################################################
## mysql serverId
-canal.instance.mysql.slaveId = 1234
-
+canal.instance.mysql.slaveId=0
# position info
-canal.instance.master.address = 127.0.0.1:3306
-canal.instance.master.journal.name =
-canal.instance.master.position =
-canal.instance.master.timestamp =
+canal.instance.master.address=127.0.0.1:3306
+canal.instance.master.journal.name=
+canal.instance.master.position=
+canal.instance.master.timestamp=
-#canal.instance.standby.address =
+
+# table meta tsdb info
+canal.instance.tsdb.enable=true
+canal.instance.tsdb.dir=${canal.file.data.dir:../conf}/${canal.instance.destination:}
+canal.instance.tsdb.url=jdbc:h2:${canal.instance.tsdb.dir}/h2;CACHE_SIZE=1000;MODE=MYSQL;
+#canal.instance.tsdb.url=jdbc:mysql://127.0.0.1:3306/canal_tsdb
+canal.instance.tsdb.dbUsername=canal
+canal.instance.tsdb.dbPassword=canal
+
+
+#canal.instance.standby.address =
#canal.instance.standby.journal.name =
#canal.instance.standby.position =
#canal.instance.standby.timestamp =
-
# username/password
-canal.instance.dbUsername = canal
-canal.instance.dbPassword = canal
-canal.instance.defaultDatabaseName =
-canal.instance.connectionCharset = UTF-8
-
+canal.instance.dbUsername=canal
+canal.instance.dbPassword=canal
+canal.instance.defaultDatabaseName=test
+canal.instance.connectionCharset=UTF-8
# table regex
-canal.instance.filter.regex = .*\\..*
+canal.instance.filter.regex=.*\\..*
# table black regex
-canal.instance.filter.black.regex =
-
+canal.instance.filter.black.regex=
#################################################
\ No newline at end of file
diff --git a/deployer/src/main/resources/example/rds_instance.properties b/deployer/src/main/resources/example/rds_instance.properties
new file mode 100644
index 00000000..f04b3832
--- /dev/null
+++ b/deployer/src/main/resources/example/rds_instance.properties
@@ -0,0 +1,32 @@
+#################################################
+# rds openapi binlog
+canal.instance.rds.open.url=https://rds.aliyuncs.com/
+canal.instance.rds.open.accesskey=
+canal.instance.rds.open.secretkey=
+canal.instance.rds.instanceId=
+canal.instance.rds.startTime=
+canal.instance.rds.endTime=
+
+# local binlog dir
+canal.instance.parser.directory=${canal.file.data.dir:../conf}/${canal.instance.destination:}/binlog
+# position info
+canal.instance.master.address=127.0.0.1:3306
+
+# table meta tsdb info
+canal.instance.tsdb.enable=true
+canal.instance.tsdb.dir=${canal.file.data.dir:../conf}/${canal.instance.destination:}
+canal.instance.tsdb.url=jdbc:h2:${canal.instance.tsdb.dir}/h2;CACHE_SIZE=1000;MODE=MYSQL;
+#canal.instance.tsdb.url=jdbc:mysql://127.0.0.1:3306/canal_tsdb
+#canal.instance.tsdb.dbUsername=canal
+#canal.instance.tsdb.dbPassword=canal
+
+# username/password
+canal.instance.dbUsername=canal
+canal.instance.dbPassword=canal
+canal.instance.defaultDatabaseName=test
+canal.instance.connectionCharset=UTF-8
+# table regex
+canal.instance.filter.regex=test\\..*
+# table black regex
+canal.instance.filter.black.regex=
+#################################################
\ No newline at end of file
diff --git a/deployer/src/main/resources/logback.xml b/deployer/src/main/resources/logback.xml
index 73a3693b..1b0f4103 100644
--- a/deployer/src/main/resources/logback.xml
+++ b/deployer/src/main/resources/logback.xml
@@ -74,8 +74,8 @@
-
+
+
\ No newline at end of file
diff --git a/deployer/src/main/resources/spring/default-instance.xml b/deployer/src/main/resources/spring/default-instance.xml
index 5631b7cb..8a26c34a 100644
--- a/deployer/src/main/resources/spring/default-instance.xml
+++ b/deployer/src/main/resources/spring/default-instance.xml
@@ -85,7 +85,7 @@
diff --git a/deployer/src/main/resources/spring/file-instance.xml b/deployer/src/main/resources/spring/file-instance.xml
index b5fcc908..3ee38c98 100644
--- a/deployer/src/main/resources/spring/file-instance.xml
+++ b/deployer/src/main/resources/spring/file-instance.xml
@@ -71,7 +71,7 @@
diff --git a/deployer/src/main/resources/spring/group-instance.xml b/deployer/src/main/resources/spring/group-instance.xml
index 6fefaa87..5ac91794 100644
--- a/deployer/src/main/resources/spring/group-instance.xml
+++ b/deployer/src/main/resources/spring/group-instance.xml
@@ -77,7 +77,7 @@
-
-
-
-
-
-
-
-
+
-
-
- ${canal.zkServers:127.0.0.1:2181}
-
-
-
-
-
-
-
-
-
-
+
@@ -96,10 +69,10 @@
-
+
@@ -144,20 +117,25 @@
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/deployer/src/main/resources/spring/memory-instance.xml b/deployer/src/main/resources/spring/memory-instance.xml
index 269b9deb..7f1eff3f 100644
--- a/deployer/src/main/resources/spring/memory-instance.xml
+++ b/deployer/src/main/resources/spring/memory-instance.xml
@@ -68,7 +68,7 @@
diff --git a/deployer/src/main/resources/spring/tsdb/h2-tsdb.xml b/deployer/src/main/resources/spring/tsdb/h2-tsdb.xml
new file mode 100644
index 00000000..6f8ba05d
--- /dev/null
+++ b/deployer/src/main/resources/spring/tsdb/h2-tsdb.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+ classpath:canal.properties
+ classpath:${canal.instance.destination:}/instance.properties
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/deployer/src/main/resources/spring/tsdb/mysql-tsdb.xml b/deployer/src/main/resources/spring/tsdb/mysql-tsdb.xml
new file mode 100644
index 00000000..555eec44
--- /dev/null
+++ b/deployer/src/main/resources/spring/tsdb/mysql-tsdb.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+ classpath:canal.properties
+ classpath:${canal.instance.destination:}/instance.properties
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/deployer/src/main/resources/spring/tsdb/sql-map/sqlmap-config.xml b/deployer/src/main/resources/spring/tsdb/sql-map/sqlmap-config.xml
new file mode 100644
index 00000000..26690703
--- /dev/null
+++ b/deployer/src/main/resources/spring/tsdb/sql-map/sqlmap-config.xml
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/deployer/src/main/resources/spring/tsdb/sql-map/sqlmap_history.xml b/deployer/src/main/resources/spring/tsdb/sql-map/sqlmap_history.xml
new file mode 100644
index 00000000..7445bf69
--- /dev/null
+++ b/deployer/src/main/resources/spring/tsdb/sql-map/sqlmap_history.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+ select
+
+
+
+ insert into meta_history (
+
+
+ delete from meta_history
+ where destination=#destination#
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/deployer/src/main/resources/spring/tsdb/sql-map/sqlmap_snapshot.xml b/deployer/src/main/resources/spring/tsdb/sql-map/sqlmap_snapshot.xml
new file mode 100644
index 00000000..79aa25fe
--- /dev/null
+++ b/deployer/src/main/resources/spring/tsdb/sql-map/sqlmap_snapshot.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+ select
+
+
+ insert into meta_snapshot (
+
+
+ update meta_snapshot set gmt_modified=now(),
+ binlog_file=#binlogFile#,binlog_offest=#binlogOffest#,binlog_master_id=#binlogMasterId#,binlog_timestamp=#binlogTimestamp#,data=#data#,extra=#extra#
+ where destination=#destination# and binlog_timestamp=0
+
+
+
+ delete from meta_snapshot
+ where destination=#destination#
+
+
+
+
+
+
\ No newline at end of file
diff --git a/deployer/src/main/resources/spring/tsdb/sql/create_table.sql b/deployer/src/main/resources/spring/tsdb/sql/create_table.sql
new file mode 100644
index 00000000..e5d6dbf4
--- /dev/null
+++ b/deployer/src/main/resources/spring/tsdb/sql/create_table.sql
@@ -0,0 +1,39 @@
+CREATE TABLE IF NOT EXISTS `meta_snapshot` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `gmt_create` datetime NOT NULL COMMENT '创建时间',
+ `gmt_modified` datetime NOT NULL COMMENT '修改时间',
+ `destination` varchar(128) DEFAULT NULL COMMENT '通道名称',
+ `binlog_file` varchar(64) DEFAULT NULL COMMENT 'binlog文件名',
+ `binlog_offest` bigint(20) DEFAULT NULL COMMENT 'binlog偏移量',
+ `binlog_master_id` varchar(64) DEFAULT NULL COMMENT 'binlog节点id',
+ `binlog_timestamp` bigint(20) DEFAULT NULL COMMENT 'binlog应用的时间戳',
+ `data` longtext DEFAULT NULL COMMENT '表结构数据',
+ `extra` text DEFAULT NULL COMMENT '额外的扩展信息',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY binlog_file_offest(`destination`,`binlog_master_id`,`binlog_file`,`binlog_offest`),
+ KEY `destination` (`destination`),
+ KEY `destination_timestamp` (`destination`,`binlog_timestamp`),
+ KEY `gmt_modified` (`gmt_modified`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='表结构记录表快照表';
+
+CREATE TABLE IF NOT EXISTS `meta_history` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `gmt_create` datetime NOT NULL COMMENT '创建时间',
+ `gmt_modified` datetime NOT NULL COMMENT '修改时间',
+ `destination` varchar(128) DEFAULT NULL COMMENT '通道名称',
+ `binlog_file` varchar(64) DEFAULT NULL COMMENT 'binlog文件名',
+ `binlog_offest` bigint(20) DEFAULT NULL COMMENT 'binlog偏移量',
+ `binlog_master_id` varchar(64) DEFAULT NULL COMMENT 'binlog节点id',
+ `binlog_timestamp` bigint(20) DEFAULT NULL COMMENT 'binlog应用的时间戳',
+ `use_schema` varchar(1024) DEFAULT NULL COMMENT '执行sql时对应的schema',
+ `schema` varchar(1024) DEFAULT NULL COMMENT '对应的schema',
+ `table` varchar(1024) DEFAULT NULL COMMENT '对应的table',
+ `sql` longtext DEFAULT NULL COMMENT '执行的sql',
+ `type` varchar(256) DEFAULT NULL COMMENT 'sql类型',
+ `extra` text DEFAULT NULL COMMENT '额外的扩展信息',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY binlog_file_offest(`destination`,`binlog_master_id`,`binlog_file`,`binlog_offest`),
+ KEY `destination` (`destination`),
+ KEY `destination_timestamp` (`destination`,`binlog_timestamp`),
+ KEY `gmt_modified` (`gmt_modified`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='表结构变化明细表';
\ No newline at end of file
diff --git a/driver/pom.xml b/driver/pom.xml
index b9b3107b..edd24e57 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
@@ -33,10 +33,6 @@
org.slf4j
slf4j-api
-
- org.jboss.netty
- netty
-
junit
diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java
index 9972fe66..1b77a1fd 100644
--- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java
+++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java
@@ -2,11 +2,8 @@ package com.alibaba.otter.canal.parse.driver.mysql;
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.lang.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,6 +13,8 @@ import com.alibaba.otter.canal.parse.driver.mysql.packets.client.QuitCommandPack
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ErrorPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.HandshakeInitializationPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.Reply323Packet;
+import com.alibaba.otter.canal.parse.driver.mysql.socket.SocketChannel;
+import com.alibaba.otter.canal.parse.driver.mysql.socket.SocketChannelPool;
import com.alibaba.otter.canal.parse.driver.mysql.utils.MySQLPasswordEncrypter;
import com.alibaba.otter.canal.parse.driver.mysql.utils.PacketManager;
@@ -35,6 +34,7 @@ public class MysqlConnector {
private byte charsetNumber = 33;
private String defaultSchema = "retl";
private int soTimeout = 30 * 1000;
+ private int connTimeout = 5 * 1000;
private int receiveBufferSize = 16 * 1024;
private int sendBufferSize = 16 * 1024;
@@ -43,6 +43,8 @@ public class MysqlConnector {
// mysql connectinnId
private long connectionId = -1;
private AtomicBoolean connected = new AtomicBoolean(false);
+
+ public static final int timeout = 3000; // 3s
public MysqlConnector(){
}
@@ -64,14 +66,12 @@ public class MysqlConnector {
public void connect() throws IOException {
if (connected.compareAndSet(false, true)) {
try {
- channel = SocketChannel.open();
- configChannel(channel);
+ channel = SocketChannelPool.open(address);
logger.info("connect MysqlConnection to {}...", address);
- channel.connect(address);
negotiate(channel);
} catch (Exception e) {
disconnect();
- throw new IOException("connect " + this.address + " failure:" + ExceptionUtils.getStackTrace(e));
+ throw new IOException("connect " + this.address + " failure", e);
}
} else {
logger.error("the channel can't be connected twice.");
@@ -91,7 +91,7 @@ public class MysqlConnector {
}
logger.info("disConnect MysqlConnection to {}...", address);
} catch (Exception e) {
- throw new IOException("disconnect " + this.address + " failure:" + ExceptionUtils.getStackTrace(e));
+ throw new IOException("disconnect " + this.address + " failure", e);
}
// 执行一次quit
@@ -104,7 +104,7 @@ public class MysqlConnector {
executor.update("KILL CONNECTION " + connectionId);
} catch (Exception e) {
// 忽略具体异常
- logger.info("KILL DUMP " + connectionId + " failure:" + ExceptionUtils.getStackTrace(e));
+ logger.info("KILL DUMP " + connectionId + " failure", e);
} finally {
if (connector != null) {
connector.disconnect();
@@ -132,6 +132,7 @@ public class MysqlConnector {
connector.setReceiveBufferSize(getReceiveBufferSize());
connector.setSendBufferSize(getSendBufferSize());
connector.setSoTimeout(getSoTimeout());
+ connector.setConnTimeout(connTimeout);
return connector;
}
@@ -142,24 +143,12 @@ public class MysqlConnector {
HeaderPacket quitHeader = new HeaderPacket();
quitHeader.setPacketBodyLength(cmdBody.length);
quitHeader.setPacketSequenceNumber((byte) 0x00);
- PacketManager.write(channel,
- new ByteBuffer[] { ByteBuffer.wrap(quitHeader.toBytes()), ByteBuffer.wrap(cmdBody) });
- }
-
- // ====================== help method ====================
-
- private void configChannel(SocketChannel channel) throws IOException {
- channel.socket().setKeepAlive(true);
- channel.socket().setReuseAddress(true);
- channel.socket().setSoTimeout(soTimeout);
- channel.socket().setTcpNoDelay(true);
- channel.socket().setReceiveBufferSize(receiveBufferSize);
- channel.socket().setSendBufferSize(sendBufferSize);
+ PacketManager.writePkg(channel, quitHeader.toBytes(), cmdBody);
}
private void negotiate(SocketChannel channel) throws IOException {
- HeaderPacket header = PacketManager.readHeader(channel, 4);
- byte[] body = PacketManager.readBytes(channel, header.getPacketBodyLength());
+ HeaderPacket header = PacketManager.readHeader(channel, 4, timeout);
+ byte[] body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout);
if (body[0] < 0) {// check field_count
if (body[0] == -1) {
ErrorPacket error = new ErrorPacket();
@@ -191,15 +180,14 @@ public class MysqlConnector {
h.setPacketBodyLength(clientAuthPkgBody.length);
h.setPacketSequenceNumber((byte) (header.getPacketSequenceNumber() + 1));
- PacketManager.write(channel,
- new ByteBuffer[] { ByteBuffer.wrap(h.toBytes()), ByteBuffer.wrap(clientAuthPkgBody) });
+ PacketManager.writePkg(channel, h.toBytes(), clientAuthPkgBody);
logger.info("client authentication packet is sent out.");
// check auth result
header = null;
header = PacketManager.readHeader(channel, 4);
body = null;
- body = PacketManager.readBytes(channel, header.getPacketBodyLength());
+ body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout);
assert body != null;
if (body[0] < 0) {
if (body[0] == -1) {
@@ -228,7 +216,7 @@ public class MysqlConnector {
h323.setPacketBodyLength(b323Body.length);
h323.setPacketSequenceNumber((byte) (packetSequenceNumber + 1));
- PacketManager.write(channel, new ByteBuffer[] { ByteBuffer.wrap(h323.toBytes()), ByteBuffer.wrap(b323Body) });
+ PacketManager.writePkg(channel, h323.toBytes(), b323Body);
logger.info("client 323 authentication packet is sent out.");
// check auth result
HeaderPacket header = PacketManager.readHeader(channel, 4);
@@ -341,4 +329,11 @@ public class MysqlConnector {
this.dumping = dumping;
}
+ public int getConnTimeout() {
+ return connTimeout;
+ }
+
+ public void setConnTimeout(int connTimeout) {
+ this.connTimeout = connTimeout;
+ }
}
diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlQueryExecutor.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlQueryExecutor.java
index e9041f56..6d30bd4f 100644
--- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlQueryExecutor.java
+++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlQueryExecutor.java
@@ -1,17 +1,18 @@
package com.alibaba.otter.canal.parse.driver.mysql;
import java.io.IOException;
-import java.nio.channels.SocketChannel;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.otter.canal.parse.driver.mysql.packets.HeaderPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.client.QueryCommandPacket;
+import com.alibaba.otter.canal.parse.driver.mysql.packets.server.EOFPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ErrorPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.FieldPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetHeaderPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.RowDataPacket;
+import com.alibaba.otter.canal.parse.driver.mysql.socket.SocketChannel;
import com.alibaba.otter.canal.parse.driver.mysql.utils.PacketManager;
/**
@@ -51,7 +52,7 @@ public class MysqlQueryExecutor {
QueryCommandPacket cmd = new QueryCommandPacket();
cmd.setQueryString(queryString);
byte[] bodyBytes = cmd.toBytes();
- PacketManager.write(channel, bodyBytes);
+ PacketManager.writeBody(channel, bodyBytes);
byte[] body = readNextPacket();
if (body[0] < 0) {
@@ -88,16 +89,70 @@ public class MysqlQueryExecutor {
for (RowDataPacket r : rowData) {
resultSet.getFieldValues().addAll(r.getColumns());
}
- resultSet.setSourceAddress(channel.socket().getRemoteSocketAddress());
+ resultSet.setSourceAddress(channel.getRemoteSocketAddress());
return resultSet;
}
- private void readEofPacket() throws IOException {
+ public List queryMulti(String queryString) throws IOException {
+ QueryCommandPacket cmd = new QueryCommandPacket();
+ cmd.setQueryString(queryString);
+ byte[] bodyBytes = cmd.toBytes();
+ PacketManager.writeBody(channel, bodyBytes);
+ List resultSets = new ArrayList();
+ boolean moreResult = true;
+ while (moreResult) {
+ byte[] body = readNextPacket();
+ if (body[0] < 0) {
+ ErrorPacket packet = new ErrorPacket();
+ packet.fromBytes(body);
+ throw new IOException(packet + "\n with command: " + queryString);
+ }
+
+ ResultSetHeaderPacket rsHeader = new ResultSetHeaderPacket();
+ rsHeader.fromBytes(body);
+
+ List fields = new ArrayList();
+ for (int i = 0; i < rsHeader.getColumnCount(); i++) {
+ FieldPacket fp = new FieldPacket();
+ fp.fromBytes(readNextPacket());
+ fields.add(fp);
+ }
+
+ moreResult = readEofPacket();
+
+ List rowData = new ArrayList();
+ while (true) {
+ body = readNextPacket();
+ if (body[0] == -2) {
+ break;
+ }
+ RowDataPacket rowDataPacket = new RowDataPacket();
+ rowDataPacket.fromBytes(body);
+ rowData.add(rowDataPacket);
+ }
+
+ ResultSetPacket resultSet = new ResultSetPacket();
+ resultSet.getFieldDescriptors().addAll(fields);
+ for (RowDataPacket r : rowData) {
+ resultSet.getFieldValues().addAll(r.getColumns());
+ }
+ resultSet.setSourceAddress(channel.getRemoteSocketAddress());
+ resultSets.add(resultSet);
+ }
+
+ return resultSets;
+ }
+
+ private boolean readEofPacket() throws IOException {
byte[] eofBody = readNextPacket();
+ EOFPacket packet = new EOFPacket();
+ packet.fromBytes(eofBody);
if (eofBody[0] != -2) {
throw new IOException("EOF Packet is expected, but packet with field_count=" + eofBody[0] + " is found.");
}
+
+ return (packet.statusFlag & 0x0008) != 0;
}
protected byte[] readNextPacket() throws IOException {
diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlUpdateExecutor.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlUpdateExecutor.java
index 22546c7c..dee9006e 100644
--- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlUpdateExecutor.java
+++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlUpdateExecutor.java
@@ -1,7 +1,6 @@
package com.alibaba.otter.canal.parse.driver.mysql;
import java.io.IOException;
-import java.nio.channels.SocketChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,28 +20,29 @@ public class MysqlUpdateExecutor {
private static final Logger logger = LoggerFactory.getLogger(MysqlUpdateExecutor.class);
- private SocketChannel channel;
+ private MysqlConnector connector;
public MysqlUpdateExecutor(MysqlConnector connector) throws IOException{
if (!connector.isConnected()) {
throw new IOException("should execute connector.connect() first");
}
- this.channel = connector.getChannel();
+ this.connector = connector;
}
- public MysqlUpdateExecutor(SocketChannel ch){
- this.channel = ch;
- }
+ /*
+ * public MysqlUpdateExecutor(SocketChannel ch){ this.channel = ch; }
+ */
public OKPacket update(String updateString) throws IOException {
QueryCommandPacket cmd = new QueryCommandPacket();
cmd.setQueryString(updateString);
byte[] bodyBytes = cmd.toBytes();
- PacketManager.write(channel, bodyBytes);
+ PacketManager.writeBody(connector.getChannel(), bodyBytes);
logger.debug("read update result...");
- byte[] body = PacketManager.readBytes(channel, PacketManager.readHeader(channel, 4).getPacketBodyLength());
+ byte[] body = PacketManager.readBytes(connector.getChannel(),
+ PacketManager.readHeader(connector.getChannel(), 4).getPacketBodyLength());
if (body[0] < 0) {
ErrorPacket packet = new ErrorPacket();
packet.fromBytes(body);
diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/packets/client/ClientAuthenticationPacket.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/packets/client/ClientAuthenticationPacket.java
index 04975a31..fb04d7dc 100644
--- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/packets/client/ClientAuthenticationPacket.java
+++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/packets/client/ClientAuthenticationPacket.java
@@ -47,10 +47,11 @@ public class ClientAuthenticationPacket extends PacketWithHeaderPacket {
/**
* CLIENT_LONG_PASSWORD CLIENT_LONG_FLAG CLIENT_PROTOCOL_41
* CLIENT_INTERACTIVE CLIENT_TRANSACTIONS CLIENT_SECURE_CONNECTION
+ * CLIENT_MULTI_STATEMENTS;
*/
- ByteHelper.writeUnsignedIntLittleEndian(1 | 4 | 512 | 8192 | 32768, out); // remove
- // client_interactive
- // feature
+ ByteHelper.writeUnsignedIntLittleEndian(1 | 4 | 512 | 8192 | 32768 | 0x00010000, out); // remove
+ // client_interactive
+ // feature
// 2. write max_packet_size
ByteHelper.writeUnsignedIntLittleEndian(MSC.MAX_PACKET_LENGTH, out);
diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/packets/client/SemiAckCommandPacket.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/packets/client/SemiAckCommandPacket.java
new file mode 100644
index 00000000..8041aecf
--- /dev/null
+++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/packets/client/SemiAckCommandPacket.java
@@ -0,0 +1,55 @@
+package com.alibaba.otter.canal.parse.driver.mysql.packets.client;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.alibaba.otter.canal.parse.driver.mysql.packets.CommandPacket;
+import com.alibaba.otter.canal.parse.driver.mysql.utils.ByteHelper;
+
+/**
+ * semi ack command
+ *
+ * @author amos_chen
+ */
+public class SemiAckCommandPacket extends CommandPacket {
+
+ public long binlogPosition;
+ public String binlogFileName;
+
+ public SemiAckCommandPacket(){
+
+ }
+
+ @Override
+ public void fromBytes(byte[] data) throws IOException {
+ }
+
+ /**
+ *
+ * Bytes Name
+ * --------------------------------------------------------
+ * Bytes Name
+ * ----- ----
+ * 1 semi mark
+ * 8 binlog position to start at (little endian)
+ * n binlog file name
+ *
+ *
+ */
+ public byte[] toBytes() throws IOException {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ // 0 write semi mark
+ out.write(0xef);
+ // 1 write 8 bytes for position
+ ByteHelper.write8ByteUnsignedIntLittleEndian(binlogPosition, out);
+
+ // 2 write binlog filename
+ if (StringUtils.isNotEmpty(binlogFileName)) {
+ out.write(binlogFileName.getBytes());
+ }
+ return out.toByteArray();
+ }
+
+}
diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannel.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannel.java
index 898ed5eb..40ce6c32 100644
--- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannel.java
+++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannel.java
@@ -7,7 +7,6 @@ import io.netty.channel.Channel;
import java.io.IOException;
import java.net.SocketAddress;
-import java.nio.ByteBuffer;
/**
* 封装netty的通信channel和数据接收缓存，实现读、写、连接校验的功能。 2016-12-28
@@ -18,19 +17,14 @@ public class SocketChannel {
private Channel channel = null;
private Object lock = new Object();
- private ByteBuf cache = PooledByteBufAllocator.DEFAULT.directBuffer(1024 * 1024 * 5); // 缓存大小
+ private ByteBuf cache = PooledByteBufAllocator.DEFAULT.directBuffer(1024 * 1024); // 缓存大小
public Channel getChannel() {
return channel;
}
- public void setChannel(Channel channel, boolean notify) {
+ public void setChannel(Channel channel) {
this.channel = channel;
- if (notify) {// 是否需要通知，主要是channel不可用时
- synchronized (this) {
- notifyAll();
- }
- }
}
public void writeCache(ByteBuf buf) {
@@ -38,9 +32,6 @@ public class SocketChannel {
cache.discardReadBytes();// 回收内存
cache.writeBytes(buf);
}
- synchronized (this) {
- notifyAll();
- }
}
public void writeChannel(byte[]... buf) throws IOException {
@@ -51,24 +42,57 @@ public class SocketChannel {
}
}
- public int read(ByteBuffer buffer) throws IOException {
- if (null == channel) {
- throw new IOException("socket has Interrupted !");
- }
- if (cache.readableBytes() < buffer.remaining()) {
- synchronized (this) {
- try {
- wait();
- } catch (InterruptedException e) {
+ public byte[] read(int readSize) throws IOException {
+ do {
+ if (readSize > cache.readableBytes()) {
+ if (null == channel) {
+ throw new java.nio.channels.ClosedByInterruptException();
+ }
+ synchronized (this) {
+ try {
+ wait(100);
+ } catch (InterruptedException e) {
+ throw new java.nio.channels.ClosedByInterruptException();
+ }
+ }
+ } else {
+ byte[] back = new byte[readSize];
+ synchronized (lock) {
+ cache.readBytes(back);
+ }
+ return back;
+ }
+ } while (true);
+ }
+
+ public byte[] read(int readSize, int timeout) throws IOException {
+ int accumulatedWaitTime = 0;
+ do {
+ if (readSize > cache.readableBytes()) {
+ if (null == channel) {
throw new IOException("socket has Interrupted !");
}
+
+ accumulatedWaitTime += 100;
+ if (accumulatedWaitTime > timeout) {
+ throw new IOException("socket read timeout occured !");
+ }
+
+ synchronized (this) {
+ try {
+ wait(100);
+ } catch (InterruptedException e) {
+ throw new IOException("socket has Interrupted !");
+ }
+ }
+ } else {
+ byte[] back = new byte[readSize];
+ synchronized (lock) {
+ cache.readBytes(back);
+ }
+ return back;
}
- } else {
- synchronized (lock) {
- cache.readBytes(buffer);
- }
- }
- return 0;
+ } while (true);
}
public boolean isConnected() {
diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannelPool.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannelPool.java
index 68990903..52609b19 100644
--- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannelPool.java
+++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannelPool.java
@@ -21,6 +21,8 @@ import java.net.SocketAddress;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import com.alibaba.otter.canal.common.utils.BooleanMutex;
+
/**
* @author luoyaogui 实现channel的管理（监听连接、读数据、回收） 2016-12-28
*/
@@ -53,21 +55,20 @@ public abstract class SocketChannelPool {
public static SocketChannel open(SocketAddress address) throws Exception {
final SocketChannel socket = new SocketChannel();
+ final BooleanMutex mutex = new BooleanMutex(false);
boot.connect(address).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture arg0) throws Exception {
if (arg0.isSuccess()) {
- socket.setChannel(arg0.channel(), false);
- }
- synchronized (socket) {
- socket.notify();
+ socket.setChannel(arg0.channel());
}
+
+ mutex.set(true);
}
});
- synchronized (socket) {
- socket.wait();
- }
+ // wait for complete
+ mutex.get();
if (null == socket.getChannel()) {
throw new IOException("can't create socket!");
}
@@ -79,21 +80,22 @@ public abstract class SocketChannelPool {
private SocketChannel socket = null;
+ @Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
- socket.setChannel(null, true);
+ socket.setChannel(null);
chManager.remove(ctx.channel());// 移除
}
+ @Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
- if (null == socket) {
- socket = chManager.get(ctx.channel());
- }
+ if (null == socket) socket = chManager.get(ctx.channel());
if (socket != null) {
socket.writeCache((ByteBuf) msg);
}
ReferenceCountUtil.release(msg);// 添加防止内存泄漏的
}
+ @Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
ctx.close();
}
diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/utils/ByteHelper.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/utils/ByteHelper.java
index 2c7cd31b..67c3830e 100644
--- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/utils/ByteHelper.java
+++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/utils/ByteHelper.java
@@ -108,7 +108,18 @@ public abstract class ByteHelper {
return out.toByteArray();
}
-
+
+ public static void write8ByteUnsignedIntLittleEndian(long data, ByteArrayOutputStream out) {
+ out.write((byte) (data & 0xFF));
+ out.write((byte) (data >>> 8));
+ out.write((byte) (data >>> 16));
+ out.write((byte) (data >>> 24));
+ out.write((byte) (data >>> 32));
+ out.write((byte) (data >>> 40));
+ out.write((byte) (data >>> 48));
+ out.write((byte) (data >>> 56));
+ }
+
public static void writeUnsignedIntLittleEndian(long data, ByteArrayOutputStream out) {
out.write((byte) (data & 0xFF));
out.write((byte) (data >>> 8));
diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/utils/PacketManager.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/utils/PacketManager.java
index 2b10e822..7d4b9020 100644
--- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/utils/PacketManager.java
+++ b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/utils/PacketManager.java
@@ -1,69 +1,44 @@
package com.alibaba.otter.canal.parse.driver.mysql.utils;
import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
import com.alibaba.otter.canal.parse.driver.mysql.packets.HeaderPacket;
+import com.alibaba.otter.canal.parse.driver.mysql.socket.SocketChannel;
public abstract class PacketManager {
public static HeaderPacket readHeader(SocketChannel ch, int len) throws IOException {
HeaderPacket header = new HeaderPacket();
- header.fromBytes(readBytesAsBuffer(ch, len).array());
+ header.fromBytes(ch.read(len));
return header;
}
- public static ByteBuffer readBytesAsBuffer(SocketChannel ch, int len) throws IOException {
- ByteBuffer buffer = ByteBuffer.allocate(len);
- while (buffer.hasRemaining()) {
- int readNum = ch.read(buffer);
- if (readNum == -1) {
- throw new IOException("Unexpected End Stream");
- }
- }
- return buffer;
+ public static HeaderPacket readHeader(SocketChannel ch, int len, int timeout) throws IOException {
+ HeaderPacket header = new HeaderPacket();
+ header.fromBytes(ch.read(len, timeout));
+ return header;
}
public static byte[] readBytes(SocketChannel ch, int len) throws IOException {
- return readBytesAsBuffer(ch, len).array();
+ return ch.read(len);
+ }
+
+ public static byte[] readBytes(SocketChannel ch, int len, int timeout) throws IOException {
+ return ch.read(len, timeout);
}
- /**
- * Since We r using blocking IO, so we will just write once and assert the
- * length to simplify the read operation.
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
diff --git a/example/src/main/java/com/alibaba/otter/canal/example/ClusterCanalClientTest.java b/example/src/main/java/com/alibaba/otter/canal/example/ClusterCanalClientTest.java
index 478cc304..d4a18af0 100644
--- a/example/src/main/java/com/alibaba/otter/canal/example/ClusterCanalClientTest.java
+++ b/example/src/main/java/com/alibaba/otter/canal/example/ClusterCanalClientTest.java
@@ -1,7 +1,5 @@
package com.alibaba.otter.canal.example;
-import org.apache.commons.lang.exception.ExceptionUtils;
-
import com.alibaba.otter.canal.client.CanalConnector;
import com.alibaba.otter.canal.client.CanalConnectors;
@@ -41,7 +39,7 @@ public class ClusterCanalClientTest extends AbstractCanalClientTest {
logger.info("## stop the canal client");
clientTest.stop();
} catch (Throwable e) {
- logger.warn("##something goes wrong when stopping canal:\n{}", ExceptionUtils.getFullStackTrace(e));
+ logger.warn("##something goes wrong when stopping canal:", e);
} finally {
logger.info("## canal client is down.");
}
diff --git a/example/src/main/java/com/alibaba/otter/canal/example/SimpleCanalClientTest.java b/example/src/main/java/com/alibaba/otter/canal/example/SimpleCanalClientTest.java
index ae68d145..658a1419 100644
--- a/example/src/main/java/com/alibaba/otter/canal/example/SimpleCanalClientTest.java
+++ b/example/src/main/java/com/alibaba/otter/canal/example/SimpleCanalClientTest.java
@@ -2,8 +2,6 @@ package com.alibaba.otter.canal.example;
import java.net.InetSocketAddress;
-import org.apache.commons.lang.exception.ExceptionUtils;
-
import com.alibaba.otter.canal.client.CanalConnector;
import com.alibaba.otter.canal.client.CanalConnectors;
import com.alibaba.otter.canal.common.utils.AddressUtils;
@@ -23,8 +21,11 @@ public class SimpleCanalClientTest extends AbstractCanalClientTest {
public static void main(String args[]) {
// 根据ip，直接创建链接，无HA的功能
String destination = "example";
- CanalConnector connector = CanalConnectors.newSingleConnector(new InetSocketAddress(AddressUtils.getHostIp(),
- 11111), destination, "", "");
+ String ip = AddressUtils.getHostIp();
+ CanalConnector connector = CanalConnectors.newSingleConnector(new InetSocketAddress(ip, 11111),
+ destination,
+ "",
+ "");
final SimpleCanalClientTest clientTest = new SimpleCanalClientTest(destination);
clientTest.setConnector(connector);
@@ -36,7 +37,7 @@ public class SimpleCanalClientTest extends AbstractCanalClientTest {
logger.info("## stop the canal client");
clientTest.stop();
} catch (Throwable e) {
- logger.warn("##something goes wrong when stopping canal:\n{}", ExceptionUtils.getFullStackTrace(e));
+ logger.warn("##something goes wrong when stopping canal:", e);
} finally {
logger.info("## canal client is down.");
}
diff --git a/filter/pom.xml b/filter/pom.xml
index ed2e5670..30b53e28 100644
--- a/filter/pom.xml
+++ b/filter/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
diff --git a/instance/core/pom.xml b/instance/core/pom.xml
index c87de497..cbfab2fd 100644
--- a/instance/core/pom.xml
+++ b/instance/core/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../../pom.xml
canal.instance.core
diff --git a/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/AbstractCanalInstance.java b/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/AbstractCanalInstance.java
index 03dfb200..9143a626 100644
--- a/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/AbstractCanalInstance.java
+++ b/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/AbstractCanalInstance.java
@@ -2,7 +2,6 @@ package com.alibaba.otter.canal.instance.core;
import java.util.List;
-import com.alibaba.otter.canal.parse.index.CanalLogPositionManager;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,6 +16,7 @@ import com.alibaba.otter.canal.parse.ha.HeartBeatHAController;
import com.alibaba.otter.canal.parse.inbound.AbstractEventParser;
import com.alibaba.otter.canal.parse.inbound.group.GroupEventParser;
import com.alibaba.otter.canal.parse.inbound.mysql.MysqlEventParser;
+import com.alibaba.otter.canal.parse.index.CanalLogPositionManager;
import com.alibaba.otter.canal.protocol.CanalEntry;
import com.alibaba.otter.canal.protocol.ClientIdentity;
import com.alibaba.otter.canal.sink.CanalEventSink;
diff --git a/instance/manager/pom.xml b/instance/manager/pom.xml
index 6c90a9cc..10f01e43 100644
--- a/instance/manager/pom.xml
+++ b/instance/manager/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../../pom.xml
com.alibaba.otter
diff --git a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java
index 842697ac..53196169 100644
--- a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java
+++ b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import com.alibaba.otter.canal.parse.index.*;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +37,12 @@ import com.alibaba.otter.canal.parse.inbound.AbstractEventParser;
import com.alibaba.otter.canal.parse.inbound.group.GroupEventParser;
import com.alibaba.otter.canal.parse.inbound.mysql.LocalBinlogEventParser;
import com.alibaba.otter.canal.parse.inbound.mysql.MysqlEventParser;
+import com.alibaba.otter.canal.parse.index.CanalLogPositionManager;
+import com.alibaba.otter.canal.parse.index.FailbackLogPositionManager;
+import com.alibaba.otter.canal.parse.index.MemoryLogPositionManager;
+import com.alibaba.otter.canal.parse.index.MetaLogPositionManager;
+import com.alibaba.otter.canal.parse.index.PeriodMixedLogPositionManager;
+import com.alibaba.otter.canal.parse.index.ZooKeeperLogPositionManager;
import com.alibaba.otter.canal.parse.support.AuthenticationInfo;
import com.alibaba.otter.canal.protocol.position.EntryPosition;
import com.alibaba.otter.canal.sink.entry.EntryEventSink;
diff --git a/instance/pom.xml b/instance/pom.xml
index c1928e99..aeec17cb 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
diff --git a/instance/spring/pom.xml b/instance/spring/pom.xml
index c4012218..6a8f172a 100644
--- a/instance/spring/pom.xml
+++ b/instance/spring/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../../pom.xml
com.alibaba.otter
diff --git a/meta/pom.xml b/meta/pom.xml
index 06155714..6192d92d 100644
--- a/meta/pom.xml
+++ b/meta/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
diff --git a/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java b/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java
index 72e3646b..383fb351 100644
--- a/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java
+++ b/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java
@@ -367,7 +367,7 @@ public class FileMixedMetaManager extends MemoryMetaManager implements CanalMeta
this.dataDir = new File(dataDir);
}
- public void setDataDir(File dataDir) {
+ public void setDataDirByFile(File dataDir) {
this.dataDir = dataDir;
}
diff --git a/meta/src/test/java/com/alibaba/otter/canal/meta/FileMixedMetaManagerTest.java b/meta/src/test/java/com/alibaba/otter/canal/meta/FileMixedMetaManagerTest.java
index 56ea51a8..4c330c86 100644
--- a/meta/src/test/java/com/alibaba/otter/canal/meta/FileMixedMetaManagerTest.java
+++ b/meta/src/test/java/com/alibaba/otter/canal/meta/FileMixedMetaManagerTest.java
@@ -31,7 +31,7 @@ public class FileMixedMetaManagerTest extends AbstractMetaManagerTest {
@Test
public void testSubscribeAll() {
FileMixedMetaManager metaManager = new FileMixedMetaManager();
- metaManager.setDataDir(dataDir);
+ metaManager.setDataDirByFile(dataDir);
metaManager.setPeriod(100);
metaManager.start();
@@ -40,7 +40,7 @@ public class FileMixedMetaManagerTest extends AbstractMetaManagerTest {
sleep(2000L);
// 重新构建一次，能获得上一次zk上的记录
FileMixedMetaManager metaManager2 = new FileMixedMetaManager();
- metaManager2.setDataDir(dataDir);
+ metaManager2.setDataDirByFile(dataDir);
metaManager2.setPeriod(100);
metaManager2.start();
@@ -52,7 +52,7 @@ public class FileMixedMetaManagerTest extends AbstractMetaManagerTest {
@Test
public void testBatchAll() {
FileMixedMetaManager metaManager = new FileMixedMetaManager();
- metaManager.setDataDir(dataDir);
+ metaManager.setDataDirByFile(dataDir);
metaManager.setPeriod(100);
metaManager.start();
@@ -67,7 +67,7 @@ public class FileMixedMetaManagerTest extends AbstractMetaManagerTest {
@Test
public void testCursorAll() {
FileMixedMetaManager metaManager = new FileMixedMetaManager();
- metaManager.setDataDir(dataDir);
+ metaManager.setDataDirByFile(dataDir);
metaManager.setPeriod(100);
metaManager.start();
@@ -76,7 +76,7 @@ public class FileMixedMetaManagerTest extends AbstractMetaManagerTest {
sleep(1000L);
// 重新构建一次，能获得上一次zk上的记录
FileMixedMetaManager metaManager2 = new FileMixedMetaManager();
- metaManager2.setDataDir(dataDir);
+ metaManager2.setDataDirByFile(dataDir);
metaManager2.setPeriod(100);
metaManager2.start();
diff --git a/parse/pom.xml b/parse/pom.xml
index d80342f9..efdb57f2 100644
--- a/parse/pom.xml
+++ b/parse/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
canal.parse
@@ -45,11 +45,41 @@
canal.parse.driver
${project.version}
+
+ com.alibaba
+ druid
+
+
+ mysql
+ mysql-connector-java
+
+
+ org.apache.ibatis
+ ibatis-sqlmap
+
+
+ com.h2database
+ h2
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ org.apache.commons
+ commons-compress
+
junit
junit
test
+
+ org.springframework
+ spring-test
+ test
+
+
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/AbstractEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/AbstractEventParser.java
index 6b34edf5..1ea6af96 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/AbstractEventParser.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/AbstractEventParser.java
@@ -96,6 +96,10 @@ public abstract class AbstractEventParser extends AbstractCanalLifeCycle
protected void preDump(ErosaConnection connection) {
}
+ protected boolean processTableMeta(EntryPosition position) {
+ return true;
+ }
+
protected void afterDump(ErosaConnection connection) {
}
@@ -145,7 +149,6 @@ public abstract class AbstractEventParser extends AbstractCanalLifeCycle
ErosaConnection erosaConnection = null;
while (running) {
try {
-
// 开始执行replication
// 1. 构造Erosa连接
erosaConnection = buildErosaConnection();
@@ -163,6 +166,11 @@ public abstract class AbstractEventParser extends AbstractCanalLifeCycle
if (startPosition == null) {
throw new CanalParseException("can't find start position for " + destination);
}
+
+ if (!processTableMeta(startPosition)) {
+ throw new CanalParseException("can't find init table meta for " + destination
+ + " with position : " + startPosition);
+ }
logger.info("find start position : {}", startPosition.toString());
// 重新链接，因为在找position过程中可能有状态，需要断开后重建
erosaConnection.reconnect();
@@ -173,7 +181,7 @@ public abstract class AbstractEventParser extends AbstractCanalLifeCycle
public boolean sink(EVENT event) {
try {
- CanalEntry.Entry entry = parseAndProfilingIfNecessary(event);
+ CanalEntry.Entry entry = parseAndProfilingIfNecessary(event, false);
if (!running) {
return false;
@@ -275,7 +283,7 @@ public abstract class AbstractEventParser extends AbstractCanalLifeCycle
parseThread.setUncaughtExceptionHandler(handler);
parseThread.setName(String.format("destination = %s , address = %s , EventParser",
destination,
- runningInfo == null ? null : runningInfo.getAddress().toString()));
+ runningInfo == null ? null : runningInfo.getAddress()));
parseThread.start();
}
@@ -320,13 +328,13 @@ public abstract class AbstractEventParser extends AbstractCanalLifeCycle
return result;
}
- protected CanalEntry.Entry parseAndProfilingIfNecessary(EVENT bod) throws Exception {
+ protected CanalEntry.Entry parseAndProfilingIfNecessary(EVENT bod, boolean isSeek) throws Exception {
long startTs = -1;
boolean enabled = getProfilingEnabled();
if (enabled) {
startTs = System.currentTimeMillis();
}
- CanalEntry.Entry event = binlogParser.parse(bod);
+ CanalEntry.Entry event = binlogParser.parse(bod, isSeek);
if (enabled) {
this.parsingInterval = System.currentTimeMillis() - startTs;
}
@@ -430,7 +438,7 @@ public abstract class AbstractEventParser extends AbstractCanalLifeCycle
}
} catch (Throwable e) {
- logger.warn("heartBeat run failed " + ExceptionUtils.getStackTrace(e));
+ logger.warn("heartBeat run failed ", e);
}
}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/BinlogParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/BinlogParser.java
index 3ff91287..034879e0 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/BinlogParser.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/BinlogParser.java
@@ -11,7 +11,7 @@ import com.alibaba.otter.canal.protocol.CanalEntry;
*/
public interface BinlogParser extends CanalLifeCycle {
- CanalEntry.Entry parse(T event) throws CanalParseException;
+ CanalEntry.Entry parse(T event, boolean isSeek) throws CanalParseException;
void reset();
}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/ErosaConnection.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/ErosaConnection.java
index 4b32bb94..2e953956 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/ErosaConnection.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/ErosaConnection.java
@@ -15,8 +15,6 @@ public interface ErosaConnection {
public void disconnect() throws IOException;
- public boolean isConnected();
-
/**
* 用于快速数据查找,和dump的区别在于，seek会只给出部分的数据
*/
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/TableMeta.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/TableMeta.java
index de934fbc..7f56e440 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/TableMeta.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/TableMeta.java
@@ -3,51 +3,79 @@ package com.alibaba.otter.canal.parse.inbound;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
-
import com.taobao.tddl.dbsync.binlog.event.TableMapLogEvent;
+import org.apache.commons.lang.StringUtils;
/**
* 描述数据meta对象,mysql binlog中对应的{@linkplain TableMapLogEvent}包含的信息不全
- *
+ *
*
* 1. 主键信息
* 2. column name
* 3. unsigned字段
*
- *
+ *
* @author jianghang 2013-1-18 下午12:24:59
* @version 1.0.0
*/
public class TableMeta {
- private String fullName; // schema.table
- private List fileds;
+ private String schema;
+ private String table;
+ private List fields = new ArrayList();
+ private String ddl; // 表结构的DDL语句
- public TableMeta(String fullName, List fileds){
- this.fullName = fullName;
- this.fileds = fileds;
+ public TableMeta(){
+
+ }
+
+ public TableMeta(String schema, String table, List fields){
+ this.schema = schema;
+ this.table = table;
+ this.fields = fields;
}
public String getFullName() {
- return fullName;
+ return schema + "." + table;
}
- public void setFullName(String fullName) {
- this.fullName = fullName;
+ public String getSchema() {
+ return schema;
}
- public List getFileds() {
- return fileds;
+ public void setSchema(String schema) {
+ this.schema = schema;
}
- public void setFileds(List fileds) {
- this.fileds = fileds;
+ public String getTable() {
+ return table;
+ }
+
+ public void setTable(String table) {
+ this.table = table;
+ }
+
+ public List getFields() {
+ return fields;
+ }
+
+ public void setFields(List fileds) {
+ this.fields = fileds;
+ }
+
+ public FieldMeta getFieldMetaByName(String name) {
+ for (FieldMeta meta : fields) {
+ if (meta.getColumnName().equalsIgnoreCase(name)) {
+ return meta;
+ }
+ }
+
+ throw new RuntimeException("unknow column : " + name);
}
public List getPrimaryFields() {
List primarys = new ArrayList();
- for (FieldMeta meta : fileds) {
+ for (FieldMeta meta : fields) {
if (meta.isKey()) {
primarys.add(meta);
}
@@ -56,14 +84,49 @@ public class TableMeta {
return primarys;
}
+ public String getDdl() {
+ return ddl;
+ }
+
+ public void setDdl(String ddl) {
+ this.ddl = ddl;
+ }
+
+ public void addFieldMeta(FieldMeta fieldMeta) {
+ this.fields.add(fieldMeta);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder data = new StringBuilder();
+ data.append("TableMeta [schema=" + schema + ", table=" + table + ", fileds=");
+ for (FieldMeta field : fields) {
+ data.append("\n\t").append(field.toString());
+ }
+ data.append("\n]");
+ return data.toString();
+ }
+
public static class FieldMeta {
- private String columnName;
- private String columnType;
- private String isNullable;
- private String iskey;
- private String defaultValue;
- private String extra;
+ public FieldMeta(){
+
+ }
+
+ public FieldMeta(String columnName, String columnType, boolean nullable, boolean key, String defaultValue){
+ this.columnName = columnName;
+ this.columnType = columnType;
+ this.nullable = nullable;
+ this.key = key;
+ this.defaultValue = defaultValue;
+ }
+
+ private String columnName;
+ private String columnType;
+ private boolean nullable;
+ private boolean key;
+ private String defaultValue;
+ private String extra;
public String getColumnName() {
return columnName;
@@ -81,20 +144,8 @@ public class TableMeta {
this.columnType = columnType;
}
- public String getIsNullable() {
- return isNullable;
- }
-
- public void setIsNullable(String isNullable) {
- this.isNullable = isNullable;
- }
-
- public String getIskey() {
- return iskey;
- }
-
- public void setIskey(String iskey) {
- this.iskey = iskey;
+ public void setNullable(boolean nullable) {
+ this.nullable = nullable;
}
public String getDefaultValue() {
@@ -105,6 +156,22 @@ public class TableMeta {
this.defaultValue = defaultValue;
}
+ public boolean isUnsigned() {
+ return StringUtils.containsIgnoreCase(columnType, "unsigned");
+ }
+
+ public boolean isNullable() {
+ return nullable;
+ }
+
+ public boolean isKey() {
+ return key;
+ }
+
+ public void setKey(boolean key) {
+ this.key = key;
+ }
+
public String getExtra() {
return extra;
}
@@ -113,22 +180,10 @@ public class TableMeta {
this.extra = extra;
}
- public boolean isUnsigned() {
- return StringUtils.containsIgnoreCase(columnType, "unsigned");
- }
-
- public boolean isKey() {
- return StringUtils.equalsIgnoreCase(iskey, "PRI");
- }
-
- public boolean isNullable() {
- return StringUtils.equalsIgnoreCase(isNullable, "YES");
- }
-
public String toString() {
return "FieldMeta [columnName=" + columnName + ", columnType=" + columnType + ", defaultValue="
- + defaultValue + ", extra=" + extra + ", isNullable=" + isNullable + ", iskey=" + iskey + "]";
+ + defaultValue + ", nullable=" + nullable + ", key=" + key + "]";
}
-
}
+
}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/AbstractMysqlEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/AbstractMysqlEventParser.java
index c8bf197b..422bae37 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/AbstractMysqlEventParser.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/AbstractMysqlEventParser.java
@@ -7,15 +7,22 @@ import org.slf4j.LoggerFactory;
import com.alibaba.otter.canal.filter.CanalEventFilter;
import com.alibaba.otter.canal.filter.aviater.AviaterRegexFilter;
+import com.alibaba.otter.canal.parse.exception.CanalParseException;
import com.alibaba.otter.canal.parse.inbound.AbstractEventParser;
import com.alibaba.otter.canal.parse.inbound.BinlogParser;
import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.LogEventConvert;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.TableMetaTSDB;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.TableMetaTSDBBuilder;
+import com.alibaba.otter.canal.protocol.position.EntryPosition;
public abstract class AbstractMysqlEventParser extends AbstractEventParser {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
protected static final long BINLOG_START_OFFEST = 4L;
+ protected boolean enableTsdb = false;
+ protected String tsdbSpringXml;
+ protected TableMetaTSDB tableMetaTSDB;
// 编码信息
protected byte connectionCharsetNumber = (byte) 33;
protected Charset connectionCharset = Charset.forName("UTF-8");
@@ -24,6 +31,7 @@ public abstract class AbstractMysqlEventParser extends AbstractEventParser {
protected boolean filterQueryDdl = false;
protected boolean filterRows = false;
protected boolean filterTableError = false;
+ protected boolean useDruidDdlFilter = true;
protected BinlogParser buildParser() {
LogEventConvert convert = new LogEventConvert();
@@ -53,6 +61,40 @@ public abstract class AbstractMysqlEventParser extends AbstractEventParser {
}
}
+ /**
+ * 回滚到指定位点
+ *
+ * @param position
+ * @return
+ */
+ protected boolean processTableMeta(EntryPosition position) {
+ if (tableMetaTSDB != null) {
+ return tableMetaTSDB.rollback(position);
+ }
+
+ return true;
+ }
+
+ public void start() throws CanalParseException {
+ if (enableTsdb) {
+ if (tableMetaTSDB == null) {
+ // 初始化
+ tableMetaTSDB = TableMetaTSDBBuilder.build(destination, tsdbSpringXml);
+ }
+ }
+
+ super.start();
+ }
+
+ public void stop() throws CanalParseException {
+ if (enableTsdb) {
+ TableMetaTSDBBuilder.destory(destination);
+ tableMetaTSDB = null;
+ }
+
+ super.stop();
+ }
+
public void setEventBlackFilter(CanalEventFilter eventBlackFilter) {
super.setEventBlackFilter(eventBlackFilter);
@@ -97,4 +139,32 @@ public abstract class AbstractMysqlEventParser extends AbstractEventParser {
this.filterTableError = filterTableError;
}
+ public boolean isUseDruidDdlFilter() {
+ return useDruidDdlFilter;
+ }
+
+ public void setUseDruidDdlFilter(boolean useDruidDdlFilter) {
+ this.useDruidDdlFilter = useDruidDdlFilter;
+ }
+
+ public void setEnableTsdb(boolean enableTsdb) {
+ this.enableTsdb = enableTsdb;
+ if (this.enableTsdb) {
+ if (tableMetaTSDB == null) {
+ // 初始化
+ tableMetaTSDB = TableMetaTSDBBuilder.build(destination, tsdbSpringXml);
+ }
+ }
+ }
+
+ public void setTsdbSpringXml(String tsdbSpringXml) {
+ this.tsdbSpringXml = tsdbSpringXml;
+ if (this.enableTsdb) {
+ if (tableMetaTSDB == null) {
+ // 初始化
+ tableMetaTSDB = TableMetaTSDBBuilder.build(destination, tsdbSpringXml);
+ }
+ }
+ }
+
}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinLogConnection.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinLogConnection.java
index 3c91350a..73b4f3d1 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinLogConnection.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinLogConnection.java
@@ -8,6 +8,7 @@ import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.alibaba.otter.canal.parse.exception.CanalParseException;
import com.alibaba.otter.canal.parse.inbound.ErosaConnection;
import com.alibaba.otter.canal.parse.inbound.SinkFunction;
import com.alibaba.otter.canal.parse.inbound.mysql.local.BinLogFileQueue;
@@ -84,26 +85,19 @@ public class LocalBinLogConnection implements ErosaConnection {
while (running) {
boolean needContinue = true;
LogEvent event = null;
- L: while (fetcher.fetch()) {
- /*
- * event = decoder.decode(fetcher, context); if (event ==
- * null) { throw new CanalParseException("parse failed"); }
- * if (!func.sink(event)) { needContinue = false; break; }
- */
+ // 处理一下binlog文件名
+ event = new RotateLogEvent(context.getLogPosition().getFileName(), 4);
+ func.sink(event);
+ while (fetcher.fetch()) {
+ event = decoder.decode(fetcher, context);
+ if (event == null) {
+ throw new CanalParseException("parse failed");
+ }
- do {
- if (event == null) {
- event = new RotateLogEvent(context.getLogPosition().getFileName(), context.getLogPosition()
- .getPosition());
- } else {
- event = decoder.decode(fetcher, context);
- }
-
- if (event != null && !func.sink(event)) {
- needContinue = false;
- break L;
- }
- } while (event != null);
+ if (!func.sink(event)) {
+ needContinue = false;
+ break;
+ }
}
if (needContinue) {// 读取下一个
@@ -121,7 +115,6 @@ public class LocalBinLogConnection implements ErosaConnection {
}
current = nextFile;
-
fetcher.open(current);
context.setLogPosition(new LogPosition(nextFile.getName()));
} else {
@@ -161,30 +154,27 @@ public class LocalBinLogConnection implements ErosaConnection {
binlogFilename = lastXidLogFilename;
binlogFileOffset = lastXidLogFileOffset;
- L: while (fetcher.fetch()) {
- LogEvent event;
- do {
- event = decoder.decode(fetcher, context);
- if (event != null) {
- if (event.getWhen() > timestampSeconds) {
- break L;
- }
+ while (fetcher.fetch()) {
+ LogEvent event = decoder.decode(fetcher, context);
+ if (event != null) {
+ if (event.getWhen() > timestampSeconds) {
+ break;
+ }
- needContinue = false;
- if (LogEvent.QUERY_EVENT == event.getHeader().getType()) {
- if (StringUtils.endsWithIgnoreCase(((QueryLogEvent) event).getQuery(), "BEGIN")) {
- binlogFilename = lastXidLogFilename;
- binlogFileOffset = lastXidLogFileOffset;
- } else if (StringUtils.endsWithIgnoreCase(((QueryLogEvent) event).getQuery(), "COMMIT")) {
- lastXidLogFilename = current.getName();
- lastXidLogFileOffset = event.getLogPos();
- }
- } else if (LogEvent.XID_EVENT == event.getHeader().getType()) {
+ needContinue = false;
+ if (LogEvent.QUERY_EVENT == event.getHeader().getType()) {
+ if (StringUtils.endsWithIgnoreCase(((QueryLogEvent) event).getQuery(), "BEGIN")) {
+ binlogFilename = lastXidLogFilename;
+ binlogFileOffset = lastXidLogFileOffset;
+ } else if (StringUtils.endsWithIgnoreCase(((QueryLogEvent) event).getQuery(), "COMMIT")) {
lastXidLogFilename = current.getName();
lastXidLogFileOffset = event.getLogPos();
}
+ } else if (LogEvent.XID_EVENT == event.getHeader().getType()) {
+ lastXidLogFilename = current.getName();
+ lastXidLogFileOffset = event.getLogPos();
}
- } while (event != null);
+ }
}
if (needContinue) {// 读取下一个
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParser.java
index 331b4d45..ea6b0365 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParser.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParser.java
@@ -9,6 +9,7 @@ import com.alibaba.otter.canal.parse.exception.CanalParseException;
import com.alibaba.otter.canal.parse.inbound.ErosaConnection;
import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.LogEventConvert;
import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.TableMetaCache;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta;
import com.alibaba.otter.canal.parse.index.CanalLogPositionManager;
import com.alibaba.otter.canal.parse.support.AuthenticationInfo;
import com.alibaba.otter.canal.protocol.position.EntryPosition;
@@ -23,14 +24,14 @@ import com.alibaba.otter.canal.protocol.position.LogPosition;
public class LocalBinlogEventParser extends AbstractMysqlEventParser implements CanalEventParser {
// 数据库信息
- private AuthenticationInfo masterInfo;
- private EntryPosition masterPosition; // binlog信息
- private MysqlConnection metaConnection; // 查询meta信息的链接
- private TableMetaCache tableMetaCache; // 对应meta
+ protected AuthenticationInfo masterInfo;
+ protected EntryPosition masterPosition; // binlog信息
+ protected MysqlConnection metaConnection; // 查询meta信息的链接
+ protected TableMetaCache tableMetaCache; // 对应meta
- private String directory;
- private boolean needWait = false;
- private int bufferSize = 16 * 1024;
+ protected String directory;
+ protected boolean needWait = false;
+ protected int bufferSize = 16 * 1024;
public LocalBinlogEventParser(){
// this.runningInfo = new AuthenticationInfo();
@@ -50,7 +51,13 @@ public class LocalBinlogEventParser extends AbstractMysqlEventParser implements
throw new CanalParseException(e);
}
- tableMetaCache = new TableMetaCache(metaConnection);
+ if (tableMetaTSDB != null && tableMetaTSDB instanceof DatabaseTableMeta) {
+ ((DatabaseTableMeta) tableMetaTSDB).setConnection(metaConnection);
+ ((DatabaseTableMeta) tableMetaTSDB).setFilter(eventFilter);
+ ((DatabaseTableMeta) tableMetaTSDB).setBlackFilter(eventBlackFilter);
+ }
+
+ tableMetaCache = new TableMetaCache(metaConnection, tableMetaTSDB);
((LogEventConvert) binlogParser).setTableMetaCache(tableMetaCache);
}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java
index 3fc309f9..239e2c09 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java
@@ -2,12 +2,10 @@ package com.alibaba.otter.canal.parse.inbound.mysql;
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,40 +14,58 @@ import com.alibaba.otter.canal.parse.driver.mysql.MysqlQueryExecutor;
import com.alibaba.otter.canal.parse.driver.mysql.MysqlUpdateExecutor;
import com.alibaba.otter.canal.parse.driver.mysql.packets.HeaderPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.client.BinlogDumpCommandPacket;
+import com.alibaba.otter.canal.parse.driver.mysql.packets.client.SemiAckCommandPacket;
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetPacket;
import com.alibaba.otter.canal.parse.driver.mysql.utils.PacketManager;
import com.alibaba.otter.canal.parse.exception.CanalParseException;
import com.alibaba.otter.canal.parse.inbound.ErosaConnection;
import com.alibaba.otter.canal.parse.inbound.SinkFunction;
import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.DirectLogFetcher;
+import com.alibaba.otter.canal.parse.support.AuthenticationInfo;
import com.taobao.tddl.dbsync.binlog.LogContext;
import com.taobao.tddl.dbsync.binlog.LogDecoder;
import com.taobao.tddl.dbsync.binlog.LogEvent;
-import com.taobao.tddl.dbsync.binlog.LogPosition;
-import com.taobao.tddl.dbsync.binlog.event.FormatDescriptionLogEvent;
public class MysqlConnection implements ErosaConnection {
- private static final Logger logger = LoggerFactory.getLogger(MysqlConnection.class);
+ private static final Logger logger = LoggerFactory.getLogger(MysqlConnection.class);
private MysqlConnector connector;
private long slaveId;
- private Charset charset = Charset.forName("UTF-8");
+ private Charset charset = Charset.forName("UTF-8");
private BinlogFormat binlogFormat;
private BinlogImage binlogImage;
- private int binlogChecksum;
+
+ // tsdb releated
+ private AuthenticationInfo authInfo;
+ protected int connTimeout = 5 * 1000; // 5秒
+ protected int soTimeout = 60 * 60 * 1000; // 1小时
public MysqlConnection(){
}
public MysqlConnection(InetSocketAddress address, String username, String password){
-
+ authInfo = new AuthenticationInfo();
+ authInfo.setAddress(address);
+ authInfo.setUsername(username);
+ authInfo.setPassword(password);
connector = new MysqlConnector(address, username, password);
+ // 将connection里面的参数透传下
+ connector.setSoTimeout(soTimeout);
+ connector.setConnTimeout(connTimeout);
}
public MysqlConnection(InetSocketAddress address, String username, String password, byte charsetNumber,
String defaultSchema){
+ authInfo = new AuthenticationInfo();
+ authInfo.setAddress(address);
+ authInfo.setUsername(username);
+ authInfo.setPassword(password);
+ authInfo.setDefaultDatabaseName(defaultSchema);
connector = new MysqlConnector(address, username, password, charsetNumber, defaultSchema);
+ // 将connection里面的参数透传下
+ connector.setSoTimeout(soTimeout);
+ connector.setConnTimeout(connTimeout);
}
public void connect() throws IOException {
@@ -73,6 +89,11 @@ public class MysqlConnection implements ErosaConnection {
return exector.query(cmd);
}
+ public List queryMulti(String cmd) throws IOException {
+ MysqlQueryExecutor exector = new MysqlQueryExecutor(connector);
+ return exector.queryMulti(cmd);
+ }
+
public void update(String cmd) throws IOException {
MysqlUpdateExecutor exector = new MysqlUpdateExecutor(connector);
exector.update(cmd);
@@ -83,7 +104,7 @@ public class MysqlConnection implements ErosaConnection {
*/
public void seek(String binlogfilename, Long binlogPosition, SinkFunction func) throws IOException {
updateSettings();
- loadBinlogChecksum();
+
sendBinlogDump(binlogfilename, binlogPosition);
DirectLogFetcher fetcher = new DirectLogFetcher(connector.getReceiveBufferSize());
fetcher.start(connector.getChannel());
@@ -93,8 +114,6 @@ public class MysqlConnection implements ErosaConnection {
decoder.handle(LogEvent.QUERY_EVENT);
decoder.handle(LogEvent.XID_EVENT);
LogContext context = new LogContext();
- context.setLogPosition(new LogPosition(binlogfilename));
- context.setFormatDescription(new FormatDescriptionLogEvent(4, binlogChecksum));
while (fetcher.fetch()) {
LogEvent event = null;
event = decoder.decode(fetcher, context);
@@ -111,14 +130,11 @@ public class MysqlConnection implements ErosaConnection {
public void dump(String binlogfilename, Long binlogPosition, SinkFunction func) throws IOException {
updateSettings();
- loadBinlogChecksum();
sendBinlogDump(binlogfilename, binlogPosition);
DirectLogFetcher fetcher = new DirectLogFetcher(connector.getReceiveBufferSize());
fetcher.start(connector.getChannel());
LogDecoder decoder = new LogDecoder(LogEvent.UNKNOWN_EVENT, LogEvent.ENUM_END_EVENT);
LogContext context = new LogContext();
- context.setLogPosition(new LogPosition(binlogfilename));
- context.setFormatDescription(new FormatDescriptionLogEvent(4, binlogChecksum));
while (fetcher.fetch()) {
LogEvent event = null;
event = decoder.decode(fetcher, context);
@@ -130,6 +146,10 @@ public class MysqlConnection implements ErosaConnection {
if (!func.sink(event)) {
break;
}
+
+ if (event.getSemival() == 1) {
+ sendSemiAck(context.getLogPosition().getFileName(), binlogPosition);
+ }
}
}
@@ -141,6 +161,7 @@ public class MysqlConnection implements ErosaConnection {
BinlogDumpCommandPacket binlogDumpCmd = new BinlogDumpCommandPacket();
binlogDumpCmd.binlogFileName = binlogfilename;
binlogDumpCmd.binlogPosition = binlogPosition;
+ // binlogDumpCmd.slaveServerId = this.slaveId;
binlogDumpCmd.slaveServerId = this.slaveId;
byte[] cmdBody = binlogDumpCmd.toBytes();
@@ -148,17 +169,32 @@ public class MysqlConnection implements ErosaConnection {
HeaderPacket binlogDumpHeader = new HeaderPacket();
binlogDumpHeader.setPacketBodyLength(cmdBody.length);
binlogDumpHeader.setPacketSequenceNumber((byte) 0x00);
- PacketManager.write(connector.getChannel(), new ByteBuffer[] { ByteBuffer.wrap(binlogDumpHeader.toBytes()),
- ByteBuffer.wrap(cmdBody) });
-
+ PacketManager.writePkg(connector.getChannel(), binlogDumpHeader.toBytes(), cmdBody);
connector.setDumping(true);
}
+ private void sendSemiAck(String binlogfilename, Long binlogPosition) throws IOException {
+ SemiAckCommandPacket semiAckCmd = new SemiAckCommandPacket();
+ semiAckCmd.binlogFileName = binlogfilename;
+ semiAckCmd.binlogPosition = binlogPosition;
+
+ byte[] cmdBody = semiAckCmd.toBytes();
+
+ logger.info("SEMI ACK with position:{}", semiAckCmd);
+ HeaderPacket semiAckHeader = new HeaderPacket();
+ semiAckHeader.setPacketBodyLength(cmdBody.length);
+ semiAckHeader.setPacketSequenceNumber((byte) 0x00);
+ PacketManager.writePkg(connector.getChannel(), semiAckHeader.toBytes(), cmdBody);
+
+ }
+
public MysqlConnection fork() {
MysqlConnection connection = new MysqlConnection();
connection.setCharset(getCharset());
connection.setSlaveId(getSlaveId());
connection.setConnector(connector.fork());
+ // set authInfo
+ connection.setAuthInfo(authInfo);
return connection;
}
@@ -179,25 +215,25 @@ public class MysqlConnection implements ErosaConnection {
try {
update("set wait_timeout=9999999");
} catch (Exception e) {
- logger.warn(ExceptionUtils.getFullStackTrace(e));
+ logger.warn("update wait_timeout failed", e);
}
try {
update("set net_write_timeout=1800");
} catch (Exception e) {
- logger.warn(ExceptionUtils.getFullStackTrace(e));
+ logger.warn("update net_write_timeout failed", e);
}
try {
update("set net_read_timeout=1800");
} catch (Exception e) {
- logger.warn(ExceptionUtils.getFullStackTrace(e));
+ logger.warn("update net_read_timeout failed", e);
}
try {
// 设置服务端返回结果时不做编码转化，直接按照数据库的二进制编码进行发送，由客户端自己根据需求进行编码转化
update("set names 'binary'");
} catch (Exception e) {
- logger.warn(ExceptionUtils.getFullStackTrace(e));
+ logger.warn("update names failed", e);
}
try {
@@ -205,12 +241,9 @@ public class MysqlConnection implements ErosaConnection {
// 如果不设置会出现错误： Slave can not handle replication events with the
// checksum that master is configured to log
// 但也不能乱设置，需要和mysql server的checksum配置一致，不然RotateLogEvent会出现乱码
- // '@@global.binlog_checksum'需要去掉单引号,在mysql 5.6.29下导致master退出
- update("set @master_binlog_checksum= @@global.binlog_checksum");
+ update("set @master_binlog_checksum= '@@global.binlog_checksum'");
} catch (Exception e) {
- if (!StringUtils.contains(e.getMessage(), "Unknown system variable")) {
- logger.warn(ExceptionUtils.getFullStackTrace(e));
- }
+ logger.warn("update master_binlog_checksum failed", e);
}
try {
@@ -219,7 +252,7 @@ public class MysqlConnection implements ErosaConnection {
update("set @slave_uuid=uuid()");
} catch (Exception e) {
if (!StringUtils.contains(e.getMessage(), "Unknown system variable")) {
- logger.warn(ExceptionUtils.getFullStackTrace(e));
+ logger.warn("update slave_uuid failed", e);
}
}
@@ -227,7 +260,7 @@ public class MysqlConnection implements ErosaConnection {
// mariadb针对特殊的类型，需要设置session变量
update("SET @mariadb_slave_capability='" + LogEvent.MARIA_SLAVE_CAPABILITY_MINE + "'");
} catch (Exception e) {
- logger.warn(ExceptionUtils.getFullStackTrace(e));
+ logger.warn("update mariadb_slave_capability failed", e);
}
}
@@ -278,28 +311,6 @@ public class MysqlConnection implements ErosaConnection {
}
}
- /**
- * 获取主库checksum信息
- * https://dev.mysql.com/doc/refman/5.6/en/replication-options
- * -binary-log.html#option_mysqld_binlog-checksum
- */
- private void loadBinlogChecksum() {
- ResultSetPacket rs = null;
- try {
- rs = query("select @master_binlog_checksum");
- } catch (IOException e) {
- throw new CanalParseException(e);
- }
-
- List columnValues = rs.getFieldValues();
- if (columnValues != null && columnValues.size() >= 1 && columnValues.get(0) != null
- && columnValues.get(0).toUpperCase().equals("CRC32")) {
- binlogChecksum = LogEvent.BINLOG_CHECKSUM_ALG_CRC32;
- } else {
- binlogChecksum = LogEvent.BINLOG_CHECKSUM_ALG_OFF;
- }
- }
-
public static enum BinlogFormat {
STATEMENT("STATEMENT"), ROW("ROW"), MIXED("MIXED");
@@ -419,4 +430,23 @@ public class MysqlConnection implements ErosaConnection {
return binlogImage;
}
+ public InetSocketAddress getAddress() {
+ return authInfo.getAddress();
+ }
+
+ public void setConnTimeout(int connTimeout) {
+ this.connTimeout = connTimeout;
+ }
+
+ public void setSoTimeout(int soTimeout) {
+ this.soTimeout = soTimeout;
+ }
+
+ public AuthenticationInfo getAuthInfo() {
+ return authInfo;
+ }
+
+ public void setAuthInfo(AuthenticationInfo authInfo) {
+ this.authInfo = authInfo;
+ }
}
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 9b7b152a..49ade7d9 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
@@ -1,16 +1,16 @@
package com.alibaba.otter.canal.parse.inbound.mysql;
import java.io.IOException;
+import java.net.InetAddress;
import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TimerTask;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
import org.springframework.util.CollectionUtils;
import com.alibaba.otter.canal.common.utils.JsonUtils;
@@ -27,6 +27,7 @@ import com.alibaba.otter.canal.parse.inbound.mysql.MysqlConnection.BinlogFormat;
import com.alibaba.otter.canal.parse.inbound.mysql.MysqlConnection.BinlogImage;
import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.LogEventConvert;
import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.TableMetaCache;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta;
import com.alibaba.otter.canal.parse.support.AuthenticationInfo;
import com.alibaba.otter.canal.protocol.CanalEntry;
import com.alibaba.otter.canal.protocol.position.EntryPosition;
@@ -118,7 +119,13 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
}
}
- tableMetaCache = new TableMetaCache(metaConnection);
+ if (tableMetaTSDB != null && tableMetaTSDB instanceof DatabaseTableMeta) {
+ ((DatabaseTableMeta) tableMetaTSDB).setConnection(metaConnection);
+ ((DatabaseTableMeta) tableMetaTSDB).setFilter(eventFilter);
+ ((DatabaseTableMeta) tableMetaTSDB).setBlackFilter(eventBlackFilter);
+ }
+
+ tableMetaCache = new TableMetaCache(metaConnection, tableMetaTSDB);
((LogEventConvert) binlogParser).setTableMetaCache(tableMetaCache);
}
}
@@ -237,19 +244,19 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
((HeartBeatCallback) haController).onFailed(e);
}
reconnect = true;
- logger.warn("connect failed by " + ExceptionUtils.getStackTrace(e));
+ logger.warn("connect failed by ", e);
} catch (IOException e) {
if (haController != null && haController instanceof HeartBeatCallback) {
((HeartBeatCallback) haController).onFailed(e);
}
reconnect = true;
- logger.warn("connect failed by " + ExceptionUtils.getStackTrace(e));
+ logger.warn("connect failed by ", e);
} catch (Throwable e) {
if (haController != null && haController instanceof HeartBeatCallback) {
((HeartBeatCallback) haController).onFailed(e);
}
reconnect = true;
- logger.warn("connect failed by " + ExceptionUtils.getStackTrace(e));
+ logger.warn("connect failed by ", e);
}
}
@@ -307,10 +314,35 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
connection.getConnector().setSendBufferSize(sendBufferSize);
connection.getConnector().setSoTimeout(defaultConnectionTimeoutInSeconds * 1000);
connection.setCharset(connectionCharset);
+ // 随机生成slaveId
+ if (this.slaveId <= 0) {
+ this.slaveId = generateUniqueServerId();
+ }
connection.setSlaveId(this.slaveId);
return connection;
}
+ private final long generateUniqueServerId() {
+ try {
+ // a=`echo $masterip|cut -d\. -f1`
+ // b=`echo $masterip|cut -d\. -f2`
+ // c=`echo $masterip|cut -d\. -f3`
+ // d=`echo $masterip|cut -d\. -f4`
+ // #server_id=`expr $a \* 256 \* 256 \* 256 + $b \* 256 \* 256 + $c
+ // \* 256 + $d `
+ // #server_id=$b$c$d
+ // server_id=`expr $b \* 256 \* 256 + $c \* 256 + $d `
+ InetAddress localHost = InetAddress.getLocalHost();
+ byte[] addr = localHost.getAddress();
+ int salt = (destination != null) ? destination.hashCode() : 0;
+ return ((0x7f & salt) << 24) + ((0xff & (int) addr[1]) << 16) // NL
+ + ((0xff & (int) addr[2]) << 8) // NL
+ + (0xff & (int) addr[3]);
+ } catch (UnknownHostException e) {
+ throw new CanalParseException("Unknown host", e);
+ }
+ }
+
protected EntryPosition findStartPosition(ErosaConnection connection) throws IOException {
EntryPosition startPosition = findStartPositionInternal(connection);
if (needTransactionPosition.get()) {
@@ -333,6 +365,41 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
return endPosition;
}
+ protected EntryPosition findEndPositionWithMasterIdAndTimestamp(MysqlConnection connection) {
+ MysqlConnection mysqlConnection = (MysqlConnection) connection;
+ final EntryPosition endPosition = findEndPosition(mysqlConnection);
+ if (tableMetaTSDB != null) {
+ long startTimestamp = System.currentTimeMillis();
+ return findAsPerTimestampInSpecificLogFile(mysqlConnection,
+ startTimestamp,
+ endPosition,
+ endPosition.getJournalName(),
+ true);
+ } else {
+ return endPosition;
+ }
+ }
+
+ protected EntryPosition findPositionWithMasterIdAndTimestamp(MysqlConnection connection, EntryPosition fixedPosition) {
+ MysqlConnection mysqlConnection = (MysqlConnection) connection;
+ if (tableMetaTSDB != null && (fixedPosition.getTimestamp() == null || fixedPosition.getTimestamp() <= 0)) {
+ // 使用一个未来极大的时间，基于位点进行定位
+ long startTimestamp = System.currentTimeMillis() + 102L * 365 * 24 * 3600 * 1000; // 当前时间的未来102年
+ EntryPosition entryPosition = findAsPerTimestampInSpecificLogFile(mysqlConnection,
+ startTimestamp,
+ fixedPosition,
+ fixedPosition.getJournalName(),
+ true);
+ if (entryPosition == null) {
+ throw new CanalParseException("[fixed timestamp] can't found begin/commit position before with fixed position"
+ + fixedPosition.getJournalName() + ":" + fixedPosition.getPosition());
+ }
+ return entryPosition;
+ } else {
+ return fixedPosition;
+ }
+ }
+
protected EntryPosition findStartPositionInternal(ErosaConnection connection) {
MysqlConnection mysqlConnection = (MysqlConnection) connection;
LogPosition logPosition = logPositionManager.getLatestIndexBy(destination);
@@ -346,7 +413,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
}
if (entryPosition == null) {
- entryPosition = findEndPosition(mysqlConnection); // 默认从当前最后一个位置进行消费
+ entryPosition = findEndPositionWithMasterIdAndTimestamp(mysqlConnection); // 默认从当前最后一个位置进行消费
}
// 判断一下是否需要按时间订阅
@@ -358,13 +425,15 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
return findByStartTimeStamp(mysqlConnection, entryPosition.getTimestamp());
} else {
logger.warn("prepare to find start position just show master status");
- return findEndPosition(mysqlConnection); // 默认从当前最后一个位置进行消费
+ return findEndPositionWithMasterIdAndTimestamp(mysqlConnection); // 默认从当前最后一个位置进行消费
}
} else {
if (entryPosition.getPosition() != null && entryPosition.getPosition() > 0L) {
// 如果指定binlogName + offest，直接返回
+ entryPosition = findPositionWithMasterIdAndTimestamp(mysqlConnection, entryPosition);
logger.warn("prepare to find start position {}:{}:{}",
- new Object[] { entryPosition.getJournalName(), entryPosition.getPosition(), "" });
+ new Object[] { entryPosition.getJournalName(), entryPosition.getPosition(),
+ entryPosition.getTimestamp() });
return entryPosition;
} else {
EntryPosition specificLogFilePosition = null;
@@ -378,7 +447,8 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
specificLogFilePosition = findAsPerTimestampInSpecificLogFile(mysqlConnection,
entryPosition.getTimestamp(),
endPosition,
- entryPosition.getJournalName());
+ entryPosition.getJournalName(),
+ true);
}
}
@@ -429,83 +499,47 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
// 主要考虑一个事务执行时间可能会几秒种，如果仅仅按照timestamp相同，则可能会丢失事务的前半部分数据
private Long findTransactionBeginPosition(ErosaConnection mysqlConnection, final EntryPosition entryPosition)
throws IOException {
- // 尝试找到一个合适的位置
- final AtomicBoolean reDump = new AtomicBoolean(false);
+ // 针对开始的第一条为非Begin记录，需要从该binlog扫描
+ final AtomicLong preTransactionStartPosition = new AtomicLong(0L);
mysqlConnection.reconnect();
- mysqlConnection.seek(entryPosition.getJournalName(), entryPosition.getPosition(), new SinkFunction() {
+ mysqlConnection.seek(entryPosition.getJournalName(), 4L, new SinkFunction() {
private LogPosition lastPosition;
public boolean sink(LogEvent event) {
try {
- CanalEntry.Entry entry = parseAndProfilingIfNecessary(event);
+ CanalEntry.Entry entry = parseAndProfilingIfNecessary(event, true);
if (entry == null) {
return true;
}
- // 直接查询第一条业务数据，确认是否为事务Begin/End
- if (CanalEntry.EntryType.TRANSACTIONBEGIN == entry.getEntryType()
- || CanalEntry.EntryType.TRANSACTIONEND == entry.getEntryType()) {
- lastPosition = buildLastPosition(entry);
- return false;
- } else {
- reDump.set(true);
- lastPosition = buildLastPosition(entry);
- return false;
+ // 直接查询第一条业务数据，确认是否为事务Begin
+ // 记录一下transaction begin position
+ if (entry.getEntryType() == CanalEntry.EntryType.TRANSACTIONBEGIN
+ && entry.getHeader().getLogfileOffset() < entryPosition.getPosition()) {
+ preTransactionStartPosition.set(entry.getHeader().getLogfileOffset());
}
+
+ if (entry.getHeader().getLogfileOffset() >= entryPosition.getPosition()) {
+ return false;// 退出
+ }
+
+ lastPosition = buildLastPosition(entry);
} catch (Exception e) {
- // 上一次记录的poistion可能为一条update/insert/delete变更事件，直接进行dump的话，会缺少tableMap事件，导致tableId未进行解析
processSinkError(e, lastPosition, entryPosition.getJournalName(), entryPosition.getPosition());
- reDump.set(true);
return false;
}
+
+ return running;
}
});
- // 针对开始的第一条为非Begin记录，需要从该binlog扫描
- if (reDump.get()) {
- final AtomicLong preTransactionStartPosition = new AtomicLong(0L);
- mysqlConnection.reconnect();
- mysqlConnection.seek(entryPosition.getJournalName(), 4L, new SinkFunction() {
- private LogPosition lastPosition;
-
- public boolean sink(LogEvent event) {
- try {
- CanalEntry.Entry entry = parseAndProfilingIfNecessary(event);
- if (entry == null) {
- return true;
- }
-
- // 直接查询第一条业务数据，确认是否为事务Begin
- // 记录一下transaction begin position
- if (entry.getEntryType() == CanalEntry.EntryType.TRANSACTIONBEGIN
- && entry.getHeader().getLogfileOffset() < entryPosition.getPosition()) {
- preTransactionStartPosition.set(entry.getHeader().getLogfileOffset());
- }
-
- if (entry.getHeader().getLogfileOffset() >= entryPosition.getPosition()) {
- return false;// 退出
- }
-
- lastPosition = buildLastPosition(entry);
- } catch (Exception e) {
- processSinkError(e, lastPosition, entryPosition.getJournalName(), entryPosition.getPosition());
- return false;
- }
-
- return running;
- }
- });
-
- // 判断一下找到的最接近position的事务头的位置
- if (preTransactionStartPosition.get() > entryPosition.getPosition()) {
- logger.error("preTransactionEndPosition greater than startPosition from zk or localconf, maybe lost data");
- throw new CanalParseException("preTransactionStartPosition greater than startPosition from zk or localconf, maybe lost data");
- }
- return preTransactionStartPosition.get();
- } else {
- return entryPosition.getPosition();
+ // 判断一下找到的最接近position的事务头的位置
+ if (preTransactionStartPosition.get() > entryPosition.getPosition()) {
+ logger.error("preTransactionEndPosition greater than startPosition from zk or localconf, maybe lost data");
+ throw new CanalParseException("preTransactionStartPosition greater than startPosition from zk or localconf, maybe lost data");
}
+ return preTransactionStartPosition.get();
}
// 根据时间查找binlog位置
@@ -522,7 +556,8 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
EntryPosition entryPosition = findAsPerTimestampInSpecificLogFile(mysqlConnection,
startTimestamp,
endPosition,
- startSearchBinlogFile);
+ startSearchBinlogFile,
+ false);
if (entryPosition == null) {
if (StringUtils.equalsIgnoreCase(minBinlogFileName, startSearchBinlogFile)) {
// 已经找到最早的一个binlog，没必要往前找了
@@ -549,9 +584,9 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
return entryPosition;
}
} catch (Exception e) {
- logger.warn("the binlogfile:{} doesn't exist, to continue to search the next binlogfile , caused by {}",
- startSearchBinlogFile,
- ExceptionUtils.getFullStackTrace(e));
+ logger.warn(String.format("the binlogfile:%s doesn't exist, to continue to search the next binlogfile , caused by",
+ startSearchBinlogFile),
+ e);
int binlogSeqNum = Integer.parseInt(startSearchBinlogFile.substring(startSearchBinlogFile.indexOf(".") + 1));
if (binlogSeqNum <= 1) {
logger.warn("Didn't find the corresponding binlog files");
@@ -670,7 +705,8 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
private EntryPosition findAsPerTimestampInSpecificLogFile(MysqlConnection mysqlConnection,
final Long startTimestamp,
final EntryPosition endPosition,
- final String searchBinlogFile) {
+ final String searchBinlogFile,
+ final Boolean justForPositionTimestamp) {
final LogPosition logPosition = new LogPosition();
try {
@@ -683,7 +719,16 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
public boolean sink(LogEvent event) {
EntryPosition entryPosition = null;
try {
- CanalEntry.Entry entry = parseAndProfilingIfNecessary(event);
+ CanalEntry.Entry entry = parseAndProfilingIfNecessary(event, true);
+ if (justForPositionTimestamp && logPosition.getPostion() == null && event.getWhen() > 0) {
+ // 初始位点
+ entryPosition = new EntryPosition(searchBinlogFile,
+ event.getLogPos(),
+ event.getWhen() * 1000,
+ event.getServerId());
+ logPosition.setPostion(entryPosition);
+ }
+
if (entry == null) {
return true;
}
@@ -691,11 +736,14 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
String logfilename = entry.getHeader().getLogfileName();
Long logfileoffset = entry.getHeader().getLogfileOffset();
Long logposTimestamp = entry.getHeader().getExecuteTime();
+ Long serverId = entry.getHeader().getServerId();
if (CanalEntry.EntryType.TRANSACTIONBEGIN.equals(entry.getEntryType())
|| CanalEntry.EntryType.TRANSACTIONEND.equals(entry.getEntryType())) {
- logger.debug("compare exit condition:{},{},{}, startTimestamp={}...", new Object[] {
- logfilename, logfileoffset, logposTimestamp, startTimestamp });
+ if (logger.isDebugEnabled()) {
+ logger.debug("compare exit condition:{},{},{}, startTimestamp={}...", new Object[] {
+ logfilename, logfileoffset, logposTimestamp, startTimestamp });
+ }
// 事务头和尾寻找第一条记录时间戳，如果最小的一条记录都不满足条件，可直接退出
if (logposTimestamp >= startTimestamp) {
return false;
@@ -703,7 +751,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
}
if (StringUtils.equals(endPosition.getJournalName(), logfilename)
- && endPosition.getPosition() <= (logfileoffset + event.getEventLen())) {
+ && endPosition.getPosition() < logfileoffset) {
return false;
}
@@ -711,17 +759,19 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
// position = current +
// data.length，代表该事务的下一条offest，避免多余的事务重复
if (CanalEntry.EntryType.TRANSACTIONEND.equals(entry.getEntryType())) {
- entryPosition = new EntryPosition(logfilename,
- logfileoffset + event.getEventLen(),
- logposTimestamp);
- logger.debug("set {} to be pending start position before finding another proper one...",
- entryPosition);
+ entryPosition = new EntryPosition(logfilename, logfileoffset, logposTimestamp, serverId);
+ if (logger.isDebugEnabled()) {
+ logger.debug("set {} to be pending start position before finding another proper one...",
+ entryPosition);
+ }
logPosition.setPostion(entryPosition);
} else if (CanalEntry.EntryType.TRANSACTIONBEGIN.equals(entry.getEntryType())) {
// 当前事务开始位点
- entryPosition = new EntryPosition(logfilename, logfileoffset, logposTimestamp);
- logger.debug("set {} to be pending start position before finding another proper one...",
- entryPosition);
+ entryPosition = new EntryPosition(logfilename, logfileoffset, logposTimestamp, serverId);
+ if (logger.isDebugEnabled()) {
+ logger.debug("set {} to be pending start position before finding another proper one...",
+ entryPosition);
+ }
logPosition.setPostion(entryPosition);
}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/DirectLogFetcher.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/DirectLogFetcher.java
index 0742e391..1e8d70df 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/DirectLogFetcher.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/DirectLogFetcher.java
@@ -3,13 +3,12 @@ package com.alibaba.otter.canal.parse.inbound.mysql.dbsync;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.SocketTimeoutException;
-import java.nio.ByteBuffer;
import java.nio.channels.ClosedByInterruptException;
-import java.nio.channels.SocketChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.alibaba.otter.canal.parse.driver.mysql.socket.SocketChannel;
import com.taobao.tddl.dbsync.binlog.LogFetcher;
/**
@@ -38,6 +37,8 @@ public class DirectLogFetcher extends LogFetcher {
private SocketChannel channel;
+ private boolean issemi = false;
+
// private BufferedInputStream input;
public DirectLogFetcher(){
@@ -54,6 +55,10 @@ public class DirectLogFetcher extends LogFetcher {
public void start(SocketChannel channel) throws IOException {
this.channel = channel;
+ String dbsemi = System.getProperty("db.semi");
+ if ("1".equals(dbsemi)) {
+ issemi = true;
+ }
// 和mysql driver一样，提供buffer机制，提升读取binlog速度
// this.input = new
// BufferedInputStream(channel.socket().getInputStream(), 16384);
@@ -107,6 +112,14 @@ public class DirectLogFetcher extends LogFetcher {
}
}
+ // if mysql is in semi mode
+ if (issemi) {
+ // parse semi mark
+ int semimark = getUint8(NET_HEADER_SIZE + 1);
+ int semival = getUint8(NET_HEADER_SIZE + 2);
+ this.semival = semival;
+ }
+
// The first packet is a multi-packet, concatenate the packets.
while (netlen == MAX_PACKET_LENGTH) {
if (!fetch0(0, NET_HEADER_SIZE)) {
@@ -123,7 +136,11 @@ public class DirectLogFetcher extends LogFetcher {
}
// Preparing buffer variables to decoding.
- origin = NET_HEADER_SIZE + 1;
+ if (issemi) {
+ origin = NET_HEADER_SIZE + 3;
+ } else {
+ origin = NET_HEADER_SIZE + 1;
+ }
position = origin;
limit -= origin;
return true;
@@ -149,20 +166,8 @@ public class DirectLogFetcher extends LogFetcher {
private final boolean fetch0(final int off, final int len) throws IOException {
ensureCapacity(off + len);
- ByteBuffer buffer = ByteBuffer.wrap(this.buffer, off, len);
- while (buffer.hasRemaining()) {
- int readNum = channel.read(buffer);
- if (readNum == -1) {
- throw new IOException("Unexpected End Stream");
- }
- }
-
- // for (int count, n = 0; n < len; n += count) {
- // if (0 > (count = input.read(buffer, off + n, len - n))) {
- // // Reached end of input stream
- // return false;
- // }
- // }
+ byte[] read = channel.read(len);
+ System.arraycopy(read, 0, this.buffer, off, len);
if (limit < off + len) limit = off + len;
return true;
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/LogEventConvert.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/LogEventConvert.java
index 1bbb0eb8..27fa8117 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/LogEventConvert.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/LogEventConvert.java
@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.Charset;
import java.sql.Types;
+import java.util.Arrays;
import java.util.BitSet;
import java.util.List;
@@ -21,7 +22,9 @@ import com.alibaba.otter.canal.parse.exception.TableIdNotFoundException;
import com.alibaba.otter.canal.parse.inbound.BinlogParser;
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.dbsync.SimpleDdlParser.DdlResult;
+import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DdlResult;
+import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DruidDdlParser;
+import com.alibaba.otter.canal.parse.inbound.mysql.ddl.SimpleDdlParser;
import com.alibaba.otter.canal.protocol.CanalEntry.Column;
import com.alibaba.otter.canal.protocol.CanalEntry.Entry;
import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;
@@ -33,6 +36,7 @@ import com.alibaba.otter.canal.protocol.CanalEntry.RowData;
import com.alibaba.otter.canal.protocol.CanalEntry.TransactionBegin;
import com.alibaba.otter.canal.protocol.CanalEntry.TransactionEnd;
import com.alibaba.otter.canal.protocol.CanalEntry.Type;
+import com.alibaba.otter.canal.protocol.position.EntryPosition;
import com.google.protobuf.ByteString;
import com.taobao.tddl.dbsync.binlog.LogEvent;
import com.taobao.tddl.dbsync.binlog.event.DeleteRowsLogEvent;
@@ -86,8 +90,10 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
private boolean filterTableError = false;
// 新增rows过滤，用于仅订阅除rows以外的数据
private boolean filterRows = false;
+ private boolean useDruidDdlFilter = true;
- public Entry parse(LogEvent logEvent) throws CanalParseException {
+ @Override
+ public Entry parse(LogEvent logEvent, boolean isSeek) throws CanalParseException {
if (logEvent == null || logEvent instanceof UnknownLogEvent) {
return null;
}
@@ -98,7 +104,7 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
binlogFileName = ((RotateLogEvent) logEvent).getFilename();
break;
case LogEvent.QUERY_EVENT:
- return parseQueryEvent((QueryLogEvent) logEvent);
+ return parseQueryEvent((QueryLogEvent) logEvent, isSeek);
case LogEvent.XID_EVENT:
return parseXidEvent((XidLogEvent) logEvent);
case LogEvent.TABLE_MAP_EVENT:
@@ -137,7 +143,7 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
}
}
- private Entry parseQueryEvent(QueryLogEvent event) {
+ private Entry parseQueryEvent(QueryLogEvent event, boolean isSeek) {
String queryString = event.getQuery();
if (StringUtils.endsWithIgnoreCase(queryString, BEGIN)) {
TransactionBegin transactionBegin = createTransactionBegin(event.getSessionId());
@@ -148,106 +154,139 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
Header header = createHeader(binlogFileName, event.getHeader(), "", "", null);
return createEntry(header, EntryType.TRANSACTIONEND, transactionEnd.toByteString());
} else {
- // DDL语句处理
- DdlResult result = SimpleDdlParser.parse(queryString, event.getDbName());
-
- String schemaName = event.getDbName();
- if (StringUtils.isNotEmpty(result.getSchemaName())) {
- schemaName = result.getSchemaName();
- }
-
- String tableName = result.getTableName();
+ boolean notFilter = false;
EventType type = EventType.QUERY;
- // fixed issue https://github.com/alibaba/canal/issues/58
- if (result.getType() == EventType.ALTER || result.getType() == EventType.ERASE
- || result.getType() == EventType.CREATE || result.getType() == EventType.TRUNCATE
- || result.getType() == EventType.RENAME || result.getType() == EventType.CINDEX
- || result.getType() == EventType.DINDEX) { // 针对DDL类型
-
- if (filterQueryDdl) {
- return null;
+ String tableName = null;
+ String schemaName = null;
+ if (useDruidDdlFilter) {
+ List results = DruidDdlParser.parse(queryString, event.getDbName());
+ for (DdlResult result : results) {
+ if (!processFilter(queryString, result)) {
+ // 只要有一个数据不进行过滤
+ notFilter = true;
+ }
+ }
+ if (results.size() > 0) {
+ // 如果针对多行的DDL,只能取第一条
+ type = results.get(0).getType();
+ schemaName = results.get(0).getSchemaName();
+ tableName = results.get(0).getTableName();
+ }
+ } else {
+ DdlResult result = SimpleDdlParser.parse(queryString, event.getDbName());
+ if (!processFilter(queryString, result)) {
+ notFilter = true;
}
type = result.getType();
- if (StringUtils.isEmpty(tableName)
- || (result.getType() == EventType.RENAME && StringUtils.isEmpty(result.getOriTableName()))) {
- // 如果解析不出tableName,记录一下日志，方便bugfix，目前直接抛出异常，中断解析
- throw new CanalParseException("SimpleDdlParser process query failed. pls submit issue with this queryString: "
- + queryString + " , and DdlResult: " + result.toString());
- // return null;
- } else {
- // check name filter
- String name = schemaName + "." + tableName;
- if (nameFilter != null && !nameFilter.filter(name)) {
- if (result.getType() == EventType.RENAME) {
- // rename校验只要源和目标满足一个就进行操作
- if (nameFilter != null
- && !nameFilter.filter(result.getOriSchemaName() + "." + result.getOriTableName())) {
- return null;
- }
- } else {
- // 其他情况返回null
- return null;
- }
- }
+ schemaName = result.getSchemaName();
+ tableName = result.getTableName();
+ }
- if (nameBlackFilter != null && nameBlackFilter.filter(name)) {
- if (result.getType() == EventType.RENAME) {
- // rename校验只要源和目标满足一个就进行操作
- if (nameBlackFilter != null
- && nameBlackFilter.filter(result.getOriSchemaName() + "." + result.getOriTableName())) {
- return null;
- }
- } else {
- // 其他情况返回null
- return null;
- }
- }
- }
- } else if (result.getType() == EventType.INSERT || result.getType() == EventType.UPDATE
- || result.getType() == EventType.DELETE) {
- // 对外返回，保证兼容，还是返回QUERY类型，这里暂不解析tableName，所以无法支持过滤
- if (filterQueryDml) {
- return null;
- }
- } else if (filterQueryDcl) {
+ if (!notFilter) {
+ // 如果是过滤的数据就不处理了
return null;
}
- // 更新下table meta cache
- if (tableMetaCache != null
- && (result.getType() == EventType.ALTER || result.getType() == EventType.ERASE || result.getType() == EventType.RENAME)) {
- for (DdlResult renameResult = result; renameResult != null; renameResult = renameResult.getRenameTableResult()) {
- String schemaName0 = event.getDbName(); // 防止rename语句后产生schema变更带来影响
- if (StringUtils.isNotEmpty(renameResult.getSchemaName())) {
- schemaName0 = renameResult.getSchemaName();
- }
-
- tableName = renameResult.getTableName();
- if (StringUtils.isNotEmpty(tableName)) {
- // 如果解析到了正确的表信息，则根据全名进行清除
- tableMetaCache.clearTableMeta(schemaName0, tableName);
- } else {
- // 如果无法解析正确的表信息，则根据schema进行清除
- tableMetaCache.clearTableMetaWithSchemaName(schemaName0);
- }
- }
+ if (!isSeek) {
+ // 使用新的表结构元数据管理方式
+ EntryPosition position = createPosition(event.getHeader());
+ tableMetaCache.apply(position, event.getDbName(), queryString, null);
}
Header header = createHeader(binlogFileName, event.getHeader(), schemaName, tableName, type);
RowChange.Builder rowChangeBuider = RowChange.newBuilder();
- if (result.getType() != EventType.QUERY) {
+ if (type != EventType.QUERY) {
rowChangeBuider.setIsDdl(true);
}
rowChangeBuider.setSql(queryString);
if (StringUtils.isNotEmpty(event.getDbName())) {// 可能为空
rowChangeBuider.setDdlSchemaName(event.getDbName());
}
- rowChangeBuider.setEventType(result.getType());
+ rowChangeBuider.setEventType(type);
return createEntry(header, EntryType.ROWDATA, rowChangeBuider.build().toByteString());
}
}
+ private boolean processFilter(String queryString, DdlResult result) {
+ String schemaName = result.getSchemaName();
+ String tableName = result.getTableName();
+ // fixed issue https://github.com/alibaba/canal/issues/58
+ // 更新下table meta cache
+ if (tableMetaCache != null
+ && (result.getType() == EventType.ALTER || result.getType() == EventType.ERASE || result.getType() == EventType.RENAME)) {
+ // 对外返回，保证兼容，还是返回QUERY类型，这里暂不解析tableName，所以无法支持过滤
+ for (DdlResult renameResult = result; renameResult != null; renameResult = renameResult.getRenameTableResult()) {
+ String schemaName0 = renameResult.getSchemaName();
+ String tableName0 = renameResult.getTableName();
+ if (StringUtils.isNotEmpty(tableName0)) {
+ // 如果解析到了正确的表信息，则根据全名进行清除
+ tableMetaCache.clearTableMeta(schemaName0, tableName0);
+ } else {
+ // 如果无法解析正确的表信息，则根据schema进行清除
+ tableMetaCache.clearTableMetaWithSchemaName(schemaName0);
+ }
+ }
+ }
+
+ // fixed issue https://github.com/alibaba/canal/issues/58
+ if (result.getType() == EventType.ALTER || result.getType() == EventType.ERASE
+ || result.getType() == EventType.CREATE || result.getType() == EventType.TRUNCATE
+ || result.getType() == EventType.RENAME || result.getType() == EventType.CINDEX
+ || result.getType() == EventType.DINDEX) { // 针对DDL类型
+
+ if (filterQueryDdl) {
+ return true;
+ }
+
+ if (StringUtils.isEmpty(tableName)
+ || (result.getType() == EventType.RENAME && StringUtils.isEmpty(result.getOriTableName()))) {
+ // 如果解析不出tableName,记录一下日志，方便bugfix，目前直接抛出异常，中断解析
+ throw new CanalParseException("SimpleDdlParser process query failed. pls submit issue with this queryString: "
+ + queryString + " , and DdlResult: " + result.toString());
+ // return null;
+ } else {
+ // check name filter
+ String name = schemaName + "." + tableName;
+ if (nameFilter != null && !nameFilter.filter(name)) {
+ if (result.getType() == EventType.RENAME) {
+ // rename校验只要源和目标满足一个就进行操作
+ if (nameFilter != null
+ && !nameFilter.filter(result.getOriSchemaName() + "." + result.getOriTableName())) {
+ return true;
+ }
+ } else {
+ // 其他情况返回null
+ return true;
+ }
+ }
+
+ if (nameBlackFilter != null && nameBlackFilter.filter(name)) {
+ if (result.getType() == EventType.RENAME) {
+ // rename校验只要源和目标满足一个就进行操作
+ if (nameBlackFilter != null
+ && nameBlackFilter.filter(result.getOriSchemaName() + "." + result.getOriTableName())) {
+ return true;
+ }
+ } else {
+ // 其他情况返回null
+ return true;
+ }
+ }
+ }
+ } else if (result.getType() == EventType.INSERT || result.getType() == EventType.UPDATE
+ || result.getType() == EventType.DELETE) {
+ // 对外返回，保证兼容，还是返回QUERY类型，这里暂不解析tableName，所以无法支持过滤
+ if (filterQueryDml) {
+ return true;
+ }
+ } else if (filterQueryDcl) {
+ return true;
+ }
+
+ return false;
+ }
+
private Entry parseRowsQueryEvent(RowsQueryLogEvent event) {
if (filterQueryDml) {
return null;
@@ -256,7 +295,15 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
String queryString = null;
try {
queryString = new String(event.getRowsQuery().getBytes(ISO_8859_1), charset.name());
- return buildQueryEntry(queryString, event.getHeader());
+ String tableName = null;
+ if (useDruidDdlFilter) {
+ List results = DruidDdlParser.parse(queryString, null);
+ if (results.size() > 0) {
+ tableName = results.get(0).getTableName();
+ }
+ }
+
+ return buildQueryEntry(queryString, event.getHeader(), tableName);
} catch (UnsupportedEncodingException e) {
throw new CanalParseException(e);
}
@@ -317,6 +364,10 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
throw new TableIdNotFoundException("not found tableId:" + event.getTableId());
}
+ boolean isHeartBeat = isAliSQLHeartBeat(table.getDbName(), table.getTableName());
+ boolean isRDSHeartBeat = tableMetaCache.isOnRDS()
+ && isRDSHeartBeat(table.getDbName(), table.getTableName());
+
String fullname = table.getDbName() + "." + table.getTableName();
// check name filter
if (nameFilter != null && !nameFilter.filter(fullname)) {
@@ -326,9 +377,23 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
return null;
}
- if (tableMetaCache.isOnRDS() && "mysql.ha_health_check".equals(fullname)) {
- // 忽略rds模式的mysql.ha_health_check心跳数据
- return null;
+ // if (isHeartBeat || isRDSHeartBeat) {
+ // // 忽略rds模式的mysql.ha_health_check心跳数据
+ // return null;
+ // }
+ TableMeta tableMeta = null;
+ if (isRDSHeartBeat) {
+ // 处理rds模式的mysql.ha_health_check心跳数据
+ // 主要RDS的心跳表基本无权限,需要mock一个tableMeta
+ FieldMeta idMeta = new FieldMeta("id", "bigint(20)", true, false, "0");
+ FieldMeta typeMeta = new FieldMeta("type", "char(1)", false, true, "0");
+ tableMeta = new TableMeta(table.getDbName(), table.getTableName(), Arrays.asList(idMeta, typeMeta));
+ } else if (isHeartBeat) {
+ // 处理alisql模式的test.heartbeat心跳数据
+ // 心跳表基本无权限,需要mock一个tableMeta
+ FieldMeta idMeta = new FieldMeta("id", "smallint(6)", false, true, null);
+ FieldMeta typeMeta = new FieldMeta("type", "int(11)", true, false, null);
+ tableMeta = new TableMeta(table.getDbName(), table.getTableName(), Arrays.asList(idMeta, typeMeta));
}
EventType eventType = null;
@@ -348,6 +413,7 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
table.getDbName(),
table.getTableName(),
eventType);
+ EntryPosition position = createPosition(event.getHeader());
RowChange.Builder rowChangeBuider = RowChange.newBuilder();
rowChangeBuider.setTableId(event.getTableId());
rowChangeBuider.setIsDdl(false);
@@ -357,9 +423,9 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
BitSet columns = event.getColumns();
BitSet changeColumns = event.getChangeColumns();
boolean tableError = false;
- TableMeta tableMeta = null;
- if (tableMetaCache != null) {// 入错存在table meta cache
- tableMeta = getTableMeta(table.getDbName(), table.getTableName(), true);
+ if (tableMetaCache != null && tableMeta == null) {// 入错存在table meta
+ // cache
+ tableMeta = getTableMeta(table.getDbName(), table.getTableName(), true, position);
if (tableMeta == null) {
tableError = true;
if (!filterTableError) {
@@ -405,6 +471,13 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
}
}
+ private EntryPosition createPosition(LogHeader logHeader) {
+ return new EntryPosition(binlogFileName,
+ logHeader.getLogPos(),
+ logHeader.getWhen() * 1000L,
+ logHeader.getServerId()); // 记录到秒
+ }
+
private boolean parseOneRow(RowData.Builder rowDataBuilder, RowsLogEvent event, RowsLogBuffer buffer, BitSet cols,
boolean isAfter, TableMeta tableMeta) throws UnsupportedEncodingException {
int columnCnt = event.getTable().getColumnCnt();
@@ -413,18 +486,19 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
boolean tableError = false;
// check table fileds count，只能处理加字段
boolean existRDSNoPrimaryKey = false;
- if (tableMeta != null && columnInfo.length > tableMeta.getFileds().size()) {
+ if (tableMeta != null && columnInfo.length > tableMeta.getFields().size()) {
if (tableMetaCache.isOnRDS()) {
// 特殊处理下RDS的场景
List primaryKeys = tableMeta.getPrimaryFields();
if (primaryKeys == null || primaryKeys.isEmpty()) {
- if (columnInfo.length == tableMeta.getFileds().size() + 1
+ if (columnInfo.length == tableMeta.getFields().size() + 1
&& columnInfo[columnInfo.length - 1].type == LogEvent.MYSQL_TYPE_LONGLONG) {
existRDSNoPrimaryKey = true;
}
}
}
+ EntryPosition position = createPosition(event.getHeader());
if (!existRDSNoPrimaryKey) {
// online ddl增加字段操作步骤：
// 1. 新增一张临时表，将需要做ddl表的数据全量导入
@@ -432,7 +506,7 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
// 3. 锁住应用请求，将临时表rename为老表的名字，完成增加字段的操作
// 尝试做一次reload，可能因为ddl没有正确解析，或者使用了类似online ddl的操作
// 因为online ddl没有对应表名的alter语法，所以不会有clear cache的操作
- tableMeta = getTableMeta(event.getTable().getDbName(), event.getTable().getTableName(), false);// 强制重新获取一次
+ tableMeta = getTableMeta(event.getTable().getDbName(), event.getTable().getTableName(), false, position);// 强制重新获取一次
if (tableMeta == null) {
tableError = true;
if (!filterTableError) {
@@ -442,11 +516,11 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
}
// 在做一次判断
- if (tableMeta != null && columnInfo.length > tableMeta.getFileds().size()) {
+ if (tableMeta != null && columnInfo.length > tableMeta.getFields().size()) {
tableError = true;
if (!filterTableError) {
throw new CanalParseException("column size is not match for table:" + tableMeta.getFullName()
- + "," + columnInfo.length + " vs " + tableMeta.getFileds().size());
+ + "," + columnInfo.length + " vs " + tableMeta.getFields().size());
}
}
} else {
@@ -473,7 +547,7 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
FieldMeta fieldMeta = null;
if (tableMeta != null && !tableError) {
// 处理file meta
- fieldMeta = tableMeta.getFileds().get(i);
+ fieldMeta = tableMeta.getFields().get(i);
columnBuilder.setName(fieldMeta.getColumnName());
columnBuilder.setIsKey(fieldMeta.isKey());
// 增加mysql type类型,issue 73
@@ -614,6 +688,14 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
}
+ private Entry buildQueryEntry(String queryString, LogHeader logHeader, String tableName) {
+ Header header = createHeader(binlogFileName, logHeader, "", tableName, EventType.QUERY);
+ RowChange.Builder rowChangeBuider = RowChange.newBuilder();
+ rowChangeBuider.setSql(queryString);
+ rowChangeBuider.setEventType(EventType.QUERY);
+ return createEntry(header, EntryType.ROWDATA, rowChangeBuider.build().toByteString());
+ }
+
private Entry buildQueryEntry(String queryString, LogHeader logHeader) {
Header header = createHeader(binlogFileName, logHeader, "", "", EventType.QUERY);
RowChange.Builder rowChangeBuider = RowChange.newBuilder();
@@ -672,9 +754,9 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
return true;
}
- private TableMeta getTableMeta(String dbName, String tbName, boolean useCache) {
+ private TableMeta getTableMeta(String dbName, String tbName, boolean useCache, EntryPosition position) {
try {
- return tableMetaCache.getTableMeta(dbName, tbName, useCache);
+ return tableMetaCache.getTableMeta(dbName, tbName, useCache, position);
} catch (Exception e) {
String message = ExceptionUtils.getRootCauseMessage(e);
if (filterTableError) {
@@ -691,6 +773,14 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
return "LONGTEXT".equalsIgnoreCase(columnType) || "MEDIUMTEXT".equalsIgnoreCase(columnType)
|| "TEXT".equalsIgnoreCase(columnType) || "TINYTEXT".equalsIgnoreCase(columnType);
}
+
+ private boolean isAliSQLHeartBeat(String schema, String table) {
+ return "test".equalsIgnoreCase(schema) && "heartbeat".equalsIgnoreCase(table);
+ }
+
+ private boolean isRDSHeartBeat(String schema, String table) {
+ return "mysql".equalsIgnoreCase(schema) && "ha_health_check".equalsIgnoreCase(table);
+ }
public static TransactionBegin createTransactionBegin(long threadId) {
TransactionBegin.Builder beginBuilder = TransactionBegin.newBuilder();
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java
index d8575ec8..10e0e26c 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java
@@ -14,48 +14,58 @@ import com.alibaba.otter.canal.parse.exception.CanalParseException;
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.MysqlConnection;
-import com.google.common.base.Function;
-import com.google.common.collect.MigrateMap;
+import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DruidDdlParser;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.TableMetaTSDB;
+import com.alibaba.otter.canal.protocol.position.EntryPosition;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
/**
* 处理table meta解析和缓存
- *
+ *
* @author jianghang 2013-1-17 下午10:15:16
* @version 1.0.0
*/
public class TableMetaCache {
- public static final String COLUMN_NAME = "COLUMN_NAME";
- public static final String COLUMN_TYPE = "COLUMN_TYPE";
- public static final String IS_NULLABLE = "IS_NULLABLE";
- public static final String COLUMN_KEY = "COLUMN_KEY";
- public static final String COLUMN_DEFAULT = "COLUMN_DEFAULT";
- public static final String EXTRA = "EXTRA";
- private MysqlConnection connection;
- private boolean isOnRDS = false;
+ public static final String COLUMN_NAME = "COLUMN_NAME";
+ public static final String COLUMN_TYPE = "COLUMN_TYPE";
+ public static final String IS_NULLABLE = "IS_NULLABLE";
+ public static final String COLUMN_KEY = "COLUMN_KEY";
+ public static final String COLUMN_DEFAULT = "COLUMN_DEFAULT";
+ public static final String EXTRA = "EXTRA";
+ private MysqlConnection connection;
+ private boolean isOnRDS = false;
+ private TableMetaTSDB tableMetaTSDB;
// 第一层tableId,第二层schema.table,解决tableId重复，对应多张表
- private Map tableMetaCache;
+ private LoadingCache tableMetaDB;
- public TableMetaCache(MysqlConnection con){
+ public TableMetaCache(MysqlConnection con, TableMetaTSDB tableMetaTSDB){
this.connection = con;
- tableMetaCache = MigrateMap.makeComputingMap(new Function() {
+ this.tableMetaTSDB = tableMetaTSDB;
+ // 如果持久存储的表结构为空，从db里面获取下
+ if (tableMetaTSDB == null) {
+ this.tableMetaDB = CacheBuilder.newBuilder().build(new CacheLoader() {
- public TableMeta apply(String name) {
- try {
- return getTableMeta0(name);
- } catch (IOException e) {
- // 尝试做一次retry操作
+ @Override
+ public TableMeta load(String name) throws Exception {
try {
- connection.reconnect();
- return getTableMeta0(name);
- } catch (IOException e1) {
- throw new CanalParseException("fetch failed by table meta:" + name, e1);
+ return getTableMetaByDB(name);
+ } catch (CanalParseException e) {
+ // 尝试做一次retry操作
+ try {
+ connection.reconnect();
+ return getTableMetaByDB(name);
+ } catch (IOException e1) {
+ throw new CanalParseException("fetch failed by table meta:" + name, e1);
+ }
}
}
- }
- });
+ });
+ }
try {
ResultSetPacket packet = connection.query("show global variables like 'rds\\_%'");
@@ -66,47 +76,15 @@ public class TableMetaCache {
}
}
- public TableMeta getTableMeta(String schema, String table) {
- return getTableMeta(schema, table, true);
- }
-
- public TableMeta getTableMeta(String schema, String table, boolean useCache) {
- if (!useCache) {
- tableMetaCache.remove(getFullName(schema, table));
- }
-
- return tableMetaCache.get(getFullName(schema, table));
- }
-
- public void clearTableMeta(String schema, String table) {
- tableMetaCache.remove(getFullName(schema, table));
- }
-
- public void clearTableMetaWithSchemaName(String schema) {
- // Set removeNames = new HashSet(); //
- // 存一份临时变量，避免在遍历的时候进行删除
- for (String name : tableMetaCache.keySet()) {
- if (StringUtils.startsWithIgnoreCase(name, schema + ".")) {
- // removeNames.add(name);
- tableMetaCache.remove(name);
- }
- }
-
- // for (String name : removeNames) {
- // tables.remove(name);
- // }
- }
-
- public void clearTableMeta() {
- tableMetaCache.clear();
- }
-
- private TableMeta getTableMeta0(String fullname) throws IOException {
+ private TableMeta getTableMetaByDB(String fullname) throws IOException {
ResultSetPacket packet = connection.query("desc " + fullname);
- return new TableMeta(fullname, parserTableMeta(packet));
+ String[] names = StringUtils.split(fullname, "`.`");
+ String schema = names[0];
+ String table = names[1].substring(0, names[1].length());
+ return new TableMeta(schema, table, parserTableMeta(packet));
}
- private List parserTableMeta(ResultSetPacket packet) {
+ public static List parserTableMeta(ResultSetPacket packet) {
Map nameMaps = new HashMap(6, 1f);
int index = 0;
@@ -122,9 +100,13 @@ public class TableMetaCache {
// 做一个优化，使用String.intern()，共享String对象，减少内存使用
meta.setColumnName(packet.getFieldValues().get(nameMaps.get(COLUMN_NAME) + i * size).intern());
meta.setColumnType(packet.getFieldValues().get(nameMaps.get(COLUMN_TYPE) + i * size));
- meta.setIsNullable(packet.getFieldValues().get(nameMaps.get(IS_NULLABLE) + i * size));
- meta.setIskey(packet.getFieldValues().get(nameMaps.get(COLUMN_KEY) + i * size));
- meta.setDefaultValue(packet.getFieldValues().get(nameMaps.get(COLUMN_DEFAULT) + i * size));
+ meta.setNullable(StringUtils.equalsIgnoreCase(packet.getFieldValues().get(nameMaps.get(IS_NULLABLE) + i
+ * size),
+ "YES"));
+ meta.setKey("PRI".equalsIgnoreCase(packet.getFieldValues().get(nameMaps.get(COLUMN_KEY) + i * size)));
+ // 特殊处理引号
+ meta.setDefaultValue(DruidDdlParser.unescapeQuotaName(packet.getFieldValues()
+ .get(nameMaps.get(COLUMN_DEFAULT) + i * size)));
meta.setExtra(packet.getFieldValues().get(nameMaps.get(EXTRA) + i * size));
result.add(meta);
@@ -133,6 +115,98 @@ public class TableMetaCache {
return result;
}
+ public TableMeta getTableMeta(String schema, String table) {
+ return getTableMeta(schema, table, true);
+ }
+
+ public TableMeta getTableMeta(String schema, String table, boolean useCache) {
+ if (!useCache) {
+ tableMetaDB.invalidate(getFullName(schema, table));
+ }
+
+ return tableMetaDB.getUnchecked(getFullName(schema, table));
+ }
+
+ public TableMeta getTableMeta(String schema, String table, EntryPosition position) {
+ return getTableMeta(schema, table, true, position);
+ }
+
+ public TableMeta getTableMeta(String schema, String table, boolean useCache, EntryPosition position) {
+ TableMeta tableMeta = null;
+ if (tableMetaTSDB != null) {
+ tableMeta = tableMetaTSDB.find(schema, table);
+ if (tableMeta == null) {
+ // 因为条件变化，可能第一次的tableMeta没取到，需要从db获取一次，并记录到snapshot中
+ String fullName = getFullName(schema, table);
+ try {
+ ResultSetPacket packet = connection.query("show create table " + fullName);
+ String createDDL = null;
+ if (packet.getFieldValues().size() > 0) {
+ createDDL = packet.getFieldValues().get(1);
+ }
+ // 强制覆盖掉内存值
+ tableMetaTSDB.apply(position, schema, createDDL, "first");
+ tableMeta = tableMetaTSDB.find(schema, table);
+ } catch (IOException e) {
+ throw new CanalParseException("fetch failed by table meta:" + fullName, e);
+ }
+ }
+ return tableMeta;
+ } else {
+ if (!useCache) {
+ tableMetaDB.invalidate(getFullName(schema, table));
+ }
+
+ return tableMetaDB.getUnchecked(getFullName(schema, table));
+ }
+ }
+
+ public void clearTableMeta(String schema, String table) {
+ if (tableMetaTSDB != null) {
+ // tsdb不需要做,会基于ddl sql自动清理
+ } else {
+ tableMetaDB.invalidate(getFullName(schema, table));
+ }
+ }
+
+ public void clearTableMetaWithSchemaName(String schema) {
+ if (tableMetaTSDB != null) {
+ // tsdb不需要做,会基于ddl sql自动清理
+ } else {
+ for (String name : tableMetaDB.asMap().keySet()) {
+ if (StringUtils.startsWithIgnoreCase(name, schema + ".")) {
+ // removeNames.add(name);
+ tableMetaDB.invalidate(name);
+ }
+ }
+ }
+ }
+
+ public void clearTableMeta() {
+ if (tableMetaTSDB != null) {
+ // tsdb不需要做,会基于ddl sql自动清理
+ } else {
+ tableMetaDB.invalidateAll();
+ }
+ }
+
+ /**
+ * 更新一下本地的表结构内存
+ *
+ * @param position
+ * @param schema
+ * @param ddl
+ * @return
+ */
+ public boolean apply(EntryPosition position, String schema, String ddl, String extra) {
+ if (tableMetaTSDB != null) {
+ return tableMetaTSDB.apply(position, schema, ddl, extra);
+ } else {
+ // ignore
+ return true;
+ }
+ }
+
private String getFullName(String schema, String table) {
StringBuilder builder = new StringBuilder();
return builder.append('`')
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DdlResult.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DdlResult.java
new file mode 100644
index 00000000..9a7a5bb5
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DdlResult.java
@@ -0,0 +1,115 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.ddl;
+
+import com.alibaba.otter.canal.protocol.CanalEntry.EventType;
+
+/**
+ * @author agapple 2017年8月1日 下午7:30:42
+ * @since 3.2.5
+ */
+public class DdlResult {
+
+ private String schemaName;
+ private String tableName;
+ private String oriSchemaName; // rename ddl中的源表
+ private String oriTableName; // rename ddl中的目标表
+ private EventType type;
+ private DdlResult renameTableResult; // 多个rename table的存储
+
+ /*
+ * RENAME TABLE tbl_name TO new_tbl_name [, tbl_name2 TO new_tbl_name2] ...
+ */
+
+ public DdlResult(){
+ }
+
+ public DdlResult(String schemaName){
+ this.schemaName = schemaName;
+ }
+
+ public DdlResult(String schemaName, String tableName){
+ this.schemaName = schemaName;
+ this.tableName = tableName;
+ }
+
+ public DdlResult(String schemaName, String tableName, String oriSchemaName, String oriTableName){
+ this.schemaName = schemaName;
+ this.tableName = tableName;
+ this.oriSchemaName = oriSchemaName;
+ this.oriTableName = oriTableName;
+ }
+
+ public String getSchemaName() {
+ return schemaName;
+ }
+
+ public void setSchemaName(String schemaName) {
+ this.schemaName = schemaName;
+ }
+
+ public String getTableName() {
+ return tableName;
+ }
+
+ public void setTableName(String tableName) {
+ this.tableName = tableName;
+ }
+
+ public EventType getType() {
+ return type;
+ }
+
+ public void setType(EventType type) {
+ this.type = type;
+ }
+
+ public String getOriSchemaName() {
+ return oriSchemaName;
+ }
+
+ public void setOriSchemaName(String oriSchemaName) {
+ this.oriSchemaName = oriSchemaName;
+ }
+
+ public String getOriTableName() {
+ return oriTableName;
+ }
+
+ public void setOriTableName(String oriTableName) {
+ this.oriTableName = oriTableName;
+ }
+
+ public DdlResult getRenameTableResult() {
+ return renameTableResult;
+ }
+
+ public void setRenameTableResult(DdlResult renameTableResult) {
+ this.renameTableResult = renameTableResult;
+ }
+
+ @Override
+ public DdlResult clone() {
+ DdlResult result = new DdlResult();
+ result.setOriSchemaName(oriSchemaName);
+ result.setOriTableName(oriTableName);
+ result.setSchemaName(schemaName);
+ result.setTableName(tableName);
+ // result.setType(type);
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ DdlResult ddlResult = this;
+ StringBuffer sb = new StringBuffer();
+ do {
+ sb.append(String.format("DdlResult [schemaName=%s , tableName=%s , oriSchemaName=%s , oriTableName=%s , type=%s ];",
+ ddlResult.schemaName,
+ ddlResult.tableName,
+ ddlResult.oriSchemaName,
+ ddlResult.oriTableName,
+ ddlResult.type));
+ ddlResult = ddlResult.renameTableResult;
+ } while (ddlResult != null);
+ return sb.toString();
+ }
+}
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
new file mode 100644
index 00000000..64ddc722
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java
@@ -0,0 +1,213 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.ddl;
+
+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.otter.canal.protocol.CanalEntry.EventType;
+
+/**
+ * @author agapple 2017年7月27日 下午4:05:34
+ * @since 1.0.25
+ */
+public class DruidDdlParser {
+
+ public static List parse(String queryString, String schmeaName) {
+ List stmtList = null;
+ try {
+ stmtList = SQLUtils.parseStatements(queryString, JdbcConstants.MYSQL, false);
+ } catch (ParserException e) {
+ // 可能存在一些SQL是不支持的，比如存储过程
+ DdlResult ddlResult = new DdlResult();
+ ddlResult.setType(EventType.QUERY);
+ return Arrays.asList(ddlResult);
+ }
+
+ List ddlResults = new ArrayList();
+ for (SQLStatement statement : stmtList) {
+ if (statement instanceof SQLCreateTableStatement) {
+ DdlResult ddlResult = new DdlResult();
+ SQLCreateTableStatement createTable = (SQLCreateTableStatement) statement;
+ processName(ddlResult, schmeaName, createTable.getName(), false);
+ ddlResult.setType(EventType.CREATE);
+ ddlResults.add(ddlResult);
+ } else if (statement instanceof SQLAlterTableStatement) {
+ SQLAlterTableStatement alterTable = (SQLAlterTableStatement) statement;
+ for (SQLAlterTableItem item : alterTable.getItems()) {
+ if (item instanceof SQLAlterTableRename) {
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, alterTable.getName(), true);
+ processName(ddlResult, schmeaName, ((SQLAlterTableRename) item).getToName(), false);
+ ddlResults.add(ddlResult);
+ } else if (item instanceof SQLAlterTableAddIndex) {
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, alterTable.getName(), false);
+ ddlResult.setType(EventType.CINDEX);
+ ddlResults.add(ddlResult);
+ } else if (item instanceof SQLAlterTableDropIndex || item instanceof SQLAlterTableDropKey) {
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, alterTable.getName(), false);
+ ddlResult.setType(EventType.DINDEX);
+ ddlResults.add(ddlResult);
+ } else if (item instanceof SQLAlterTableAddConstraint) {
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, alterTable.getName(), false);
+ SQLConstraint constraint = ((SQLAlterTableAddConstraint) item).getConstraint();
+ if (constraint instanceof SQLUnique) {
+ ddlResult.setType(EventType.CINDEX);
+ ddlResults.add(ddlResult);
+ }
+ } else if (item instanceof SQLAlterTableDropConstraint) {
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, alterTable.getName(), false);
+ ddlResult.setType(EventType.DINDEX);
+ ddlResults.add(ddlResult);
+ } else {
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, alterTable.getName(), false);
+ ddlResult.setType(EventType.ALTER);
+ ddlResults.add(ddlResult);
+ }
+ }
+ } else if (statement instanceof SQLDropTableStatement) {
+ SQLDropTableStatement dropTable = (SQLDropTableStatement) statement;
+ for (SQLExprTableSource tableSource : dropTable.getTableSources()) {
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, tableSource.getExpr(), false);
+ ddlResult.setType(EventType.ERASE);
+ ddlResults.add(ddlResult);
+ }
+ } else if (statement instanceof SQLCreateIndexStatement) {
+ SQLCreateIndexStatement createIndex = (SQLCreateIndexStatement) statement;
+ SQLTableSource tableSource = createIndex.getTable();
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, ((SQLExprTableSource) tableSource).getExpr(), false);
+ ddlResult.setType(EventType.CINDEX);
+ ddlResults.add(ddlResult);
+ } else if (statement instanceof SQLDropIndexStatement) {
+ SQLDropIndexStatement dropIndex = (SQLDropIndexStatement) statement;
+ SQLExprTableSource tableSource = dropIndex.getTableName();
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, tableSource.getExpr(), false);
+ ddlResult.setType(EventType.DINDEX);
+ ddlResults.add(ddlResult);
+ } else if (statement instanceof SQLTruncateStatement) {
+ SQLTruncateStatement truncate = (SQLTruncateStatement) statement;
+ for (SQLExprTableSource tableSource : truncate.getTableSources()) {
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, tableSource.getExpr(), false);
+ ddlResult.setType(EventType.TRUNCATE);
+ ddlResults.add(ddlResult);
+ }
+ } else if (statement instanceof MySqlRenameTableStatement) {
+ MySqlRenameTableStatement rename = (MySqlRenameTableStatement) statement;
+ for (Item item : rename.getItems()) {
+ DdlResult ddlResult = new DdlResult();
+ processName(ddlResult, schmeaName, item.getName(), true);
+ processName(ddlResult, schmeaName, item.getTo(), false);
+ ddlResult.setType(EventType.RENAME);
+ ddlResults.add(ddlResult);
+ }
+ } else if (statement instanceof SQLInsertStatement) {
+ DdlResult ddlResult = new DdlResult();
+ SQLInsertStatement insert = (SQLInsertStatement) statement;
+ processName(ddlResult, schmeaName, insert.getTableName(), false);
+ ddlResult.setType(EventType.INSERT);
+ ddlResults.add(ddlResult);
+ } else if (statement instanceof SQLUpdateStatement) {
+ DdlResult ddlResult = new DdlResult();
+ SQLUpdateStatement update = (SQLUpdateStatement) statement;
+ // 拿到的表名可能为null,比如update a,b set a.id=x
+ processName(ddlResult, schmeaName, update.getTableName(), false);
+ ddlResult.setType(EventType.UPDATE);
+ ddlResults.add(ddlResult);
+ } else if (statement instanceof SQLDeleteStatement) {
+ DdlResult ddlResult = new DdlResult();
+ SQLDeleteStatement delete = (SQLDeleteStatement) statement;
+ // 拿到的表名可能为null,比如delete a,b from a where a.id = b.id
+ processName(ddlResult, schmeaName, delete.getTableName(), false);
+ ddlResult.setType(EventType.DELETE);
+ ddlResults.add(ddlResult);
+ }
+ }
+
+ return ddlResults;
+ }
+
+ private static void processName(DdlResult ddlResult, String schema, SQLExpr sqlName, boolean isOri) {
+ if (sqlName == null) {
+ return;
+ }
+
+ String table = null;
+ if (sqlName instanceof SQLPropertyExpr) {
+ SQLIdentifierExpr owner = (SQLIdentifierExpr) ((SQLPropertyExpr) sqlName).getOwner();
+ schema = unescapeName(owner.getName());
+ table = unescapeName(((SQLPropertyExpr) sqlName).getName());
+ } else if (sqlName instanceof SQLIdentifierExpr) {
+ table = unescapeName(((SQLIdentifierExpr) sqlName).getName());
+ }
+
+ if (isOri) {
+ ddlResult.setOriSchemaName(schema);
+ ddlResult.setOriTableName(table);
+ } else {
+ ddlResult.setSchemaName(schema);
+ ddlResult.setTableName(table);
+ }
+ }
+
+ public static String unescapeName(String name) {
+ if (name != null && name.length() > 2) {
+ char c0 = name.charAt(0);
+ char x0 = name.charAt(name.length() - 1);
+ if ((c0 == '"' && x0 == '"') || (c0 == '`' && x0 == '`')) {
+ return name.substring(1, name.length() - 1);
+ }
+ }
+
+ return name;
+ }
+
+ public static String unescapeQuotaName(String name) {
+ if (name != null && name.length() > 2) {
+ char c0 = name.charAt(0);
+ char x0 = name.charAt(name.length() - 1);
+ if (c0 == '\'' && x0 == '\'') {
+ return name.substring(1, name.length() - 1);
+ }
+ }
+
+ return name;
+ }
+
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/SimpleDdlParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/SimpleDdlParser.java
similarity index 73%
rename from parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/SimpleDdlParser.java
rename to parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/SimpleDdlParser.java
index c6342bff..53f7de82 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/SimpleDdlParser.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/SimpleDdlParser.java
@@ -1,4 +1,4 @@
-package com.alibaba.otter.canal.parse.inbound.mysql.dbsync;
+package com.alibaba.otter.canal.parse.inbound.mysql.ddl;
import org.apache.commons.lang.StringUtils;
import org.apache.oro.text.regex.Perl5Matcher;
@@ -218,102 +218,4 @@ public class SimpleDdlParser {
sql = sb.toString();
}
}
-
- public static class DdlResult {
-
- private String schemaName;
- private String tableName;
- private String oriSchemaName; // rename ddl中的源表
- private String oriTableName; // rename ddl中的目标表
- private EventType type;
- private DdlResult renameTableResult; // 多个rename table的存储
-
- /*
- * RENAME TABLE tbl_name TO new_tbl_name [, tbl_name2 TO new_tbl_name2]
- * ...
- */
-
- public DdlResult(){
- }
-
- public DdlResult(String schemaName){
- this.schemaName = schemaName;
- }
-
- public DdlResult(String schemaName, String tableName){
- this.schemaName = schemaName;
- this.tableName = tableName;
- }
-
- public DdlResult(String schemaName, String tableName, String oriSchemaName, String oriTableName){
- this.schemaName = schemaName;
- this.tableName = tableName;
- this.oriSchemaName = oriSchemaName;
- this.oriTableName = oriTableName;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
- }
-
- public String getTableName() {
- return tableName;
- }
-
- public void setTableName(String tableName) {
- this.tableName = tableName;
- }
-
- public EventType getType() {
- return type;
- }
-
- public void setType(EventType type) {
- this.type = type;
- }
-
- public String getOriSchemaName() {
- return oriSchemaName;
- }
-
- public void setOriSchemaName(String oriSchemaName) {
- this.oriSchemaName = oriSchemaName;
- }
-
- public String getOriTableName() {
- return oriTableName;
- }
-
- public void setOriTableName(String oriTableName) {
- this.oriTableName = oriTableName;
- }
-
- public DdlResult getRenameTableResult() {
- return renameTableResult;
- }
-
- public void setRenameTableResult(DdlResult renameTableResult) {
- this.renameTableResult = renameTableResult;
- }
-
- @Override
- public String toString() {
- DdlResult ddlResult = this;
- StringBuffer sb = new StringBuffer();
- do {
- sb.append(String.format("DdlResult [schemaName=%s , tableName=%s , oriSchemaName=%s , oriTableName=%s , type=%s ];",
- ddlResult.schemaName,
- ddlResult.tableName,
- ddlResult.oriSchemaName,
- ddlResult.oriTableName,
- ddlResult.type));
- ddlResult = ddlResult.renameTableResult;
- } while (ddlResult != null);
- return sb.toString();
- }
- }
}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/HttpHelper.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/HttpHelper.java
new file mode 100644
index 00000000..7b641ade
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/HttpHelper.java
@@ -0,0 +1,368 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.rds;
+
+import static org.apache.http.client.config.RequestConfig.custom;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.net.ssl.SSLContext;
+
+import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.CookieStore;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.cookie.Cookie;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.ssl.TrustStrategy;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Lists;
+
+public class HttpHelper {
+
+ protected static final Logger logger = LoggerFactory.getLogger(HttpHelper.class);
+
+ public static byte[] getBytes(String url, int timeout) throws Exception {
+ long start = System.currentTimeMillis();
+ HttpClientBuilder builder = HttpClientBuilder.create();
+ builder.setMaxConnPerRoute(50);
+ builder.setMaxConnTotal(100);
+ CloseableHttpClient httpclient = builder.build();
+ URI uri = new URIBuilder(url).build();
+ RequestConfig config = custom().setConnectTimeout(timeout)
+ .setConnectionRequestTimeout(timeout)
+ .setSocketTimeout(timeout)
+ .build();
+ HttpGet httpGet = new HttpGet(uri);
+ HttpClientContext context = HttpClientContext.create();
+ context.setRequestConfig(config);
+ CloseableHttpResponse response = httpclient.execute(httpGet, context);
+ try {
+ int statusCode = response.getStatusLine().getStatusCode();
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ if (logger.isWarnEnabled()) {
+ logger.warn("post " + url + ", cost : " + cost);
+ }
+ if (statusCode == HttpStatus.SC_OK) {
+ return EntityUtils.toByteArray(response.getEntity());
+ } else {
+ String errorMsg = EntityUtils.toString(response.getEntity());
+ throw new RuntimeException("requestGet remote error, url=" + uri.toString() + ", code=" + statusCode
+ + ", error msg=" + errorMsg);
+ }
+ } finally {
+ response.close();
+ httpGet.releaseConnection();
+ }
+ }
+
+ public static String get(String url, int timeout) {
+ // logger.info("get url is :" + url);
+ // 支持采用https协议，忽略证书
+ url = url.trim();
+ if (url.startsWith("https")) {
+ return getIgnoreCerf(url, null, null, timeout);
+ }
+ long start = System.currentTimeMillis();
+ HttpClientBuilder builder = HttpClientBuilder.create();
+ builder.setMaxConnPerRoute(50);
+ builder.setMaxConnTotal(100);
+ CloseableHttpClient httpclient = builder.build();
+ CloseableHttpResponse response = null;
+ HttpGet httpGet = null;
+ try {
+ URI uri = new URIBuilder(url).build();
+ RequestConfig config = custom().setConnectTimeout(timeout)
+ .setConnectionRequestTimeout(timeout)
+ .setSocketTimeout(timeout)
+ .build();
+ httpGet = new HttpGet(uri);
+ HttpClientContext context = HttpClientContext.create();
+ context.setRequestConfig(config);
+ response = httpclient.execute(httpGet, context);
+ int statusCode = response.getStatusLine().getStatusCode();
+ if (statusCode == HttpStatus.SC_OK) {
+ return EntityUtils.toString(response.getEntity());
+ } else {
+ String errorMsg = EntityUtils.toString(response.getEntity());
+ throw new RuntimeException("requestGet remote error, url=" + uri.toString() + ", code=" + statusCode
+ + ", error msg=" + errorMsg);
+ }
+ } catch (Throwable t) {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ String curlRequest = getCurlRequest(url, null, null, cost);
+ throw new RuntimeException("requestGet remote error, request : " + curlRequest, t);
+ } finally {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ printCurlRequest(url, null, null, cost);
+ if (response != null) {
+ try {
+ response.close();
+ } catch (IOException e) {
+ }
+ }
+ httpGet.releaseConnection();
+ }
+ }
+
+ private static String getIgnoreCerf(String url, CookieStore cookieStore, Map params, int timeout) {
+ long start = System.currentTimeMillis();
+ HttpClientBuilder builder = HttpClientBuilder.create();
+ builder.setMaxConnPerRoute(50);
+ builder.setMaxConnTotal(100);
+ HttpGet httpGet = null;
+ CloseableHttpResponse response = null;
+ try {
+ // 创建支持忽略证书的https
+ final SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+
+ @Override
+ public boolean isTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+ return true;
+ }
+ }).build();
+
+ CloseableHttpClient httpClient = HttpClientBuilder.create()
+ .setSSLContext(sslContext)
+ .setConnectionManager(new PoolingHttpClientConnectionManager(RegistryBuilder. create()
+ .register("http", PlainConnectionSocketFactory.INSTANCE)
+ .register("https", new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE))
+ .build()))
+ .build();
+ // ---------------- 创建支持https 的client成功---------
+
+ URI uri = new URIBuilder(url).build();
+ RequestConfig config = custom().setConnectTimeout(timeout)
+ .setConnectionRequestTimeout(timeout)
+ .setSocketTimeout(timeout)
+ .build();
+ httpGet = new HttpGet(uri);
+ HttpClientContext context = HttpClientContext.create();
+ context.setRequestConfig(config);
+ response = httpClient.execute(httpGet, context);
+ int statusCode = response.getStatusLine().getStatusCode();
+ if (statusCode == HttpStatus.SC_OK) {
+ return EntityUtils.toString(response.getEntity());
+ } else {
+ String errorMsg = EntityUtils.toString(response.getEntity());
+ throw new RuntimeException("requestGet remote error, url=" + uri.toString() + ", code=" + statusCode
+ + ", error msg=" + errorMsg);
+ }
+ } catch (Throwable t) {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ String curlRequest = getCurlRequest(url, cookieStore, params, cost);
+ throw new RuntimeException("requestPost(Https) remote error, request : " + curlRequest, t);
+ } finally {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ printCurlRequest(url, null, null, cost);
+ if (response != null) {
+ try {
+ response.close();
+ } catch (IOException e) {
+ }
+ }
+ if (httpGet != null) {
+ httpGet.releaseConnection();
+ }
+ }
+ }
+
+ private static String postIgnoreCerf(String url, CookieStore cookieStore, Map params, int timeout) {
+ long start = System.currentTimeMillis();
+ HttpClientBuilder builder = HttpClientBuilder.create();
+ builder.setMaxConnPerRoute(50);
+ builder.setMaxConnTotal(100);
+ HttpPost httpPost = null;
+ CloseableHttpResponse response = null;
+ try {
+ // 创建支持忽略证书的https
+ final SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+
+ @Override
+ public boolean isTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+ return true;
+ }
+ }).build();
+
+ CloseableHttpClient httpClient = HttpClientBuilder.create()
+ .setSSLContext(sslContext)
+ .setConnectionManager(new PoolingHttpClientConnectionManager(RegistryBuilder. create()
+ .register("http", PlainConnectionSocketFactory.INSTANCE)
+ .register("https", new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE))
+ .build()))
+ .build();
+ // ---------------- 创建支持https 的client成功---------
+
+ URI uri = new URIBuilder(url).build();
+ RequestConfig config = custom().setConnectTimeout(timeout)
+ .setConnectionRequestTimeout(timeout)
+ .setSocketTimeout(timeout)
+ .build();
+ httpPost = new HttpPost(uri);
+ List parameters = Lists.newArrayList();
+ for (String key : params.keySet()) {
+ NameValuePair nameValuePair = new BasicNameValuePair(key, params.get(key));
+ parameters.add(nameValuePair);
+ }
+ httpPost.setEntity(new UrlEncodedFormEntity(parameters, Charset.forName("UTF-8")));
+ HttpClientContext context = HttpClientContext.create();
+ context.setRequestConfig(config);
+ context.setCookieStore(cookieStore);
+
+ response = httpClient.execute(httpPost, context);
+ int statusCode = response.getStatusLine().getStatusCode();
+ if (statusCode == HttpStatus.SC_OK) {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ printCurlRequest(url, cookieStore, params, cost);
+ return EntityUtils.toString(response.getEntity());
+ } else {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ String curlRequest = getCurlRequest(url, cookieStore, params, cost);
+ throw new RuntimeException("requestPost(Https) remote error, request : " + curlRequest
+ + ", statusCode=" + statusCode + "");
+ }
+ } catch (Throwable t) {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ String curlRequest = getCurlRequest(url, cookieStore, params, cost);
+ throw new RuntimeException("requestPost(Https) remote error, request : " + curlRequest, t);
+ } finally {
+ if (response != null) {
+ try {
+ response.close();
+ } catch (IOException e) {
+ }
+ }
+ if (httpPost != null) {
+ httpPost.releaseConnection();
+ }
+ }
+ }
+
+ public static String post(String url, CookieStore cookieStore, Map params, int timeout) {
+ url = url.trim();
+ // 支持采用https协议，忽略证书
+ if (url.startsWith("https")) {
+ return postIgnoreCerf(url, cookieStore, params, timeout);
+ }
+ long start = System.currentTimeMillis();
+ HttpClientBuilder builder = HttpClientBuilder.create();
+ builder.setMaxConnPerRoute(50);
+ builder.setMaxConnTotal(100);
+ HttpPost httpPost = null;
+ CloseableHttpResponse response = null;
+ try {
+ CloseableHttpClient httpclient = builder.build();
+ URI uri = new URIBuilder(url).build();
+ RequestConfig config = custom().setConnectTimeout(timeout)
+ .setConnectionRequestTimeout(timeout)
+ .setSocketTimeout(timeout)
+ .build();
+ httpPost = new HttpPost(uri);
+ List parameters = Lists.newArrayList();
+ for (String key : params.keySet()) {
+ NameValuePair nameValuePair = new BasicNameValuePair(key, params.get(key));
+ parameters.add(nameValuePair);
+ }
+ httpPost.setEntity(new UrlEncodedFormEntity(parameters, Charset.forName("UTF-8")));
+ HttpClientContext context = HttpClientContext.create();
+ context.setRequestConfig(config);
+ context.setCookieStore(cookieStore);
+
+ response = httpclient.execute(httpPost, context);
+ int statusCode = response.getStatusLine().getStatusCode();
+ if (statusCode == HttpStatus.SC_OK) {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ printCurlRequest(url, cookieStore, params, cost);
+ return EntityUtils.toString(response.getEntity());
+ } else {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ String curlRequest = getCurlRequest(url, cookieStore, params, cost);
+ throw new RuntimeException("requestPost remote error, request : " + curlRequest + ", statusCode="
+ + statusCode + ";" + EntityUtils.toString(response.getEntity()));
+ }
+ } catch (Throwable t) {
+ long end = System.currentTimeMillis();
+ long cost = end - start;
+ String curlRequest = getCurlRequest(url, cookieStore, params, cost);
+ throw new RuntimeException("requestPost remote error, request : " + curlRequest, t);
+ } finally {
+ if (response != null) {
+ try {
+ response.close();
+ } catch (IOException e) {
+ }
+ }
+ if (httpPost != null) {
+ httpPost.releaseConnection();
+ }
+ }
+ }
+
+ public static void printCurlRequest(String url, CookieStore cookieStore, Map params, long cost) {
+ logger.warn(getCurlRequest(url, cookieStore, params, cost));
+ }
+
+ private static String getCurlRequest(String url, CookieStore cookieStore, Map params, long cost) {
+ if (params == null) {
+ return "curl '" + url + "'\ncost : " + cost;
+ } else {
+ StringBuilder paramsStr = new StringBuilder();
+ Iterator> iterator = params.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry entry = iterator.next();
+ paramsStr.append(entry.getKey() + "=" + entry.getValue());
+ if (iterator.hasNext()) {
+ paramsStr.append("&");
+ }
+ }
+ if (cookieStore == null) {
+ return "curl '" + url + "' -d '" + paramsStr.toString() + "'\ncost : " + cost;
+ } else {
+ StringBuilder cookieStr = new StringBuilder();
+ List cookies = cookieStore.getCookies();
+ Iterator iteratorCookie = cookies.iterator();
+ while (iteratorCookie.hasNext()) {
+ Cookie cookie = iteratorCookie.next();
+ cookieStr.append(cookie.getName() + "=" + cookie.getValue());
+ if (iteratorCookie.hasNext()) {
+ cookieStr.append(";");
+ }
+ }
+ return "curl '" + url + "' -b '" + cookieStr + "' -d '" + paramsStr.toString() + "'\ncost : " + cost;
+ }
+ }
+ }
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/RdsBinlogOpenApi.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/RdsBinlogOpenApi.java
new file mode 100644
index 00000000..eb638739
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/RdsBinlogOpenApi.java
@@ -0,0 +1,334 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.rds;
+
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.TreeMap;
+import java.util.UUID;
+
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * @author agapple 2017年10月14日 下午1:53:52
+ * @since 1.0.25
+ */
+public class RdsBinlogOpenApi {
+
+ protected static final Logger logger = LoggerFactory.getLogger(RdsBinlogOpenApi.class);
+ private static final String ISO8601_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+ private static final int TIMEOUT = 10000;
+ private static final String ENCODING = "UTF-8";
+ private static final String MAC_NAME = "HmacSHA1";
+ private static final String API_VERSION = "2014-08-15";
+ private static final String SIGNATURE_VERSION = "1.0";
+
+ public static void downloadBinlogFiles(String url, String ak, String sk, String dbInstanceId, Date startTime,
+ Date endTime, File destDir) throws Throwable {
+ int pageSize = 100;
+ int pageNumber = 0;
+ int pageRecordCount = 1;
+ String hostInstanceID = null;
+ while (pageRecordCount > 0 && pageRecordCount <= pageSize) {
+ pageNumber += 1;
+ String result = describeBinlogFiles(url, ak, sk, dbInstanceId, startTime, endTime, pageSize, pageNumber);
+ JSONObject jsobObj = JSON.parseObject(result);
+ pageRecordCount = jsobObj.getInteger("PageRecordCount");
+
+ if (pageRecordCount > 0) {
+ FileUtils.forceMkdir(destDir);
+ File hostIdFile = new File(destDir, "hostId");
+ if (hostIdFile.exists()) {
+ List lines = IOUtils.readLines(new FileInputStream(hostIdFile));
+ hostInstanceID = StringUtils.join(lines, "\n");
+ }
+
+ String itemStr = jsobObj.getString("Items");
+ JSONObject binLogFileObj = JSONObject.parseObject(itemStr);
+ JSONArray items = binLogFileObj.getJSONArray("BinLogFile");
+ if (items == null || items.isEmpty()) {
+ continue;
+ }
+ for (int i = 0; i < items.size(); i++) {
+ JSONObject item = (JSONObject) items.get(i);
+ String oneHostInstanceID = item.getString("HostInstanceID");
+ if (hostInstanceID == null) {
+ hostInstanceID = oneHostInstanceID;
+ FileOutputStream hostIdFileOut = null;
+ try {
+ hostIdFileOut = new FileOutputStream(hostIdFile);
+ hostIdFileOut.write(oneHostInstanceID.getBytes());
+ hostIdFileOut.flush();
+ } finally {
+ IOUtils.closeQuietly(hostIdFileOut);
+ }
+ }
+
+ if (hostInstanceID.equals(oneHostInstanceID)) { // 只选择一个host下载
+ String downloadLink = item.getString("DownloadLink");
+ String fileName = StringUtils.substringBetween(downloadLink, "mysql-bin.", ".tar");
+ if (StringUtils.isNotEmpty(fileName)) {
+ File currentFile = new File(destDir, "mysql-bin." + fileName);
+ if (currentFile.isFile() && currentFile.exists()) {
+ // 检查一下文件是否存在，存在就就没必要下载了
+ continue;
+ }
+ }
+
+ HttpGet httpGet = new HttpGet(downloadLink);
+ CloseableHttpClient httpClient = HttpClientBuilder.create()
+ .setMaxConnPerRoute(50)
+ .setMaxConnTotal(100)
+ .build();
+ RequestConfig requestConfig = RequestConfig.custom()
+ .setConnectTimeout(TIMEOUT)
+ .setConnectionRequestTimeout(TIMEOUT)
+ .setSocketTimeout(TIMEOUT)
+ .build();
+ httpGet.setConfig(requestConfig);
+ HttpResponse response = httpClient.execute(httpGet);
+ int statusCode = response.getStatusLine().getStatusCode();
+ if (statusCode != HttpResponseStatus.OK.code()) {
+ throw new RuntimeException("download failed , url:" + downloadLink + " , statusCode:"
+ + statusCode);
+ }
+ saveFile(destDir, response);
+ }
+ }
+ }
+ }
+ }
+
+ private static void saveFile(File parentFile, HttpResponse response) throws IOException {
+ InputStream is = response.getEntity().getContent();
+ long totalSize = Long.parseLong(response.getFirstHeader("Content-Length").getValue());
+ String fileName = response.getFirstHeader("Content-Disposition").getValue();
+ fileName = StringUtils.substringAfter(fileName, "filename=");
+ boolean isTar = StringUtils.endsWith(fileName, ".tar");
+ FileUtils.forceMkdir(parentFile);
+ FileOutputStream fos = null;
+ try {
+ if (isTar) {
+ TarArchiveInputStream tais = new TarArchiveInputStream(is);
+ TarArchiveEntry tarArchiveEntry = null;
+ while ((tarArchiveEntry = tais.getNextTarEntry()) != null) {
+ String name = tarArchiveEntry.getName();
+ File tarFile = new File(parentFile, name);
+ logger.info("start to download file " + tarFile.getName());
+ BufferedOutputStream bos = null;
+ try {
+ bos = new BufferedOutputStream(new FileOutputStream(tarFile));
+ int read = -1;
+ byte[] buffer = new byte[1024];
+ while ((read = tais.read(buffer)) != -1) {
+ bos.write(buffer, 0, read);
+ }
+ logger.info("download file " + tarFile.getName() + " end!");
+ } finally {
+ IOUtils.closeQuietly(bos);
+ }
+ }
+ tais.close();
+ } else {
+ File file = new File(parentFile, fileName);
+ if (!file.isFile()) {
+ file.createNewFile();
+ }
+ try {
+ fos = new FileOutputStream(file);
+ byte[] buffer = new byte[1024];
+ int len;
+ long copySize = 0;
+ long nextPrintProgress = 0;
+ logger.info("start to download file " + file.getName());
+ while ((len = is.read(buffer)) != -1) {
+ fos.write(buffer, 0, len);
+ copySize += len;
+ long progress = copySize * 100 / totalSize;
+ if (progress >= nextPrintProgress) {
+ logger.info("download " + file.getName() + " progress : " + progress
+ + "% , download size : " + copySize + ", total size : " + totalSize);
+ nextPrintProgress += 10;
+ }
+ }
+ logger.info("download file " + file.getName() + " end!");
+ fos.flush();
+ } finally {
+ IOUtils.closeQuietly(fos);
+ }
+ }
+ } finally {
+ IOUtils.closeQuietly(fos);
+ }
+ }
+
+ public static String describeBinlogFiles(String url, String ak, String sk, String dbInstanceId, Date startTime,
+ Date endTime, int pageSize, int pageNumber) throws Exception {
+ Map paramMap = new HashMap();
+ paramMap.put("Action", "DescribeBinlogFiles");
+ paramMap.put("DBInstanceId", dbInstanceId); // rds实例id
+ paramMap.put("StartTime", formatIso8601Date(startTime));
+ paramMap.put("EndTime", formatIso8601Date(endTime));
+ paramMap.put("PageSize", String.valueOf(pageSize));
+ paramMap.put("PageNumber", String.valueOf(pageNumber));
+ return doRequest(url, paramMap, ak, sk);
+ }
+
+ private static String doRequest(String domin, Map param, String ak, String sk) throws Exception {
+ param.put("AccessKeyId", ak);
+ param.put("SignatureMethod", "HMAC-SHA1");
+ param.put("SignatureVersion", SIGNATURE_VERSION);
+ param.put("Version", API_VERSION);
+ param.put("SignatureNonce", UUID.randomUUID().toString());
+ param.put("Format", "JSON");
+ param.put("Timestamp", formatIso8601Date(new Date()));
+ String signStr = generate("POST", param, sk);
+ param.put("Signature", signStr);
+ String request = concatQueryString(param);
+ String url = domin + "?" + request;
+ String result = HttpHelper.post(url, null, Collections.EMPTY_MAP, TIMEOUT);
+ return result;
+ }
+
+ public static String concatQueryString(Map parameters) throws UnsupportedEncodingException {
+ if (null == parameters) {
+ return null;
+ }
+ StringBuilder urlBuilder = new StringBuilder("");
+ for (Map.Entry entry : parameters.entrySet()) {
+ String key = entry.getKey();
+ String val = entry.getValue();
+ urlBuilder.append(encode(key));
+ if (val != null) {
+ urlBuilder.append("=").append(encode(val));
+ }
+ urlBuilder.append("&");
+ }
+ int strIndex = urlBuilder.length();
+ if (parameters.size() > 0) {
+ urlBuilder.deleteCharAt(strIndex - 1);
+ }
+ return urlBuilder.toString();
+ }
+
+ public static String encode(String value) throws UnsupportedEncodingException {
+ return URLEncoder.encode(value, "UTF-8");
+ }
+
+ private static String formatIso8601Date(Date date) {
+ SimpleDateFormat df = new SimpleDateFormat(ISO8601_DATE_FORMAT);
+ df.setTimeZone(TimeZone.getTimeZone("GMT"));
+ return df.format(date);
+ }
+
+ /**
+ * 使用 HMAC-SHA1 签名方法对对encryptText进行签名
+ *
+ * @param encryptText 被签名的字符串
+ * @param encryptKey 密钥
+ * @return
+ * @throws Exception
+ */
+ public static byte[] HmacSHA1Encrypt(String encryptText, String encryptKey) throws Exception {
+ byte[] data = encryptKey.getBytes(ENCODING);
+ // 根据给定的字节数组构造一个密钥,第二参数指定一个密钥算法的名称
+ SecretKey secretKey = new SecretKeySpec(data, MAC_NAME);
+ // 生成一个指定 Mac 算法 的 Mac 对象
+ Mac mac = Mac.getInstance(MAC_NAME);
+ // 用给定密钥初始化 Mac 对象
+ mac.init(secretKey);
+
+ byte[] text = encryptText.getBytes(ENCODING);
+ // 完成 Mac 操作
+ return mac.doFinal(text);
+ }
+
+ private static String base64(byte input[]) throws UnsupportedEncodingException {
+ return new String(Base64.encodeBase64(input), ENCODING);
+ }
+
+ /** 对参数名称和参数值进行URL编码 **/
+ public static String generate(String method, Map parameter, String accessKeySecret)
+ throws Exception {
+ String signString = generateSignString(method, parameter);
+ byte[] signBytes = HmacSHA1Encrypt(signString, accessKeySecret + "&");
+ String signature = base64(signBytes);
+ if ("POST".equals(method)) {
+ return signature;
+ }
+ return URLEncoder.encode(signature, "UTF-8");
+ }
+
+ private static String generateQueryString(TreeMap treeMap) {
+ StringBuilder canonicalizedQueryString = new StringBuilder();
+ boolean first = true;
+ for (String key : treeMap.navigableKeySet()) {
+ String value = treeMap.get(key);
+ if (!first) {
+ canonicalizedQueryString.append("&");
+ }
+ first = false;
+ canonicalizedQueryString.append(percentEncode(key)).append("=").append(percentEncode(value));
+ }
+ return canonicalizedQueryString.toString();
+ }
+
+ public static String generateSignString(String httpMethod, Map parameter) throws IOException {
+ TreeMap sortParameter = new TreeMap();
+ sortParameter.putAll(parameter);
+ String canonicalizedQueryString = generateQueryString(sortParameter);
+ if (null == httpMethod) {
+ throw new RuntimeException("httpMethod can not be empty");
+ }
+ /** 构造待签名的字符串* */
+ StringBuilder stringToSign = new StringBuilder();
+ stringToSign.append(httpMethod).append("&");
+ stringToSign.append(percentEncode("/")).append("&");
+ stringToSign.append(percentEncode(canonicalizedQueryString));
+ return stringToSign.toString();
+ }
+
+ public static String percentEncode(String value) {
+ try {
+ return value == null ? null : URLEncoder.encode(value, ENCODING)
+ .replaceAll("\\+", "%20")
+ .replaceAll("\\*", "%2A")
+ .replaceAll("%7E", "~");
+ } catch (Exception e) {
+ }
+ return "";
+ }
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/RdsLocalBinlogEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/RdsLocalBinlogEventParser.java
new file mode 100644
index 00000000..68be38e5
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/RdsLocalBinlogEventParser.java
@@ -0,0 +1,111 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.rds;
+
+import java.io.File;
+import java.util.Date;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.util.Assert;
+
+import com.alibaba.otter.canal.parse.CanalEventParser;
+import com.alibaba.otter.canal.parse.exception.CanalParseException;
+import com.alibaba.otter.canal.parse.inbound.mysql.LocalBinlogEventParser;
+import com.alibaba.otter.canal.protocol.position.EntryPosition;
+
+/**
+ * 基于rds binlog备份文件的复制
+ *
+ * @author agapple 2017年10月15日 下午1:27:36
+ * @since 1.0.25
+ */
+public class RdsLocalBinlogEventParser extends LocalBinlogEventParser implements CanalEventParser {
+
+ private String url = "https://rds.aliyuncs.com/"; // openapi地址
+ private String accesskey; // 云账号的ak
+ private String secretkey; // 云账号sk
+ private String instanceId; // rds实例id
+ private Long startTime;
+ private Long endTime;
+
+ public RdsLocalBinlogEventParser(){
+ }
+
+ public void start() throws CanalParseException {
+ try {
+ Assert.notNull(startTime);
+ Assert.notNull(accesskey);
+ Assert.notNull(secretkey);
+ Assert.notNull(instanceId);
+ Assert.notNull(url);
+ if (endTime == null) {
+ endTime = System.currentTimeMillis();
+ }
+
+ RdsBinlogOpenApi.downloadBinlogFiles(url,
+ accesskey,
+ secretkey,
+ instanceId,
+ new Date(startTime),
+ new Date(endTime),
+ new File(directory));
+
+ // 更新一下时间戳
+ masterPosition = new EntryPosition(startTime);
+ } catch (Throwable e) {
+ logger.error("download binlog failed", e);
+ throw new CanalParseException(e);
+ }
+
+ super.start();
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ if (StringUtils.isNotEmpty(url)) {
+ this.url = url;
+ }
+ }
+
+ public String getAccesskey() {
+ return accesskey;
+ }
+
+ public void setAccesskey(String accesskey) {
+ this.accesskey = accesskey;
+ }
+
+ public String getSecretkey() {
+ return secretkey;
+ }
+
+ public void setSecretkey(String secretkey) {
+ this.secretkey = secretkey;
+ }
+
+ public String getInstanceId() {
+ return instanceId;
+ }
+
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
+
+ public Long getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Long startTime) {
+ this.startTime = startTime;
+ }
+
+ public Long getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Long endTime) {
+ this.endTime = endTime;
+ }
+
+}
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
new file mode 100644
index 00000000..8c57b3ac
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java
@@ -0,0 +1,493 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+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.otter.canal.filter.CanalEventFilter;
+import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetPacket;
+import com.alibaba.otter.canal.parse.exception.CanalParseException;
+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.MysqlConnection;
+import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.TableMetaCache;
+import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DdlResult;
+import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DruidDdlParser;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao.MetaHistoryDAO;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao.MetaHistoryDO;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao.MetaSnapshotDAO;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao.MetaSnapshotDO;
+import com.alibaba.otter.canal.protocol.position.EntryPosition;
+
+/**
+ * 基于db远程管理 see internal class: CanalTableMeta , ConsoleTableMetaTSDB
+ *
+ * @author agapple 2017年7月27日 下午10:47:55
+ * @since 3.2.5
+ */
+public class DatabaseTableMeta implements TableMetaTSDB {
+
+ private static Logger logger = LoggerFactory.getLogger(DatabaseTableMeta.class);
+ private static Pattern pattern = Pattern.compile("Duplicate entry '.*' for key '*'");
+ private static Pattern h2Pattern = Pattern.compile("Unique index or primary key violation");
+ private static final EntryPosition INIT_POSITION = new EntryPosition("0", 0L, -2L, -1L);
+ private String destination;
+ private MemoryTableMeta memoryTableMeta;
+ private MysqlConnection connection; // 查询meta信息的链接
+ private CanalEventFilter filter;
+ private CanalEventFilter blackFilter;
+ private EntryPosition lastPosition;
+ private ScheduledExecutorService scheduler;
+ private MetaHistoryDAO metaHistoryDAO;
+ private MetaSnapshotDAO metaSnapshotDAO;
+
+ public DatabaseTableMeta(){
+
+ }
+
+ @Override
+ public boolean init(final String destination) {
+ this.destination = destination;
+ this.memoryTableMeta = new MemoryTableMeta();
+ this.scheduler = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+
+ @Override
+ public Thread newThread(Runnable r) {
+ return new Thread(r, "[scheduler-table-meta-snapshot]");
+ }
+ });
+
+ // 24小时生成一份snapshot
+ scheduler.scheduleWithFixedDelay(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ MDC.put("destination", destination);
+ applySnapshotToDB(lastPosition, false);
+ } catch (Throwable e) {
+ logger.error("scheudle applySnapshotToDB faield", e);
+ }
+ }
+ }, 24, 24, TimeUnit.HOURS);
+ return true;
+ }
+
+ @Override
+ public TableMeta find(String schema, String table) {
+ synchronized (memoryTableMeta) {
+ return memoryTableMeta.find(schema, table);
+ }
+ }
+
+ @Override
+ public boolean apply(EntryPosition position, String schema, String ddl, String extra) {
+ // 首先记录到内存结构
+ synchronized (memoryTableMeta) {
+ if (memoryTableMeta.apply(position, schema, ddl, extra)) {
+ this.lastPosition = position;
+ // 同步每次变更给远程做历史记录
+ return applyHistoryToDB(position, schema, ddl, extra);
+ } else {
+ throw new RuntimeException("apply to memory is failed");
+ }
+ }
+ }
+
+ @Override
+ public boolean rollback(EntryPosition position) {
+ // 每次rollback需要重新构建一次memory data
+ this.memoryTableMeta = new MemoryTableMeta();
+ boolean flag = false;
+ EntryPosition snapshotPosition = buildMemFromSnapshot(position);
+ if (snapshotPosition != null) {
+ applyHistoryOnMemory(snapshotPosition, position);
+ flag = true;
+ }
+
+ if (!flag) {
+ // 如果没有任何数据，则为初始化状态，全量dump一份关注的表
+ if (dumpTableMeta(connection, filter)) {
+ // 记录一下snapshot结果,方便快速恢复
+ flag = applySnapshotToDB(INIT_POSITION, true);
+ }
+ }
+
+ return flag;
+ }
+
+ @Override
+ public Map snapshot() {
+ return memoryTableMeta.snapshot();
+ }
+
+ /**
+ * 初始化的时候dump一下表结构
+ */
+ private boolean dumpTableMeta(MysqlConnection connection, final CanalEventFilter filter) {
+ try {
+ ResultSetPacket packet = connection.query("show databases");
+ List schemas = new ArrayList();
+ for (String schema : packet.getFieldValues()) {
+ schemas.add(schema);
+ }
+
+ for (String schema : schemas) {
+ packet = connection.query("show tables from `" + schema + "`");
+ List tables = new ArrayList();
+ for (String table : packet.getFieldValues()) {
+ String fullName = schema + "." + table;
+ if (blackFilter == null || !blackFilter.filter(fullName)) {
+ if (filter == null || filter.filter(fullName)) {
+ tables.add(table);
+ }
+ }
+ }
+
+ if (tables.isEmpty()) {
+ continue;
+ }
+
+ StringBuilder sql = new StringBuilder();
+ for (String table : tables) {
+ sql.append("show create table `" + schema + "`.`" + table + "`;");
+ }
+
+ List packets = connection.queryMulti(sql.toString());
+ for (ResultSetPacket onePacket : packets) {
+ if (onePacket.getFieldValues().size() > 1) {
+ String oneTableCreateSql = onePacket.getFieldValues().get(1);
+ memoryTableMeta.apply(INIT_POSITION, schema, oneTableCreateSql, null);
+ }
+ }
+ }
+
+ return true;
+ } catch (IOException e) {
+ throw new CanalParseException(e);
+ }
+ }
+
+ private boolean applyHistoryToDB(EntryPosition position, String schema, String ddl, String extra) {
+ Map content = new HashMap();
+ content.put("destination", destination);
+ content.put("binlogFile", position.getJournalName());
+ content.put("binlogOffest", String.valueOf(position.getPosition()));
+ content.put("binlogMasterId", String.valueOf(position.getServerId()));
+ content.put("binlogTimestamp", String.valueOf(position.getTimestamp()));
+ content.put("useSchema", schema);
+ if (content.isEmpty()) {
+ throw new RuntimeException("apply failed caused by content is empty in applyHistoryToDB");
+ }
+ // 待补充
+ List ddlResults = DruidDdlParser.parse(ddl, schema);
+ if (ddlResults.size() > 0) {
+ DdlResult ddlResult = ddlResults.get(0);
+ content.put("sqlSchema", ddlResult.getSchemaName());
+ content.put("sqlTable", ddlResult.getTableName());
+ content.put("sqlType", ddlResult.getType().name());
+ content.put("sqlText", ddl);
+ content.put("extra", extra);
+ }
+
+ MetaHistoryDO metaDO = new MetaHistoryDO();
+ try {
+ BeanUtils.populate(metaDO, content);
+ // 会建立唯一约束,解决:
+ // 1. 重复的binlog file+offest
+ // 2. 重复的masterId+timestamp
+ metaHistoryDAO.insert(metaDO);
+ } catch (Throwable e) {
+ if (isUkDuplicateException(e)) {
+ // 忽略掉重复的位点
+ logger.warn("dup apply for sql : " + ddl);
+ } else {
+ throw new CanalParseException("apply history to db failed caused by : " + e.getMessage(), e);
+ }
+
+ }
+ return true;
+ }
+
+ /**
+ * 发布数据到console上
+ */
+ private boolean applySnapshotToDB(EntryPosition position, boolean init) {
+ // 获取一份快照
+ MemoryTableMeta tmpMemoryTableMeta = new MemoryTableMeta();
+ Map schemaDdls = null;
+ synchronized (memoryTableMeta) {
+ if (!init && position == null) {
+ // 如果是持续构建,则识别一下是否有DDL变更过,如果没有就忽略了
+ return false;
+ }
+ schemaDdls = memoryTableMeta.snapshot();
+ for (Map.Entry entry : schemaDdls.entrySet()) {
+ tmpMemoryTableMeta.apply(position, entry.getKey(), entry.getValue(), null);
+ }
+ }
+
+ // 基于临时内存对象进行对比
+ boolean compareAll = true;
+ for (Schema schema : tmpMemoryTableMeta.getRepository().getSchemas()) {
+ for (String table : schema.showTables()) {
+ if (!compareTableMetaDbAndMemory(connection, tmpMemoryTableMeta, schema.getName(), table)) {
+ compareAll = false;
+ }
+ }
+ }
+ if (compareAll) {
+ Map content = new HashMap();
+ content.put("destination", destination);
+ content.put("binlogFile", position.getJournalName());
+ content.put("binlogOffest", String.valueOf(position.getPosition()));
+ content.put("binlogMasterId", String.valueOf(position.getServerId()));
+ content.put("binlogTimestamp", String.valueOf(position.getTimestamp()));
+ content.put("data", JSON.toJSONString(schemaDdls));
+ if (content.isEmpty()) {
+ throw new RuntimeException("apply failed caused by content is empty in applySnapshotToDB");
+ }
+
+ MetaSnapshotDO snapshotDO = new MetaSnapshotDO();
+ try {
+ BeanUtils.populate(snapshotDO, content);
+ metaSnapshotDAO.insert(snapshotDO);
+ } catch (Throwable e) {
+ if (isUkDuplicateException(e)) {
+ // 忽略掉重复的位点
+ logger.info("dup apply snapshot use position : " + position + " , just ignore");
+ } else {
+ throw new CanalParseException("apply failed caused by : " + e.getMessage(), e);
+ }
+ }
+ return true;
+ } else {
+ logger.error("compare failed , check log");
+ }
+ return false;
+ }
+
+ private boolean compareTableMetaDbAndMemory(MysqlConnection connection, MemoryTableMeta memoryTableMeta,
+ final String schema, final String table) {
+ TableMeta tableMetaFromMem = memoryTableMeta.find(schema, table);
+
+ TableMeta tableMetaFromDB = new TableMeta();
+ tableMetaFromDB.setSchema(schema);
+ tableMetaFromDB.setTable(table);
+ try {
+ ResultSetPacket packet = connection.query("desc " + getFullName(schema, table));
+ tableMetaFromDB.setFields(TableMetaCache.parserTableMeta(packet));
+ } catch (IOException e) {
+ if (e.getMessage().contains("errorNumber=1146")) {
+ logger.error("table not exist in db , pls check :" + getFullName(schema, table) + " , mem : "
+ + tableMetaFromMem);
+ return false;
+ }
+ throw new CanalParseException(e);
+ }
+
+ boolean result = compareTableMeta(tableMetaFromMem, tableMetaFromDB);
+ if (!result) {
+ String createDDL = null;
+ try {
+ ResultSetPacket packet = connection.query("show create table " + getFullName(schema, table));
+ if (packet.getFieldValues().size() > 1) {
+ createDDL = packet.getFieldValues().get(1);
+ }
+ } catch (IOException e) {
+ // ignore
+ }
+
+ logger.error("pls submit github issue, show create table ddl:" + createDDL + " , compare failed . \n db : "
+ + tableMetaFromDB + " \n mem : " + tableMetaFromMem);
+ }
+ return result;
+ }
+
+ private EntryPosition buildMemFromSnapshot(EntryPosition position) {
+ try {
+ MetaSnapshotDO snapshotDO = metaSnapshotDAO.findByTimestamp(destination, position.getTimestamp());
+ if (snapshotDO == null) {
+ return null;
+ }
+ String binlogFile = snapshotDO.getBinlogFile();
+ Long binlogOffest = snapshotDO.getBinlogOffest();
+ String binlogMasterId = snapshotDO.getBinlogMasterId();
+ Long binlogTimestamp = snapshotDO.getBinlogTimestamp();
+
+ EntryPosition snapshotPosition = new EntryPosition(binlogFile,
+ binlogOffest == null ? 0l : binlogOffest,
+ binlogTimestamp == null ? 0l : binlogTimestamp,
+ Long.valueOf(binlogMasterId == null ? "-2" : binlogMasterId));
+ // data存储为Map，每个分库一套建表
+ String sqlData = snapshotDO.getData();
+ JSONObject jsonObj = JSON.parseObject(sqlData);
+ for (Map.Entry entry : jsonObj.entrySet()) {
+ // 记录到内存
+ if (!memoryTableMeta.apply(snapshotPosition,
+ ObjectUtils.toString(entry.getKey()),
+ ObjectUtils.toString(entry.getValue()),
+ null)) {
+ return null;
+ }
+ }
+
+ return snapshotPosition;
+ } catch (Throwable e) {
+ throw new CanalParseException("apply failed caused by : " + e.getMessage(), e);
+ }
+ }
+
+ private boolean applyHistoryOnMemory(EntryPosition position, EntryPosition rollbackPosition) {
+ try {
+ List metaHistoryDOList = metaHistoryDAO.findByTimestamp(destination,
+ position.getTimestamp(),
+ rollbackPosition.getTimestamp());
+ if (metaHistoryDOList == null) {
+ return true;
+ }
+
+ for (MetaHistoryDO metaHistoryDO : metaHistoryDOList) {
+ String binlogFile = metaHistoryDO.getBinlogFile();
+ Long binlogOffest = metaHistoryDO.getBinlogOffest();
+ String binlogMasterId = metaHistoryDO.getBinlogMasterId();
+ Long binlogTimestamp = metaHistoryDO.getBinlogTimestamp();
+ String useSchema = metaHistoryDO.getUseSchema();
+ String sqlData = metaHistoryDO.getSqlText();
+ EntryPosition snapshotPosition = new EntryPosition(binlogFile,
+ binlogOffest == null ? 0L : binlogOffest,
+ binlogTimestamp == null ? 0L : binlogTimestamp,
+ Long.valueOf(binlogMasterId == null ? "-2" : binlogMasterId));
+
+ // 如果是同一秒内,对比一下history的位点，如果比期望的位点要大，忽略之
+ if (snapshotPosition.getTimestamp() > rollbackPosition.getTimestamp()) {
+ continue;
+ } else if (rollbackPosition.getServerId() == snapshotPosition.getServerId()
+ && snapshotPosition.compareTo(rollbackPosition) > 0) {
+ continue;
+ }
+
+ // 记录到内存
+ if (!memoryTableMeta.apply(snapshotPosition, useSchema, sqlData, null)) {
+ return false;
+ }
+
+ }
+
+ return metaHistoryDOList.size() > 0;
+ } catch (Throwable e) {
+ throw new CanalParseException("apply failed", e);
+ }
+ }
+
+ private String getFullName(String schema, String table) {
+ StringBuilder builder = new StringBuilder();
+ return builder.append('`')
+ .append(schema)
+ .append('`')
+ .append('.')
+ .append('`')
+ .append(table)
+ .append('`')
+ .toString();
+ }
+
+ private boolean compareTableMeta(TableMeta source, TableMeta target) {
+ if (!StringUtils.equalsIgnoreCase(source.getSchema(), target.getSchema())) {
+ return false;
+ }
+
+ if (!StringUtils.equalsIgnoreCase(source.getTable(), target.getTable())) {
+ return false;
+ }
+
+ List sourceFields = source.getFields();
+ List targetFields = target.getFields();
+ if (sourceFields.size() != targetFields.size()) {
+ return false;
+ }
+
+ for (int i = 0; i < sourceFields.size(); i++) {
+ FieldMeta sourceField = sourceFields.get(i);
+ FieldMeta targetField = targetFields.get(i);
+ if (!StringUtils.equalsIgnoreCase(sourceField.getColumnName(), targetField.getColumnName())) {
+ return false;
+ }
+
+ if (!StringUtils.equalsIgnoreCase(sourceField.getColumnType(), targetField.getColumnType())) {
+ return false;
+ }
+
+ if (!StringUtils.equalsIgnoreCase(sourceField.getDefaultValue(), targetField.getDefaultValue())) {
+ return false;
+ }
+
+ if (sourceField.isNullable() != targetField.isNullable()) {
+ return false;
+ }
+
+ if (sourceField.isKey() != targetField.isKey()) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ public void setConnection(MysqlConnection connection) {
+ this.connection = connection;
+ }
+
+ public void setFilter(CanalEventFilter filter) {
+ this.filter = filter;
+ }
+
+ public MetaHistoryDAO getMetaHistoryDAO() {
+ return metaHistoryDAO;
+ }
+
+ public void setMetaHistoryDAO(MetaHistoryDAO metaHistoryDAO) {
+ this.metaHistoryDAO = metaHistoryDAO;
+ }
+
+ public MetaSnapshotDAO getMetaSnapshotDAO() {
+ return metaSnapshotDAO;
+ }
+
+ public void setMetaSnapshotDAO(MetaSnapshotDAO metaSnapshotDAO) {
+ this.metaSnapshotDAO = metaSnapshotDAO;
+ }
+
+ public void setBlackFilter(CanalEventFilter blackFilter) {
+ this.blackFilter = blackFilter;
+ }
+
+ public MysqlConnection getConnection() {
+ return connection;
+ }
+
+ public boolean isUkDuplicateException(Throwable t) {
+ if (pattern.matcher(t.getMessage()).find() || h2Pattern.matcher(t.getMessage()).find()) {
+ // 违反外键约束时也抛出这种异常，所以这里还要判断包含字符串Duplicate entry
+ return true;
+ }
+ return false;
+ }
+}
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
new file mode 100644
index 00000000..f36aa726
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta.java
@@ -0,0 +1,244 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+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.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.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.otter.canal.parse.inbound.TableMeta;
+import com.alibaba.otter.canal.parse.inbound.TableMeta.FieldMeta;
+import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DruidDdlParser;
+import com.alibaba.otter.canal.protocol.position.EntryPosition;
+
+/**
+ * 基于DDL维护的内存表结构
+ *
+ * @author agapple 2017年7月27日 下午4:19:40
+ * @since 3.2.5
+ */
+public class MemoryTableMeta implements TableMetaTSDB {
+
+ private Logger logger = LoggerFactory.getLogger(MemoryTableMeta.class);
+ private Map, TableMeta> tableMetas = new ConcurrentHashMap, TableMeta>();
+ private SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL);
+
+ public MemoryTableMeta(){
+ }
+
+ @Override
+ public boolean init(String destination) {
+ return true;
+ }
+
+ public boolean apply(EntryPosition position, String schema, String ddl, String extra) {
+ tableMetas.clear();
+ synchronized (this) {
+ if (StringUtils.isNotEmpty(schema)) {
+ repository.setDefaultSchema(schema);
+ }
+
+ try {
+ // druid暂时flush privileges语法解析有问题
+ if (!StringUtils.startsWithIgnoreCase(StringUtils.trim(ddl), "flush")) {
+ repository.console(ddl);
+ }
+ } catch (Throwable e) {
+ logger.warn("parse faield : " + ddl, e);
+ }
+ }
+
+ // TableMeta meta = find("tddl5_00", "ab");
+ // if (meta != null) {
+ // repository.setDefaultSchema("tddl5_00");
+ // System.out.println(repository.console("show create table tddl5_00.ab"));
+ // System.out.println(repository.console("show columns from tddl5_00.ab"));
+ // }
+ return true;
+ }
+
+ @Override
+ public TableMeta find(String schema, String table) {
+ List keys = Arrays.asList(schema, table);
+ TableMeta tableMeta = tableMetas.get(keys);
+ if (tableMeta == null) {
+ synchronized (this) {
+ tableMeta = tableMetas.get(keys);
+ if (tableMeta == null) {
+ Schema schemaRep = repository.findSchema(schema);
+ if (schema == null) {
+ return null;
+ }
+ SchemaObject data = schemaRep.findTable(table);
+ if (data == null) {
+ return null;
+ }
+ SQLStatement statement = data.getStatement();
+ if (statement == null) {
+ return null;
+ }
+ if (statement instanceof SQLCreateTableStatement) {
+ tableMeta = parse((SQLCreateTableStatement) statement);
+ }
+ if (tableMeta != null) {
+ if (table != null) {
+ tableMeta.setTable(table);
+ }
+ if (schema != null) {
+ tableMeta.setSchema(schema);
+ }
+
+ tableMetas.put(keys, tableMeta);
+ }
+ }
+ }
+ }
+
+ return tableMeta;
+ }
+
+ @Override
+ public boolean rollback(EntryPosition position) {
+ throw new RuntimeException("not support for memory");
+ }
+
+ public Map snapshot() {
+ Map schemaDdls = new HashMap();
+ for (Schema schema : repository.getSchemas()) {
+ StringBuffer data = new StringBuffer(4 * 1024);
+ for (String table : schema.showTables()) {
+ SchemaObject schemaObject = schema.findTable(table);
+ schemaObject.getStatement().output(data);
+ data.append("; \n");
+ }
+ schemaDdls.put(schema.getName(), data.toString());
+ }
+
+ return schemaDdls;
+ }
+
+ private TableMeta parse(SQLCreateTableStatement statement) {
+ int size = statement.getTableElementList().size();
+ if (size > 0) {
+ TableMeta tableMeta = new TableMeta();
+ for (int i = 0; i < size; ++i) {
+ SQLTableElement element = statement.getTableElementList().get(i);
+ processTableElement(element, tableMeta);
+ }
+ return tableMeta;
+ }
+
+ return null;
+ }
+
+ private void processTableElement(SQLTableElement element, TableMeta tableMeta) {
+ if (element instanceof SQLColumnDefinition) {
+ FieldMeta fieldMeta = new FieldMeta();
+ SQLColumnDefinition column = (SQLColumnDefinition) element;
+ String name = getSqlName(column.getName());
+ // String charset = getSqlName(column.getCharsetExpr());
+ SQLDataType dataType = column.getDataType();
+ String dataTypStr = dataType.getName();
+ if (dataType.getArguments().size() > 0) {
+ dataTypStr += "(";
+ for (int i = 0; i < column.getDataType().getArguments().size(); i++) {
+ if (i != 0) {
+ dataTypStr += ",";
+ }
+ SQLExpr arg = column.getDataType().getArguments().get(i);
+ dataTypStr += arg.toString();
+ }
+ dataTypStr += ")";
+ }
+
+ if (dataType instanceof SQLDataTypeImpl) {
+ SQLDataTypeImpl dataTypeImpl = (SQLDataTypeImpl) dataType;
+ if (dataTypeImpl.isUnsigned()) {
+ dataTypStr += " unsigned";
+ }
+
+ if (dataTypeImpl.isZerofill()) {
+ dataTypStr += " zerofill";
+ }
+ }
+
+ if (column.getDefaultExpr() == null || column.getDefaultExpr() instanceof SQLNullExpr) {
+ fieldMeta.setDefaultValue(null);
+ } else {
+ fieldMeta.setDefaultValue(DruidDdlParser.unescapeQuotaName(getSqlName(column.getDefaultExpr())));
+ }
+
+ fieldMeta.setColumnName(name);
+ fieldMeta.setColumnType(dataTypStr);
+ fieldMeta.setNullable(true);
+ List constraints = column.getConstraints();
+ for (SQLColumnConstraint constraint : constraints) {
+ if (constraint instanceof SQLNotNullConstraint) {
+ fieldMeta.setNullable(false);
+ } else if (constraint instanceof SQLNullConstraint) {
+ fieldMeta.setNullable(true);
+ } else if (constraint instanceof SQLColumnPrimaryKey) {
+ fieldMeta.setKey(true);
+ }
+ }
+ tableMeta.addFieldMeta(fieldMeta);
+ } else if (element instanceof MySqlPrimaryKey) {
+ MySqlPrimaryKey column = (MySqlPrimaryKey) element;
+ List pks = column.getColumns();
+ for (SQLSelectOrderByItem pk : pks) {
+ String name = getSqlName(pk.getExpr());
+ FieldMeta field = tableMeta.getFieldMetaByName(name);
+ field.setKey(true);
+ }
+ }
+ }
+
+ private String getSqlName(SQLExpr sqlName) {
+ if (sqlName == null) {
+ return null;
+ }
+
+ if (sqlName instanceof SQLPropertyExpr) {
+ SQLIdentifierExpr owner = (SQLIdentifierExpr) ((SQLPropertyExpr) sqlName).getOwner();
+ return DruidDdlParser.unescapeName(owner.getName()) + "."
+ + DruidDdlParser.unescapeName(((SQLPropertyExpr) sqlName).getName());
+ } else if (sqlName instanceof SQLIdentifierExpr) {
+ return DruidDdlParser.unescapeName(((SQLIdentifierExpr) sqlName).getName());
+ } else if (sqlName instanceof SQLCharExpr) {
+ return ((SQLCharExpr) sqlName).getText();
+ } else {
+ return sqlName.toString();
+ }
+ }
+
+
+ public SchemaRepository getRepository() {
+ return repository;
+ }
+
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDB.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDB.java
new file mode 100644
index 00000000..d712adbe
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDB.java
@@ -0,0 +1,41 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb;
+
+import java.util.Map;
+
+import com.alibaba.otter.canal.parse.inbound.TableMeta;
+import com.alibaba.otter.canal.protocol.position.EntryPosition;
+
+/**
+ * 表结构的时间序列存储
+ *
+ * @author agapple 2017年7月27日 下午4:06:30
+ * @since 1.0.25
+ */
+public interface TableMetaTSDB {
+
+ /**
+ * 初始化
+ */
+ public boolean init(String destination);
+
+ /**
+ * 获取当前的表结构
+ */
+ public TableMeta find(String schema, String table);
+
+ /**
+ * 添加ddl到时间序列库中
+ */
+ public boolean apply(EntryPosition position, String schema, String ddl, String extra);
+
+ /**
+ * 回滚到指定位点的表结构
+ */
+ public boolean rollback(EntryPosition position);
+
+ /**
+ * 生成快照内容
+ */
+ public Map snapshot();
+
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDBBuilder.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDBBuilder.java
new file mode 100644
index 00000000..8e37ef71
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDBBuilder.java
@@ -0,0 +1,51 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb;
+
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import com.google.common.collect.Maps;
+
+/**
+ * @author agapple 2017年10月11日 下午8:45:40
+ * @since 1.0.25
+ */
+public class TableMetaTSDBBuilder {
+
+ protected final static Logger logger = LoggerFactory.getLogger(TableMetaTSDBBuilder.class);
+ private static ConcurrentMap contexts = Maps.newConcurrentMap();
+
+ /**
+ * 代理一下tableMetaTSDB的获取,使用隔离的spring定义
+ */
+ public static TableMetaTSDB build(String destination, String springXml) {
+ if (StringUtils.isNotEmpty(springXml)) {
+ ClassPathXmlApplicationContext applicationContext = contexts.get(destination);
+ if (applicationContext == null) {
+ synchronized (contexts) {
+ if (applicationContext == null) {
+ applicationContext = new ClassPathXmlApplicationContext(springXml);
+ contexts.put(destination, applicationContext);
+ }
+ }
+ }
+ TableMetaTSDB tableMetaTSDB = (TableMetaTSDB) applicationContext.getBean("tableMetaTSDB");
+ tableMetaTSDB.init(destination);
+ logger.info("{} init TableMetaTSDB with {}", destination, springXml);
+ return tableMetaTSDB;
+ } else {
+ return null;
+ }
+ }
+
+ public static void destory(String destination) {
+ ClassPathXmlApplicationContext context = contexts.remove(destination);
+ if (context != null) {
+ logger.info("{} destory TableMetaTSDB", destination);
+ context.close();
+ }
+ }
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaBaseDAO.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaBaseDAO.java
new file mode 100644
index 00000000..968e83b8
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaBaseDAO.java
@@ -0,0 +1,59 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao;
+
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport;
+
+/**
+ * @author agapple 2017年10月14日 上午1:05:22
+ * @since 1.0.25
+ */
+@SuppressWarnings("deprecation")
+public class MetaBaseDAO extends SqlMapClientDaoSupport {
+
+ protected boolean isH2 = false;
+
+ protected void initTable(String tableName) throws Exception {
+ Connection conn = null;
+ InputStream input = null;
+ try {
+ DataSource dataSource = getDataSource();
+ conn = dataSource.getConnection();
+ String name = "mysql";
+ isH2 = isH2(conn);
+ if (isH2) {
+ name = "h2";
+ }
+ input = Thread.currentThread()
+ .getContextClassLoader()
+ .getResourceAsStream("ddl/" + name + "/" + tableName + ".sql");
+ if (input == null) {
+ return;
+ }
+
+ String sql = StringUtils.join(IOUtils.readLines(input), "\n");
+ Statement stmt = conn.createStatement();
+ stmt.execute(sql);
+ stmt.close();
+ } catch (Throwable e) {
+ logger.warn("init " + tableName + " failed", e);
+ } finally {
+ IOUtils.closeQuietly(input);
+ if (conn != null) {
+ conn.close();
+ }
+ }
+ }
+
+ private boolean isH2(Connection conn) throws SQLException {
+ String product = conn.getMetaData().getDatabaseProductName();
+ return StringUtils.containsIgnoreCase(product, "H2");
+ }
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaHistoryDAO.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaHistoryDAO.java
new file mode 100644
index 00000000..6ec51614
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaHistoryDAO.java
@@ -0,0 +1,52 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import com.google.common.collect.Maps;
+
+/**
+ * canal数据的存储
+ *
+ * @author wanshao 2017年7月27日 下午10:51:55
+ * @since 3.2.5
+ */
+@SuppressWarnings("deprecation")
+public class MetaHistoryDAO extends MetaBaseDAO {
+
+ public Long insert(MetaHistoryDO metaDO) {
+ return (Long) getSqlMapClientTemplate().insert("meta_history.insert", metaDO);
+ }
+
+ public List findByTimestamp(String destination, Long snapshotTimestamp, Long timestamp) {
+ HashMap params = Maps.newHashMapWithExpectedSize(2);
+ params.put("destination", destination);
+ params.put("snapshotTimestamp", snapshotTimestamp == null ? 0L : snapshotTimestamp);
+ params.put("timestamp", timestamp == null ? 0L : timestamp);
+ return (List) getSqlMapClientTemplate().queryForList("meta_history.findByTimestamp", params);
+ }
+
+ public Integer deleteByName(String destination) {
+ HashMap params = Maps.newHashMapWithExpectedSize(2);
+ params.put("destination", destination);
+ return getSqlMapClientTemplate().delete("meta_history.deleteByName", params);
+ }
+
+ /**
+ * 删除interval秒之前的数据
+ */
+ public Integer deleteByGmtModified(int interval) {
+ HashMap params = Maps.newHashMapWithExpectedSize(2);
+ long timestamp = System.currentTimeMillis() - interval * 1000;
+ Date date = new Date(timestamp);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ params.put("timestamp", format.format(date));
+ return getSqlMapClientTemplate().delete("meta_history.deleteByGmtModified", params);
+ }
+
+ protected void initDao() throws Exception {
+ initTable("meta_history");
+ }
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaHistoryDO.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaHistoryDO.java
new file mode 100644
index 00000000..6ac548f1
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaHistoryDO.java
@@ -0,0 +1,148 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao;
+
+import java.util.Date;
+
+/**
+ * @author agapple 2017年7月27日 下午11:09:41
+ * @since 1.0.25
+ */
+public class MetaHistoryDO {
+
+ private Long id;
+ private Date gmtCreate;
+ private Date gmtModified;
+ private String destination;
+ private String binlogFile;
+ private Long binlogOffest;
+ private String binlogMasterId;
+ private Long binlogTimestamp;
+ private String useSchema;
+ private String sqlSchema;
+ private String sqlTable;
+ private String sqlText;
+ private String sqlType;
+ private String extra;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtModified() {
+ return gmtModified;
+ }
+
+ public void setGmtModified(Date gmtModified) {
+ this.gmtModified = gmtModified;
+ }
+
+ public String getBinlogFile() {
+ return binlogFile;
+ }
+
+ public void setBinlogFile(String binlogFile) {
+ this.binlogFile = binlogFile;
+ }
+
+ public Long getBinlogOffest() {
+ return binlogOffest;
+ }
+
+ public void setBinlogOffest(Long binlogOffest) {
+ this.binlogOffest = binlogOffest;
+ }
+
+ public String getBinlogMasterId() {
+ return binlogMasterId;
+ }
+
+ public void setBinlogMasterId(String binlogMasterId) {
+ this.binlogMasterId = binlogMasterId;
+ }
+
+ public Long getBinlogTimestamp() {
+ return binlogTimestamp;
+ }
+
+ public void setBinlogTimestamp(Long binlogTimestamp) {
+ this.binlogTimestamp = binlogTimestamp;
+ }
+
+ public String getUseSchema() {
+ return useSchema;
+ }
+
+ public void setUseSchema(String useSchema) {
+ this.useSchema = useSchema;
+ }
+
+
+ public String getExtra() {
+ return extra;
+ }
+
+ public void setExtra(String extra) {
+ this.extra = extra;
+ }
+
+ public String getDestination() {
+ return destination;
+ }
+
+ public void setDestination(String destination) {
+ this.destination = destination;
+ }
+
+ public String getSqlSchema() {
+ return sqlSchema;
+ }
+
+ public void setSqlSchema(String sqlSchema) {
+ this.sqlSchema = sqlSchema;
+ }
+
+ public String getSqlTable() {
+ return sqlTable;
+ }
+
+ public void setSqlTable(String sqlTable) {
+ this.sqlTable = sqlTable;
+ }
+
+ public String getSqlText() {
+ return sqlText;
+ }
+
+ public void setSqlText(String sqlText) {
+ this.sqlText = sqlText;
+ }
+
+ public String getSqlType() {
+ return sqlType;
+ }
+
+ public void setSqlType(String sqlType) {
+ this.sqlType = sqlType;
+ }
+
+ @Override
+ public String toString() {
+ return "MetaHistoryDO [id=" + id + ", gmtCreate=" + gmtCreate + ", gmtModified=" + gmtModified
+ + ", destination=" + destination + ", binlogFile=" + binlogFile + ", binlogOffest=" + binlogOffest
+ + ", binlogMasterId=" + binlogMasterId + ", binlogTimestamp=" + binlogTimestamp + ", useSchema="
+ + useSchema + ", sqlSchema=" + sqlSchema + ", sqlTable=" + sqlTable + ", sqlText=" + sqlText
+ + ", sqlType=" + sqlType + ", extra=" + extra + "]";
+ }
+
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaSnapshotDAO.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaSnapshotDAO.java
new file mode 100644
index 00000000..f525031a
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaSnapshotDAO.java
@@ -0,0 +1,56 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+
+import com.google.common.collect.Maps;
+
+/**
+ * canal数据的存储
+ *
+ * @author wanshao 2017年7月27日 下午10:51:55
+ * @since 3.2.5
+ */
+@SuppressWarnings("deprecation")
+public class MetaSnapshotDAO extends MetaBaseDAO {
+
+ public Long insert(MetaSnapshotDO snapshotDO) {
+ return (Long) getSqlMapClientTemplate().insert("meta_snapshot.insert", snapshotDO);
+ }
+
+ public Long update(MetaSnapshotDO snapshotDO) {
+ return (Long) getSqlMapClientTemplate().insert("meta_snapshot.update", snapshotDO);
+ }
+
+ public MetaSnapshotDO findByTimestamp(String destination, Long timestamp) {
+ HashMap params = Maps.newHashMapWithExpectedSize(2);
+ params.put("timestamp", timestamp == null ? 0L : timestamp);
+ params.put("destination", destination);
+
+ return (MetaSnapshotDO) getSqlMapClientTemplate().queryForObject("meta_snapshot.findByTimestamp", params);
+ }
+
+ public Integer deleteByName(String destination) {
+ HashMap params = Maps.newHashMapWithExpectedSize(2);
+ params.put("destination", destination);
+ return getSqlMapClientTemplate().delete("meta_snapshot.deleteByName", params);
+ }
+
+ /**
+ * 删除interval秒之前的数据
+ */
+ public Integer deleteByGmtModified(int interval) {
+ HashMap params = Maps.newHashMapWithExpectedSize(2);
+ long timestamp = System.currentTimeMillis() - interval * 1000;
+ Date date = new Date(timestamp);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ params.put("timestamp", format.format(date));
+ return getSqlMapClientTemplate().delete("meta_snapshot.deleteByGmtModified", params);
+ }
+
+ protected void initDao() throws Exception {
+ initTable("meta_snapshot");
+ }
+
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaSnapshotDO.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaSnapshotDO.java
new file mode 100644
index 00000000..693c5f8e
--- /dev/null
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/dao/MetaSnapshotDO.java
@@ -0,0 +1,110 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao;
+
+import java.util.Date;
+
+/**
+ * @author agapple 2017年7月27日 下午11:09:41
+ * @since 1.0.25
+ */
+public class MetaSnapshotDO {
+
+ private Long id;
+ private Date gmtCreate;
+ private Date gmtModified;
+ private String destination;
+ private String binlogFile;
+ private Long binlogOffest;
+ private String binlogMasterId;
+ private Long binlogTimestamp;
+ private String data;
+ private String extra;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtModified() {
+ return gmtModified;
+ }
+
+ public void setGmtModified(Date gmtModified) {
+ this.gmtModified = gmtModified;
+ }
+
+ public String getBinlogFile() {
+ return binlogFile;
+ }
+
+ public void setBinlogFile(String binlogFile) {
+ this.binlogFile = binlogFile;
+ }
+
+ public Long getBinlogOffest() {
+ return binlogOffest;
+ }
+
+ public void setBinlogOffest(Long binlogOffest) {
+ this.binlogOffest = binlogOffest;
+ }
+
+ public String getBinlogMasterId() {
+ return binlogMasterId;
+ }
+
+ public void setBinlogMasterId(String binlogMasterId) {
+ this.binlogMasterId = binlogMasterId;
+ }
+
+ public Long getBinlogTimestamp() {
+ return binlogTimestamp;
+ }
+
+ public void setBinlogTimestamp(Long binlogTimestamp) {
+ this.binlogTimestamp = binlogTimestamp;
+ }
+
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+
+ public String getExtra() {
+ return extra;
+ }
+
+ public void setExtra(String extra) {
+ this.extra = extra;
+ }
+
+ public String getDestination() {
+ return destination;
+ }
+
+ public void setDestination(String destination) {
+ this.destination = destination;
+ }
+
+ @Override
+ public String toString() {
+ return "MetaSnapshotDO [id=" + id + ", gmtCreate=" + gmtCreate + ", gmtModified=" + gmtModified
+ + ", destination=" + destination + ", binlogFile=" + binlogFile + ", binlogOffest=" + binlogOffest
+ + ", binlogMasterId=" + binlogMasterId + ", binlogTimestamp=" + binlogTimestamp + ", data=" + data
+ + ", extra=" + extra + "]";
+ }
+
+}
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManager.java b/parse/src/main/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManager.java
index ed0b9879..bcc2af7d 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManager.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManager.java
@@ -45,6 +45,7 @@ public class FileMixedLogPositionManager extends AbstractLogPositionManager {
private ScheduledExecutorService executorService;
+ @SuppressWarnings("serial")
private final LogPosition nullPosition = new LogPosition() {
};
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManager.java b/parse/src/main/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManager.java
index 4a1e60c7..6dbda0a5 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManager.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManager.java
@@ -29,6 +29,7 @@ public class PeriodMixedLogPositionManager extends AbstractLogPositionManager {
private long period;
private Set persistTasks;
+ @SuppressWarnings("serial")
private final LogPosition nullPosition = new LogPosition() {
};
diff --git a/parse/src/main/resources/ddl/derby/meta_history.sql b/parse/src/main/resources/ddl/derby/meta_history.sql
new file mode 100644
index 00000000..0529e1fa
--- /dev/null
+++ b/parse/src/main/resources/ddl/derby/meta_history.sql
@@ -0,0 +1,22 @@
+CREATE TABLE meta_history (
+ id bigint GENERATED ALWAYS AS IDENTITY NOT NULL,
+ gmt_create timestamp NOT NULL,
+ gmt_modified timestamp NOT NULL,
+ destination varchar(128) DEFAULT NULL,
+ binlog_file varchar(64) DEFAULT NULL,
+ binlog_offest bigint DEFAULT NULL,
+ binlog_master_id varchar(64) DEFAULT NULL,
+ binlog_timestamp bigint DEFAULT NULL,
+ use_schema varchar(1024) DEFAULT NULL,
+ sql_schema varchar(1024) DEFAULT NULL,
+ sql_table varchar(1024) DEFAULT NULL,
+ sql_text clob(16 M) DEFAULT NULL,
+ sql_type varchar(1024) DEFAULT NULL,
+ extra varchar(512) DEFAULT NULL,
+ PRIMARY KEY (id),
+ CONSTRAINT meta_history_binlog_file_offest UNIQUE (destination,binlog_master_id,binlog_file,binlog_offest)
+);
+
+create index meta_history_destination on meta_history(destination);
+create index meta_history_destination_timestamp on meta_history(destination,binlog_timestamp);
+create index meta_history_gmt_modified on meta_history(gmt_modified);
\ No newline at end of file
diff --git a/parse/src/main/resources/ddl/derby/meta_snapshot.sql b/parse/src/main/resources/ddl/derby/meta_snapshot.sql
new file mode 100644
index 00000000..61e6cd53
--- /dev/null
+++ b/parse/src/main/resources/ddl/derby/meta_snapshot.sql
@@ -0,0 +1,18 @@
+CREATE TABLE meta_snapshot (
+ id bigint GENERATED ALWAYS AS IDENTITY NOT NULL,
+ gmt_create timestamp NOT NULL,
+ gmt_modified timestamp NOT NULL,
+ destination varchar(128) DEFAULT NULL,
+ binlog_file varchar(64) DEFAULT NULL,
+ binlog_offest bigint DEFAULT NULL,
+ binlog_master_id varchar(64) DEFAULT NULL,
+ binlog_timestamp bigint DEFAULT NULL,
+ data clob(16 M) DEFAULT NULL,
+ extra varchar(512) DEFAULT NULL,
+ PRIMARY KEY (id),
+ CONSTRAINT meta_snapshot_binlog_file_offest UNIQUE (destination,binlog_master_id,binlog_file,binlog_offest)
+);
+
+create index meta_snapshot_destination on meta_snapshot(destination);
+create index meta_snapshot_destination_timestamp on meta_snapshot(destination,binlog_timestamp);
+create index meta_snapshot_gmt_modified on meta_snapshot(gmt_modified);
\ No newline at end of file
diff --git a/parse/src/main/resources/ddl/h2/meta_history.sql b/parse/src/main/resources/ddl/h2/meta_history.sql
new file mode 100644
index 00000000..4c7bbff4
--- /dev/null
+++ b/parse/src/main/resources/ddl/h2/meta_history.sql
@@ -0,0 +1,21 @@
+CREATE TABLE IF NOT EXISTS `meta_history` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `gmt_create` datetime NOT NULL COMMENT '创建时间',
+ `gmt_modified` datetime NOT NULL COMMENT '修改时间',
+ `destination` varchar(128) DEFAULT NULL COMMENT '通道名称',
+ `binlog_file` varchar(64) DEFAULT NULL COMMENT 'binlog文件名',
+ `binlog_offest` bigint(20) DEFAULT NULL COMMENT 'binlog偏移量',
+ `binlog_master_id` varchar(64) DEFAULT NULL COMMENT 'binlog节点id',
+ `binlog_timestamp` bigint(20) DEFAULT NULL COMMENT 'binlog应用的时间戳',
+ `use_schema` varchar(1024) DEFAULT NULL COMMENT '执行sql时对应的schema',
+ `sql_schema` varchar(1024) DEFAULT NULL COMMENT '对应的schema',
+ `sql_table` varchar(1024) DEFAULT NULL COMMENT '对应的table',
+ `sql_text` longtext DEFAULT NULL COMMENT '执行的sql',
+ `sql_type` varchar(256) DEFAULT NULL COMMENT 'sql类型',
+ `extra` text DEFAULT NULL COMMENT '额外的扩展信息',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY meta_history_binlog_file_offest(`destination`,`binlog_master_id`,`binlog_file`,`binlog_offest`),
+ KEY `meta_history_destination` (`destination`),
+ KEY `meta_history_destination_timestamp` (`destination`,`binlog_timestamp`),
+ KEY `meta_history_gmt_modified` (`gmt_modified`)
+);
\ No newline at end of file
diff --git a/parse/src/main/resources/ddl/h2/meta_snapshot.sql b/parse/src/main/resources/ddl/h2/meta_snapshot.sql
new file mode 100644
index 00000000..c14d7358
--- /dev/null
+++ b/parse/src/main/resources/ddl/h2/meta_snapshot.sql
@@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS `meta_snapshot` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `gmt_create` datetime NOT NULL COMMENT '创建时间',
+ `gmt_modified` datetime NOT NULL COMMENT '修改时间',
+ `destination` varchar(128) DEFAULT NULL COMMENT '通道名称',
+ `binlog_file` varchar(64) DEFAULT NULL COMMENT 'binlog文件名',
+ `binlog_offest` bigint(20) DEFAULT NULL COMMENT 'binlog偏移量',
+ `binlog_master_id` varchar(64) DEFAULT NULL COMMENT 'binlog节点id',
+ `binlog_timestamp` bigint(20) DEFAULT NULL COMMENT 'binlog应用的时间戳',
+ `data` longtext DEFAULT NULL COMMENT '表结构数据',
+ `extra` text DEFAULT NULL COMMENT '额外的扩展信息',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY meta_snapshot_binlog_file_offest(`destination`,`binlog_master_id`,`binlog_file`,`binlog_offest`),
+ KEY `meta_snapshot_destination` (`destination`),
+ KEY `meta_snapshot_destination_timestamp` (`destination`,`binlog_timestamp`),
+ KEY `meta_snapshot_gmt_modified` (`gmt_modified`)
+);
\ No newline at end of file
diff --git a/parse/src/main/resources/ddl/mysql/meta_history.sql b/parse/src/main/resources/ddl/mysql/meta_history.sql
new file mode 100644
index 00000000..36425961
--- /dev/null
+++ b/parse/src/main/resources/ddl/mysql/meta_history.sql
@@ -0,0 +1,21 @@
+CREATE TABLE IF NOT EXISTS `meta_history` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `gmt_create` datetime NOT NULL COMMENT '创建时间',
+ `gmt_modified` datetime NOT NULL COMMENT '修改时间',
+ `destination` varchar(128) DEFAULT NULL COMMENT '通道名称',
+ `binlog_file` varchar(64) DEFAULT NULL COMMENT 'binlog文件名',
+ `binlog_offest` bigint(20) DEFAULT NULL COMMENT 'binlog偏移量',
+ `binlog_master_id` varchar(64) DEFAULT NULL COMMENT 'binlog节点id',
+ `binlog_timestamp` bigint(20) DEFAULT NULL COMMENT 'binlog应用的时间戳',
+ `use_schema` varchar(1024) DEFAULT NULL COMMENT '执行sql时对应的schema',
+ `sql_schema` varchar(1024) DEFAULT NULL COMMENT '对应的schema',
+ `sql_table` varchar(1024) DEFAULT NULL COMMENT '对应的table',
+ `sql_text` longtext DEFAULT NULL COMMENT '执行的sql',
+ `sql_type` varchar(256) DEFAULT NULL COMMENT 'sql类型',
+ `extra` text DEFAULT NULL COMMENT '额外的扩展信息',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY binlog_file_offest(`destination`,`binlog_master_id`,`binlog_file`,`binlog_offest`),
+ KEY `destination` (`destination`),
+ KEY `destination_timestamp` (`destination`,`binlog_timestamp`),
+ KEY `gmt_modified` (`gmt_modified`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='表结构变化明细表';
\ No newline at end of file
diff --git a/parse/src/main/resources/ddl/mysql/meta_snapshot.sql b/parse/src/main/resources/ddl/mysql/meta_snapshot.sql
new file mode 100644
index 00000000..43313cb6
--- /dev/null
+++ b/parse/src/main/resources/ddl/mysql/meta_snapshot.sql
@@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS `meta_snapshot` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `gmt_create` datetime NOT NULL COMMENT '创建时间',
+ `gmt_modified` datetime NOT NULL COMMENT '修改时间',
+ `destination` varchar(128) DEFAULT NULL COMMENT '通道名称',
+ `binlog_file` varchar(64) DEFAULT NULL COMMENT 'binlog文件名',
+ `binlog_offest` bigint(20) DEFAULT NULL COMMENT 'binlog偏移量',
+ `binlog_master_id` varchar(64) DEFAULT NULL COMMENT 'binlog节点id',
+ `binlog_timestamp` bigint(20) DEFAULT NULL COMMENT 'binlog应用的时间戳',
+ `data` longtext DEFAULT NULL COMMENT '表结构数据',
+ `extra` text DEFAULT NULL COMMENT '额外的扩展信息',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY binlog_file_offest(`destination`,`binlog_master_id`,`binlog_file`,`binlog_offest`),
+ KEY `destination` (`destination`),
+ KEY `destination_timestamp` (`destination`,`binlog_timestamp`),
+ KEY `gmt_modified` (`gmt_modified`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='表结构记录表快照表';
\ No newline at end of file
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java
index 71ac0789..707eaa20 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java
@@ -2,7 +2,6 @@ package com.alibaba.otter.canal.parse;
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
import org.junit.Assert;
import org.junit.Test;
@@ -94,7 +93,6 @@ public class DirectLogFetcherTest {
HeaderPacket binlogDumpHeader = new HeaderPacket();
binlogDumpHeader.setPacketBodyLength(cmdBody.length);
binlogDumpHeader.setPacketSequenceNumber((byte) 0x00);
- PacketManager.write(connector.getChannel(), new ByteBuffer[] { ByteBuffer.wrap(binlogDumpHeader.toBytes()),
- ByteBuffer.wrap(cmdBody) });
+ PacketManager.writePkg(connector.getChannel(), binlogDumpHeader.toBytes(), cmdBody);
}
}
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/TableMetaCacheTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/TableMetaCacheTest.java
index b0af1256..f9fc0796 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/TableMetaCacheTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/TableMetaCacheTest.java
@@ -2,32 +2,40 @@ package com.alibaba.otter.canal.parse.inbound;
import java.io.IOException;
import java.net.InetSocketAddress;
+import java.util.List;
import org.junit.Assert;
import org.junit.Test;
-import com.alibaba.otter.canal.parse.inbound.TableMeta.FieldMeta;
+import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetPacket;
import com.alibaba.otter.canal.parse.inbound.mysql.MysqlConnection;
-import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.TableMetaCache;
public class TableMetaCacheTest {
@Test
- public void testSimple() {
-
- MysqlConnection connection = new MysqlConnection(new InetSocketAddress("127.0.0.1", 3306), "xxxxx", "xxxxx");
+ public void testSimple() throws IOException {
+ MysqlConnection connection = new MysqlConnection(new InetSocketAddress("127.0.0.1", 3306), "root", "hello");
try {
connection.connect();
} catch (IOException e) {
Assert.fail(e.getMessage());
}
- TableMetaCache cache = new TableMetaCache(connection);
- TableMeta meta = cache.getTableMeta("otter1", "otter_stability1");
- Assert.assertNotNull(meta);
- for (FieldMeta field : meta.getFileds()) {
- System.out.println("filed :" + field.getColumnName() + " , isKey : " + field.isKey() + " , isNull : "
- + field.isNullable());
+ List packets = connection.queryMulti("show create table test.ljh_test");
+ String createDDL = null;
+ if (packets.get(0).getFieldValues().size() > 0) {
+ createDDL = packets.get(0).getFieldValues().get(1);
}
+
+ System.out.println(createDDL);
+
+ // TableMetaCache cache = new TableMetaCache(connection);
+ // TableMeta meta = cache.getTableMeta("otter1", "otter_stability1");
+ // Assert.assertNotNull(meta);
+ // for (FieldMeta field : meta.getFields()) {
+ // System.out.println("filed :" + field.getColumnName() + " , isKey : "
+ // + field.isKey() + " , isNull : "
+ // + field.isNullable());
+ // }
}
}
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/group/GroupEventPaserTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/group/GroupEventPaserTest.java
index 3f6dff3c..57e26784 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/group/GroupEventPaserTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/group/GroupEventPaserTest.java
@@ -88,8 +88,8 @@ public class GroupEventPaserTest {
private BinlogParser buildParser(AuthenticationInfo info) {
return new AbstractBinlogParser() {
- public Entry parse(LogEvent event) throws CanalParseException {
- // return _parser.parse(event);
+ @Override
+ public Entry parse(LogEvent event, boolean isSeek) throws CanalParseException {
return null;
}
};
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java
index 212f3af6..a4c1c6df 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java
@@ -25,11 +25,11 @@ public class LocalBinlogDumpTest {
@Test
public void testSimple() {
- String directory = "/home/jianghang/tmp/binlog";
+ String directory = "/Users/wanshao/projects/canal/parse/src/test/resources/binlog/tsdb";
final LocalBinlogEventParser controller = new LocalBinlogEventParser();
- final EntryPosition startPosition = new EntryPosition("mysql-bin.000006", 4L);
+ final EntryPosition startPosition = new EntryPosition("mysql-bin.000003", 123L);
- controller.setMasterInfo(new AuthenticationInfo(new InetSocketAddress("127.0.0.1", 3306), "xxxxx", "xxxxx"));
+ controller.setMasterInfo(new AuthenticationInfo(new InetSocketAddress("127.0.0.1", 3306), "canal", "canal"));
controller.setConnectionCharset(Charset.forName("UTF-8"));
controller.setDirectory(directory);
controller.setMasterPosition(startPosition);
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParserTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParserTest.java
index d619916a..ba8854a7 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParserTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParserTest.java
@@ -23,15 +23,15 @@ import com.alibaba.otter.canal.sink.exception.CanalSinkException;
public class LocalBinlogEventParserTest {
private static final String MYSQL_ADDRESS = "127.0.0.1";
- private static final String USERNAME = "xxxxx";
- private static final String PASSWORD = "xxxxx";
+ private static final String USERNAME = "canal";
+ private static final String PASSWORD = "canal";
private String directory;
@Before
public void setUp() {
URL url = Thread.currentThread().getContextClassLoader().getResource("dummy.txt");
File dummyFile = new File(url.getFile());
- directory = new File(dummyFile.getParent() + "/binlog").getPath();
+ directory = new File(dummyFile + "/binlog/tsdb").getPath();
}
@Test
@@ -40,7 +40,7 @@ public class LocalBinlogEventParserTest {
final AtomicLong entryCount = new AtomicLong(0);
final EntryPosition entryPosition = new EntryPosition();
- final EntryPosition defaultPosition = buildPosition("mysql-bin.000001", 6163L, 1322803601000L);
+ final EntryPosition defaultPosition = buildPosition("mysql-bin.000003", 219L, 1505467103000L);
final LocalBinlogEventParser controller = new LocalBinlogEventParser();
controller.setMasterPosition(defaultPosition);
controller.setMasterInfo(buildAuthentication());
@@ -103,7 +103,7 @@ public class LocalBinlogEventParserTest {
final AtomicLong entryCount = new AtomicLong(0);
final EntryPosition entryPosition = new EntryPosition();
- final EntryPosition defaultPosition = buildPosition("mysql-bin.000001", null, 1322803601000L);
+ final EntryPosition defaultPosition = buildPosition("mysql-bin.000003", null, 1505467103000L);
final LocalBinlogEventParser controller = new LocalBinlogEventParser();
controller.setMasterPosition(defaultPosition);
controller.setMasterInfo(buildAuthentication());
@@ -156,15 +156,15 @@ public class LocalBinlogEventParserTest {
Assert.assertTrue(entryCount.get() > 0);
// 对比第一条数据和起始的position相同
- Assert.assertEquals(entryPosition.getJournalName(), "mysql-bin.000001");
- Assert.assertTrue(entryPosition.getPosition() <= 6163L);
+ Assert.assertEquals(entryPosition.getJournalName(), "mysql-bin.000003");
+ Assert.assertTrue(entryPosition.getPosition() <= 300L);
Assert.assertTrue(entryPosition.getTimestamp() <= defaultPosition.getTimestamp());
}
@Test
public void test_no_position() throws InterruptedException {
final TimeoutChecker timeoutChecker = new TimeoutChecker(3 * 1000);
- final EntryPosition defaultPosition = buildPosition("mysql-bin.000002",
+ final EntryPosition defaultPosition = buildPosition("mysql-bin.000003",
null,
new Date().getTime() + 1000 * 1000L);
final AtomicLong entryCount = new AtomicLong(0);
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java
index f7dab29a..a0754635 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java
@@ -7,6 +7,7 @@ import java.util.List;
import org.junit.Assert;
import org.junit.Test;
+import com.alibaba.otter.canal.filter.aviater.AviaterRegexFilter;
import com.alibaba.otter.canal.parse.exception.CanalParseException;
import com.alibaba.otter.canal.parse.index.AbstractLogPositionManager;
import com.alibaba.otter.canal.parse.stub.AbstractCanalEventSinkTest;
@@ -26,13 +27,18 @@ public class MysqlDumpTest {
@Test
public void testSimple() {
final MysqlEventParser controller = new MysqlEventParser();
- final EntryPosition startPosition = new EntryPosition("mysql-bin.000003", 4L);
+ final EntryPosition startPosition = new EntryPosition("mysql-bin.000001", 104606L);
controller.setConnectionCharset(Charset.forName("UTF-8"));
controller.setSlaveId(3344L);
controller.setDetectingEnable(false);
- controller.setMasterInfo(new AuthenticationInfo(new InetSocketAddress("127.0.0.1", 3306), "xxxxx", "xxxxx"));
+ controller.setMasterInfo(new AuthenticationInfo(new InetSocketAddress("127.0.0.1", 3306), "canal", "canal"));
controller.setMasterPosition(startPosition);
+ controller.setEnableTsdb(true);
+ controller.setDestination("example");
+ controller.setTsdbSpringXml("classpath:tsdb/h2-tsdb.xml");
+ controller.setEventFilter(new AviaterRegexFilter("test\\..*"));
+ controller.setEventBlackFilter(new AviaterRegexFilter("canal_tsdb\\..*"));
controller.setEventSink(new AbstractCanalEventSinkTest>() {
public boolean sink(List entrys, InetSocketAddress remoteAddress, String destination)
@@ -100,7 +106,7 @@ public class MysqlDumpTest {
controller.start();
try {
- Thread.sleep(100 * 1000L);
+ Thread.sleep(100 * 1000 * 1000L);
} catch (InterruptedException e) {
Assert.fail(e.getMessage());
}
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParserTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParserTest.java
index 82ecf4af..f254c17c 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParserTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParserTest.java
@@ -24,8 +24,8 @@ public class MysqlEventParserTest {
private static final String DETECTING_SQL = "insert into retl.xdual values(1,now()) on duplicate key update x=now()";
private static final String MYSQL_ADDRESS = "127.0.0.1";
- private static final String USERNAME = "root";
- private static final String PASSWORD = "xxxxxx";
+ private static final String USERNAME = "canal";
+ private static final String PASSWORD = "canal";
@Test
public void test_position() throws InterruptedException {
@@ -34,7 +34,7 @@ public class MysqlEventParserTest {
final EntryPosition entryPosition = new EntryPosition();
final MysqlEventParser controller = new MysqlEventParser();
- final EntryPosition defaultPosition = buildPosition("mysql-bin.000001", 6163L, 1322803601000L);
+ final EntryPosition defaultPosition = buildPosition("mysql-bin.000003", 4690L, 1505481064000L);
controller.setSlaveId(3344L);
controller.setDetectingEnable(true);
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsBinlogOpenApiTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsBinlogOpenApiTest.java
new file mode 100644
index 00000000..596847ae
--- /dev/null
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsBinlogOpenApiTest.java
@@ -0,0 +1,27 @@
+package com.alibaba.otter.canal.parse.inbound.mysql;
+
+import java.io.File;
+import java.util.Date;
+
+import org.apache.commons.lang.time.DateUtils;
+
+import com.alibaba.otter.canal.parse.inbound.mysql.rds.RdsBinlogOpenApi;
+
+/**
+ * @author agapple 2017年10月15日 下午2:14:34
+ * @since 1.0.25
+ */
+public class RdsBinlogOpenApiTest {
+
+ public void testSimple() throws Throwable {
+ Date startTime = DateUtils.parseDate("2017-10-13 20:56:58", new String[] { "yyyy-MM-dd HH:mm:ss" });
+ Date endTime = DateUtils.parseDate("2017-10-14 02:57:59", new String[] { "yyyy-MM-dd HH:mm:ss" });
+ RdsBinlogOpenApi.downloadBinlogFiles("https://rds.aliyuncs.com/",
+ "",
+ "",
+ "rm-bp180v4mfjnm157es",
+ startTime,
+ endTime,
+ new File("/tmp/binlog/"));
+ }
+}
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsLocalBinlogDumpTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsLocalBinlogDumpTest.java
new file mode 100644
index 00000000..82fe8803
--- /dev/null
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsLocalBinlogDumpTest.java
@@ -0,0 +1,117 @@
+package com.alibaba.otter.canal.parse.inbound.mysql;
+
+import java.net.InetSocketAddress;
+import java.nio.charset.Charset;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.alibaba.otter.canal.parse.exception.CanalParseException;
+import com.alibaba.otter.canal.parse.inbound.mysql.rds.RdsLocalBinlogEventParser;
+import com.alibaba.otter.canal.parse.index.AbstractLogPositionManager;
+import com.alibaba.otter.canal.parse.stub.AbstractCanalEventSinkTest;
+import com.alibaba.otter.canal.parse.support.AuthenticationInfo;
+import com.alibaba.otter.canal.protocol.CanalEntry.Column;
+import com.alibaba.otter.canal.protocol.CanalEntry.Entry;
+import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;
+import com.alibaba.otter.canal.protocol.CanalEntry.EventType;
+import com.alibaba.otter.canal.protocol.CanalEntry.RowChange;
+import com.alibaba.otter.canal.protocol.CanalEntry.RowData;
+import com.alibaba.otter.canal.protocol.position.LogPosition;
+import com.alibaba.otter.canal.sink.exception.CanalSinkException;
+
+/**
+ * @author agapple 2017年10月15日 下午2:16:58
+ * @since 1.0.25
+ */
+public class RdsLocalBinlogDumpTest {
+
+ @Test
+ public void testSimple() {
+ String directory = "/tmp/rds";
+ final RdsLocalBinlogEventParser controller = new RdsLocalBinlogEventParser();
+ controller.setMasterInfo(new AuthenticationInfo(new InetSocketAddress("127.0.0.1", 3306), "root", "hello"));
+ controller.setConnectionCharset(Charset.forName("UTF-8"));
+ controller.setDirectory(directory);
+ controller.setAccesskey("");
+ controller.setSecretkey("");
+ controller.setInstanceId("");
+ controller.setStartTime(1507860498350L);
+ controller.setEventSink(new AbstractCanalEventSinkTest>() {
+
+ public boolean sink(List entrys, InetSocketAddress remoteAddress, String destination)
+ throws CanalSinkException,
+ InterruptedException {
+
+ for (Entry entry : entrys) {
+ if (entry.getEntryType() == EntryType.TRANSACTIONBEGIN
+ || entry.getEntryType() == EntryType.TRANSACTIONEND) {
+ continue;
+ }
+
+ if (entry.getEntryType() == EntryType.ROWDATA) {
+ RowChange rowChage = null;
+ try {
+ rowChage = RowChange.parseFrom(entry.getStoreValue());
+ } catch (Exception e) {
+ throw new RuntimeException("ERROR ## parser of eromanga-event has an error , data:"
+ + entry.toString(), e);
+ }
+
+ EventType eventType = rowChage.getEventType();
+ System.out.println(String.format("================> binlog[%s:%s] , name[%s,%s] , eventType : %s",
+ entry.getHeader().getLogfileName(),
+ entry.getHeader().getLogfileOffset(),
+ entry.getHeader().getSchemaName(),
+ entry.getHeader().getTableName(),
+ eventType));
+
+ for (RowData rowData : rowChage.getRowDatasList()) {
+ if (eventType == EventType.DELETE) {
+ print(rowData.getBeforeColumnsList());
+ } else if (eventType == EventType.INSERT) {
+ print(rowData.getAfterColumnsList());
+ } else {
+ System.out.println("-------> before");
+ print(rowData.getBeforeColumnsList());
+ System.out.println("-------> after");
+ print(rowData.getAfterColumnsList());
+ }
+ }
+ }
+ }
+
+ return true;
+ }
+
+ });
+ controller.setLogPositionManager(new AbstractLogPositionManager() {
+
+ @Override
+ public LogPosition getLatestIndexBy(String destination) {
+ return null;
+ }
+
+ @Override
+ public void persistLogPosition(String destination, LogPosition logPosition) throws CanalParseException {
+ System.out.println(logPosition);
+ }
+ });
+
+ controller.start();
+
+ try {
+ Thread.sleep(100 * 1000 * 1000L);
+ } catch (InterruptedException e) {
+ Assert.fail(e.getMessage());
+ }
+ controller.stop();
+ }
+
+ private void print(List columns) {
+ for (Column column : columns) {
+ System.out.println(column.getName() + " : " + column.getValue() + " update=" + column.getUpdated());
+ }
+ }
+}
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/SimpleDdlParserTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/SimpleDdlParserTest.java
index 50dce482..f2bb1ce4 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/SimpleDdlParserTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/SimpleDdlParserTest.java
@@ -3,8 +3,8 @@ package com.alibaba.otter.canal.parse.inbound.mysql;
import org.junit.Assert;
import org.junit.Test;
-import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.SimpleDdlParser;
-import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.SimpleDdlParser.DdlResult;
+import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DdlResult;
+import com.alibaba.otter.canal.parse.inbound.mysql.ddl.SimpleDdlParser;
import com.alibaba.otter.canal.protocol.CanalEntry.EventType;
public class SimpleDdlParserTest {
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMetaTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMetaTest.java
new file mode 100644
index 00000000..9ef0dfc3
--- /dev/null
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMetaTest.java
@@ -0,0 +1,37 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.alibaba.otter.canal.parse.inbound.TableMeta;
+
+/**
+ * @author agapple 2017年8月1日 下午7:15:54
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "/tsdb/mysql-tsdb.xml" })
+public class MemoryTableMetaTest {
+
+ @Test
+ public void testSimple() throws Throwable {
+ MemoryTableMeta memoryTableMeta = new MemoryTableMeta();
+ URL url = Thread.currentThread().getContextClassLoader().getResource("dummy.txt");
+ File dummyFile = new File(url.getFile());
+ File create = new File(dummyFile.getParent() + "/ddl", "create.sql");
+ String sql = StringUtils.join(IOUtils.readLines(new FileInputStream(create)), "\n");
+ memoryTableMeta.apply(null, "test", sql, null);
+
+ TableMeta meta = memoryTableMeta.find("test", "test");
+ System.out.println(meta);
+ Assert.assertTrue(meta.getFieldMetaByName("ID").isKey());
+ }
+}
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MetaHistoryDAOTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MetaHistoryDAOTest.java
new file mode 100644
index 00000000..b199a326
--- /dev/null
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MetaHistoryDAOTest.java
@@ -0,0 +1,33 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao.MetaHistoryDAO;
+import com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao.MetaHistoryDO;
+
+/**
+ * Created by wanshao Date: 2017/9/20 Time: 下午5:00
+ **/
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "/tsdb/mysql-tsdb.xml" })
+public class MetaHistoryDAOTest {
+
+ @Resource
+ MetaHistoryDAO metaHistoryDAO;
+
+ @Test
+ public void testSimple() {
+ List metaHistoryDOList = metaHistoryDAO.findByTimestamp("test", 0L, 0L);
+ for (MetaHistoryDO metaHistoryDO : metaHistoryDOList) {
+ System.out.println(metaHistoryDO.getId());
+ }
+ }
+
+}
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaManagerBuilderTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaManagerBuilderTest.java
new file mode 100644
index 00000000..76bd771e
--- /dev/null
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaManagerBuilderTest.java
@@ -0,0 +1,18 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb;
+
+import org.junit.Test;
+import org.springframework.util.Assert;
+
+/**
+ * @author agapple 2017年10月12日 上午10:50:00
+ * @since 1.0.25
+ */
+public class TableMetaManagerBuilderTest {
+
+ @Test
+ public void testSimple() {
+ TableMetaTSDB tableMetaTSDB = TableMetaTSDBBuilder.build("test", "classpath:tsdb/mysql-tsdb.xml");
+ Assert.notNull(tableMetaTSDB);
+ TableMetaTSDBBuilder.destory("test");
+ }
+}
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaManagerTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaManagerTest.java
new file mode 100644
index 00000000..cd5bfe6e
--- /dev/null
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaManagerTest.java
@@ -0,0 +1,46 @@
+package com.alibaba.otter.canal.parse.inbound.mysql.tsdb;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.alibaba.otter.canal.protocol.position.EntryPosition;
+
+/**
+ * @author wanshao 2017年8月2日 下午4:11:45
+ * @since 3.2.5
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "/tsdb/h2-tsdb.xml" })
+public class TableMetaManagerTest {
+
+ @Resource
+ DatabaseTableMeta tableMetaManager;
+
+ @Test
+ public void testSimple() throws FileNotFoundException, IOException {
+ tableMetaManager.init("test");
+
+ URL url = Thread.currentThread().getContextClassLoader().getResource("dummy.txt");
+ File dummyFile = new File(url.getFile());
+ File create = new File(dummyFile.getParent() + "/ddl", "create.sql");
+ EntryPosition position = new EntryPosition("mysql-bin.001115", 139177334L, 3065927853L, 1501660815000L);
+ String createSql = StringUtils.join(IOUtils.readLines(new FileInputStream(create)), "\n");
+ tableMetaManager.apply(position, "tddl5_00", createSql, null);
+
+ String alterSql = "alter table `test` add column name varchar(32) after c_varchar";
+ position = new EntryPosition("mysql-bin.001115", 139177334L, 3065927854L, 1501660815000L);
+ tableMetaManager.apply(position, "tddl5_00", alterSql, null);
+ }
+}
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java
index 41d4a6b3..8a0d7c7d 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java
@@ -30,14 +30,18 @@ public class PeriodMixedLogPositionManagerTest extends AbstractLogPositionManage
MemoryLogPositionManager memoryLogPositionManager = new MemoryLogPositionManager();
ZooKeeperLogPositionManager zookeeperLogPositionManager = new ZooKeeperLogPositionManager(zkclientx);
- PeriodMixedLogPositionManager logPositionManager = new PeriodMixedLogPositionManager(memoryLogPositionManager, zookeeperLogPositionManager, 1000L);
+ PeriodMixedLogPositionManager logPositionManager = new PeriodMixedLogPositionManager(memoryLogPositionManager,
+ zookeeperLogPositionManager,
+ 1000L);
logPositionManager.start();
LogPosition position2 = doTest(logPositionManager);
sleep(1500);
- PeriodMixedLogPositionManager logPositionManager2 = new PeriodMixedLogPositionManager(memoryLogPositionManager, zookeeperLogPositionManager, 1000L);
+ PeriodMixedLogPositionManager logPositionManager2 = new PeriodMixedLogPositionManager(memoryLogPositionManager,
+ zookeeperLogPositionManager,
+ 1000L);
logPositionManager2.start();
LogPosition getPosition2 = logPositionManager2.getLatestIndexBy(destination);
diff --git a/parse/src/test/resources/binlog/tsdb/mysql-bin.000001 b/parse/src/test/resources/binlog/tsdb/mysql-bin.000001
new file mode 100644
index 00000000..992efb5c
Binary files /dev/null and b/parse/src/test/resources/binlog/tsdb/mysql-bin.000001 differ
diff --git a/parse/src/test/resources/binlog/tsdb/mysql-bin.000002 b/parse/src/test/resources/binlog/tsdb/mysql-bin.000002
new file mode 100644
index 00000000..dda78313
Binary files /dev/null and b/parse/src/test/resources/binlog/tsdb/mysql-bin.000002 differ
diff --git a/parse/src/test/resources/binlog/tsdb/mysql-bin.000003 b/parse/src/test/resources/binlog/tsdb/mysql-bin.000003
new file mode 100644
index 00000000..fe11ee38
Binary files /dev/null and b/parse/src/test/resources/binlog/tsdb/mysql-bin.000003 differ
diff --git a/parse/src/test/resources/ddl/create.sql b/parse/src/test/resources/ddl/create.sql
new file mode 100644
index 00000000..74e716ab
--- /dev/null
+++ b/parse/src/test/resources/ddl/create.sql
@@ -0,0 +1,64 @@
+CREATE TABLE `test_all` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `c_bit_1` bit(1) DEFAULT NULL,
+ `c_bit_8` bit(8) DEFAULT NULL,
+ `c_bit_16` bit(16) DEFAULT NULL,
+ `c_bit_32` bit(32) DEFAULT NULL,
+ `c_bit_64` bit(64) DEFAULT NULL,
+ `c_bool` boolean DEFAULT NULL,
+ `c_tinyint_1` tinyint(1) DEFAULT NULL,
+ `c_tinyint_4` tinyint(4) DEFAULT NULL,
+ `c_tinyint_8` tinyint(8) DEFAULT NULL,
+ `c_tinyint_8_un` tinyint(8) unsigned DEFAULT NULL,
+ `c_smallint_1` smallint(1) DEFAULT NULL,
+ `c_smallint_16` smallint(16) DEFAULT NULL,
+ `c_smallint_16_un` smallint(16) unsigned DEFAULT NULL,
+ `c_mediumint_1` mediumint(1) DEFAULT NULL,
+ `c_mediumint_24` mediumint(24) DEFAULT NULL,
+ `c_mediumint_24_un` mediumint(24) unsigned DEFAULT NULL,
+ `c_int_1` int(1) DEFAULT NULL,
+ `c_int_32` int(32) DEFAULT NULL,
+ `c_int_32_un` int(32) unsigned DEFAULT NULL,
+ `c_bigint_1` bigint(1) DEFAULT NULL,
+ `c_bigint_64` bigint(64) DEFAULT NULL,
+ `c_bigint_64_un` bigint(64) unsigned DEFAULT NULL,
+ `c_decimal` decimal(10,3) DEFAULT NULL,
+ `c_decimal_pr` decimal(10,3) DEFAULT NULL,
+ `c_float` float DEFAULT NULL,
+ `c_float_pr` float(10,3) DEFAULT NULL,
+ `c_float_un` float(10,3) unsigned DEFAULT NULL,
+ `c_double` double DEFAULT NULL,
+ `c_double_pr` double(10,3) DEFAULT NULL,
+ `c_double_un` double(10,3) unsigned DEFAULT NULL,
+ `c_date` date DEFAULT NULL COMMENT 'date',
+ `c_datetime` datetime DEFAULT NULL,
+ `c_datetime_1` datetime(1) DEFAULT NULL,
+ `c_datetime_3` datetime(3) DEFAULT NULL,
+ `c_datetime_6` datetime(6) DEFAULT NULL,
+ `c_timestamp` timestamp DEFAULT CURRENT_TIMESTAMP,
+ `c_timestamp_1` timestamp(1) DEFAULT 0,
+ `c_timestamp_3` timestamp(3) DEFAULT 0,
+ `c_timestamp_6` timestamp(6) DEFAULT 0,
+ `c_time` time DEFAULT NULL,
+ `c_time_1` time(1) DEFAULT NULL,
+ `c_time_3` time(3) DEFAULT NULL,
+ `c_time_6` time(6) DEFAULT NULL,
+ `c_year` year DEFAULT NULL,
+ `c_year_4` year(4) DEFAULT NULL,
+ `c_char` char(10) DEFAULT NULL,
+ `c_varchar` varchar(10) DEFAULT NULL,
+ `c_binary` binary(10) DEFAULT NULL,
+ `c_varbinary` varbinary(10) DEFAULT NULL,
+ `c_blob_tiny` tinyblob DEFAULT NULL,
+ `c_blob` blob DEFAULT NULL,
+ `c_blob_medium` mediumblob DEFAULT NULL,
+ `c_blob_long` longblob DEFAULT NULL,
+ `c_text_tiny` tinytext DEFAULT NULL,
+ `c_text` text DEFAULT NULL,
+ `c_text_medium` mediumtext DEFAULT NULL,
+ `c_text_long` longtext DEFAULT NULL,
+ `c_enum` enum('a','b','c') DEFAULT NULL,
+ `c_set` set('a','b','c') DEFAULT NULL,
+ `c_json` json DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='10000000'
\ No newline at end of file
diff --git a/parse/src/test/resources/tsdb/derby-tsdb.xml b/parse/src/test/resources/tsdb/derby-tsdb.xml
new file mode 100644
index 00000000..4ce4dcbf
--- /dev/null
+++ b/parse/src/test/resources/tsdb/derby-tsdb.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/parse/src/test/resources/tsdb/h2-tsdb.xml b/parse/src/test/resources/tsdb/h2-tsdb.xml
new file mode 100644
index 00000000..c0a3d385
--- /dev/null
+++ b/parse/src/test/resources/tsdb/h2-tsdb.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/parse/src/test/resources/tsdb/mysql-tsdb.xml b/parse/src/test/resources/tsdb/mysql-tsdb.xml
new file mode 100644
index 00000000..099c034d
--- /dev/null
+++ b/parse/src/test/resources/tsdb/mysql-tsdb.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/parse/src/test/resources/tsdb/sql-map/sqlmap-config.xml b/parse/src/test/resources/tsdb/sql-map/sqlmap-config.xml
new file mode 100644
index 00000000..2485a35b
--- /dev/null
+++ b/parse/src/test/resources/tsdb/sql-map/sqlmap-config.xml
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/parse/src/test/resources/tsdb/sql-map/sqlmap_history.xml b/parse/src/test/resources/tsdb/sql-map/sqlmap_history.xml
new file mode 100644
index 00000000..7445bf69
--- /dev/null
+++ b/parse/src/test/resources/tsdb/sql-map/sqlmap_history.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+ select
+
+
+
+ insert into meta_history (
+
+
+ delete from meta_history
+ where destination=#destination#
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/parse/src/test/resources/tsdb/sql-map/sqlmap_snapshot.xml b/parse/src/test/resources/tsdb/sql-map/sqlmap_snapshot.xml
new file mode 100644
index 00000000..7ba0a435
--- /dev/null
+++ b/parse/src/test/resources/tsdb/sql-map/sqlmap_snapshot.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+ select
+
+
+ select * FROM (
+ select ROW_NUMBER() OVER() AS rownum,
+
+
+ insert into meta_snapshot (
+
+
+ update meta_snapshot set gmt_modified=now(),
+ binlog_file=#binlogFile#,binlog_offest=#binlogOffest#,binlog_master_id=#binlogMasterId#,binlog_timestamp=#binlogTimestamp#,data=#data#,extra=#extra#
+ where destination=#destination# and binlog_timestamp=0
+
+
+
+ delete from meta_snapshot
+ where destination=#destination#
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 03bec07c..a951f42c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
canal
pom
canal module for otter ${project.version}
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
https://github.com/alibaba/canal
org.sonatype.oss
@@ -109,6 +109,7 @@
1.6
1.6
UTF-8
+ 3.2.9.RELEASE
@@ -130,10 +131,36 @@
+
+ org.springframework
+ spring-core
+ ${spring_version}
+
+
+ org.springframework
+ spring-aop
+ ${spring_version}
+
+
+ org.springframework
+ spring-context
+ ${spring_version}
+
+
+ org.springframework
+ spring-jdbc
+ ${spring_version}
+
+
+ org.springframework
+ spring-orm
+ ${spring_version}
+
org.springframework
- spring
- 2.5.6
+ spring-test
+ ${spring_version}
+ test
@@ -146,6 +173,21 @@
commons-io
2.4
+
+ commons-codec
+ commons-codec
+ 1.9
+
+
+ org.apache.commons
+ commons-compress
+ 1.9
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.1
+
org.apache.zookeeper
zookeeper
@@ -170,9 +212,9 @@
- com.github.sgroschupf
+ com.101tec
zkclient
- 0.1
+ 0.10
com.alibaba
@@ -194,11 +236,6 @@
oro
2.0.8
-
- org.jboss.netty
- netty
- 3.2.5.Final
-
io.netty
netty-all
@@ -209,6 +246,16 @@
protobuf-java
2.6.1
+
+ org.apache.ibatis
+ ibatis-sqlmap
+ 2.3.4.726
+
+
+ com.alibaba
+ druid
+ 1.1.7-preview_0
+
ch.qos.logback
@@ -230,6 +277,11 @@
slf4j-api
1.7.12
+
+ com.h2database
+ h2
+ 1.4.196
+
junit
@@ -240,9 +292,10 @@
mysql
mysql-connector-java
- 5.1.33
- test
+ 5.1.40
+
+
diff --git a/protocol/pom.xml b/protocol/pom.xml
index b13c17b1..ec7c7867 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
diff --git a/protocol/src/main/java/com/alibaba/otter/canal/protocol/position/EntryPosition.java b/protocol/src/main/java/com/alibaba/otter/canal/protocol/position/EntryPosition.java
index 2890e9ad..1f8ec38d 100644
--- a/protocol/src/main/java/com/alibaba/otter/canal/protocol/position/EntryPosition.java
+++ b/protocol/src/main/java/com/alibaba/otter/canal/protocol/position/EntryPosition.java
@@ -1,5 +1,6 @@
package com.alibaba.otter.canal.protocol.position;
+
/**
* 数据库对象的唯一标示
*
@@ -121,4 +122,18 @@ public class EntryPosition extends TimePosition {
return true;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ public int compareTo(EntryPosition o) {
+ final int val = journalName.compareTo(o.journalName);
+
+ if (val == 0) {
+ return (int) (position - o.position);
+ }
+ return val;
+ }
+
}
diff --git a/server/pom.xml b/server/pom.xml
index 5538d9f5..1d243981 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
canal.server
diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java
index 57289f7a..19a7827d 100644
--- a/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java
+++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java
@@ -34,7 +34,10 @@ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements Cana
private int port;
private Channel serverChannel = null;
private ServerBootstrap bootstrap = null;
- private ChannelGroup childGroups = null; //socket channel container, used to close sockets explicitly.
+ private ChannelGroup childGroups = null; // socket channel
+ // container, used to
+ // close sockets
+ // explicitly.
private static class SingletonHolder {
@@ -60,12 +63,10 @@ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements Cana
this.bootstrap = new ServerBootstrap(new NioServerSocketChannelFactory(Executors.newCachedThreadPool(),
Executors.newCachedThreadPool()));
/*
- * enable keep-alive mechanism, handle abnormal network connection scenarios on OS level.
- * the threshold parameters are depended on OS.
- * e.g. On Linux:
- * net.ipv4.tcp_keepalive_time = 300
- * net.ipv4.tcp_keepalive_probes = 2
- * net.ipv4.tcp_keepalive_intvl = 30
+ * enable keep-alive mechanism, handle abnormal network connection
+ * scenarios on OS level. the threshold parameters are depended on OS.
+ * e.g. On Linux: net.ipv4.tcp_keepalive_time = 300
+ * net.ipv4.tcp_keepalive_probes = 2 net.ipv4.tcp_keepalive_intvl = 30
*/
bootstrap.setOption("child.keepAlive", true);
/*
@@ -79,8 +80,9 @@ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements Cana
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipelines = Channels.pipeline();
pipelines.addLast(FixedHeaderFrameDecoder.class.getName(), new FixedHeaderFrameDecoder());
- //support to maintain child socket channel.
- pipelines.addLast(HandshakeInitializationHandler.class.getName(), new HandshakeInitializationHandler(childGroups));
+ // support to maintain child socket channel.
+ pipelines.addLast(HandshakeInitializationHandler.class.getName(),
+ new HandshakeInitializationHandler(childGroups));
pipelines.addLast(ClientAuthenticationHandler.class.getName(),
new ClientAuthenticationHandler(embeddedServer));
@@ -105,9 +107,10 @@ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements Cana
this.serverChannel.close().awaitUninterruptibly(1000);
}
- //close sockets explicitly to reduce socket channel hung in complicated network environment.
+ // close sockets explicitly to reduce socket channel hung in complicated
+ // network environment.
if (this.childGroups != null) {
- this.childGroups.close().awaitUninterruptibly(5000);
+ this.childGroups.close().awaitUninterruptibly(5000);
}
if (this.bootstrap != null) {
diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java
index 73bcd5d2..eaa6b636 100644
--- a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java
+++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java
@@ -89,11 +89,13 @@ public class ClientAuthenticationHandler extends SimpleChannelHandler {
if (clientAuth.getNetWriteTimeout() > 0) {
writeTimeout = clientAuth.getNetWriteTimeout();
}
- //fix bug: soTimeout parameter's unit from connector is millseconds.
+ // fix bug: soTimeout parameter's unit from connector is
+ // millseconds.
IdleStateHandler idleStateHandler = new IdleStateHandler(NettyUtils.hashedWheelTimer,
readTimeout,
writeTimeout,
- 0, TimeUnit.MILLISECONDS);
+ 0,
+ TimeUnit.MILLISECONDS);
ctx.getPipeline().addBefore(SessionHandler.class.getName(),
IdleStateHandler.class.getName(),
idleStateHandler);
diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/HandshakeInitializationHandler.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/HandshakeInitializationHandler.java
index 438e508f..178a93dd 100644
--- a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/HandshakeInitializationHandler.java
+++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/HandshakeInitializationHandler.java
@@ -19,20 +19,21 @@ import com.alibaba.otter.canal.server.netty.NettyUtils;
* @version 1.0.0
*/
public class HandshakeInitializationHandler extends SimpleChannelHandler {
- //support to maintain socket channel.
- private ChannelGroup childGroups;
- public HandshakeInitializationHandler(ChannelGroup childGroups) {
- this.childGroups = childGroups;
- }
+ // support to maintain socket channel.
+ private ChannelGroup childGroups;
+
+ public HandshakeInitializationHandler(ChannelGroup childGroups){
+ this.childGroups = childGroups;
+ }
private static final Logger logger = LoggerFactory.getLogger(HandshakeInitializationHandler.class);
public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
- //add new socket channel in channel container, used to manage sockets.
- if(childGroups != null) {
- childGroups.add(ctx.getChannel());
- }
+ // add new socket channel in channel container, used to manage sockets.
+ if (childGroups != null) {
+ childGroups.add(ctx.getChannel());
+ }
byte[] body = Packet.newBuilder()
.setType(CanalPacket.PacketType.HANDSHAKE)
diff --git a/server/src/test/java/com/alibaba/otter/canal/server/BaseCanalServerWithEmbededTest.java b/server/src/test/java/com/alibaba/otter/canal/server/BaseCanalServerWithEmbededTest.java
index 10f2f3e5..afc74c86 100644
--- a/server/src/test/java/com/alibaba/otter/canal/server/BaseCanalServerWithEmbededTest.java
+++ b/server/src/test/java/com/alibaba/otter/canal/server/BaseCanalServerWithEmbededTest.java
@@ -19,12 +19,12 @@ import com.alibaba.otter.canal.server.embedded.CanalServerWithEmbedded;
public abstract class BaseCanalServerWithEmbededTest {
protected static final String cluster1 = "127.0.0.1:2188";
- protected static final String DESTINATION = "ljhtest1";
+ protected static final String DESTINATION = "example";
protected static final String DETECTING_SQL = "insert into retl.xdual values(1,now()) on duplicate key update x=now()";
protected static final String MYSQL_ADDRESS = "127.0.0.1";
- protected static final String USERNAME = "retl";
- protected static final String PASSWORD = "retl";
- protected static final String FILTER = "retl\\..*,erosa.zk_complaint_bizdata";
+ protected static final String USERNAME = "canal";
+ protected static final String PASSWORD = "canal";
+ protected static final String FILTER = ".*\\\\..*";
private CanalServerWithEmbedded server;
private ClientIdentity clientIdentity = new ClientIdentity(DESTINATION, (short) 1); ;
diff --git a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandaloneTest.java b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandaloneTest.java
index 9790f770..a4ce077a 100644
--- a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandaloneTest.java
+++ b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandaloneTest.java
@@ -34,8 +34,8 @@ public class CanalServerWithEmbedded_StandaloneTest extends BaseCanalServerWithE
new InetSocketAddress(MYSQL_ADDRESS, 3306)));
parameter.setDbUsername(USERNAME);
parameter.setDbPassword(PASSWORD);
- parameter.setPositions(Arrays.asList("{\"journalName\":\"mysql-bin.000001\",\"position\":6163L,\"timestamp\":1322803601000L}",
- "{\"journalName\":\"mysql-bin.000001\",\"position\":6163L,\"timestamp\":1322803601000L}"));
+ parameter.setPositions(Arrays.asList("{\"journalName\":\"mysql-bin.000003\",\"position\":14217L,\"timestamp\":\"1505998863000\"}",
+ "{\"journalName\":\"mysql-bin.000003\",\"position\":14377L,\"timestamp\":\"1505998863000\"}"));
parameter.setSlaveId(1234L);
diff --git a/sink/pom.xml b/sink/pom.xml
index bffb8bdf..4ed7e04f 100644
--- a/sink/pom.xml
+++ b/sink/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
diff --git a/store/pom.xml b/store/pom.xml
index a0b478fd..318c2f9d 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -3,7 +3,7 @@
com.alibaba.otter
canal
- 1.0.25-SNAPSHOT
+ 1.0.26-SNAPSHOT
../pom.xml
com.alibaba.otter
