From 44ed76ebb80447e7b8b0d55f1f09420afca0d141 Mon Sep 17 00:00:00 2001 From: Chongzhi Deng Date: Tue, 17 Dec 2024 15:32:03 +0800 Subject: [PATCH] fix typo (#5299) Signed-off-by: BruceAko --- charts/tests/test.sh | 2 +- .../adapter/clickhouse/service/ClickHouseEtlService.java | 6 +++--- .../otter/canal/adapter/launcher/rest/CommonRest.java | 2 +- .../client/adapter/phoenix/service/PhoenixEtlService.java | 6 +++--- client-adapter/pom.xml | 2 +- .../canal/client/adapter/rdb/service/RdbEtlService.java | 6 +++--- .../otter/canal/parse/inbound/mysql/MysqlEventParser.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charts/tests/test.sh b/charts/tests/test.sh index 96619ce4..0434fec7 100755 --- a/charts/tests/test.sh +++ b/charts/tests/test.sh @@ -2,4 +2,4 @@ helm install canal-admin -f ./admin-values.yaml ../canal-admin --dry-run -helm install canal-admin -f ./server-values.yaml ../canal-server --dry-run \ No newline at end of file +helm install canal-server -f ./server-values.yaml ../canal-server --dry-run \ No newline at end of file diff --git a/client-adapter/clickhouse/src/main/java/com/alibaba/otter/canal/client/adapter/clickhouse/service/ClickHouseEtlService.java b/client-adapter/clickhouse/src/main/java/com/alibaba/otter/canal/client/adapter/clickhouse/service/ClickHouseEtlService.java index 994dbd08..480114a2 100644 --- a/client-adapter/clickhouse/src/main/java/com/alibaba/otter/canal/client/adapter/clickhouse/service/ClickHouseEtlService.java +++ b/client-adapter/clickhouse/src/main/java/com/alibaba/otter/canal/client/adapter/clickhouse/service/ClickHouseEtlService.java @@ -126,13 +126,13 @@ public class ClickHouseEtlService extends AbstractEtlService { int i = 1; for (Map.Entry entry : columnsMap.entrySet()) { - String targetClolumnName = entry.getKey(); + String targetColumnName = entry.getKey(); String srcColumnName = entry.getValue(); if (srcColumnName == null) { - srcColumnName = targetClolumnName; + srcColumnName = targetColumnName; } - Integer type = columnType.get(targetClolumnName.toLowerCase()); + Integer type = columnType.get(targetColumnName.toLowerCase()); Object value = rs.getObject(srcColumnName); if (value != null) { SyncUtil.setPStmt(type, pstmt, value, i); diff --git a/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/rest/CommonRest.java b/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/rest/CommonRest.java index 29150487..184704a0 100644 --- a/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/rest/CommonRest.java +++ b/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/rest/CommonRest.java @@ -217,7 +217,7 @@ public class CommonRest { resStatus = "off"; } Map res = new LinkedHashMap<>(); - res.put("stauts", resStatus); + res.put("status", resStatus); return res; } } diff --git a/client-adapter/phoenix/src/main/java/com/alibaba/otter/canal/client/adapter/phoenix/service/PhoenixEtlService.java b/client-adapter/phoenix/src/main/java/com/alibaba/otter/canal/client/adapter/phoenix/service/PhoenixEtlService.java index 06cfb45e..86049002 100644 --- a/client-adapter/phoenix/src/main/java/com/alibaba/otter/canal/client/adapter/phoenix/service/PhoenixEtlService.java +++ b/client-adapter/phoenix/src/main/java/com/alibaba/otter/canal/client/adapter/phoenix/service/PhoenixEtlService.java @@ -352,13 +352,13 @@ public class PhoenixEtlService { Map insertValues = new HashMap<>(); int i = 1; for (Map.Entry entry : columnsMap.entrySet()) { - String targetClolumnName = entry.getKey(); + String targetColumnName = entry.getKey(); String srcColumnName = entry.getValue(); if (srcColumnName == null) { - srcColumnName = targetClolumnName; + srcColumnName = targetColumnName; } - Integer type = columnType.get(targetClolumnName.toLowerCase()); + Integer type = columnType.get(targetColumnName.toLowerCase()); try { Object value = rs.getObject(srcColumnName); diff --git a/client-adapter/pom.xml b/client-adapter/pom.xml index 21d023c5..a9d18e31 100644 --- a/client-adapter/pom.xml +++ b/client-adapter/pom.xml @@ -136,7 +136,7 @@ kafka-clients ${kafka_version} - + com.rabbitmq amqp-client diff --git a/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbEtlService.java b/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbEtlService.java index 92ec1455..40f6c563 100644 --- a/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbEtlService.java +++ b/client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbEtlService.java @@ -122,13 +122,13 @@ public class RdbEtlService extends AbstractEtlService { int i = 1; for (Map.Entry entry : columnsMap.entrySet()) { - String targetClolumnName = entry.getKey(); + String targetColumnName = entry.getKey(); String srcColumnName = entry.getValue(); if (srcColumnName == null) { - srcColumnName = targetClolumnName; + srcColumnName = targetColumnName; } - Integer type = columnType.get(targetClolumnName.toLowerCase()); + Integer type = columnType.get(targetColumnName.toLowerCase()); Object value = rs.getObject(srcColumnName); if (value != null) { SyncUtil.setPStmt(type, pstmt, value, i); diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java index 4a8f6ac2..4065f122 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java @@ -726,7 +726,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE @SuppressWarnings("unused") private SlaveEntryPosition findSlavePosition(MysqlConnection mysqlConnection) { try { - String showSql = "show slave stauts"; + String showSql = "show slave status"; if (mysqlConnection.atLeastMySQL84()) { // 兼容mysql 8.4 showSql = "show replica status";