chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1622 from rewerma/master

Browse Source 
fix bugs
This commit is contained in:
agapple
2019-03-22 18:14:14 +08:00
committed by GitHub
parent c94e3a0024 37c5168a7d
commit 08167c95c7
2 changed files with 330 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/support/PhTypeUtil.java
View File

@@ -130,8 +130,10 @@ public class PhTypeUtil {
} else if (b[0] == 0) { } else if (b[0] == 0) {
v = false; v = false;
} }
} else if (phType == PhType.TIME || phType == PhType.DATE) { } else if (phType == PhType.DATE) {
v = new Date(decodeLong(b, 0)); v = new java.sql.Date(decodeLong(b, 0));
} else if (phType == PhType.TIME) {
v = new java.sql.Time(decodeLong(b, 0));
} else if (phType == PhType.TIMESTAMP) { } else if (phType == PhType.TIMESTAMP) {
long millisDeserialized = decodeLong(b, 0); long millisDeserialized = decodeLong(b, 0);
Timestamp ts = new Timestamp(millisDeserialized); Timestamp ts = new Timestamp(millisDeserialized);

1
client/src/main/java/com/alibaba/otter/canal/client/kafka/KafkaCanalConnector.java
View File

@@ -56,6 +56,7 @@ public class KafkaCanalConnector implements CanalMQConnector {
properties.put("auto.offset.reset", "latest"); // 如果没有offset则从最后的offset开始读 properties.put("auto.offset.reset", "latest"); // 如果没有offset则从最后的offset开始读
properties.put("request.timeout.ms", "40000"); // 必须大于session.timeout.ms的设置 properties.put("request.timeout.ms", "40000"); // 必须大于session.timeout.ms的设置
properties.put("session.timeout.ms", "30000"); // 默认为30秒 properties.put("session.timeout.ms", "30000"); // 默认为30秒
properties.put("isolation.level", "read_committed");
if (batchSize == null) { if (batchSize == null) {
batchSize = 100; batchSize = 100;
} }