You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by yu...@apache.org on 2021/03/01 09:07:34 UTC
[incubator-tubemq] 20/29: [TUBEMQ-556]Index value is bigger than
the actual number of records (#422)
This is an automated email from the ASF dual-hosted git repository.
yuanbo pushed a commit to branch TUBEMQ-469
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
commit 61b204a2acd44102113a07f2c0b723c3e97df82f
Author: gosonzhang <46...@qq.com>
AuthorDate: Mon Feb 8 21:48:38 2021 +0800
[TUBEMQ-556]Index value is bigger than the actual number of records (#422)
Co-authored-by: gosonzhang <go...@tencent.com>
---
.../tubemq/server/broker/web/BrokerAdminServlet.java | 16 ++++++++--------
.../tubemq/server/common/webbase/WebMethodMapper.java | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/web/BrokerAdminServlet.java b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/web/BrokerAdminServlet.java
index dd4bbdf..7f999ff 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/broker/web/BrokerAdminServlet.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/broker/web/BrokerAdminServlet.java
@@ -110,10 +110,10 @@ public class BrokerAdminServlet extends AbstractWebHandler {
if (index++ > 0) {
sBuilder.append(",");
}
- sBuilder.append("{\"id\":").append(index + 1)
+ sBuilder.append("{\"id\":").append(index)
.append(",\"method\":\"").append(method).append("\"}");
}
- sBuilder.append("],\"totalCnt\":").append(index + 1).append("}");
+ sBuilder.append("],\"totalCnt\":").append(index).append("}");
}
/***
@@ -150,10 +150,10 @@ public class BrokerAdminServlet extends AbstractWebHandler {
int partitionId = Integer.parseInt(partitionIdArr[2]);
String consumerId = entry.getValue().getConsumerId();
boolean ifFilterConsume = entry.getValue().isFilterConsume();
- if (index > 0) {
+ if (index++ > 0) {
sBuilder.append(",");
}
- sBuilder.append("{\"index\":").append(++index).append(",\"groupName\":\"")
+ sBuilder.append("{\"index\":").append(index).append(",\"groupName\":\"")
.append(groupName).append("\",\"topicName\":\"").append(topicName)
.append("\",\"partitionId\":").append(partitionId);
Long regTime =
@@ -231,11 +231,11 @@ public class BrokerAdminServlet extends AbstractWebHandler {
|| (!topicNameSet.isEmpty() && !topicNameSet.contains(entry.getKey()))) {
continue;
}
- if (recordId > 0) {
+ if (recordId++ > 0) {
sBuilder.append(",");
}
index = 0;
- sBuilder.append("{\"index\":").append(++recordId).append(",\"topicName\":\"")
+ sBuilder.append("{\"index\":").append(recordId).append(",\"topicName\":\"")
.append(entry.getKey()).append("\",\"storeInfo\":[");
ConcurrentHashMap<Integer, MessageStore> partStoreMap = entry.getValue();
if (partStoreMap != null) {
@@ -564,13 +564,13 @@ public class BrokerAdminServlet extends AbstractWebHandler {
if (entry.getKey() == null || entry.getValue() == null) {
continue;
}
- if (totalCnt > 0) {
+ if (totalCnt++ > 0) {
sBuilder.append(",");
}
sBuilder.append("{\"Partition\":\"").append(entry.getKey())
.append("\",\"Consumer\":\"")
.append(entry.getValue().getConsumerId())
- .append("\",\"index\":").append(++totalCnt).append("}");
+ .append("\",\"index\":").append(totalCnt).append("}");
}
sBuilder.append("],\"totalCnt\":").append(totalCnt).append("}");
}
diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/common/webbase/WebMethodMapper.java b/tubemq-server/src/main/java/org/apache/tubemq/server/common/webbase/WebMethodMapper.java
index 147a388..c6885ec 100644
--- a/tubemq-server/src/main/java/org/apache/tubemq/server/common/webbase/WebMethodMapper.java
+++ b/tubemq-server/src/main/java/org/apache/tubemq/server/common/webbase/WebMethodMapper.java
@@ -52,7 +52,7 @@ public class WebMethodMapper {
}
}
logger.error(new StringBuilder(512)
- .append("registerWebMethod failure, not found Method by clsMethodName")
+ .append("registerWebMethod failure, not found Method by clsMethodName ")
.append(clsMethodName).append(" in WebHandler class ")
.append(webHandler.getClass().getName()).toString());
}