From ea20076a32fc4425baa2574b58e0b5d29b5160c6 Mon Sep 17 00:00:00 2001 From: tanpenggood <37927946+tanpenggood@users.noreply.github.com> Date: Sat, 9 Oct 2021 15:23:36 +0800 Subject: [PATCH] fix: rowChange typo (#3593) --- .../canal/example/BaseCanalClientTest.java | 20 +++++++++---------- .../inbound/mysql/LocalBinlogDumpTest.java | 8 ++++---- .../parse/inbound/mysql/MysqlDumpTest.java | 14 ++++++------- .../inbound/mysql/RdsLocalBinlogDumpTest.java | 8 ++++---- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/example/src/main/java/com/alibaba/otter/canal/example/BaseCanalClientTest.java b/example/src/main/java/com/alibaba/otter/canal/example/BaseCanalClientTest.java index e245fa19..12ad9774 100644 --- a/example/src/main/java/com/alibaba/otter/canal/example/BaseCanalClientTest.java +++ b/example/src/main/java/com/alibaba/otter/canal/example/BaseCanalClientTest.java @@ -132,14 +132,14 @@ public class BaseCanalClientTest { } if (entry.getEntryType() == EntryType.ROWDATA) { - RowChange rowChage = null; + RowChange rowChange = null; try { - rowChage = RowChange.parseFrom(entry.getStoreValue()); + rowChange = RowChange.parseFrom(entry.getStoreValue()); } catch (Exception e) { throw new RuntimeException("parse event has an error , data:" + entry.toString(), e); } - EventType eventType = rowChage.getEventType(); + EventType eventType = rowChange.getEventType(); logger.info(row_format, new Object[] { entry.getHeader().getLogfileName(), @@ -148,13 +148,13 @@ public class BaseCanalClientTest { String.valueOf(entry.getHeader().getExecuteTime()), simpleDateFormat.format(date), entry.getHeader().getGtid(), String.valueOf(delayTime) }); - if (eventType == EventType.QUERY || rowChage.getIsDdl()) { - logger.info("ddl : " + rowChage.getIsDdl() + " , sql ----> " + rowChage.getSql() + SEP); + if (eventType == EventType.QUERY || rowChange.getIsDdl()) { + logger.info("ddl : " + rowChange.getIsDdl() + " , sql ----> " + rowChange.getSql() + SEP); continue; } - printXAInfo(rowChage.getPropsList()); - for (RowData rowData : rowChage.getRowDatasList()) { + printXAInfo(rowChange.getPropsList()); + for (RowData rowData : rowChange.getRowDatasList()) { if (eventType == EventType.DELETE) { printColumn(rowData.getBeforeColumnsList()); } else if (eventType == EventType.INSERT) { @@ -217,7 +217,7 @@ public class BaseCanalClientTest { /** * 获取当前Entry的 GTID信息示例 - * + * * @param header * @return */ @@ -235,7 +235,7 @@ public class BaseCanalClientTest { /** * 获取当前Entry的 GTID Sequence No信息示例 - * + * * @param header * @return */ @@ -253,7 +253,7 @@ public class BaseCanalClientTest { /** * 获取当前Entry的 GTID Last Committed信息示例 - * + * * @param header * @return */ diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java index b38901f5..11a6c255 100644 --- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java +++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java @@ -47,15 +47,15 @@ public class LocalBinlogDumpTest { } if (entry.getEntryType() == EntryType.ROWDATA) { - RowChange rowChage = null; + RowChange rowChange = null; try { - rowChage = RowChange.parseFrom(entry.getStoreValue()); + rowChange = RowChange.parseFrom(entry.getStoreValue()); } catch (Exception e) { throw new RuntimeException("ERROR ## parser of eromanga-event has an error , data:" + entry.toString(), e); } - EventType eventType = rowChage.getEventType(); + EventType eventType = rowChange.getEventType(); System.out.println(String.format("================> binlog[%s:%s] , name[%s,%s] , eventType : %s", entry.getHeader().getLogfileName(), entry.getHeader().getLogfileOffset(), @@ -63,7 +63,7 @@ public class LocalBinlogDumpTest { entry.getHeader().getTableName(), eventType)); - for (RowData rowData : rowChage.getRowDatasList()) { + for (RowData rowData : rowChange.getRowDatasList()) { if (eventType == EventType.DELETE) { print(rowData.getBeforeColumnsList()); } else if (eventType == EventType.INSERT) { diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java index 79bcfcf3..31fec4d5 100644 --- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java +++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java @@ -59,15 +59,15 @@ public class MysqlDumpTest { continue; } - RowChange rowChage = null; + RowChange rowChange = null; try { - rowChage = RowChange.parseFrom(entry.getStoreValue()); + rowChange = RowChange.parseFrom(entry.getStoreValue()); } catch (Exception e) { throw new RuntimeException("ERROR ## parser of eromanga-event has an error , data:" + entry.toString(), e); } - EventType eventType = rowChage.getEventType(); + EventType eventType = rowChange.getEventType(); System.out.println(String.format("================> binlog[%s:%s] , name[%s,%s] , eventType : %s", entry.getHeader().getLogfileName(), entry.getHeader().getLogfileOffset(), @@ -75,12 +75,12 @@ public class MysqlDumpTest { entry.getHeader().getTableName(), eventType)); - if (eventType == EventType.QUERY || rowChage.getIsDdl()) { - System.out.println(" sql ----> " + rowChage.getSql()); + if (eventType == EventType.QUERY || rowChange.getIsDdl()) { + System.out.println(" sql ----> " + rowChange.getSql()); } - printXAInfo(rowChage.getPropsList()); - for (RowData rowData : rowChage.getRowDatasList()) { + printXAInfo(rowChange.getPropsList()); + for (RowData rowData : rowChange.getRowDatasList()) { if (eventType == EventType.DELETE) { print(rowData.getBeforeColumnsList()); } else if (eventType == EventType.INSERT) { diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsLocalBinlogDumpTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsLocalBinlogDumpTest.java index 943faf49..cdbf2427 100644 --- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsLocalBinlogDumpTest.java +++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/RdsLocalBinlogDumpTest.java @@ -53,15 +53,15 @@ public class RdsLocalBinlogDumpTest { } if (entry.getEntryType() == EntryType.ROWDATA) { - RowChange rowChage = null; + RowChange rowChange = null; try { - rowChage = RowChange.parseFrom(entry.getStoreValue()); + rowChange = RowChange.parseFrom(entry.getStoreValue()); } catch (Exception e) { throw new RuntimeException("ERROR ## parser of eromanga-event has an error , data:" + entry.toString(), e); } - EventType eventType = rowChage.getEventType(); + EventType eventType = rowChange.getEventType(); System.out.println(String.format("================> binlog[%s:%s] , name[%s,%s] , eventType : %s", entry.getHeader().getLogfileName(), entry.getHeader().getLogfileOffset(), @@ -69,7 +69,7 @@ public class RdsLocalBinlogDumpTest { entry.getHeader().getTableName(), eventType)); - for (RowData rowData : rowChage.getRowDatasList()) { + for (RowData rowData : rowChange.getRowDatasList()) { if (eventType == EventType.DELETE) { print(rowData.getBeforeColumnsList()); } else if (eventType == EventType.INSERT) {