chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix typo (#5299)

Browse Source 
Signed-off-by: BruceAko <chongzhi@hust.edu.cn>
This commit is contained in:
Chongzhi Deng
2024-12-17 15:32:03 +08:00
committed by GitHub
parent fe836f7515
commit 44ed76ebb8
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
charts/tests/test.sh
View File

@@ -2,4 +2,4 @@
helm install canal-admin -f ./admin-values.yaml ../canal-admin --dry-run helm install canal-admin -f ./admin-values.yaml ../canal-admin --dry-run
helm install canal-admin -f ./server-values.yaml ../canal-server --dry-run helm install canal-server -f ./server-values.yaml ../canal-server --dry-run

6
client-adapter/clickhouse/src/main/java/com/alibaba/otter/canal/client/adapter/clickhouse/service/ClickHouseEtlService.java
View File

@@ -126,13 +126,13 @@ public class ClickHouseEtlService extends AbstractEtlService {
int i = 1; int i = 1;
for (Map.Entry<String, String> entry : columnsMap.entrySet()) { for (Map.Entry<String, String> entry : columnsMap.entrySet()) {
String targetClolumnName = entry.getKey(); String targetColumnName = entry.getKey();
String srcColumnName = entry.getValue(); String srcColumnName = entry.getValue();
if (srcColumnName == null) { if (srcColumnName == null) {
srcColumnName = targetClolumnName; srcColumnName = targetColumnName;
} }
Integer type = columnType.get(targetClolumnName.toLowerCase()); Integer type = columnType.get(targetColumnName.toLowerCase());
Object value = rs.getObject(srcColumnName); Object value = rs.getObject(srcColumnName);
if (value != null) { if (value != null) {
SyncUtil.setPStmt(type, pstmt, value, i); SyncUtil.setPStmt(type, pstmt, value, i);

2
client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/rest/CommonRest.java
View File

@@ -217,7 +217,7 @@ public class CommonRest {
resStatus = "off"; resStatus = "off";
} }
Map<String, String> res = new LinkedHashMap<>(); Map<String, String> res = new LinkedHashMap<>();
res.put("stauts", resStatus); res.put("status", resStatus);
return res; return res;
} }
} }

6
client-adapter/phoenix/src/main/java/com/alibaba/otter/canal/client/adapter/phoenix/service/PhoenixEtlService.java
View File

@@ -352,13 +352,13 @@ public class PhoenixEtlService {
Map<String, Object> insertValues = new HashMap<>(); Map<String, Object> insertValues = new HashMap<>();
int i = 1; int i = 1;
for (Map.Entry<String, String> entry : columnsMap.entrySet()) { for (Map.Entry<String, String> entry : columnsMap.entrySet()) {
String targetClolumnName = entry.getKey(); String targetColumnName = entry.getKey();
String srcColumnName = entry.getValue(); String srcColumnName = entry.getValue();
if (srcColumnName == null) { if (srcColumnName == null) {
srcColumnName = targetClolumnName; srcColumnName = targetColumnName;
} }
Integer type = columnType.get(targetClolumnName.toLowerCase()); Integer type = columnType.get(targetColumnName.toLowerCase());
try { try {
Object value = rs.getObject(srcColumnName); Object value = rs.getObject(srcColumnName);

2
client-adapter/pom.xml
View File

@@ -136,7 +136,7 @@
<artifactId>kafka-clients</artifactId> <artifactId>kafka-clients</artifactId>
<version>${kafka_version}</version> <version>${kafka_version}</version>
</dependency> </dependency>
<!-- rabbotmq --> <!-- rabbitmq -->
<dependency> <dependency>
<groupId>com.rabbitmq</groupId> <groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId> <artifactId>amqp-client</artifactId>

6
client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbEtlService.java
View File

@@ -122,13 +122,13 @@ public class RdbEtlService extends AbstractEtlService {
int i = 1; int i = 1;
for (Map.Entry<String, String> entry : columnsMap.entrySet()) { for (Map.Entry<String, String> entry : columnsMap.entrySet()) {
String targetClolumnName = entry.getKey(); String targetColumnName = entry.getKey();
String srcColumnName = entry.getValue(); String srcColumnName = entry.getValue();
if (srcColumnName == null) { if (srcColumnName == null) {
srcColumnName = targetClolumnName; srcColumnName = targetColumnName;
} }
Integer type = columnType.get(targetClolumnName.toLowerCase()); Integer type = columnType.get(targetColumnName.toLowerCase());
Object value = rs.getObject(srcColumnName); Object value = rs.getObject(srcColumnName);
if (value != null) { if (value != null) {
SyncUtil.setPStmt(type, pstmt, value, i); SyncUtil.setPStmt(type, pstmt, value, i);

2
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
View File

@@ -726,7 +726,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
@SuppressWarnings("unused") @SuppressWarnings("unused")
private SlaveEntryPosition findSlavePosition(MysqlConnection mysqlConnection) { private SlaveEntryPosition findSlavePosition(MysqlConnection mysqlConnection) {
try { try {
String showSql = "show slave stauts"; String showSql = "show slave status";
if (mysqlConnection.atLeastMySQL84()) { if (mysqlConnection.atLeastMySQL84()) {
// 兼容mysql 8.4 // 兼容mysql 8.4
showSql = "show replica status"; showSql = "show replica status";