Commit Graph
1067 Commits
Author SHA1 Message Date
mcy f21abc13af fixed #1538 2019-02-26 10:23:38 +08:00
mcy fcc1fc78ae fix #1521 2019-02-22 17:09:50 +08:00
mcy 17efc2ada0 es 批量提交修改 2019-02-22 16:56:58 +08:00
mcy 01dc8ce2b8 YmlConfigBinder代码整理 2019-02-20 15:00:48 +08:00
mcy 57c3226e56 Merge branch 'feature/es2' 2019-02-19 15:05:59 +08:00
rewerma 79a3961da1 Merge pull request #34 from alibaba/master
merge
2019-02-19 15:05:34 +08:00
agapple 62338a945e Merge pull request #1496 from rewerma/master
远程配置代码整理
2019-02-18 21:08:02 +08:00
agapple e07db7b178 Merge pull request #1507 from i404/master
修复 FlatMessage  Hash 到不正确的分区的Bug。
2019-02-18 21:05:03 +08:00
mcy 05cc627b5d fix rdb etl bug 2019-02-15 11:39:26 +08:00
i404 44beaf1916 修复当 canal.mq.flatMessage = true 时,MQMessageUtils::messagePartition 数据分区错误的 bug 2019-02-14 18:26:01 +08:00
mcy 476244b26d modify 2019-02-14 15:41:27 +08:00
mcy cfdf509f9a 增加对pk的支持 2019-02-14 15:29:27 +08:00
mcy c14ed724ff update中增加upsert判断 2019-02-13 15:59:46 +08:00
mcy 5a4cfeab46 Merge branch 'master' into feature/es2
# Conflicts:
#	client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/support/ESTemplate.java
2019-02-13 15:51:24 +08:00
mcy 947cf130ab fixed #1504 2019-02-13 15:50:11 +08:00
mcy 0ef21e4155 代码整理 2019-02-13 15:47:48 +08:00
mcy 83b760494d ES adapter代码重新整理
新增upsert属性
2019-02-13 15:19:09 +08:00
mcy aba8df699c Merge branch 'master' into feature/es2
# Conflicts:
#	client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/SchemaItem.java
2019-02-12 17:21:42 +08:00
rewer 0c5f5c128f 整理代码 2019-02-07 13:49:35 +08:00
mcy ad62275cd7 增加kafka自定义properties 2019-02-05 19:20:36 +08:00
mcy f6d03bcb37 fixed #1490 2019-02-05 17:48:08 +08:00
mcy 5284aa9793 fix bugs 2019-02-01 16:20:53 +08:00
mcy 10276e254a mq模式下adapter配置增加groupId属性对应 2019-02-01 15:18:16 +08:00
mcy 597a08ac37 通过groupId过滤对应的adapter配置 2019-02-01 13:51:49 +08:00
mcy 8211ef35e6 修改yml配置读取绑定,遵循spring yml加载方式,支持environment级占位符替换 2019-02-01 10:11:52 +08:00
mcy a20960834b 远程配置代码整理 2019-01-31 09:45:52 +08:00
rewerma 7b6b332463 Merge pull request #33 from alibaba/master
merge
2019-01-31 09:03:37 +08:00
agapple 43f869599d Merge pull request #1484 from liulangwa/master
捕获"rs = query("select @@global.binlog_checksum")" 结果rs为null的异常
2019-01-30 11:45:33 +08:00
agapple e3d05f6201 Merge pull request #1482 from wurongjun/master
修复从数据库加载配置写入文件时因目录不存在出现的问题
2019-01-30 11:43:47 +08:00
codebee 032301102c 捕获"rs = query("select @@global.binlog_checksum")" 结果rs为null的异常 2019-01-29 17:10:26 +08:00
wurongjun@duiba.com.cn bb64d84298 修复从数据库加载配置写入文件时因目录不存在出现的问题 2019-01-29 16:10:26 +08:00
bigbro ccd39e9d62 Merge pull request #1 from alibaba/master
update
2019-01-29 16:03:43 +08:00
agapple 32031da9db Merge pull request #1475 from rewerma/master
整理远程配置, 统一扩展接口
2019-01-29 10:13:03 +08:00
mcy 9a2e890f57 整理adapter端远程配置, 统一扩展接口 2019-01-25 18:50:30 +08:00
mcy 8f76b33214 解析配置修改 2019-01-25 17:51:38 +08:00
mcy a7467539c7 整理server端远程配置, 统一扩展接口 2019-01-25 17:50:50 +08:00
agapple db5495d158 Merge pull request #1464 from KangZhiDong/master
修改注释
2019-01-25 10:41:40 +08:00
kangzhidong b04d948064 修改注释 2019-01-23 11:58:07 +08:00
agapple 5f8eb4d261 Merge pull request #1456 from rewerma/master
新增kafka消息投递事务
2019-01-21 23:45:13 +08:00
mcy 197ca67c8b 测试调整 2019-01-21 09:56:35 +08:00
machey 851637611f modify 2019-01-20 15:02:06 +08:00
machey 4ebf17f57b 代码调整 2019-01-20 14:30:20 +08:00
machey 2f214ce3a6 采用事务批量异步投递kafka flatMessage
fixed #1454
2019-01-20 14:20:06 +08:00
agapple 8d4fbb395b fixed issue #1451 , fixed NPE 2019-01-18 11:00:02 +08:00
agapple d935c39648 Merge pull request #1449 from wdlily/master
fixed a word
2019-01-18 10:24:01 +08:00
wdlily 6e0e3fbef1 fixed a word
change '租' to '组'
2019-01-17 15:52:24 +08:00
rewerma cbe88af2e3 Merge pull request #1442 from rewerma/master
fixed #1430
2019-01-17 15:18:40 +08:00
mcy ba9d9dea6d fixed #1433 2019-01-17 11:27:12 +08:00
mcy 2d88d803ee merge #1440 and fixed #1430 2019-01-17 10:52:27 +08:00
rewerma ff1fef1eb6 Merge pull request #32 from alibaba/master
merge
2019-01-17 10:48:23 +08:00