You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/09/11 11:58:03 UTC
[inlong] branch master updated: [INLONG-5853][TubeMQ] Fix typo in AddTopicExecutor (#5854)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 a2eeee4f2 [INLONG-5853][TubeMQ] Fix typo in AddTopicExecutor (#5854)
a2eeee4f2 is described below
commit a2eeee4f2a1d0b4334a13b4aaf63204caaceaa4d
Author: Xiangying Meng <55...@users.noreply.github.com>
AuthorDate: Sun Sep 11 19:57:58 2022 +0800
[INLONG-5853][TubeMQ] Fix typo in AddTopicExecutor (#5854)
---
.../src/main/java/org/apache/inlong/agent/core/job/JobManager.java | 4 ++--
.../java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java | 4 ++--
.../org/apache/inlong/tubemq/manager/executors/AddTopicExecutor.java | 4 ++--
.../org/apache/inlong/tubemq/manager/service/BrokerServiceImpl.java | 2 +-
.../org/apache/inlong/tubemq/manager/service/RegionServiceImpl.java | 2 +-
.../org/apache/inlong/tubemq/manager/service/TubeMQErrorConst.java | 2 +-
.../inlong/tubemq/manager/service/interfaces/BrokerService.java | 4 ++--
.../inlong/tubemq/manager/service/broker/TestBrokerService.java | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobManager.java
index a5fb4fb21..771fc99a8 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobManager.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobManager.java
@@ -292,14 +292,14 @@ public class JobManager extends AbstractDaemon {
/**
* check job existence using job file name
*/
- public boolean checkJobExsit(String fileName) {
+ public boolean checkJobExist(String fileName) {
return jobProfileDb.getJobByFileName(fileName) != null;
}
/**
* get sql job existence
*/
- public boolean sqlJobExsit() {
+ public boolean sqlJobExist() {
return jobProfileDb.getJobById(SQL_JOB_ID) != null;
}
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java
index 7eab6d2f4..4ef05dd4e 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java
@@ -255,7 +255,7 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
* request manager to get db collect task, make sure it is not throwing exceptions
*/
public void fetchDbCollectTask() {
- if (agentManager.getJobManager().sqlJobExsit()) {
+ if (agentManager.getJobManager().sqlJobExist()) {
return;
}
JsonObject resultData = getResultData(httpManager.doSentPost(managerDbCollectorTaskUrl, getSqlTaskRequest()));
@@ -387,7 +387,7 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
Collection<File> suitFiles = PluginUtils.findSuitFiles(triggerProfile);
// filter files exited before
List<File> pendingFiles = suitFiles.stream().filter(file ->
- !agentManager.getJobManager().checkJobExsit(file.getAbsolutePath()))
+ !agentManager.getJobManager().checkJobExist(file.getAbsolutePath()))
.collect(Collectors.toList());
for (File pendingFile : pendingFiles) {
JobProfile copiedProfile = copyJobProfile(triggerProfile, dataTime,
diff --git a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/executors/AddTopicExecutor.java b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/executors/AddTopicExecutor.java
index d96bf76a7..278a26b7d 100644
--- a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/executors/AddTopicExecutor.java
+++ b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/executors/AddTopicExecutor.java
@@ -146,13 +146,13 @@ public class AddTopicExecutor {
if (topicBrokerList.isEmpty()) {
brandNewTopics.add(topic);
} else {
- handleAddingExsitTopics(masterEntry, brokerInfoList, topic, topicBrokerList);
+ handleAddingExistTopics(masterEntry, brokerInfoList, topic, topicBrokerList);
}
}
handleAddingNewTopics(masterEntry, brokerInfoList, brandNewTopics);
}
- private void handleAddingExsitTopics(MasterEntry masterEntry, TubeHttpBrokerInfoList brokerInfoList,
+ private void handleAddingExistTopics(MasterEntry masterEntry, TubeHttpBrokerInfoList brokerInfoList,
String topic, List<Integer> topicBrokerList) {
// remove brokers which have been added.
List<Integer> configurableBrokerIdList =
diff --git a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/BrokerServiceImpl.java b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/BrokerServiceImpl.java
index 34fceb5a6..c6ad54beb 100644
--- a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/BrokerServiceImpl.java
+++ b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/BrokerServiceImpl.java
@@ -71,7 +71,7 @@ public class BrokerServiceImpl implements BrokerService {
}
@Override
- public boolean checkIfBrokersAllExsit(List<Long> brokerIdList, long clusterId) {
+ public boolean checkIfBrokersAllExist(List<Long> brokerIdList, long clusterId) {
List<BrokerEntry> brokerEntries = brokerRepository
.findBrokerEntryByBrokerIdInAndClusterIdEquals(brokerIdList, clusterId);
List<Long> regionBrokerIdList = brokerEntries.stream().map(BrokerEntry::getBrokerId).collect(
diff --git a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/RegionServiceImpl.java b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/RegionServiceImpl.java
index 45b297fac..460d11269 100644
--- a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/RegionServiceImpl.java
+++ b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/RegionServiceImpl.java
@@ -55,7 +55,7 @@ public class RegionServiceImpl implements RegionService {
List<Long> brokerIdList) {
try {
Long clusterId = regionEntry.getClusterId();
- if (!brokerService.checkIfBrokersAllExsit(brokerIdList, clusterId)) {
+ if (!brokerService.checkIfBrokersAllExist(brokerIdList, clusterId)) {
return TubeMQResult.errorResult(TubeMQErrorConst.RESOURCE_NOT_EXIST);
}
if (existBrokerIdAlreadyInRegion(clusterId, brokerIdList, null)) {
diff --git a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeMQErrorConst.java b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeMQErrorConst.java
index 21b47e3b3..7fd92324f 100644
--- a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeMQErrorConst.java
+++ b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeMQErrorConst.java
@@ -20,7 +20,7 @@ package org.apache.inlong.tubemq.manager.service;
public class TubeMQErrorConst {
public static final String PARAM_ILLEGAL = "param illegal";
public static final String BROKER_IN_OTHER_REGION = "resource already used";
- public static final String RESOURCE_NOT_EXIST = "resource not exsit";
+ public static final String RESOURCE_NOT_EXIST = "resource not exist";
public static final String MYSQL_ERROR = "mysql error";
public static final String NO_SUCH_CLUSTER = "no such cluster";
public static final String NO_SUCH_METHOD = "no such method";
diff --git a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/interfaces/BrokerService.java b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/interfaces/BrokerService.java
index 697b6755d..ef87dcd22 100644
--- a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/interfaces/BrokerService.java
+++ b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/interfaces/BrokerService.java
@@ -45,13 +45,13 @@ public interface BrokerService {
void updateBrokersRegion(List<Long> brokerIdList, Long regionId, Long clusterId);
/**
- * check if all the brokers exsit in this cluster
+ * check if all the brokers exist in this cluster
*
* @param brokerIdList
* @param clusterId
* @return
*/
- boolean checkIfBrokersAllExsit(List<Long> brokerIdList, long clusterId);
+ boolean checkIfBrokersAllExist(List<Long> brokerIdList, long clusterId);
/**
* get all broker id list in a region
diff --git a/inlong-tubemq/tubemq-manager/src/test/java/org/apache/inlong/tubemq/manager/service/broker/TestBrokerService.java b/inlong-tubemq/tubemq-manager/src/test/java/org/apache/inlong/tubemq/manager/service/broker/TestBrokerService.java
index ddbe15d7f..065c2c454 100644
--- a/inlong-tubemq/tubemq-manager/src/test/java/org/apache/inlong/tubemq/manager/service/broker/TestBrokerService.java
+++ b/inlong-tubemq/tubemq-manager/src/test/java/org/apache/inlong/tubemq/manager/service/broker/TestBrokerService.java
@@ -63,6 +63,6 @@ public class TestBrokerService {
brokerIdList.add(2L);
doReturn(brokers).when(brokerRepository)
.findBrokerEntryByBrokerIdInAndClusterIdEquals(brokerIdList, 1L);
- assertThat(brokerService.checkIfBrokersAllExsit(brokerIdList, 1));
+ assertThat(brokerService.checkIfBrokersAllExist(brokerIdList, 1));
}
}