From 833cc55e2639048b5ecd0f7eeb12511d4fdd9cca Mon Sep 17 00:00:00 2001
From: mcy <rewerma@163.com>
Date: Mon, 17 Dec 2018 09:47:09 +0800
Subject: [PATCH] =?UTF-8?q?FlatMessage=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95json=E5=8F=8D=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98=20Dml=E7=B1=BB?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0isDdl=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alibaba/otter/canal/client/adapter/support/Dml.java  | 9 +++++++++
 .../otter/canal/client/adapter/support/MessageUtil.java  | 1 +
 .../adapter/rdb/service/RdbMirrorDbSyncService.java      | 2 +-
 .../canal/client/adapter/rdb/service/RdbSyncService.java | 2 +-
 .../com/alibaba/otter/canal/protocol/FlatMessage.java    | 3 +++
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/Dml.java b/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/Dml.java
index cc19813f..38fd7a3b 100644
--- a/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/Dml.java
+++ b/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/Dml.java
@@ -18,6 +18,7 @@ public class Dml implements Serializable {
     private String                    database;                               // 数据库或schema
     private String                    table;                                  // 表名
     private List<String>              pkNames;
+    private Boolean                   isDdl;
     private String                    type;                                   // 类型: INSERT UPDATE DELETE
     // binlog executeTime
     private Long                      es;                                     // 执行耗时
@@ -59,6 +60,14 @@ public class Dml implements Serializable {
         this.pkNames = pkNames;
     }
 
+    public Boolean getIsDdl() {
+        return isDdl;
+    }
+
+    public void setIsDdl(Boolean isDdl) {
+        this.isDdl = isDdl;
+    }
+
     public String getType() {
         return type;
     }
diff --git a/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/MessageUtil.java b/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/MessageUtil.java
index 87fc2fb9..60e18c72 100644
--- a/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/MessageUtil.java
+++ b/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/MessageUtil.java
@@ -139,6 +139,7 @@ public class MessageUtil {
         dml.setDatabase(flatMessage.getDatabase());
         dml.setTable(flatMessage.getTable());
         dml.setPkNames(flatMessage.getPkNames());
+        dml.setIsDdl(flatMessage.getIsDdl());
         dml.setType(flatMessage.getType());
         dml.setTs(flatMessage.getTs());
         dml.setEs(flatMessage.getEs());
diff --git a/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbMirrorDbSyncService.java b/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbMirrorDbSyncService.java
index 4a18ce99..cd3c6567 100644
--- a/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbMirrorDbSyncService.java
+++ b/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbMirrorDbSyncService.java
@@ -56,7 +56,7 @@ public class RdbMirrorDbSyncService {
                 if (mirrorDbConfig == null) {
                     continue;
                 }
-                if (StringUtils.isNotEmpty(dml.getSql())) {
+                if (dml.getIsDdl() != null && dml.getIsDdl() && StringUtils.isNotEmpty(dml.getSql())) {
                     // DDL
                     if (logger.isDebugEnabled()) {
                         logger.debug("DDL: {}", JSON.toJSONString(dml, SerializerFeature.WriteMapNullValue));
diff --git a/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbSyncService.java b/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbSyncService.java
index 93797093..dd3a901a 100644
--- a/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbSyncService.java
+++ b/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbSyncService.java
@@ -135,7 +135,7 @@ public class RdbSyncService {
     public void sync(Map<String, Map<String, MappingConfig>> mappingConfig, List<Dml> dmls) {
         try {
             sync(dmls, dml -> {
-                if (StringUtils.isNotEmpty(dml.getSql())) {
+                if (dml.getIsDdl() != null && dml.getIsDdl() && StringUtils.isNotEmpty(dml.getSql())) {
                     // DDL
                     columnsTypeCache.remove(dml.getDestination() + "." + dml.getDatabase() + "." + dml.getTable());
                     return false;
diff --git a/protocol/src/main/java/com/alibaba/otter/canal/protocol/FlatMessage.java b/protocol/src/main/java/com/alibaba/otter/canal/protocol/FlatMessage.java
index 50e1cb3f..2b958b1c 100644
--- a/protocol/src/main/java/com/alibaba/otter/canal/protocol/FlatMessage.java
+++ b/protocol/src/main/java/com/alibaba/otter/canal/protocol/FlatMessage.java
@@ -29,6 +29,9 @@ public class FlatMessage implements Serializable {
     private List<Map<String, String>> data;
     private List<Map<String, String>> old;
 
+    public FlatMessage() {
+    }
+
     public FlatMessage(long id){
         this.id = id;
     }