From aee4a4ea54fbbf9f324d128f4d0f86dcfdbad4b0 Mon Sep 17 00:00:00 2001 From: co63oc Date: Mon, 21 Jul 2025 10:31:15 +0800 Subject: [PATCH] Fix typos --- .../config/v1/RocksDBSubscriptionGroupManager.java | 2 +- .../org/apache/rocketmq/client/impl/MQAdminImpl.java | 2 +- .../impl/consumer/DefaultMQPullConsumerImpl.java | 2 +- .../rocketmq/client/producer/DefaultMQProducer.java | 2 +- .../rocketmq/common/queue/ConcurrentTreeMap.java | 12 ++++++------ .../StatisticsItemScheduledIncrementPrinter.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java b/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java index b208169e416..f7e0de914d3 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java @@ -114,7 +114,7 @@ private boolean merge() { } else { log.info("dataVersion is not greater than kvDataVersion, no need to merge group metaData, dataVersion={}, kvDataVersion={}", dataVersion, kvDataVersion); } - log.info("finish marge subscription config from json file and merge to rocksdb"); + log.info("finish merge subscription config from json file and merge to rocksdb"); this.persist(); return true; diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/MQAdminImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/MQAdminImpl.java index c1e3ee33dc1..f98d9e5818d 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/MQAdminImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQAdminImpl.java @@ -153,7 +153,7 @@ public List fetchPublishMessageQueues(String topic) throws MQClien throw new MQClientException("Can not find Message Queue for this topic, " + topic, e); } - throw new MQClientException("Unknow why, Can not find Message Queue for this topic, " + topic, null); + throw new MQClientException("Unknown why, Can not find Message Queue for this topic, " + topic, null); } public List parsePublishMessageQueues(List messageQueueList) { diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java index 9d46e28f5d4..160de3a1f85 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java @@ -559,7 +559,7 @@ public void onException(Throwable e) { } }); } catch (MQBrokerException e) { - throw new MQClientException("pullAsync unknow exception", e); + throw new MQClientException("pullAsync unknown exception", e); } } diff --git a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java index a30443f8d1e..2091bbabbff 100644 --- a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java +++ b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java @@ -863,7 +863,7 @@ public Message request(final Message msg, final MessageQueueSelector selector, f /** * Same to {@link #request(Message, RequestCallback, long)} with target message selector specified. * - * @param msg requst message to send + * @param msg request message to send * @param selector message queue selector, through which we get target message queue to deliver message to. * @param arg argument to work along with message queue selector. * @param requestCallback callback to execute on request completion. diff --git a/common/src/main/java/org/apache/rocketmq/common/queue/ConcurrentTreeMap.java b/common/src/main/java/org/apache/rocketmq/common/queue/ConcurrentTreeMap.java index 1df2f96c79b..d56ef6dae69 100644 --- a/common/src/main/java/org/apache/rocketmq/common/queue/ConcurrentTreeMap.java +++ b/common/src/main/java/org/apache/rocketmq/common/queue/ConcurrentTreeMap.java @@ -53,16 +53,16 @@ public V putIfAbsentAndRetExsit(K key, V value) { lock.lock(); try { if (roundQueue.put(key)) { - V exsit = tree.get(key); - if (null == exsit) { + V exist = tree.get(key); + if (null == exist) { tree.put(key, value); - exsit = value; + exist = value; } log.warn("putIfAbsentAndRetExsit success. " + key); - return exsit; + return exist; } else { - V exsit = tree.get(key); - return exsit; + V exist = tree.get(key); + return exist; } } finally { lock.unlock(); 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 e1998473bf2..49576f23e53 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 @@ -52,7 +52,7 @@ public StatisticsItemScheduledIncrementPrinter(String name, StatisticsItemPrinte public void schedule(final StatisticsItem item) { setItemSampleBrief(item.getStatKind(), item.getStatObject(), new StatisticsItemSampleBrief(item, tpsItemNames)); - // print log every ${interval} miliseconds + // print log every ${interval} milliseconds ScheduledFuture future = executor.scheduleAtFixedRate(new Runnable() { @Override public void run() {