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 11:11:11 UTC
[incubator-tubemq] branch master updated: [TUBEMQ-101] Optimize
code & Fix type (#79)
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 981b83b [TUBEMQ-101] Optimize code & Fix type (#79)
981b83b is described below
commit 981b83bbc24da668f22cf8b06394dcca1b05b7d4
Author: viviel <37...@users.noreply.github.com>
AuthorDate: Wed May 13 19:11:06 2020 +0800
[TUBEMQ-101] Optimize code & Fix type (#79)
---
.../apache/tubemq/corebase/cluster/MasterInfo.java | 6 ++----
.../bdbstore/bdbentitys/BdbTopicConfEntity.java | 6 +++---
.../nodemanage/nodebroker/BrokerConfManager.java | 4 ++--
.../tubemq/server/master/web/common/BaseResult.java | 20 ++++++++++----------
.../master/web/handler/WebBrokerDefConfHandler.java | 2 +-
.../web/handler/WebBrokerTopicConfHandler.java | 6 +++---
6 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/tubemq-core/src/main/java/org/apache/tubemq/corebase/cluster/MasterInfo.java b/tubemq-core/src/main/java/org/apache/tubemq/corebase/cluster/MasterInfo.java
index 0866394..06deba6 100644
--- a/tubemq-core/src/main/java/org/apache/tubemq/corebase/cluster/MasterInfo.java
+++ b/tubemq-core/src/main/java/org/apache/tubemq/corebase/cluster/MasterInfo.java
@@ -28,7 +28,7 @@ import org.apache.tubemq.corebase.utils.TStringUtils;
public class MasterInfo {
- private final Map<String/** ip:port */, NodeAddrInfo> addrMap4Failover =
+ private final Map<String/* ip:port */, NodeAddrInfo> addrMap4Failover =
new HashMap<>();
private List<String> nodeHostPortList;
private NodeAddrInfo firstNodeAddr = null;
@@ -71,9 +71,7 @@ public class MasterInfo {
}
int port = Integer.parseInt(hostPortItem[1].trim());
NodeAddrInfo tmpNodeAddrInfo = new NodeAddrInfo(hostName, port);
- if (addrMap4Failover.get(tmpNodeAddrInfo.getHostPortStr()) == null) {
- addrMap4Failover.put(tmpNodeAddrInfo.getHostPortStr(), tmpNodeAddrInfo);
- }
+ addrMap4Failover.putIfAbsent(tmpNodeAddrInfo.getHostPortStr(), tmpNodeAddrInfo);
if (this.firstNodeAddr == null) {
this.firstNodeAddr = tmpNodeAddrInfo;
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/bdbstore/bdbentitys/BdbTopicConfEntity.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/bdbstore/bdbentitys/BdbTopicConfEntity.java
index cb8ef7e..32afd8a 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/bdbstore/bdbentitys/BdbTopicConfEntity.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/bdbstore/bdbentitys/BdbTopicConfEntity.java
@@ -131,7 +131,7 @@ public class BdbTopicConfEntity implements Serializable {
this.numTopicStores = numTopicStores;
}
- public void setunFlushDataHold(final int unFlushDataHold) {
+ public void setUnflushDataHold(final int unFlushDataHold) {
this.attributes =
TStringUtils.setAttrValToAttributes(this.attributes,
TokenConstants.TOKEN_DATA_UNFLUSHHOLD,
@@ -284,7 +284,7 @@ public class BdbTopicConfEntity implements Serializable {
this.modifyDate = modifyDate;
}
- public int getunFlushDataHold() {
+ public int getUnflushDataHold() {
String atrVal =
TStringUtils.getAttrValFrmAttributes(this.attributes,
TokenConstants.TOKEN_DATA_UNFLUSHHOLD);
@@ -365,7 +365,7 @@ public class BdbTopicConfEntity implements Serializable {
.append("\",\"topicName\":\"").append(topicName)
.append("\",\"numPartitions\":").append(numPartitions)
.append(",\"unflushThreshold\":").append(unflushThreshold)
- .append(",\"unFlushDataHold\":").append(getunFlushDataHold())
+ .append(",\"unFlushDataHold\":").append(getUnflushDataHold())
.append(",\"unflushInterval\":").append(unflushInterval)
.append(",\"deleteWhen\":\"").append(deleteWhen)
.append("\",\"deletePolicy\":\"").append(deletePolicy)
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 b09f212..980832d 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
@@ -1108,10 +1108,10 @@ public class BrokerConfManager implements Server {
sbuffer.append(TokenConstants.ATTR_SEP).append(topicEntity.getNumTopicStores());
}
sbuffer.append(TokenConstants.ATTR_SEP).append(topicEntity.getTopicStatusId());
- if (topicEntity.getunFlushDataHold() == defunFlushDataHold) {
+ if (topicEntity.getUnflushDataHold() == defunFlushDataHold) {
sbuffer.append(TokenConstants.ATTR_SEP).append(" ");
} else {
- sbuffer.append(TokenConstants.ATTR_SEP).append(topicEntity.getunFlushDataHold());
+ sbuffer.append(TokenConstants.ATTR_SEP).append(topicEntity.getUnflushDataHold());
}
if (topicEntity.getMemCacheMsgSizeInMB() == defmemCacheMsgSizeInMB) {
sbuffer.append(TokenConstants.ATTR_SEP).append(" ");
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/common/BaseResult.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/common/BaseResult.java
index 910a836..aad3c94 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/common/BaseResult.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/common/BaseResult.java
@@ -412,34 +412,34 @@ public class BaseResult implements Serializable {
return value + '%';
}
- protected String formatDate(String datestring) {
- if (TStringUtils.isBlank(datestring)) {
+ protected String formatDate(String dateString) {
+ if (TStringUtils.isBlank(dateString)) {
return null;
} else {
- return (datestring + " 00:00:00");
+ return (dateString + " 00:00:00");
}
}
/**
* When the time is queried, the end time is 23:59:59
*/
- protected String addDateEndPostfix(String datestring) {
- if (TStringUtils.isBlank(datestring)) {
+ protected String addDateEndPostfix(String dateString) {
+ if (TStringUtils.isBlank(dateString)) {
return null;
}
- return datestring + " 23:59:59";
+ return dateString + " 23:59:59";
}
/**
* When the time is queried, the start time is 00:00:00
*/
- protected String addDateStartPostfix(String datestring) {
- if (TStringUtils.isBlank(datestring)) {
+ protected String addDateStartPostfix(String dateString) {
+ if (TStringUtils.isBlank(dateString)) {
return null;
}
- return datestring + " 00:00:00";
+ return dateString + " 00:00:00";
}
@Override
@@ -447,7 +447,7 @@ public class BaseResult implements Serializable {
return ToStringBuilder.reflectionToString(this);
}
- public String[] getParameteres() {
+ public String[] getParameters() {
return new String[0];
}
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 04ed927..e94f187 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
@@ -1613,7 +1613,7 @@ public class WebBrokerDefConfHandler {
.append(",\"numPartitions\":").append(topicEntity.getNumPartitions())
.append(",\"unflushThreshold\":").append(topicEntity.getUnflushThreshold())
.append(",\"unflushInterval\":").append(topicEntity.getUnflushInterval())
- .append(",\"unFlushDataHold\":").append(topicEntity.getunFlushDataHold())
+ .append(",\"unFlushDataHold\":").append(topicEntity.getUnflushDataHold())
.append(",\"memCacheMsgCntInK\":").append(topicEntity.getMemCacheMsgCntInK())
.append(",\"memCacheMsgSizeInMB\":").append(topicEntity.getMemCacheMsgSizeInMB())
.append(",\"memCacheFlushIntvl\":").append(topicEntity.getMemCacheFlushIntvl())
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java
index bb90522..9b81d42 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/master/web/handler/WebBrokerTopicConfHandler.java
@@ -552,7 +552,7 @@ public class WebBrokerTopicConfHandler {
.append(",\"numPartitions\":").append(entity.getNumPartitions())
.append(",\"unflushThreshold\":").append(entity.getUnflushThreshold())
.append(",\"unflushInterval\":").append(entity.getUnflushInterval())
- .append(",\"unFlushDataHold\":").append(entity.getunFlushDataHold())
+ .append(",\"unFlushDataHold\":").append(entity.getUnflushDataHold())
.append(",\"deleteWhen\":\"").append(entity.getDeleteWhen())
.append("\",\"deletePolicy\":\"").append(entity.getDeletePolicy())
.append("\",\"acceptPublish\":").append(String.valueOf(entity.getAcceptPublish()))
@@ -1274,9 +1274,9 @@ public class WebBrokerTopicConfHandler {
foundChange = true;
newEntity.setUnflushThreshold(unflushThreshold);
}
- if (unFlushDataHold >= 0 && unFlushDataHold != oldEntity.getunFlushDataHold()) {
+ if (unFlushDataHold >= 0 && unFlushDataHold != oldEntity.getUnflushDataHold()) {
foundChange = true;
- newEntity.setunFlushDataHold(unFlushDataHold);
+ newEntity.setUnflushDataHold(unFlushDataHold);
}
if (memCacheMsgCntInK >= 0 && memCacheMsgCntInK != oldEntity.getMemCacheMsgCntInK()) {
foundChange = true;