You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by go...@apache.org on 2020/05/13 02:36:27 UTC
[incubator-tubemq] branch master updated: [TUBEMQ-100] Fix typos &
remove unused codes (#78)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
The following commit(s) were added to refs/heads/master by this push:
new be2a605 [TUBEMQ-100] Fix typos & remove unused codes (#78)
be2a605 is described below
commit be2a605ae9d42295bb7ec3d3323f3b51295c0c09
Author: Tboy <gu...@immomo.com>
AuthorDate: Wed May 13 10:36:21 2020 +0800
[TUBEMQ-100] Fix typos & remove unused codes (#78)
---
.../client/consumer/SimplePushMessageConsumer.java | 1 -
.../apache/tubemq/server/broker/BrokerConfig.java | 10 ---------
.../server/common/paramcheck/PBParameterUtils.java | 16 +++++++--------
.../org/apache/tubemq/server/master/TMaster.java | 6 +++---
.../nodemanage/nodebroker/BrokerConfManager.java | 12 +++++------
.../nodebroker/BrokerSyncStatusInfo.java | 24 +++++++++++-----------
.../web/handler/WebAdminGroupCtrlHandler.java | 8 ++++----
.../web/handler/WebBrokerDefConfHandler.java | 6 +++---
8 files changed, 36 insertions(+), 47 deletions(-)
diff --git a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/SimplePushMessageConsumer.java b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/SimplePushMessageConsumer.java
index ff20bcd..518b6ff 100644
--- a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/SimplePushMessageConsumer.java
+++ b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/SimplePushMessageConsumer.java
@@ -179,7 +179,6 @@ public class SimplePushMessageConsumer implements PushMessageConsumer {
final TopicProcessor topicProcessor =
baseConsumer.consumeSubInfo.getTopicProcessor(taskContext.getPartition().getTopic());
if ((topicProcessor == null) || (topicProcessor.getMessageListener() == null)) {
- isConsumed = false;
throw new TubeClientException(sBuilder
.append("Listener is null for topic ")
.append(taskContext.getPartition().getTopic()).toString());
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/BrokerConfig.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/BrokerConfig.java
index 19ee59f..fabc30e 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/BrokerConfig.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/BrokerConfig.java
@@ -84,8 +84,6 @@ public class BrokerConfig extends AbstractFileConfig {
private boolean updateConsumerOffsets = true;
// heartbeat interval in milliseconds
private long heartbeatPeriodMs = 8000L;
- // quartz thread count
- private int quartzThreadCount = 5;
// netty write buffer high water mark
private long nettyWriteBufferHighWaterMark = 10 * 1024 * 1024;
// netty write buffer low water mark
@@ -123,11 +121,6 @@ public class BrokerConfig extends AbstractFileConfig {
super();
}
- public int getQuartzThreadCount() {
- return this.quartzThreadCount;
- }
-
-
public boolean isUpdateConsumerOffsets() {
return this.updateConsumerOffsets;
}
@@ -287,9 +280,6 @@ public class BrokerConfig extends AbstractFileConfig {
if (TStringUtils.isNotBlank(brokerSect.get("maxSSDTotalFileSizes"))) {
this.maxSSDTotalFileSizes = getLong(brokerSect, "maxSSDTotalFileSizes");
}
- if (!TStringUtils.isBlank(brokerSect.get("quartzThreadCount"))) {
- this.quartzThreadCount = getInt(brokerSect, "quartzThreadCount");
- }
if (!TStringUtils.isBlank(brokerSect.get("updateConsumerOffsets"))) {
this.updateConsumerOffsets = getBoolean(brokerSect, "updateConsumerOffsets");
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/common/paramcheck/PBParameterUtils.java b/tubemq-server/src/main/java/org/apache/tubemq/server/common/paramcheck/PBParameterUtils.java
index 3e53c96..cad5145 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/common/paramcheck/PBParameterUtils.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/common/paramcheck/PBParameterUtils.java
@@ -278,7 +278,7 @@ public class PBParameterUtils {
// 先检查消费的topic集合
List<ConsumerInfo> infoList = consumerBandInfo.getConsumerInfoList();
Set<String> existedTopics = consumerBandInfo.getTopicSet();
- Map<String, TreeSet<String>> existedTopicCondtions = consumerBandInfo.getTopicConditions();
+ Map<String, TreeSet<String>> existedTopicConditions = consumerBandInfo.getTopicConditions();
if (existedTopics != null && !existedTopics.isEmpty()) {
if (existedTopics.size() != inConsumerInfo.getTopicSet().size()
|| !existedTopics.containsAll(inConsumerInfo.getTopicSet())) {
@@ -295,7 +295,7 @@ public class PBParameterUtils {
}
if (infoList != null && !infoList.isEmpty()) {
boolean isCondEqual = true;
- if (existedTopicCondtions == null || existedTopicCondtions.isEmpty()) {
+ if (existedTopicConditions == null || existedTopicConditions.isEmpty()) {
if (inConsumerInfo.getTopicConditions().isEmpty()) {
isCondEqual = true;
} else {
@@ -312,9 +312,9 @@ public class PBParameterUtils {
strBuffer.append("[Inconsistency subscribe] ").append(inConsumerInfo.getConsumerId())
.append(" subscribe without filter condition ")
.append(" is inconsistency with other consumers in the group, existed topic conditions is ")
- .append(existedTopicCondtions);
+ .append(existedTopicConditions);
} else {
- Set<String> existedCondTopics = existedTopicCondtions.keySet();
+ Set<String> existedCondTopics = existedTopicConditions.keySet();
Set<String> reqCondTopics = inConsumerInfo.getTopicConditions().keySet();
if (existedCondTopics.size() != reqCondTopics.size()
|| !existedCondTopics.containsAll(reqCondTopics)) {
@@ -324,13 +324,13 @@ public class PBParameterUtils {
.append(inConsumerInfo.getTopicConditions())
.append(" is inconsistency with other consumers in the group, existed topic" +
" conditions is ")
- .append(existedTopicCondtions);
+ .append(existedTopicConditions);
} else {
isCondEqual = true;
for (String topicKey : existedCondTopics) {
- if ((existedTopicCondtions.get(topicKey).size()
+ if ((existedTopicConditions.get(topicKey).size()
!= inConsumerInfo.getTopicConditions().get(topicKey).size())
- || (!existedTopicCondtions.get(topicKey).containsAll(inConsumerInfo
+ || (!existedTopicConditions.get(topicKey).containsAll(inConsumerInfo
.getTopicConditions().get(topicKey)))) {
isCondEqual = false;
strBuffer.append("[Inconsistency subscribe] ").append(inConsumerInfo.getConsumerId())
@@ -338,7 +338,7 @@ public class PBParameterUtils {
.append(inConsumerInfo.getTopicConditions())
.append(" is inconsistency with other consumers in the group, existed topic" +
" conditions is ")
- .append(existedTopicCondtions);
+ .append(existedTopicConditions);
break;
}
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/TMaster.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/TMaster.java
index 41056b9..0554098 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/TMaster.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/TMaster.java
@@ -1537,7 +1537,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
requireAcceptSubscribe = true;
requireSyncClient = true;
} else if (brokerRunStatus == TStatusConstants.STATUS_SERVICE_TOONLINE_ONLY_READ) {
- if ((brokerSyncStatusInfo.isBrokerConfChaned())
+ if ((brokerSyncStatusInfo.isBrokerConfChanged())
|| (!brokerSyncStatusInfo.isBrokerLoaded())) {
long waitTime =
brokerSyncStatusInfo.isFastStart() ? masterConfig.getStepChgWaitPeriodMs()
@@ -1565,7 +1565,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
requireAcceptPublish = true;
requireAcceptSubscribe = true;
requireSyncClient = true;
- if ((brokerSyncStatusInfo.isBrokerConfChaned())
+ if ((brokerSyncStatusInfo.isBrokerConfChanged())
|| (!brokerSyncStatusInfo.isBrokerLoaded())) {
this.defaultBrokerConfManager
.updateBrokerConfChanged(brokerInfo.getBrokerId(), false, true);
@@ -1584,7 +1584,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
requireSyncClient = true;
requirePartUpdate = true;
} else if (brokerRunStatus == TStatusConstants.STATUS_SERVICE_TOONLINE_PART_ONLY_READ) {
- if ((brokerSyncStatusInfo.isBrokerConfChaned())
+ if ((brokerSyncStatusInfo.isBrokerConfChanged())
|| (!brokerSyncStatusInfo.isBrokerLoaded())) {
long waitTime =
brokerSyncStatusInfo.isFastStart()
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerConfManager.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerConfManager.java
index e244feb..b09f212 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerConfManager.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerConfManager.java
@@ -816,8 +816,8 @@ public class BrokerConfManager implements Server {
if (brokerSyncStatusInfo.isFastStart()) {
brokerSyncStatusInfo.setFastStart(isFasterStart);
}
- if (!brokerSyncStatusInfo.isBrokerConfChaned()) {
- brokerSyncStatusInfo.setBrokerConfChaned();
+ if (!brokerSyncStatusInfo.isBrokerConfChanged()) {
+ brokerSyncStatusInfo.setBrokerConfChanged();
}
}
} else {
@@ -841,7 +841,7 @@ public class BrokerConfManager implements Server {
brokerSyncStatusInfo = tmpBrokerSyncStatusInfo;
}
}
- if (brokerSyncStatusInfo.isBrokerConfChaned()) {
+ if (brokerSyncStatusInfo.isBrokerConfChanged()) {
brokerSyncStatusInfo.setBrokerLoaded();
brokerSyncStatusInfo.setFastStart(isFasterStart);
}
@@ -1043,16 +1043,16 @@ public class BrokerConfManager implements Server {
private List<String> innGetTopicStrConfigInfo(BdbBrokerConfEntity brokerConfEntity,
boolean isRemoved) {
List<String> brokerTopicStrConfSet = new ArrayList<>();
- ConcurrentHashMap<String, BdbTopicConfEntity> topicBdbEntytyMap =
+ ConcurrentHashMap<String, BdbTopicConfEntity> topicBdbEntityMap =
brokerTopicEntityStoreMap.get(brokerConfEntity.getBrokerId());
- if (topicBdbEntytyMap != null) {
+ if (topicBdbEntityMap != null) {
int defNumTopicStores = brokerConfEntity.getNumTopicStores();
int defunFlushDataHold = brokerConfEntity.getDftUnFlushDataHold();
int defmemCacheMsgSizeInMB = brokerConfEntity.getDftMemCacheMsgSizeInMB();
int defmemCacheMsgCntInK = brokerConfEntity.getDftMemCacheMsgCntInK();
int defMemCacheFlushIntvl = brokerConfEntity.getDftMemCacheFlushIntvl();
StringBuilder sbuffer = new StringBuilder(512);
- for (BdbTopicConfEntity topicEntity : topicBdbEntytyMap.values()) {
+ for (BdbTopicConfEntity topicEntity : topicBdbEntityMap.values()) {
/*
* topic:partNum:acceptPublish:acceptSubscribe:unflushThreshold:unflushInterval:deleteWhen:
* deletePolicy:filterStatusId:statusId
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java
index cfe8e0c..3b82f5e 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/nodemanage/nodebroker/BrokerSyncStatusInfo.java
@@ -54,7 +54,7 @@ public class BrokerSyncStatusInfo {
private boolean isBrokerRegister = false; //broker register flag
private boolean isBrokerOnline = false; //broker online flag
private boolean isOverTLS = false; //enable tls
- private boolean isBrokerConfChaned = false; //config change flag
+ private boolean isBrokerConfChanged = false; //config change flag
private boolean isBrokerLoaded = false; //broker load status
private boolean isFastStart = false; //enable fast start
@@ -97,7 +97,7 @@ public class BrokerSyncStatusInfo {
updateBrokerConfigureInfo(bdbEntity.getBrokerDefaultConfInfo(),
brokerTopicSetConfInfo);
this.brokerManageStatus = bdbEntity.getManageStatus();
- this.isBrokerConfChaned = bdbEntity.isConfDataUpdated();
+ this.isBrokerConfChanged = bdbEntity.isConfDataUpdated();
this.isBrokerLoaded = bdbEntity.isBrokerLoaded();
this.brokerId = bdbEntity.getBrokerId();
this.brokerIp = bdbEntity.getBrokerIp();
@@ -113,19 +113,19 @@ public class BrokerSyncStatusInfo {
* Update current broker config info
*
* @param brokerManageStatus broker status
- * @param isBrokerConfChaned
+ * @param isBrokerConfChanged
* @param isBrokerLoaded
* @param brokerDefaultConfInfo broker default config
* @param brokerTopicSetConfInfo topic config
* @param isOnlineUpdate
*/
- public void updateCurrBrokerConfInfo(int brokerManageStatus, boolean isBrokerConfChaned,
+ public void updateCurrBrokerConfInfo(int brokerManageStatus, boolean isBrokerConfChanged,
boolean isBrokerLoaded, String brokerDefaultConfInfo,
List<String> brokerTopicSetConfInfo,
boolean isOnlineUpdate) {
this.brokerManageStatus = brokerManageStatus;
this.currBrokerConfId.incrementAndGet();
- this.isBrokerConfChaned = isBrokerConfChaned;
+ this.isBrokerConfChanged = isBrokerConfChanged;
this.isBrokerLoaded = isBrokerLoaded;
updateBrokerConfigureInfo(brokerDefaultConfInfo, brokerTopicSetConfInfo);
this.lastPushBrokerConfId = this.currBrokerConfId.get();
@@ -208,7 +208,7 @@ public class BrokerSyncStatusInfo {
if (isRegister) {
if (this.isBrokerOnline) {
if (this.reportedBrokerConfId <= 0) {
- if (this.isBrokerConfChaned
+ if (this.isBrokerConfChanged
|| !this.isBrokerLoaded
|| this.reportedBrokerCheckSumId != this.lastPushBrokerCheckSumId
|| !isFirstInit) {
@@ -580,12 +580,12 @@ public class BrokerSyncStatusInfo {
this.reportedBrokerTopicSetConfInfo = reportedBrokerTopicSetConfInfo;
}
- public boolean isBrokerConfChaned() {
- return isBrokerConfChaned;
+ public boolean isBrokerConfChanged() {
+ return isBrokerConfChanged;
}
- public void setBrokerConfChaned() {
- this.isBrokerConfChaned = true;
+ public void setBrokerConfChanged() {
+ this.isBrokerConfChanged = true;
this.isBrokerLoaded = false;
}
@@ -595,7 +595,7 @@ public class BrokerSyncStatusInfo {
public void setBrokerLoaded() {
this.isBrokerLoaded = true;
- this.isBrokerConfChaned = false;
+ this.isBrokerConfChanged = false;
}
// #lizard forgives
@@ -760,7 +760,7 @@ public class BrokerSyncStatusInfo {
.append(",\"isBrokerRegister\":").append(isBrokerRegister)
.append(",\"isBrokerOnline\":").append(isBrokerOnline)
.append(",\"isFirstInit\":").append(isFirstInit)
- .append(",\"isBrokerConfChaned\":").append(isBrokerConfChaned)
+ .append(",\"isBrokerConfChanged\":").append(isBrokerConfChanged)
.append(",\"isBrokerLoaded\":").append(isBrokerLoaded)
.append(",\"isFastStart\":").append(isFastStart);
if (isOrig) {
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
index eae357c..78e4a43 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
@@ -168,7 +168,7 @@ public class WebAdminGroupCtrlHandler {
if ((filterJsonArray == null) || (filterJsonArray.isEmpty())) {
throw new Exception("Null value of filterCondJsonSet, please set the value first!");
}
- Set<String> confgiuredTopicSet = brokerConfManager.getTotalConfiguredTopicNames();
+ Set<String> configuredTopicSet = brokerConfManager.getTotalConfiguredTopicNames();
HashMap<String, BdbGroupFilterCondEntity> inGroupFilterCondEntityMap =
new HashMap<>();
for (int j = 0; j < filterJsonArray.size(); j++) {
@@ -184,7 +184,7 @@ public class WebAdminGroupCtrlHandler {
groupObject.get("topicName"),
TBaseConstants.META_MAX_TOPICNAME_LENGTH,
true, "");
- if (!confgiuredTopicSet.contains(groupTopicName)) {
+ if (!configuredTopicSet.contains(groupTopicName)) {
throw new Exception(sBuilder.append("Topic ").append(groupTopicName)
.append(" not configure in master configure, please configure first!").toString());
}
@@ -1046,7 +1046,7 @@ public class WebAdminGroupCtrlHandler {
if ((jsonArray == null) || (jsonArray.isEmpty())) {
throw new Exception("Null value of groupNameJsonSet, please set the value first!");
}
- Set<String> confgiuredTopicSet = brokerConfManager.getTotalConfiguredTopicNames();
+ Set<String> configuredTopicSet = brokerConfManager.getTotalConfiguredTopicNames();
HashMap<String, BdbBlackGroupEntity> inBlackGroupEntityMap = new HashMap<>();
for (int j = 0; j < jsonArray.size(); j++) {
Map<String, String> groupObject = jsonArray.get(j);
@@ -1076,7 +1076,7 @@ public class WebAdminGroupCtrlHandler {
groupCreateUser = createUser;
groupCreateDate = createDate;
}
- if (!confgiuredTopicSet.contains(groupTopicName)) {
+ if (!configuredTopicSet.contains(groupTopicName)) {
throw new Exception(sBuilder.append("Topic ").append(groupTopicName)
.append(" not configure in master configure, please configure first!").toString());
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
index 6a6c8fd..04ed927 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerDefConfHandler.java
@@ -112,7 +112,7 @@ public class WebBrokerDefConfHandler {
isNeedFastStart = false;
}
if (oldManagStatus == TStatusConstants.STATUS_MANAGE_ONLINE) {
- if ((brokerSyncStatusInfo.isBrokerConfChaned())
+ if ((brokerSyncStatusInfo.isBrokerConfChanged())
|| (!brokerSyncStatusInfo.isBrokerLoaded())) {
isNeedFastStart = false;
}
@@ -125,7 +125,7 @@ public class WebBrokerDefConfHandler {
isNeedFastStart = false;
}
if (oldManagStatus == TStatusConstants.STATUS_MANAGE_ONLINE_NOT_WRITE) {
- if ((brokerSyncStatusInfo.isBrokerConfChaned())
+ if ((brokerSyncStatusInfo.isBrokerConfChanged())
|| (!brokerSyncStatusInfo.isBrokerLoaded())) {
isNeedFastStart = false;
}
@@ -1318,7 +1318,7 @@ public class WebBrokerDefConfHandler {
.append(stepStatus);
}
}
- strBuffer.append(",\"isConfChanged\":\"").append(brokerSyncStatusInfo.isBrokerConfChaned())
+ strBuffer.append(",\"isConfChanged\":\"").append(brokerSyncStatusInfo.isBrokerConfChanged())
.append("\",\"isConfLoaded\":\"").append(brokerSyncStatusInfo.isBrokerLoaded())
.append("\",\"isBrokerOnline\":\"").append(brokerSyncStatusInfo.isBrokerOnline())
.append("\"");