This is an automated email from the ASF dual-hosted git repository.
wenweihuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new c6a66e8115 [INLONG-11306][Agent] Modify the naming of variables in the
redis source (#11309)
c6a66e8115 is described below
commit c6a66e811566150d3f79d0fbd0d087bd6a9a35b2
Author: justinwwhuang <hww_jus...@163.com>
AuthorDate: Wed Oct 9 14:49:03 2024 +0800
[INLONG-11306][Agent] Modify the naming of variables in the redis source
(#11309)
---
.../apache/inlong/agent/constant/TaskConstants.java | 4 ++--
.../java/org/apache/inlong/agent/pojo/RedisTask.java | 9 +++++----
.../org/apache/inlong/agent/pojo/TaskProfileDto.java | 4 ++--
.../inlong/agent/plugin/sources/RedisSource.java | 18 +++++++++---------
.../inlong/agent/plugin/sources/TestRedisSource.java | 2 +-
5 files changed, 19 insertions(+), 18 deletions(-)
diff --git
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/TaskConstants.java
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/TaskConstants.java
index fbf0b5b705..e879dcd139 100755
---
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/TaskConstants.java
+++
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/TaskConstants.java
@@ -186,12 +186,12 @@ public class TaskConstants extends CommonConstants {
public static final String TASK_REDIS_READTIMEOUT =
"task.redisTask.readTimeout";
public static final String TASK_REDIS_REPLID = "task.redisTask.replId";
public static final String TASK_REDIS_OFFSET = "task.redisTask.offset";
- public static final String TASK_REDIS_DB_NUMBER =
"task.redisTask.dbNumber";
+ public static final String TASK_REDIS_DB_NAME = "task.redisTask.dbName";
public static final String TASK_REDIS_COMMAND = "task.redisTask.command";
public static final String TASK_REDIS_KEYS = "task.redisTask.keys";
public static final String TASK_REDIS_FIELD_OR_MEMBER =
"task.redisTask.fieldOrMember";
public static final String TASK_REDIS_IS_SUBSCRIBE =
"task.redisTask.isSubscribe";
- public static final String TASK_REDIS_SUBOPERATION =
"task.redisTask.subOperation";
+ public static final String TASK_REDIS_SUBSCRIPTION_OPERATION =
"task.redisTask.subscriptionOperation";
public static final String TASK_REDIS_SYNC_FREQ =
"task.redisTask.syncFreq";
public static final String TASK_STATE = "task.state";
diff --git
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/RedisTask.java
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/RedisTask.java
index 2b8a5c4ca6..aedc1ede3f 100644
---
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/RedisTask.java
+++
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/RedisTask.java
@@ -18,6 +18,7 @@
package org.apache.inlong.agent.pojo;
import lombok.Data;
+
@Data
public class RedisTask {
@@ -29,13 +30,13 @@ public class RedisTask {
private String readTimeout;
private String queueSize;
private String replId;
- private String dbNumber;
+ private String dbName;
private String command;
private String keys;
private String fieldOrMember;
private Boolean isSubscribe;
private String syncFreq;
- private String subOperations;
+ private String subscriptionOperation;
@Data
public static class RedisTaskConfig {
@@ -48,12 +49,12 @@ public class RedisTask {
private String timeout;
private String queueSize;
private String replId;
- private String dbNumber;
+ private String dbName;
private String command;
private String keys;
private String fieldOrMember;
private Boolean isSubscribe;
private String syncFreq;
- private String subOperations;
+ private String subscriptionOperation;
}
}
diff --git
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/TaskProfileDto.java
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/TaskProfileDto.java
index 1558bc042f..85c636c885 100644
---
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/TaskProfileDto.java
+++
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/TaskProfileDto.java
@@ -277,12 +277,12 @@ public class TaskProfileDto {
redisTask.setReadTimeout(config.getTimeout());
redisTask.setReplId(config.getReplId());
redisTask.setCommand(config.getCommand());
- redisTask.setDbNumber(config.getDbNumber());
+ redisTask.setDbName(config.getDbName());
redisTask.setKeys(config.getKeys());
redisTask.setFieldOrMember(config.getFieldOrMember());
redisTask.setIsSubscribe(config.getIsSubscribe());
redisTask.setSyncFreq(config.getSyncFreq());
- redisTask.setSubOperations(config.getSubOperations());
+ redisTask.setSubscriptionOperation(config.getSubscriptionOperation());
return redisTask;
}
diff --git
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/RedisSource.java
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/RedisSource.java
index aada1bf504..69bf76bdb5 100644
---
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/RedisSource.java
+++
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/RedisSource.java
@@ -92,14 +92,14 @@ public class RedisSource extends AbstractSource {
private String readTimeout;
private String replId;
private String snapShot;
- private String dbNumber;
+ private String dbName;
private String redisCommand;
private String fieldOrMember;
private boolean destroyed;
private boolean isSubscribe;
private Set<String> keys;
- private Set<String> subOperations;
+ private Set<String> subscribeOperations;
private Replicator redisReplicator;
private BlockingQueue<SourceData> redisQueue;
private ScheduledExecutorService executor;
@@ -136,7 +136,7 @@ public class RedisSource extends AbstractSource {
this.readTimeout = profile.get(TaskConstants.TASK_REDIS_READTIMEOUT,
"");
this.replId = profile.get(TaskConstants.TASK_REDIS_REPLID, "");
this.snapShot = profile.get(TaskConstants.TASK_REDIS_OFFSET, "-1");
- this.dbNumber = profile.get(TaskConstants.TASK_REDIS_DB_NUMBER, "0");
+ this.dbName = profile.get(TaskConstants.TASK_REDIS_DB_NAME);
this.keys = new
ConcurrentSkipListSet<>(Arrays.asList(profile.get(TaskConstants.TASK_REDIS_KEYS).split(",")));
this.isSubscribe =
profile.getBoolean(TaskConstants.TASK_REDIS_IS_SUBSCRIBE, false);
this.instanceId = profile.getInstanceId();
@@ -146,8 +146,8 @@ public class RedisSource extends AbstractSource {
try {
if (isSubscribe) {
// use subscribe mode
- this.subOperations = new ConcurrentSkipListSet<>(
-
Arrays.asList(profile.get(TaskConstants.TASK_REDIS_SUBOPERATION).split(",")));
+ this.subscribeOperations = new ConcurrentSkipListSet<>(
+
Arrays.asList(profile.get(TaskConstants.TASK_REDIS_SUBSCRIPTION_OPERATION).split(",")));
this.executor = (ScheduledExecutorService)
Executors.newSingleThreadExecutor();
this.redisReplicator = new RedisReplicator(uri);
initReplicator();
@@ -364,8 +364,8 @@ public class RedisSource extends AbstractSource {
private String getRedisUri() {
StringBuffer sb = new StringBuffer("redis://");
sb.append(hostName).append(":").append(port);
- if (!StringUtils.isEmpty(dbNumber)) {
- sb.append("/").append(dbNumber);
+ if (!StringUtils.isEmpty(dbName)) {
+ sb.append("/").append(dbName);
}
sb.append("?");
if (!StringUtils.isEmpty(authPassword)) {
@@ -393,9 +393,9 @@ public class RedisSource extends AbstractSource {
}
private void initReplicator() {
- if (!subOperations.isEmpty()) {
+ if (!subscribeOperations.isEmpty()) {
DefaultCommandParser replicatorCommandParser = new
DefaultCommandParser();
- for (String subOperation : subOperations) {
+ for (String subOperation : subscribeOperations) {
this.redisReplicator.addCommandParser(CommandName.name(subOperation),
replicatorCommandParser);
}
this.redisReplicator.addEventListener((replicator, event) -> {
diff --git
a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestRedisSource.java
b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestRedisSource.java
index 061a74c092..2680c01e06 100644
---
a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestRedisSource.java
+++
b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestRedisSource.java
@@ -134,7 +134,7 @@ public class TestRedisSource {
profile.set(TaskConstants.TASK_REDIS_COMMAND, command);
profile.set(TaskConstants.TASK_REDIS_KEYS, keys);
profile.set(TaskConstants.TASK_AUDIT_VERSION, "0");
- profile.set(TaskConstants.TASK_REDIS_SUBOPERATION, subOperation);
+ profile.set(TaskConstants.TASK_REDIS_SUBSCRIPTION_OPERATION,
subOperation);
profile.setInstanceId(instanceId);
}
