Commit Graph

464 Commits

Author SHA1 Message Date
lcybo
67a3a1d955 Merge pull request #827 from lcybo/metrics_support
Merge master updates
2018-08-09 22:50:32 +08:00
Chuanyi Li
a857b87388 Merge branch 'master' into metrics_support 2018-08-09 22:44:39 +08:00
七锋
b57ac0bcdf fixed merge and blob encoding example 2018-08-09 16:56:13 +08:00
charles.lin
ea6391d1c3 Merge branch 'branch-rds-support' 2018-08-09 16:44:12 +08:00
agapple
89a32aaabd Merge pull request #825 from lcybo/master
Remove dirty test case
2018-08-09 11:38:48 +08:00
charles.lin
b53131553e Commit test case 2018-08-09 02:01:44 +08:00
charles.lin
68d8afae3e Merge commit '9e816bc48f9955f9e2839873993cef9627c2f389' into branch-rds-support
Conflicts:
	instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java
	instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/model/CanalParameter.java
	parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/AbstractMysqlEventParser.java
	parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
2018-08-09 02:01:00 +08:00
lcybo
a2eb128698 Merge pull request #826 from lcybo/metrics_support
Metrics support
2018-08-08 22:56:44 +08:00
Chuanyi Li
760f2dda80 Enhance heartbeat, rowscount. 2018-08-08 22:53:08 +08:00
Chuanyi Li
bf9dc0073d Merge branch 'master' into metrics_support 2018-08-08 21:01:22 +08:00
Chuanyi Li
92f24bd02e Remove dirty test case 2018-08-08 20:59:09 +08:00
Chuanyi Li
d4797a8fb9 Merge master branch. 2018-08-08 20:35:14 +08:00
Chuanyi Li
060bd8e31d Reformat code. 2018-08-08 20:10:34 +08:00
charles.lin
61c7f7738d rds binlog 下载支持 2018-08-08 19:29:52 +08:00
七锋
9e816bc48f support otter use tableMetaTSDB 2018-08-08 18:54:57 +08:00
agapple
377a72e1c0 Merge pull request #814 from payonxp/pyf2
schema history storage interface
2018-08-08 10:36:41 +08:00
Chuanyi Li
88de747ed5 Improve sink blocking time resolution. 2018-08-08 07:53:44 +08:00
lcybo
725d36aa98 Merge pull request #819 from lcybo/metrics_support
canal 性能监控改动版,merge到开发分支(metrics_support)
2018-08-07 23:02:37 +08:00
Chuanyi Li
d24e10fb3e Canal metrics snapshot version. 2018-08-07 22:52:30 +08:00
Chuanyi Li
fdae646e26 Merge branch 'master' into metrics_support 2018-08-07 19:46:30 +08:00
Payon
b1dc5bd59f Merge branch 'master' into pyf2 2018-08-07 19:29:27 +08:00
七锋
23f7b3b5d8 fixed issue #818 , tableMeta tsdb bugfix canal-1.0.26-preview-5 2018-08-07 18:51:23 +08:00
agapple
09339333bb Merge pull request #816 from wingerx/master
fix ci: fixed compiler java 1.7
2018-08-07 18:23:41 +08:00
七锋
f36ce647e6 fixed issue #781 , upgrade fastsql 540 2018-08-07 17:46:36 +08:00
Chuanyi Li L
40c3e65341 Refactor metrics code. 2018-08-07 17:17:33 +08:00
winger
6d3584b6fb 移除canal.instance.spring 依赖后,需要加入druid与mysql connector的依赖 2. PropertyPlaceholderConfigurer由canal.instance.spring移至db 2018-08-07 16:59:55 +08:00
七锋
4006cedaad fixed issue #781, 修复部分DDL解析异常 2018-08-07 16:44:40 +08:00
七锋
cd0bf60824 fixed compiler java 1.7 2018-08-07 16:19:58 +08:00
agapple
c4c45d9e0b Merge pull request #813 from wingerx/master
fix #802: 从otter中剥离MySQL 相关同步实现,作为example的参考
2018-08-07 15:50:09 +08:00
yfpeng
02868d8fec 为了解决回追数据时Rowdata与当前schema不匹配
对TableMeta提供持久化接口,可以根据timestamp匹配历史schema
2018-08-07 13:42:29 +08:00
winger
7d9e2dc69b fix #802: 从otter中剥离MySQL 相关同步实现,作为example的参考 2018-08-07 12:04:57 +08:00
Chuanyi Li
b5a1898cec Prometheus refactor. 2018-08-07 08:18:01 +08:00
Chuanyi Li L
680faea2bb Add listener to write. 2018-08-06 17:22:28 +08:00
winger
1cd77bf551 fix bug: kafka get row data for performance 2018-08-06 15:29:14 +08:00
qmzhang
9786faba9a instance由manager管理时,CanalParameter#MetaMode增加本地文件方式,本地meta.dat存储位点信息; 2018-08-06 15:29:14 +08:00
七锋
325fe89aed fixed issue #801 , optimizer docker 2018-08-06 15:29:13 +08:00
七锋
ffeec8fc86 fixed issue #801 , support canal docker 2018-08-06 15:29:13 +08:00
winger
7662c9241e 支持GTID模式下,通过获取当前gtid值 2018-08-06 15:29:13 +08:00
Chuanyi Li L
d01195ac82 Merge branch 'master' into metrics_support 2018-08-06 15:26:44 +08:00
agapple
7c7ce43455 Merge pull request #810 from wingerx/master
fix bug: kafka get row data for performance
2018-08-06 12:19:08 +08:00
winger
119c5a6971 Merge remote-tracking branch 'upstream/master' 2018-08-06 11:19:58 +08:00
winger
8a952d3a5f fix bug: kafka get row data for performance 2018-08-06 11:11:57 +08:00
agapple
764e1b6dc0 Merge pull request #807 from qmz/master
instance with manager模式一些微调
2018-08-06 10:11:53 +08:00
Chuanyi Li
8b186d1330 canal server metrics refactor. 2018-08-06 08:12:59 +08:00
qmzhang
4e5e2f84e0 Merge branch 'master' of https://github.com/alibaba/canal 2018-08-05 19:45:59 +08:00
qmzhang
3c716e2a43 instance由manager管理时,CanalParameter#MetaMode增加本地文件方式,本地meta.dat存储位点信息; 2018-08-05 19:40:14 +08:00
七锋
872dad8ce8 fixed issue #801 , optimizer docker 2018-08-04 10:37:55 +08:00
agapple
bd6ab1cc80 Merge pull request #806 from wingerx/master
支持GTID模式下,默认获取当前gtid值作为起始值
2018-08-03 19:48:42 +08:00
七锋
7fd958a490 fixed issue #801 , support canal docker 2018-08-03 17:48:32 +08:00
Chuanyi Li L
b7431eb7d0 Reformat code. 2018-08-03 17:42:57 +08:00