From 9748fceda8cefb01e673da5575c914e9799d6ffd Mon Sep 17 00:00:00 2001 From: WithLin Date: Mon, 17 Sep 2018 11:11:07 +0800 Subject: [PATCH 1/2] fix proto3 bug --- .../alibaba/otter/canal/client/impl/SimpleCanalConnector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java b/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java index b7951912..b8fcc36a 100644 --- a/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java +++ b/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java @@ -323,7 +323,7 @@ public class SimpleCanalConnector implements CanalConnector { Packet p = Packet.parseFrom(data); switch (p.getType()) { case MESSAGES: { - if (!p.getCompression().equals(Compression.NONE)) { + if (!p.getCompression().equals(Compression.NONE) && !p.getCompression().equals(Compression.COMPRESSIONCOMPATIBLEPROTO2)) { throw new CanalClientException("compression is not supported in this connector"); } From 1a8d6e65cf3b471c6ca90f28f13fed6a3464fd15 Mon Sep 17 00:00:00 2001 From: WithLin Date: Mon, 17 Sep 2018 11:17:55 +0800 Subject: [PATCH 2/2] FIx --- .../alibaba/otter/canal/client/impl/SimpleCanalConnector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java b/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java index b8fcc36a..956c06af 100644 --- a/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java +++ b/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java @@ -323,7 +323,7 @@ public class SimpleCanalConnector implements CanalConnector { Packet p = Packet.parseFrom(data); switch (p.getType()) { case MESSAGES: { - if (!p.getCompression().equals(Compression.NONE) && !p.getCompression().equals(Compression.COMPRESSIONCOMPATIBLEPROTO2)) { + if (!p.getCompression().equals(Compression.COMPRESSIONCOMPATIBLEPROTO2)) { throw new CanalClientException("compression is not supported in this connector"); }