From b1811adaa8312269359f4b5a35f9fea738013284 Mon Sep 17 00:00:00 2001 From: wangzhu <367059791@qq.com> Date: Thu, 26 Dec 2019 14:51:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20bug:=20example=20=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ea3cbb0..748db1e 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ python >= 3 ````shell pip install canal-python +pip install protobuf ```` ### 建立与Canal的连接 @@ -125,5 +126,5 @@ while True: client.disconnect() ```` -更多详情请查看 [Sample](https://github.com/haozi3156666/canal-python/blob/master/example.py) +更多详情请查看 [Sample](https://github.com/haozi3156666/canal-python/blob/master/canal/example.py) From 643f85199769220e6d20ba271e3bc167789bd5ff Mon Sep 17 00:00:00 2001 From: wangzhu <367059791@qq.com> Date: Thu, 26 Dec 2019 14:51:34 +0800 Subject: [PATCH 2/3] fix bug: before, after --- canal/client.py | 3 ++- canal/example.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/canal/client.py b/canal/client.py index 567b592..0f47c11 100644 --- a/canal/client.py +++ b/canal/client.py @@ -180,7 +180,8 @@ def rollback(self, batch_id): column.name: column.value } else: - format_data['before'] = format_data['after'] = dict() + format_data['before'] = dict() + format_data['after'] = dict() for column in row.beforeColumns: format_data['before'][column.name] = column.value for column in row.afterColumns: diff --git a/canal/example.py b/canal/example.py index de68f90..c50c52d 100644 --- a/canal/example.py +++ b/canal/example.py @@ -38,7 +38,8 @@ column.name: column.value } else: - format_data['before'] = format_data['after'] = dict() + format_data['before'] = dict() + format_data['after'] = dict() for column in row.beforeColumns: format_data['before'][column.name] = column.value for column in row.afterColumns: From 98b06b32dc28231cdd786e878afc9d1d4fe40e89 Mon Sep 17 00:00:00 2001 From: wangzhu <367059791@qq.com> Date: Thu, 26 Dec 2019 16:19:21 +0800 Subject: [PATCH 3/3] fix bug: delete and insert --- canal/client.py | 8 ++------ canal/example.py | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/canal/client.py b/canal/client.py index 0f47c11..0455050 100644 --- a/canal/client.py +++ b/canal/client.py @@ -171,14 +171,10 @@ def rollback(self, batch_id): format_data = dict() if event_type == EntryProtocol_pb2.EventType.DELETE: for column in row.beforeColumns: - format_data = { - column.name: column.value - } + format_data[column.name] = column.value elif event_type == EntryProtocol_pb2.EventType.INSERT: for column in row.afterColumns: - format_data = { - column.name: column.value - } + format_data[column.name] = column.value else: format_data['before'] = dict() format_data['after'] = dict() diff --git a/canal/example.py b/canal/example.py index c50c52d..361ce9d 100644 --- a/canal/example.py +++ b/canal/example.py @@ -29,14 +29,10 @@ format_data = dict() if event_type == EntryProtocol_pb2.EventType.DELETE: for column in row.beforeColumns: - format_data = { - column.name: column.value - } + format_data[column.name] = column.value elif event_type == EntryProtocol_pb2.EventType.INSERT: for column in row.afterColumns: - format_data = { - column.name: column.value - } + format_data[column.name] = column.value else: format_data['before'] = dict() format_data['after'] = dict()