From 34bcfbc3cb1c7ba992e4d248cca42babc7752a60 Mon Sep 17 00:00:00 2001
From: "jianhao.dai" <jianhao.dai@fraudmetrix.cn>
Date: Thu, 20 Jul 2017 11:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=AE=A1=E6=9C=89=E6=B2=A1=E6=9C=89fi?=
 =?UTF-8?q?lter=EF=BC=8C=E9=83=BD=E5=BA=94=E8=AF=A5=E5=AF=B9meta=20cache?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inbound/mysql/dbsync/LogEventConvert.java | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/LogEventConvert.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/LogEventConvert.java
index 1bbb0eb8..d1c3ca3b 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/LogEventConvert.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/LogEventConvert.java
@@ -164,6 +164,26 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
                 || result.getType() == EventType.RENAME || result.getType() == EventType.CINDEX
                 || result.getType() == EventType.DINDEX) { // 针对DDL类型
 
+                // 更新下table meta cache
+                if (tableMetaCache != null
+                    && (result.getType() == EventType.ALTER || result.getType() == EventType.ERASE || result.getType() == EventType.RENAME)) {
+                    for (DdlResult renameResult = result; renameResult != null; renameResult = renameResult.getRenameTableResult()) {
+                        String schemaName0 = event.getDbName(); // 防止rename语句后产生schema变更带来影响
+                        if (StringUtils.isNotEmpty(renameResult.getSchemaName())) {
+                            schemaName0 = renameResult.getSchemaName();
+                        }
+
+                        tableName = renameResult.getTableName();
+                        if (StringUtils.isNotEmpty(tableName)) {
+                            // 如果解析到了正确的表信息，则根据全名进行清除
+                            tableMetaCache.clearTableMeta(schemaName0, tableName);
+                        } else {
+                            // 如果无法解析正确的表信息，则根据schema进行清除
+                            tableMetaCache.clearTableMetaWithSchemaName(schemaName0);
+                        }
+                    }
+                }
+
                 if (filterQueryDdl) {
                     return null;
                 }
@@ -214,26 +234,6 @@ public class LogEventConvert extends AbstractCanalLifeCycle implements BinlogPar
                 return null;
             }
 
-            // 更新下table meta cache
-            if (tableMetaCache != null
-                && (result.getType() == EventType.ALTER || result.getType() == EventType.ERASE || result.getType() == EventType.RENAME)) {
-                for (DdlResult renameResult = result; renameResult != null; renameResult = renameResult.getRenameTableResult()) {
-                    String schemaName0 = event.getDbName(); // 防止rename语句后产生schema变更带来影响
-                    if (StringUtils.isNotEmpty(renameResult.getSchemaName())) {
-                        schemaName0 = renameResult.getSchemaName();
-                    }
-
-                    tableName = renameResult.getTableName();
-                    if (StringUtils.isNotEmpty(tableName)) {
-                        // 如果解析到了正确的表信息，则根据全名进行清除
-                        tableMetaCache.clearTableMeta(schemaName0, tableName);
-                    } else {
-                        // 如果无法解析正确的表信息，则根据schema进行清除
-                        tableMetaCache.clearTableMetaWithSchemaName(schemaName0);
-                    }
-                }
-            }
-
             Header header = createHeader(binlogFileName, event.getHeader(), schemaName, tableName, type);
             RowChange.Builder rowChangeBuider = RowChange.newBuilder();
             if (result.getType() != EventType.QUERY) {