diff --git a/broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOrderInfoLockManager.java b/broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOrderInfoLockManager.java index 37b3eed2302..30d4ca6deef 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOrderInfoLockManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOrderInfoLockManager.java @@ -99,7 +99,7 @@ public void updateLockFreeTimestamp(String topic, String group, int queueId, Lon } }); } catch (Exception e) { - POP_LOGGER.error("unexpect error when updateLockFreeTimestamp. topic:{}, group:{}, queueId:{}, lockFreeTimestamp:{}", + POP_LOGGER.error("unexpected error when updateLockFreeTimestamp. topic:{}, group:{}, queueId:{}, lockFreeTimestamp:{}", topic, group, queueId, lockFreeTimestamp, e); } } @@ -108,7 +108,7 @@ protected void notifyLockIsFree(Key key) { try { this.brokerController.getPopMessageProcessor().notifyLongPollingRequestIfNeed(key.topic, key.group, key.queueId); } catch (Exception e) { - POP_LOGGER.error("unexpect error when notifyLockIsFree. key:{}", key, e); + POP_LOGGER.error("unexpected error when notifyLockIsFree. key:{}", key, e); } } diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/PopProcessQueue.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/PopProcessQueue.java index 50827545b69..aac93ccc57e 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/PopProcessQueue.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/PopProcessQueue.java @@ -67,7 +67,7 @@ public void setDropped(boolean dropped) { public void fillPopProcessQueueInfo(final PopProcessQueueInfo info) { info.setWaitAckCount(getWaiAckMsgCount()); - info.setDroped(isDropped()); + info.setDropped(isDropped()); info.setLastPopTimestamp(getLastPopTimestamp()); } diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java index bc1b5eff2f9..2eae63b43e7 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java @@ -450,7 +450,7 @@ public void fillProcessQueueInfo(final ProcessQueueInfo info) { info.setTryUnlockTimes(this.tryUnlockTimes.get()); info.setLastLockTimestamp(this.lastLockTimestamp); - info.setDroped(this.dropped); + info.setDropped(this.dropped); info.setLastPullTimestamp(this.lastPullTimestamp); info.setLastConsumeTimestamp(this.lastConsumeTimestamp); } catch (Exception e) { diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java index b6f1d99b1c7..3e02cd996e1 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/RebalanceImpl.java @@ -731,10 +731,10 @@ public boolean removeUnnecessaryPopMessageQueue(final MessageQueue mq, final Pop public void removeProcessQueue(final MessageQueue mq) { ProcessQueue prev = this.processQueueTable.remove(mq); if (prev != null) { - boolean droped = prev.isDropped(); + boolean dropped = prev.isDropped(); prev.setDropped(true); this.removeUnnecessaryMessageQueue(mq, prev); - log.info("Fix Offset, {}, remove unnecessary mq, {} Droped: {}", consumerGroup, mq, droped); + log.info("Fix Offset, {}, remove unnecessary mq, {} Dropped: {}", consumerGroup, mq, dropped); } } diff --git a/docs/cn/operation.md b/docs/cn/operation.md index 9f04ce1d3d9..e87d3bb8cd9 100644 --- a/docs/cn/operation.md +++ b/docs/cn/operation.md @@ -780,7 +780,7 @@ RocketMQ 5.0 开始支持自动主从切换的模式，可参考以下文档 -i - uniqe msg id + unique msg id -g diff --git a/docs/en/Operations_Trace.md b/docs/en/Operations_Trace.md index 74c2cde1af2..28d8cec95b7 100644 --- a/docs/en/Operations_Trace.md +++ b/docs/en/Operations_Trace.md @@ -11,7 +11,7 @@ ## 2 Support for Message Trace Cluster Deployment -### 2.1 Broker Configuration Fille +### 2.1 Broker Configuration File The properties profile content of the Broker side enabled message trace feature is pasted here: diff --git a/filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java b/filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java index 14fd7045b41..a30a56efd99 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java @@ -473,7 +473,7 @@ public static void checkLessThanOperand(Expression expr) { /** * Validates that the expression can be used in == or <> expression. Cannot - * not be NULL TRUE or FALSE litterals. + * not be NULL TRUE or FALSE literals. */ public static void checkEqualOperand(Expression expr) { if (expr instanceof ConstantExpression) { diff --git a/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryExpression.java b/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryExpression.java index 7a62624b514..1a207ad2848 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryExpression.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryExpression.java @@ -206,7 +206,7 @@ private static Number negate(Number left) { } else if (clazz == Double.class) { return new Double(-left.doubleValue()); } else if (clazz == BigDecimal.class) { - // We ussually get a big deciamal when we have Long.MIN_VALUE + // We usually get a big decimal when we have Long.MIN_VALUE // constant in the // Selector. Long.MIN_VALUE is too big to store in a Long as a // positive so we store it diff --git a/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java b/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java index 39762509e0d..3cf22da27e8 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java @@ -77,7 +77,7 @@ public ParseException(String message) { /** * This is the last token that has been consumed successfully. If * this object has been created due to a parse error, the token - * followng this token will (therefore) be the first error token. + * following this token will (therefore) be the first error token. */ public Token currentToken; 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 7b44aa2efba..d7561a7a321 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 @@ -469,7 +469,7 @@ final public String stringLitteral() throws ParseException { StringBuffer rc = new StringBuffer(); boolean first = true; t = jj_consume_token(STRING_LITERAL); - // Decode the sting value. + // Decode the string value. String image = t.image; for (int i = 1; i < image.length() - 1; i++) { char c = image.charAt(i); diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java b/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java index 131faffa38e..d0570fda22d 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java @@ -109,7 +109,7 @@ public static void main(String[] args) { })); } catch (Exception e) { e.printStackTrace(); - log.error("find an unexpect err.", e); + log.error("find an unexpected err.", e); System.exit(1); } diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/service/receipt/DefaultReceiptHandleManager.java b/proxy/src/main/java/org/apache/rocketmq/proxy/service/receipt/DefaultReceiptHandleManager.java index 0cb519306eb..45399760e86 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/service/receipt/DefaultReceiptHandleManager.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/service/receipt/DefaultReceiptHandleManager.java @@ -164,7 +164,7 @@ protected void scheduleRenewTask() { }); } } catch (Exception e) { - log.error("unexpect error when schedule renew task", e); + log.error("unexpected error when schedule renew task", e); } log.debug("scan for renewal done. cost:{}ms", stopwatch.elapsed().toMillis()); @@ -227,7 +227,7 @@ protected CompletableFuture startRenewMessage(ProxyContext }); } } catch (Throwable t) { - log.error("unexpect error when renew message, stop to renew it. handle:{}", messageReceiptHandle, t); + log.error("unexpected error when renew message, stop to renew it. handle:{}", messageReceiptHandle, t); resFuture.complete(null); } return resFuture; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java index d7a8dfb22c3..fd44189889a 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/TlsHelper.java @@ -63,7 +63,7 @@ public class TlsHelper { public interface DecryptionStrategy { /** - * Decrypt the target encrpted private key file. + * Decrypt the target encrypted private key file. * * @param privateKeyEncryptPath A pathname string * @param forClient tells whether it's a client-side key file diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/ConsumerRunningInfo.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/ConsumerRunningInfo.java index 542f9300678..c7141b60e93 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/ConsumerRunningInfo.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/ConsumerRunningInfo.java @@ -141,7 +141,7 @@ public static String analyzeProcessQueue(final String clientId, ConsumerRunningI mq, System.currentTimeMillis() - pq.getLastLockTimestamp())); } else { - if (pq.isDroped() && pq.getTryUnlockTimes() > 0) { + if (pq.isDropped() && pq.getTryUnlockTimes() > 0) { sb.append(String.format("%s %s unlock %d times, still failed%n", clientId, mq, diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/PopProcessQueueInfo.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/PopProcessQueueInfo.java index 3a6bc3f69e4..5bd2df552df 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/PopProcessQueueInfo.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/PopProcessQueueInfo.java @@ -18,7 +18,7 @@ public class PopProcessQueueInfo { private int waitAckCount; - private boolean droped; + private boolean dropped; private long lastPopTimestamp; @@ -32,13 +32,13 @@ public void setWaitAckCount(int waitAckCount) { } - public boolean isDroped() { - return droped; + public boolean isDropped() { + return dropped; } - public void setDroped(boolean droped) { - this.droped = droped; + public void setDropped(boolean dropped) { + this.dropped = dropped; } @@ -54,6 +54,6 @@ public void setLastPopTimestamp(long lastPopTimestamp) { @Override public String toString() { return "PopProcessQueueInfo [waitAckCount:" + waitAckCount + - ", droped:" + droped + ", lastPopTimestamp:" + lastPopTimestamp + "]"; + ", dropped:" + dropped + ", lastPopTimestamp:" + lastPopTimestamp + "]"; } } diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/ProcessQueueInfo.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/ProcessQueueInfo.java index 075b56eb820..799bc99c142 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/ProcessQueueInfo.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/body/ProcessQueueInfo.java @@ -35,7 +35,7 @@ public class ProcessQueueInfo { private long tryUnlockTimes; private long lastLockTimestamp; - private boolean droped; + private boolean dropped; private long lastPullTimestamp; private long lastConsumeTimestamp; @@ -119,12 +119,12 @@ public void setLastLockTimestamp(long lastLockTimestamp) { this.lastLockTimestamp = lastLockTimestamp; } - public boolean isDroped() { - return droped; + public boolean isDropped() { + return dropped; } - public void setDroped(boolean droped) { - this.droped = droped; + public void setDropped(boolean dropped) { + this.dropped = dropped; } public long getLastPullTimestamp() { @@ -159,8 +159,8 @@ public String toString() { + ", transactionMsgMinOffset=" + transactionMsgMinOffset + ", transactionMsgMaxOffset=" + transactionMsgMaxOffset + ", transactionMsgCount=" + transactionMsgCount + ", locked=" + locked + ", tryUnlockTimes=" + tryUnlockTimes - + ", lastLockTimestamp=" + UtilAll.timeMillisToHumanString(lastLockTimestamp) + ", droped=" - + droped + ", lastPullTimestamp=" + UtilAll.timeMillisToHumanString(lastPullTimestamp) + + ", lastLockTimestamp=" + UtilAll.timeMillisToHumanString(lastLockTimestamp) + ", dropped=" + + dropped + ", lastPullTimestamp=" + UtilAll.timeMillisToHumanString(lastPullTimestamp) + ", lastConsumeTimestamp=" + UtilAll.timeMillisToHumanString(lastConsumeTimestamp) + "]"; } } diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/statictopic/LogicQueueMappingItem.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/statictopic/LogicQueueMappingItem.java index 0c5bbb6a974..b5044a64124 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/statictopic/LogicQueueMappingItem.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/statictopic/LogicQueueMappingItem.java @@ -27,7 +27,7 @@ public class LogicQueueMappingItem extends RemotingSerializable { private String bname; //important, immutable private long logicOffset; // the start of the logic offset, important, can be changed by command only once private long startOffset; // the start of the physical offset, should always be 0, immutable - private long endOffset = -1; // the end of the physical offset, excluded, revered -1, mutable + private long endOffset = -1; // the end of the physical offset, excluded, reversed -1, mutable private long timeOfStart = -1; // mutable, reserved private long timeOfEnd = -1; // mutable, reserved diff --git a/store/src/main/java/org/apache/rocketmq/store/logfile/MappedFile.java b/store/src/main/java/org/apache/rocketmq/store/logfile/MappedFile.java index d1f11959aa6..66b121a8eaa 100644 --- a/store/src/main/java/org/apache/rocketmq/store/logfile/MappedFile.java +++ b/store/src/main/java/org/apache/rocketmq/store/logfile/MappedFile.java @@ -262,7 +262,7 @@ public interface MappedFile { /** * Returns the flushed position of this mapped file. * - * @return the flushed posotion + * @return the flushed position */ int getFlushedPosition(); diff --git a/test/src/main/java/org/apache/rocketmq/test/factory/ConsumerFactory.java b/test/src/main/java/org/apache/rocketmq/test/factory/ConsumerFactory.java index cdda908f626..94f18d310c4 100644 --- a/test/src/main/java/org/apache/rocketmq/test/factory/ConsumerFactory.java +++ b/test/src/main/java/org/apache/rocketmq/test/factory/ConsumerFactory.java @@ -47,9 +47,9 @@ public static RMQNormalConsumer getRMQNormalConsumer(String nsAddr, String consu public static RMQBroadCastConsumer getRMQBroadCastConsumer(String nsAddr, String consumerGroup, String topic, String subExpression, - AbstractListener listner) { + AbstractListener listener) { RMQBroadCastConsumer consumer = new RMQBroadCastConsumer(nsAddr, topic, subExpression, - consumerGroup, listner); + consumerGroup, listener); consumer.create(); consumer.start(); return consumer; @@ -57,9 +57,9 @@ public static RMQBroadCastConsumer getRMQBroadCastConsumer(String nsAddr, String public static RMQSqlConsumer getRMQSqlConsumer(String nsAddr, String consumerGroup, String topic, MessageSelector selector, - AbstractListener listner) { + AbstractListener listener) { RMQSqlConsumer consumer = new RMQSqlConsumer(nsAddr, topic, selector, - consumerGroup, listner); + consumerGroup, listener); consumer.create(); consumer.start(); return consumer; diff --git a/tieredstore/README.md b/tieredstore/README.md index 41e7458a2a6..658a68de050 100644 --- a/tieredstore/README.md +++ b/tieredstore/README.md @@ -30,7 +30,7 @@ The following are some core configurations, for more details, see [TieredMessage | tieredStoreFileReservedTime | 72 | hour | Default topic TTL in tiered storage | | tieredStoreGroupCommitCount | 2500 | | The number of messages that trigger one batch transfer | | tieredStoreGroupCommitSize | 33554432 | byte | The size of messages that trigger one batch transfer, 32M by default | -| tieredStoreMaxGroupCommitCount | 10000 | | The maximum number of messages waiting to be transfered per queue | +| tieredStoreMaxGroupCommitCount | 10000 | | The maximum number of messages waiting to be transferred per queue | | readAheadCacheExpireDuration | 1000 | millisecond | Read-ahead cache expiration time | | readAheadCacheSizeThresholdRate | 0.3 | | The maximum heap space occupied by the read-ahead cache |