This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 61b14c3f4 [ISSUE #4785] Enable misspell check GitHub Action (#4786)
61b14c3f4 is described below
commit 61b14c3f4eb9ec015be2bced3187042a1267b3d8
Author: Aaron Ai <[email protected]>
AuthorDate: Mon Aug 8 09:28:41 2022 +0800
[ISSUE #4785] Enable misspell check GitHub Action (#4786)
* Enable misspell check GitHub Action
* Fix typo
---
.github/workflows/misspell_check.yml | 17 +++++++++
.../apache/rocketmq/acl/common/AclUtilsTest.java | 30 ++++++++--------
.../broker/processor/AdminBrokerProcessor.java | 2 +-
.../rocketmq/client/trace/TraceDataEncoder.java | 2 +-
.../rocketmq/client/trace/TraceDispatcher.java | 2 +-
.../rocketmq/client/trace/TraceTransferBean.java | 2 +-
.../rocketmq/common/message/MessageDecoder.java | 6 ++--
.../common/statistics/StatisticsItemFormatter.java | 8 ++---
.../StatisticsItemScheduledIncrementPrinter.java | 18 +++++-----
.../statistics/StatisticsItemScheduledPrinter.java | 2 +-
.../rocketmq/common/utils/ServiceProvider.java | 2 +-
.../rocketmq/common/utils/IOTinyUtilsTest.java | 2 +-
.../container/BrokerContainerStartupTest.java | 2 +-
.../rocketmq/container/BrokerContainerTest.java | 2 +-
distribution/bin/mqshutdown | 2 +-
.../rocketmq/filter/parser/SelectorParser.java | 2 +-
.../rocketmq/filter/parser/SelectorParser.jj | 2 +-
.../remoting/netty/NettyRemotingServer.java | 2 +-
.../java/org/apache/rocketmq/store/CommitLog.java | 2 +-
.../apache/rocketmq/store/DefaultMessageStore.java | 2 +-
.../apache/rocketmq/store/StoreStatsService.java | 40 +++++++++++-----------
.../rocketmq/store/queue/BatchConsumeQueue.java | 2 +-
.../rocketmq/store/queue/ReferredIterator.java | 2 +-
.../apache/rocketmq/store/stats/BrokerStats.java | 4 +--
.../apache/rocketmq/store/BatchPutMessageTest.java | 2 +-
.../apache/rocketmq/store/MappedFileQueueTest.java | 2 +-
.../org/apache/rocketmq/store/MappedFileTest.java | 2 +-
.../apache/rocketmq/store/StoreCheckpointTest.java | 2 +-
.../test/java/stats/BrokerStatsManagerTest.java | 2 +-
.../org/apache/rocketmq/test/util/FileUtil.java | 6 ++--
.../org/apache/rocketmq/test/util/VerifyUtils.java | 8 ++---
.../client/consumer/broadcast/BaseBroadCastIT.java | 2 +-
.../normal/BroadCastNormalMsgNotRecvIT.java | 2 +-
.../normal/BroadCastNormalMsgRecvCrashIT.java | 2 +-
.../normal/BroadCastNormalMsgRecvFailIT.java | 2 +-
.../normal/BroadCastNormalMsgRecvStartLaterIT.java | 2 +-
.../BroadCastNormalMsgTwoDiffGroupRecvIT.java | 2 +-
.../normal/NormalMsgTwoSameGroupConsumerIT.java | 2 +-
.../tools/admin/DefaultMQAdminExtImpl.java | 2 +-
.../command/cluster/ClusterListSubCommand.java | 4 +--
.../tools/command/export/ExportMetricsCommand.java | 4 +--
41 files changed, 111 insertions(+), 94 deletions(-)
diff --git a/.github/workflows/misspell_check.yml
b/.github/workflows/misspell_check.yml
new file mode 100644
index 000000000..81729e42a
--- /dev/null
+++ b/.github/workflows/misspell_check.yml
@@ -0,0 +1,17 @@
+name: Misspell Check
+on:
+ pull_request:
+ types: [opened, reopened, synchronize]
+ push:
+ branches: [master, develop]
+jobs:
+ misspell-check:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - name: Install misspell
+ run: |
+ curl -L -o ./install-misspell.sh https://git.io/misspell
+ sh ./install-misspell.sh
+ - name: Run misspell
+ run: find . -type f -print0 | xargs -0 bin/misspell -error -i
transfered,derivate
diff --git a/acl/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java
b/acl/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java
index 15f71ed84..850b5335a 100644
--- a/acl/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java
+++ b/acl/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java
@@ -80,35 +80,35 @@ public class AclUtilsTest {
@Test
public void isScopeArray() {
- String[] adderss = StringUtils.split("12.12.12.12", ".");
- boolean isScope = AclUtils.isScope(adderss, 4);
+ String[] address = StringUtils.split("12.12.12.12", ".");
+ boolean isScope = AclUtils.isScope(address, 4);
Assert.assertTrue(isScope);
- isScope = AclUtils.isScope(adderss, 3);
+ isScope = AclUtils.isScope(address, 3);
Assert.assertTrue(isScope);
- adderss = StringUtils.split("12.12.1222.1222", ".");
- isScope = AclUtils.isScope(adderss, 4);
+ address = StringUtils.split("12.12.1222.1222", ".");
+ isScope = AclUtils.isScope(address, 4);
Assert.assertFalse(isScope);
- isScope = AclUtils.isScope(adderss, 3);
+ isScope = AclUtils.isScope(address, 3);
Assert.assertFalse(isScope);
// IPv6 test
- adderss = StringUtils.split("1050:0000:0000:0000:0005:0600:300c:326b",
":");
- isScope = AclUtils.isIPv6Scope(adderss, 8);
+ address = StringUtils.split("1050:0000:0000:0000:0005:0600:300c:326b",
":");
+ isScope = AclUtils.isIPv6Scope(address, 8);
Assert.assertTrue(isScope);
- isScope = AclUtils.isIPv6Scope(adderss, 4);
+ isScope = AclUtils.isIPv6Scope(address, 4);
Assert.assertTrue(isScope);
- adderss = StringUtils.split("1050:9876:0000:0000:0005:akkg:300c:326b",
":");
- isScope = AclUtils.isIPv6Scope(adderss, 8);
+ address = StringUtils.split("1050:9876:0000:0000:0005:akkg:300c:326b",
":");
+ isScope = AclUtils.isIPv6Scope(address, 8);
Assert.assertFalse(isScope);
- isScope = AclUtils.isIPv6Scope(adderss, 4);
+ isScope = AclUtils.isIPv6Scope(address, 4);
Assert.assertTrue(isScope);
- adderss =
StringUtils.split(AclUtils.expandIP("1050::0005:akkg:300c:326b", 8), ":");
- isScope = AclUtils.isIPv6Scope(adderss, 8);
+ address =
StringUtils.split(AclUtils.expandIP("1050::0005:akkg:300c:326b", 8), ":");
+ isScope = AclUtils.isIPv6Scope(address, 8);
Assert.assertFalse(isScope);
- isScope = AclUtils.isIPv6Scope(adderss, 4);
+ isScope = AclUtils.isIPv6Scope(address, 4);
Assert.assertTrue(isScope);
}
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
index 2a924b636..ab9463a96 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
@@ -2334,7 +2334,7 @@ public class AdminBrokerProcessor implements
NettyRequestProcessor {
TopicConfig topicConfig =
this.brokerController.getTopicConfigManager().getTopicConfigTable().get(requestHeader.getTopic());
if (topicConfig == null) {
LOGGER.error("No topic in this broker, client: {} topic: {}",
ctx.channel().remoteAddress(), requestHeader.getTopic());
- //be care of the response code, should set "not-exist" explictly
+ //be care of the response code, should set "not-exist" explicitly
response.setCode(ResponseCode.TOPIC_NOT_EXIST);
response.setRemark("No topic in this broker. topic: " +
requestHeader.getTopic());
return response;
diff --git
a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
index f0c685e0a..9d8669e5d 100644
---
a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
+++
b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
@@ -146,7 +146,7 @@ public class TraceDataEncoder {
if (ctx == null) {
return null;
}
- //build message trace of the transfering entity content bean
+ //build message trace of the transferring entity content bean
TraceTransferBean transferBean = new TraceTransferBean();
StringBuilder sb = new StringBuilder(256);
switch (ctx.getTraceType()) {
diff --git
a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDispatcher.java
b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDispatcher.java
index 9ddd778a9..ac4ef3ba8 100644
--- a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDispatcher.java
+++ b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDispatcher.java
@@ -34,7 +34,7 @@ public interface TraceDispatcher {
void start(String nameSrvAddr, AccessChannel accessChannel) throws
MQClientException;
/**
- * Append the transfering data
+ * Append the transferring data
* @param ctx data information
* @return
*/
diff --git
a/client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java
b/client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java
index 052ca3652..78be33fe8 100644
---
a/client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java
+++
b/client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java
@@ -20,7 +20,7 @@ import java.util.HashSet;
import java.util.Set;
/**
- * Trace transfering bean
+ * Trace transferring bean
*/
public class TraceTransferBean {
private String transData;
diff --git
a/common/src/main/java/org/apache/rocketmq/common/message/MessageDecoder.java
b/common/src/main/java/org/apache/rocketmq/common/message/MessageDecoder.java
index 0ff544cbb..602802c93 100644
---
a/common/src/main/java/org/apache/rocketmq/common/message/MessageDecoder.java
+++
b/common/src/main/java/org/apache/rocketmq/common/message/MessageDecoder.java
@@ -38,9 +38,9 @@ public class MessageDecoder {
// public final static int MSG_ID_LENGTH = 8 + 8;
public final static Charset CHARSET_UTF8 = StandardCharsets.UTF_8;
- public final static int MESSAGE_MAGIC_CODE_POSTION = 4;
- public final static int MESSAGE_FLAG_POSTION = 16;
- public final static int MESSAGE_PHYSIC_OFFSET_POSTION = 28;
+ public final static int MESSAGE_MAGIC_CODE_POSITION = 4;
+ public final static int MESSAGE_FLAG_POSITION = 16;
+ public final static int MESSAGE_PHYSIC_OFFSET_POSITION = 28;
public final static int MESSAGE_STORE_TIMESTAMP_POSITION = 56;
public final static int MESSAGE_MAGIC_CODE = -626843481;
public static final char NAME_VALUE_SEPARATOR = 1;
diff --git
a/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemFormatter.java
b/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemFormatter.java
index 87e301add..f3a9bdb72 100644
---
a/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemFormatter.java
+++
b/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemFormatter.java
@@ -20,12 +20,12 @@ import java.util.concurrent.atomic.AtomicLong;
public class StatisticsItemFormatter {
public String format(StatisticsItem statItem) {
- final String seperator = "|";
+ final String separator = "|";
StringBuilder sb = new StringBuilder();
- sb.append(statItem.getStatKind()).append(seperator);
- sb.append(statItem.getStatObject()).append(seperator);
+ sb.append(statItem.getStatKind()).append(separator);
+ sb.append(statItem.getStatObject()).append(separator);
for (AtomicLong acc : statItem.getItemAccumulates()) {
- sb.append(acc.get()).append(seperator);
+ sb.append(acc.get()).append(separator);
}
sb.append(statItem.getInvokeTimes());
return sb.toString();
diff --git
a/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemScheduledIncrementPrinter.java
b/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemScheduledIncrementPrinter.java
index d949b9188..c0db6807d 100644
---
a/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemScheduledIncrementPrinter.java
+++
b/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemScheduledIncrementPrinter.java
@@ -27,7 +27,7 @@ public class StatisticsItemScheduledIncrementPrinter extends
StatisticsItemSched
public static final int TPS_INITIAL_DELAY = 0;
public static final int TPS_INTREVAL = 1000;
- public static final String SEPERATOR = "|";
+ public static final String SEPARATOR = "|";
/**
* last snapshots of all scheduled items
@@ -175,11 +175,11 @@ public class StatisticsItemScheduledIncrementPrinter
extends StatisticsItemSched
for (StatisticsBrief brief :
briefInterceptor.getStatisticsBriefs()) {
long max = brief.getMax();
long tp999 = Math.min(brief.tp999(), max);
- //sb.append(SEPERATOR).append(brief.getTotal());
- sb.append(SEPERATOR).append(max);
- //sb.append(SEPERATOR).append(brief.getMin());
- sb.append(SEPERATOR).append(String.format("%.2f",
brief.getAvg()));
- sb.append(SEPERATOR).append(tp999);
+ //sb.append(SEPARATOR).append(brief.getTotal());
+ sb.append(SEPARATOR).append(max);
+ //sb.append(SEPARATOR).append(brief.getMin());
+ sb.append(SEPARATOR).append(String.format("%.2f",
brief.getAvg()));
+ sb.append(SEPARATOR).append(tp999);
}
return sb.toString();
}
@@ -227,9 +227,9 @@ public class StatisticsItemScheduledIncrementPrinter
extends StatisticsItemSched
StringBuilder sb = new StringBuilder();
for (int i = 0; i < briefs.length; i++) {
ItemSampleBrief brief = briefs[i];
- sb.append(SEPERATOR).append(brief.getMax());
- //sb.append(SEPERATOR).append(brief.getMin());
- sb.append(SEPERATOR).append(String.format("%.2f",
brief.getAvg()));
+ sb.append(SEPARATOR).append(brief.getMax());
+ //sb.append(SEPARATOR).append(brief.getMin());
+ sb.append(SEPARATOR).append(String.format("%.2f",
brief.getAvg()));
}
return sb.toString();
}
diff --git
a/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemScheduledPrinter.java
b/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemScheduledPrinter.java
index 2f46ac5ef..799c02ccb 100644
---
a/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemScheduledPrinter.java
+++
b/common/src/main/java/org/apache/rocketmq/common/statistics/StatisticsItemScheduledPrinter.java
@@ -62,7 +62,7 @@ public class StatisticsItemScheduledPrinter extends
FutureHolder {
public interface InitialDelay {
/**
- * Get inital delay value
+ * Get initial delay value
* @return
*/
long get();
diff --git
a/common/src/main/java/org/apache/rocketmq/common/utils/ServiceProvider.java
b/common/src/main/java/org/apache/rocketmq/common/utils/ServiceProvider.java
index 83703fc10..30a6b808f 100644
--- a/common/src/main/java/org/apache/rocketmq/common/utils/ServiceProvider.java
+++ b/common/src/main/java/org/apache/rocketmq/common/utils/ServiceProvider.java
@@ -131,7 +131,7 @@ public class ServiceProvider {
LOG.warn("No resource file with name [{}] found.", name);
}
} catch (Exception e) {
- LOG.error("Error occured when looking for resource file " + name,
e);
+ LOG.error("Error occurred when looking for resource file " + name,
e);
}
return services;
}
diff --git
a/common/src/test/java/org/apache/rocketmq/common/utils/IOTinyUtilsTest.java
b/common/src/test/java/org/apache/rocketmq/common/utils/IOTinyUtilsTest.java
index 6a63eecc2..677c15fb6 100644
--- a/common/src/test/java/org/apache/rocketmq/common/utils/IOTinyUtilsTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/utils/IOTinyUtilsTest.java
@@ -45,7 +45,7 @@ public class IOTinyUtilsTest {
}
@After
- public void destory() {
+ public void destroy() {
File file = new File(testRootDir);
UtilAll.deleteFile(file);
}
diff --git
a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerStartupTest.java
b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerStartupTest.java
index 68e4a87d4..1b9ef6d0d 100644
---
a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerStartupTest.java
+++
b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerStartupTest.java
@@ -95,7 +95,7 @@ public class BrokerContainerStartupTest {
}
@After
- public void destory() {
+ public void destroy() {
for (File file : TMP_FILE_LIST) {
UtilAll.deleteFile(file);
}
diff --git
a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java
b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java
index 73354af88..5fc88dded 100644
---
a/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java
+++
b/container/src/test/java/org/apache/rocketmq/container/BrokerContainerTest.java
@@ -338,7 +338,7 @@ public class BrokerContainerTest {
}
@After
- public void destory() {
+ public void destroy() {
for (File file : TMP_FILE_LIST) {
UtilAll.deleteFile(file);
}
diff --git a/distribution/bin/mqshutdown b/distribution/bin/mqshutdown
index eaf0236ab..6006cfeb1 100644
--- a/distribution/bin/mqshutdown
+++ b/distribution/bin/mqshutdown
@@ -87,5 +87,5 @@ case $1 in
echo "Send shutdown request to mqproxy(${pid}) OK"
;;
*)
- echo "Useage: mqshutdown broker | namesrv | controller | proxy"
+ echo "Usage: mqshutdown broker | namesrv | controller | proxy"
esac
diff --git
a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java
b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java
index 4ea7dcfd4..73502d3c6 100644
--- a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java
+++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java
@@ -108,7 +108,7 @@ public class SelectorParser implements
SelectorParserConstants {
}
//
----------------------------------------------------------------------------
- // Grammer
+ // Grammar
//
----------------------------------------------------------------------------
final public BooleanExpression JmsSelector() throws ParseException {
Expression left = null;
diff --git
a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.jj
b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.jj
index b533ac177..adb485143 100644
--- a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.jj
+++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.jj
@@ -193,7 +193,7 @@ TOKEN [IGNORE_CASE] :
}
// ----------------------------------------------------------------------------
-// Grammer
+// Grammar
// ----------------------------------------------------------------------------
BooleanExpression JmsSelector() :
{
diff --git
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
index 394b5364d..137ccaca7 100644
---
a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
+++
b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
@@ -80,7 +80,7 @@ public class NettyRemotingServer extends
NettyRemotingAbstract implements Remoti
private DefaultEventExecutorGroup defaultEventExecutorGroup;
/**
- * NettyRemotingServer may holds multiple SubRemotingServer, each server
will be stored in this container wih a
+ * NettyRemotingServer may holds multiple SubRemotingServer, each server
will be stored in this container with a
* ListenPort key.
*/
private ConcurrentMap<Integer/*Port*/, NettyRemotingAbstract>
remotingServerTable = new ConcurrentHashMap<Integer, NettyRemotingAbstract>();
diff --git a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
index ea73d6d46..479783a31 100644
--- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
@@ -711,7 +711,7 @@ public class CommitLog implements Swappable {
private boolean isMappedFileMatchedRecover(final MappedFile mappedFile) {
ByteBuffer byteBuffer = mappedFile.sliceByteBuffer();
- int magicCode =
byteBuffer.getInt(MessageDecoder.MESSAGE_MAGIC_CODE_POSTION);
+ int magicCode =
byteBuffer.getInt(MessageDecoder.MESSAGE_MAGIC_CODE_POSITION);
if (magicCode != MESSAGE_MAGIC_CODE) {
return false;
}
diff --git
a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
index 04b9f521d..c48d06654 100644
--- a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
@@ -815,7 +815,7 @@ public class DefaultMessageStore implements MessageStore {
continue;
}
-
this.storeStatsService.getGetMessageTransferedMsgCount().add(1);
+
this.storeStatsService.getGetMessageTransferredMsgCount().add(1);
getResult.addMessage(selectResult,
cqUnit.getQueueOffset(), cqUnit.getBatchNum());
status = GetMessageStatus.FOUND;
nextPhyFileStartOffset = Long.MIN_VALUE;
diff --git
a/store/src/main/java/org/apache/rocketmq/store/StoreStatsService.java
b/store/src/main/java/org/apache/rocketmq/store/StoreStatsService.java
index 27276cae1..916e1aa67 100644
--- a/store/src/main/java/org/apache/rocketmq/store/StoreStatsService.java
+++ b/store/src/main/java/org/apache/rocketmq/store/StoreStatsService.java
@@ -60,13 +60,13 @@ public class StoreStatsService extends ServiceThread {
new ConcurrentHashMap<>(128);
private final LongAdder getMessageTimesTotalFound = new LongAdder();
- private final LongAdder getMessageTransferedMsgCount = new LongAdder();
+ private final LongAdder getMessageTransferredMsgCount = new LongAdder();
private final LongAdder getMessageTimesTotalMiss = new LongAdder();
private final LinkedList<CallSnapshot> putTimesList = new
LinkedList<CallSnapshot>();
private final LinkedList<CallSnapshot> getTimesFoundList = new
LinkedList<CallSnapshot>();
private final LinkedList<CallSnapshot> getTimesMissList = new
LinkedList<CallSnapshot>();
- private final LinkedList<CallSnapshot> transferedMsgCountList = new
LinkedList<CallSnapshot>();
+ private final LinkedList<CallSnapshot> transferredMsgCountList = new
LinkedList<CallSnapshot>();
private volatile LongAdder[] putMessageDistributeTime;
private volatile LongAdder[] lastPutMessageDistributeTime;
private long messageStoreBootTimestamp = System.currentTimeMillis();
@@ -265,7 +265,7 @@ public class StoreStatsService extends ServiceThread {
sb.append("\tgetFoundTps: " + this.getGetFoundTps() + "\r\n");
sb.append("\tgetMissTps: " + this.getGetMissTps() + "\r\n");
sb.append("\tgetTotalTps: " + this.getGetTotalTps() + "\r\n");
- sb.append("\tgetTransferedTps: " + this.getGetTransferedTps() +
"\r\n");
+ sb.append("\tgetTransferredTps: " + this.getGetTransferredTps() +
"\r\n");
return sb.toString();
}
@@ -361,16 +361,16 @@ public class StoreStatsService extends ServiceThread {
return sb.toString();
}
- private String getGetTransferedTps() {
+ private String getGetTransferredTps() {
StringBuilder sb = new StringBuilder();
- sb.append(this.getGetTransferedTps(10));
+ sb.append(this.getGetTransferredTps(10));
sb.append(" ");
- sb.append(this.getGetTransferedTps(60));
+ sb.append(this.getGetTransferredTps(60));
sb.append(" ");
- sb.append(this.getGetTransferedTps(600));
+ sb.append(this.getGetTransferredTps(600));
return sb.toString();
}
@@ -475,15 +475,15 @@ public class StoreStatsService extends ServiceThread {
return Double.toString(found + miss);
}
- private String getGetTransferedTps(int time) {
+ private String getGetTransferredTps(int time) {
String result = "";
this.samplingLock.lock();
try {
- CallSnapshot last = this.transferedMsgCountList.getLast();
+ CallSnapshot last = this.transferredMsgCountList.getLast();
- if (this.transferedMsgCountList.size() > time) {
+ if (this.transferredMsgCountList.size() > time) {
CallSnapshot lastBefore =
-
this.transferedMsgCountList.get(this.transferedMsgCountList.size() - (time +
1));
+
this.transferredMsgCountList.get(this.transferredMsgCountList.size() - (time +
1));
result += CallSnapshot.getTPS(lastBefore, last);
}
@@ -518,7 +518,7 @@ public class StoreStatsService extends ServiceThread {
result.put("getFoundTps", this.getGetFoundTps());
result.put("getMissTps", this.getGetMissTps());
result.put("getTotalTps", this.getGetTotalTps());
- result.put("getTransferedTps", this.getGetTransferedTps());
+ result.put("getTransferredTps", this.getGetTransferredTps());
result.put("putLatency99", String.format("%.2f",
this.findPutMessageEntireTimePX(0.99)));
result.put("putLatency999", String.format("%.2f",
this.findPutMessageEntireTimePX(0.999)));
@@ -571,10 +571,10 @@ public class StoreStatsService extends ServiceThread {
this.getTimesMissList.removeFirst();
}
- this.transferedMsgCountList.add(new
CallSnapshot(System.currentTimeMillis(),
- this.getMessageTransferedMsgCount.longValue()));
- if (this.transferedMsgCountList.size() > (MAX_RECORDS_OF_SAMPLING
+ 1)) {
- this.transferedMsgCountList.removeFirst();
+ this.transferredMsgCountList.add(new
CallSnapshot(System.currentTimeMillis(),
+ this.getMessageTransferredMsgCount.longValue()));
+ if (this.transferredMsgCountList.size() > (MAX_RECORDS_OF_SAMPLING
+ 1)) {
+ this.transferredMsgCountList.removeFirst();
}
} finally {
@@ -586,11 +586,11 @@ public class StoreStatsService extends ServiceThread {
if (System.currentTimeMillis() > (this.lastPrintTimestamp +
printTPSInterval * 1000)) {
this.lastPrintTimestamp = System.currentTimeMillis();
- log.info("[STORETPS] put_tps {} get_found_tps {} get_miss_tps {}
get_transfered_tps {}",
+ log.info("[STORETPS] put_tps {} get_found_tps {} get_miss_tps {}
get_transferred_tps {}",
this.getPutTps(printTPSInterval),
this.getGetFoundTps(printTPSInterval),
this.getGetMissTps(printTPSInterval),
- this.getGetTransferedTps(printTPSInterval)
+ this.getGetTransferredTps(printTPSInterval)
);
final LongAdder[] times = this.resetPutMessageDistributeTime();
@@ -620,8 +620,8 @@ public class StoreStatsService extends ServiceThread {
return getMessageTimesTotalMiss;
}
- public LongAdder getGetMessageTransferedMsgCount() {
- return getMessageTransferedMsgCount;
+ public LongAdder getGetMessageTransferredMsgCount() {
+ return getMessageTransferredMsgCount;
}
public LongAdder getPutMessageFailedTimes() {
diff --git
a/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java
b/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java
index 40bc76303..fa8d680fd 100644
--- a/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java
+++ b/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java
@@ -449,7 +449,7 @@ public class BatchConsumeQueue implements
ConsumeQueueInterface, FileQueueLifeCy
final int maxRetries = 30;
boolean canWrite = this.messageStore.getRunningFlags().isCQWriteable();
if (request.getMsgBaseOffset() < 0 || request.getBatchSize() < 0) {
- log.warn("[NOTIFYME]unexpected dispacth request in batch consume
queue topic:{} queue:{} offset:{}", topic, queueId,
request.getCommitLogOffset());
+ log.warn("[NOTIFYME]unexpected dispatch request in batch consume
queue topic:{} queue:{} offset:{}", topic, queueId,
request.getCommitLogOffset());
return;
}
for (int i = 0; i < maxRetries && canWrite; i++) {
diff --git
a/store/src/main/java/org/apache/rocketmq/store/queue/ReferredIterator.java
b/store/src/main/java/org/apache/rocketmq/store/queue/ReferredIterator.java
index 4b3a646d5..eba8738af 100644
--- a/store/src/main/java/org/apache/rocketmq/store/queue/ReferredIterator.java
+++ b/store/src/main/java/org/apache/rocketmq/store/queue/ReferredIterator.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
public interface ReferredIterator<T> extends Iterator<T> {
/**
- * Release the refered resources.
+ * Release the referred resources.
*/
void release();
diff --git
a/store/src/main/java/org/apache/rocketmq/store/stats/BrokerStats.java
b/store/src/main/java/org/apache/rocketmq/store/stats/BrokerStats.java
index 165a41758..812247a9d 100644
--- a/store/src/main/java/org/apache/rocketmq/store/stats/BrokerStats.java
+++ b/store/src/main/java/org/apache/rocketmq/store/stats/BrokerStats.java
@@ -45,7 +45,7 @@ public class BrokerStats {
this.msgPutTotalTodayMorning =
this.defaultMessageStore.getStoreStatsService().getPutMessageTimesTotal();
this.msgGetTotalTodayMorning =
-
this.defaultMessageStore.getStoreStatsService().getGetMessageTransferedMsgCount().longValue();
+
this.defaultMessageStore.getStoreStatsService().getGetMessageTransferredMsgCount().longValue();
log.info("yesterday put message total: {}", msgPutTotalTodayMorning -
msgPutTotalYesterdayMorning);
log.info("yesterday get message total: {}", msgGetTotalTodayMorning -
msgGetTotalYesterdayMorning);
@@ -88,6 +88,6 @@ public class BrokerStats {
}
public long getMsgGetTotalTodayNow() {
- return
this.defaultMessageStore.getStoreStatsService().getGetMessageTransferedMsgCount().longValue();
+ return
this.defaultMessageStore.getStoreStatsService().getGetMessageTransferredMsgCount().longValue();
}
}
diff --git
a/store/src/test/java/org/apache/rocketmq/store/BatchPutMessageTest.java
b/store/src/test/java/org/apache/rocketmq/store/BatchPutMessageTest.java
index 6d42d6236..7d2a6f747 100644
--- a/store/src/test/java/org/apache/rocketmq/store/BatchPutMessageTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/BatchPutMessageTest.java
@@ -60,7 +60,7 @@ public class BatchPutMessageTest {
}
@After
- public void destory() {
+ public void destroy() {
messageStore.shutdown();
messageStore.destroy();
diff --git
a/store/src/test/java/org/apache/rocketmq/store/MappedFileQueueTest.java
b/store/src/test/java/org/apache/rocketmq/store/MappedFileQueueTest.java
index d2db76c34..5660acce8 100644
--- a/store/src/test/java/org/apache/rocketmq/store/MappedFileQueueTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/MappedFileQueueTest.java
@@ -378,7 +378,7 @@ public class MappedFileQueueTest {
}
@After
- public void destory() {
+ public void destroy() {
File file = new File("target/unit_test_store");
UtilAll.deleteFile(file);
}
diff --git a/store/src/test/java/org/apache/rocketmq/store/MappedFileTest.java
b/store/src/test/java/org/apache/rocketmq/store/MappedFileTest.java
index 02649c993..a506d4458 100644
--- a/store/src/test/java/org/apache/rocketmq/store/MappedFileTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/MappedFileTest.java
@@ -53,7 +53,7 @@ public class MappedFileTest {
}
@After
- public void destory() {
+ public void destroy() {
File file = new File("target/unit_test_store");
UtilAll.deleteFile(file);
}
diff --git
a/store/src/test/java/org/apache/rocketmq/store/StoreCheckpointTest.java
b/store/src/test/java/org/apache/rocketmq/store/StoreCheckpointTest.java
index 3c0d9253a..913725479 100644
--- a/store/src/test/java/org/apache/rocketmq/store/StoreCheckpointTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/StoreCheckpointTest.java
@@ -48,7 +48,7 @@ public class StoreCheckpointTest {
}
@After
- public void destory() {
+ public void destroy() {
File file = new File("target/checkpoint_test");
UtilAll.deleteFile(file);
}
diff --git a/store/src/test/java/stats/BrokerStatsManagerTest.java
b/store/src/test/java/stats/BrokerStatsManagerTest.java
index ba02b2a91..93cf45cc3 100644
--- a/store/src/test/java/stats/BrokerStatsManagerTest.java
+++ b/store/src/test/java/stats/BrokerStatsManagerTest.java
@@ -52,7 +52,7 @@ public class BrokerStatsManagerTest {
}
@After
- public void destory() {
+ public void destroy() {
brokerStatsManager.shutdown();
}
diff --git a/test/src/main/java/org/apache/rocketmq/test/util/FileUtil.java
b/test/src/main/java/org/apache/rocketmq/test/util/FileUtil.java
index b6106e00a..de1101003 100644
--- a/test/src/main/java/org/apache/rocketmq/test/util/FileUtil.java
+++ b/test/src/main/java/org/apache/rocketmq/test/util/FileUtil.java
@@ -24,7 +24,7 @@ import java.util.Map.Entry;
import java.util.Properties;
public class FileUtil {
- private static String lineSeperator = System.getProperty("line.separator");
+ private static String lineSeparator = System.getProperty("line.separator");
private String filePath = "";
private String fileName = "";
@@ -53,7 +53,7 @@ public class FileUtil {
public void appendFile(String content) {
File file = openFile();
- String newContent = lineSeperator + content;
+ String newContent = lineSeparator + content;
writeFile(file, newContent, true);
}
@@ -71,7 +71,7 @@ public class FileUtil {
StringBuilder sb = new StringBuilder();
for (Entry<Object, Object> keyEnty : properties.entrySet()) {
sb.append(keyEnty.getKey()).append("=").append((String)
keyEnty.getValue())
- .append(lineSeperator);
+ .append(lineSeparator);
}
return sb.toString();
}
diff --git a/test/src/main/java/org/apache/rocketmq/test/util/VerifyUtils.java
b/test/src/main/java/org/apache/rocketmq/test/util/VerifyUtils.java
index 69bfd8f7d..af4ecca1b 100644
--- a/test/src/main/java/org/apache/rocketmq/test/util/VerifyUtils.java
+++ b/test/src/main/java/org/apache/rocketmq/test/util/VerifyUtils.java
@@ -40,18 +40,18 @@ public class VerifyUtils {
public static Collection<Object> getFilterdMessage(Collection<Object>
sendMsgs,
Collection<Object> recvMsgs) {
Collection<Object> recvMsgsSync =
Collections.synchronizedCollection(recvMsgs);
- Collection<Object> filterdMsgs = new ArrayList<Object>();
+ Collection<Object> filteredMsgs = new ArrayList<Object>();
int filterNum = 0;
for (Object msg : recvMsgsSync) {
if (sendMsgs.contains(msg)) {
- filterdMsgs.add(msg);
+ filteredMsgs.add(msg);
} else {
filterNum++;
}
}
- logger.info(String.format("[%s] messages is filterd!", filterNum));
- return filterdMsgs;
+ logger.info(String.format("[%s] messages is filtered!", filterNum));
+ return filteredMsgs;
}
public static int verifyUserProperty(Collection<Object> sendMsgs,
Collection<Object> recvMsgs) {
diff --git
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/BaseBroadCastIT.java
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/BaseBroadCastIT.java
index 94efaefd8..c9ce7665c 100644
---
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/BaseBroadCastIT.java
+++
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/BaseBroadCastIT.java
@@ -47,7 +47,7 @@ public class BaseBroadCastIT extends BaseConf {
return consumer;
}
- public void printSeperator() {
+ public void printSeparator() {
for (int i = 0; i < 3; i++) {
logger.info(
"<<<<<<<<================================================================================>>>>>>>>");
diff --git
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgNotRecvIT.java
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgNotRecvIT.java
index 282a24870..f0e42ce63 100644
---
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgNotRecvIT.java
+++
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgNotRecvIT.java
@@ -38,7 +38,7 @@ public class BroadCastNormalMsgNotRecvIT extends
BaseBroadCastIT {
@Before
public void setUp() {
- printSeperator();
+ printSeparator();
topic = initTopic();
logger.info(String.format("use topic: %s;", topic));
producer = getProducer(nsAddr, topic);
diff --git
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvCrashIT.java
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvCrashIT.java
index 977e61fb0..cf61610ae 100644
---
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvCrashIT.java
+++
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvCrashIT.java
@@ -39,7 +39,7 @@ public class BroadCastNormalMsgRecvCrashIT extends
BaseBroadCastIT {
@Before
public void setUp() {
- printSeperator();
+ printSeparator();
topic = initTopic();
logger.info(String.format("use topic: %s;", topic));
producer = getProducer(nsAddr, topic);
diff --git
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvFailIT.java
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvFailIT.java
index 615c8a5d8..b4a963a10 100644
---
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvFailIT.java
+++
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvFailIT.java
@@ -40,7 +40,7 @@ public class BroadCastNormalMsgRecvFailIT extends
BaseBroadCastIT {
@Before
public void setUp() {
- printSeperator();
+ printSeparator();
topic = initTopic();
logger.info(String.format("use topic: %s;", topic));
producer = getProducer(nsAddr, topic);
diff --git
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvStartLaterIT.java
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvStartLaterIT.java
index 987b4b29f..6966faa67 100644
---
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvStartLaterIT.java
+++
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvStartLaterIT.java
@@ -39,7 +39,7 @@ public class BroadCastNormalMsgRecvStartLaterIT extends
BaseBroadCastIT {
@Before
public void setUp() {
- printSeperator();
+ printSeparator();
topic = initTopic();
logger.info(String.format("use topic: %s;", topic));
producer = getProducer(nsAddr, topic);
diff --git
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgTwoDiffGroupRecvIT.java
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgTwoDiffGroupRecvIT.java
index 019bcbb1a..5497d1683 100644
---
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgTwoDiffGroupRecvIT.java
+++
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgTwoDiffGroupRecvIT.java
@@ -39,7 +39,7 @@ public class BroadCastNormalMsgTwoDiffGroupRecvIT extends
BaseBroadCastIT {
@Before
public void setUp() {
- printSeperator();
+ printSeparator();
topic = initTopic();
logger.info(String.format("use topic: %s;", topic));
producer = getProducer(nsAddr, topic);
diff --git
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/NormalMsgTwoSameGroupConsumerIT.java
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/NormalMsgTwoSameGroupConsumerIT.java
index 4c9e491e2..7cf0785e8 100644
---
a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/NormalMsgTwoSameGroupConsumerIT.java
+++
b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/NormalMsgTwoSameGroupConsumerIT.java
@@ -39,7 +39,7 @@ public class NormalMsgTwoSameGroupConsumerIT extends
BaseBroadCastIT {
@Before
public void setUp() {
- printSeperator();
+ printSeparator();
topic = initTopic();
logger.info(String.format("use topic: %s;", topic));
producer = getProducer(nsAddr, topic);
diff --git
a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
index 0efb9e1f7..ee28c876e 100644
---
a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
+++
b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
@@ -167,7 +167,7 @@ public class DefaultMQAdminExtImpl implements MQAdminExt,
MQAdminExtInner {
boolean registerOK =
mqClientInstance.registerAdminExt(this.defaultMQAdminExt.getAdminExtGroup(),
this);
if (!registerOK) {
this.serviceState = ServiceState.CREATE_JUST;
- throw new MQClientException("The adminExt group[" +
this.defaultMQAdminExt.getAdminExtGroup() + "] has created already, specifed
another name please." + FAQUrl.suggestTodo(FAQUrl.GROUP_NAME_DUPLICATE_URL),
null);
+ throw new MQClientException("The adminExt group[" +
this.defaultMQAdminExt.getAdminExtGroup() + "] has created already, specified
another name please." + FAQUrl.suggestTodo(FAQUrl.GROUP_NAME_DUPLICATE_URL),
null);
}
mqClientInstance.start();
diff --git
a/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/ClusterListSubCommand.java
b/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/ClusterListSubCommand.java
index 12b7cdf79..711b962a6 100644
---
a/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/ClusterListSubCommand.java
+++
b/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/ClusterListSubCommand.java
@@ -228,7 +228,7 @@ public class ClusterListSubCommand implements SubCommand {
KVTable kvTable =
defaultMQAdminExt.fetchBrokerRuntimeStats(next1.getValue());
isBrokerActive =
Boolean.parseBoolean(kvTable.getTable().get("brokerActive"));
String putTps = kvTable.getTable().get("putTps");
- String getTransferedTps =
kvTable.getTable().get("getTransferedTps");
+ String getTransferredTps =
kvTable.getTable().get("getTransferredTps");
sendThreadPoolQueueSize =
kvTable.getTable().get("sendThreadPoolQueueSize");
pullThreadPoolQueueSize =
kvTable.getTable().get("pullThreadPoolQueueSize");
@@ -259,7 +259,7 @@ public class ClusterListSubCommand implements SubCommand {
}
{
- String[] tpss = getTransferedTps.split(" ");
+ String[] tpss = getTransferredTps.split(" ");
if (tpss.length > 0) {
out = Double.parseDouble(tpss[0]);
}
diff --git
a/tools/src/main/java/org/apache/rocketmq/tools/command/export/ExportMetricsCommand.java
b/tools/src/main/java/org/apache/rocketmq/tools/command/export/ExportMetricsCommand.java
index 81535f6da..74e81eb64 100644
---
a/tools/src/main/java/org/apache/rocketmq/tools/command/export/ExportMetricsCommand.java
+++
b/tools/src/main/java/org/apache/rocketmq/tools/command/export/ExportMetricsCommand.java
@@ -210,13 +210,13 @@ public class ExportMetricsCommand implements SubCommand {
double normalInTps = 0;
double normalOutTps = 0;
String putTps = kvTable.getTable().get("putTps");
- String getTransferedTps = kvTable.getTable().get("getTransferedTps");
+ String getTransferredTps = kvTable.getTable().get("getTransferredTps");
String[] inTpss = putTps.split(" ");
if (inTpss.length > 0) {
normalInTps = Double.parseDouble(inTpss[0]);
}
- String[] outTpss = getTransferedTps.split(" ");
+ String[] outTpss = getTransferredTps.split(" ");
if (outTpss.length > 0) {
normalOutTps = Double.parseDouble(outTpss[0]);
}
