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

View File

@@ -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
helm install canal-server -f ./server-values.yaml ../canal-server --dry-run

View File

@@ -126,13 +126,13 @@ public class ClickHouseEtlService extends AbstractEtlService {
int i = 1;
for (Map.Entry<String, String> 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);

View File

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

View File

@@ -352,13 +352,13 @@ public class PhoenixEtlService {
Map<String, Object> insertValues = new HashMap<>();
int i = 1;
for (Map.Entry<String, String> 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);

View File

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

View File

@@ -122,13 +122,13 @@ public class RdbEtlService extends AbstractEtlService {
int i = 1;
for (Map.Entry<String, String> 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);

View File

@@ -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";