You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by te...@apache.org on 2020/05/12 03:05:27 UTC
[incubator-tubemq] branch master updated: [TUBEMQ-98] Fix typo &
Simplify 'instanceof' judgment (#77)
This is an automated email from the ASF dual-hosted git repository.
technoboy 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 3509cc5 [TUBEMQ-98] Fix typo & Simplify 'instanceof' judgment (#77)
3509cc5 is described below
commit 3509cc5ea1b07a20833d449d66c3d3020873ff38
Author: viviel <37...@users.noreply.github.com>
AuthorDate: Tue May 12 11:05:20 2020 +0800
[TUBEMQ-98] Fix typo & Simplify 'instanceof' judgment (#77)
* [TUBEMQ-98] Fix typo & Simplify 'instanceof' judgment
---
.../tubemq/client/consumer/BaseMessageConsumer.java | 8 ++++----
.../tubemq/client/consumer/ConsumerSamplePrint.java | 3 +--
.../apache/tubemq/client/consumer/RmtDataCache.java | 18 +++++++++---------
.../client/consumer/SimplePullMessageConsumer.java | 2 +-
.../tubemq/client/consumer/RmtDataCacheTest.java | 2 +-
5 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/BaseMessageConsumer.java b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/BaseMessageConsumer.java
index ab00fa4..997320f 100644
--- a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/BaseMessageConsumer.java
+++ b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/BaseMessageConsumer.java
@@ -1651,7 +1651,7 @@ public class BaseMessageConsumer implements MessageConsumer {
logger.warn(strBuffer
.append("[heart2broker error] certificate failure, ")
.append(brokerInfo.getBrokerStrInfo())
- .append("'s partitions ared released, ")
+ .append("'s partitions area released, ")
.append(heartBeatResponseV2.getErrMsg()).toString());
strBuffer.delete(0, strBuffer.length());
}
@@ -1663,12 +1663,12 @@ public class BaseMessageConsumer implements MessageConsumer {
samplePrintCtrl.printExceptionCaught(ee);
if (!partStrSet.isEmpty()) {
strBuffer.delete(0, strBuffer.length());
- for (String partionStr : partStrSet) {
- Partition tmpPartition = new Partition(partionStr);
+ for (String partitionStr : partStrSet) {
+ Partition tmpPartition = new Partition(partitionStr);
removePartition(tmpPartition);
logger.warn(strBuffer
.append("[heart2broker Throwable] release partition:")
- .append(partionStr).toString());
+ .append(partitionStr).toString());
strBuffer.delete(0, strBuffer.length());
}
}
diff --git a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/ConsumerSamplePrint.java b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/ConsumerSamplePrint.java
index 2940022..0aadf2e 100644
--- a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/ConsumerSamplePrint.java
+++ b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/ConsumerSamplePrint.java
@@ -17,7 +17,6 @@
package org.apache.tubemq.client.consumer;
-import java.io.IOException;
import org.apache.tubemq.corebase.utils.AbstractSamplePrint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +41,7 @@ public class ConsumerSamplePrint extends AbstractSamplePrint {
if (e == null) {
return;
}
- if (e instanceof IOException || e instanceof Exception) {
+ if (e instanceof Exception) {
final long now = System.currentTimeMillis();
final long diffTime = now - lastLogTime.get();
final long curPrintCnt = totalPrintCount.incrementAndGet();
diff --git a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/RmtDataCache.java b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/RmtDataCache.java
index 17a8a37..174717e 100644
--- a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/RmtDataCache.java
+++ b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/RmtDataCache.java
@@ -280,7 +280,7 @@ public class RmtDataCache implements Closeable {
return false;
}
- public Partition getPartitonByKey(String partitionKey) {
+ public Partition getPartitionByKey(String partitionKey) {
return partitionMap.get(partitionKey);
}
@@ -488,13 +488,13 @@ public class RmtDataCache implements Closeable {
PartitionSelectResult partitionRet =
new PartitionSelectResult(true, TErrCodeConstants.SUCCESS,
"Ok!", partition, 0, lastPackConsumed);
- List<PartitionSelectResult> targetPartitonList =
+ List<PartitionSelectResult> targetPartitionList =
unNewRegisterInfoMap.get(entry.getKey());
- if (targetPartitonList == null) {
- targetPartitonList = new ArrayList<>();
- unNewRegisterInfoMap.put(entry.getKey(), targetPartitonList);
+ if (targetPartitionList == null) {
+ targetPartitionList = new ArrayList<>();
+ unNewRegisterInfoMap.put(entry.getKey(), targetPartitionList);
}
- targetPartitonList.add(partitionRet);
+ targetPartitionList.add(partitionRet);
}
}
}
@@ -606,9 +606,9 @@ public class RmtDataCache implements Closeable {
unRegPartitionList.addAll(entry.getValue());
} else {
boolean isNewBroker = true;
- for (Partition regPartiton : entry.getValue()) {
- if (!partitionList.contains(regPartiton)) {
- unRegPartitionList.add(regPartiton);
+ for (Partition regPartition : entry.getValue()) {
+ if (!partitionList.contains(regPartition)) {
+ unRegPartitionList.add(regPartition);
isNewBroker = false;
}
}
diff --git a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/SimplePullMessageConsumer.java b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/SimplePullMessageConsumer.java
index 046d57b..ba89496 100644
--- a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/SimplePullMessageConsumer.java
+++ b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/SimplePullMessageConsumer.java
@@ -156,7 +156,7 @@ public class SimplePullMessageConsumer implements PullMessageConsumer {
"The confirmContext's value invalid!");
}
Partition curPartition =
- baseConsumer.rmtDataCache.getPartitonByKey(keyId);
+ baseConsumer.rmtDataCache.getPartitionByKey(keyId);
if (curPartition == null) {
return new ConsumerResult(TErrCodeConstants.NOT_FOUND, sBuilder
.append("Not found the partition by confirmContext:")
diff --git a/tubemq-client/src/test/java/org/apache/tubemq/client/consumer/RmtDataCacheTest.java b/tubemq-client/src/test/java/org/apache/tubemq/client/consumer/RmtDataCacheTest.java
index 1b77d7f..97f1afb 100644
--- a/tubemq-client/src/test/java/org/apache/tubemq/client/consumer/RmtDataCacheTest.java
+++ b/tubemq-client/src/test/java/org/apache/tubemq/client/consumer/RmtDataCacheTest.java
@@ -54,7 +54,7 @@ public class RmtDataCacheTest {
assertEquals(1, brokerInfos.size());
assertTrue(brokerInfos.contains(brokerInfo));
- assertEquals(expectPartition.getPartitionId(), cache.getPartitonByKey("1:test:1").getBrokerId());
+ assertEquals(expectPartition.getPartitionId(), cache.getPartitionByKey("1:test:1").getBrokerId());
cache.addPartition(new Partition(brokerInfo, "test", 2), 10);
assertEquals(2, cache.getBrokerPartitionList(brokerInfo).size());