Skip to content

Commit 9422bdb

Browse files
author
王松松
committed
correct spelling mistake
1 parent bfa7f1a commit 9422bdb

File tree

4 files changed

+47
-43
lines changed

4 files changed

+47
-43
lines changed

‎client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,6 @@
1616
*/
1717
package org.apache.rocketmq.client.impl.consumer;
1818

19-
import java.util.ArrayList;
20-
import java.util.Collections;
21-
import java.util.HashMap;
22-
import java.util.Iterator;
23-
import java.util.List;
24-
import java.util.Map;
25-
import java.util.concurrent.BlockingQueue;
26-
import java.util.concurrent.Executors;
27-
import java.util.concurrent.LinkedBlockingQueue;
28-
import java.util.concurrent.RejectedExecutionException;
29-
import java.util.concurrent.ScheduledExecutorService;
30-
import java.util.concurrent.ThreadPoolExecutor;
31-
import java.util.concurrent.TimeUnit;
3219
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
3320
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
3421
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
@@ -48,6 +35,20 @@
4835
import org.apache.rocketmq.remoting.common.RemotingHelper;
4936
import org.slf4j.Logger;
5037

38+
import java.util.ArrayList;
39+
import java.util.Collections;
40+
import java.util.HashMap;
41+
import java.util.Iterator;
42+
import java.util.List;
43+
import java.util.Map;
44+
import java.util.concurrent.BlockingQueue;
45+
import java.util.concurrent.Executors;
46+
import java.util.concurrent.LinkedBlockingQueue;
47+
import java.util.concurrent.RejectedExecutionException;
48+
import java.util.concurrent.ScheduledExecutorService;
49+
import java.util.concurrent.ThreadPoolExecutor;
50+
import java.util.concurrent.TimeUnit;
51+
5152
public class ConsumeMessageConcurrentlyService implements ConsumeMessageService {
5253
private static final Logger log = ClientLogger.getLog();
5354
private final DefaultMQPushConsumerImpl defaultMQPushConsumerImpl;
@@ -163,7 +164,7 @@ public ConsumeMessageDirectlyResult consumeMessageDirectly(MessageExt msg, Strin
163164

164165
final long beginTime = System.currentTimeMillis();
165166

166-
log.info("consumeMessageDirectly receive new messge: {}", msg);
167+
log.info("consumeMessageDirectly receive new message: {}", msg);
167168

168169
try {
169170
ConsumeConcurrentlyStatus status = this.messageListener.consumeMessage(msgs, context);

‎client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@
1616
*/
1717
package org.apache.rocketmq.client.impl.consumer;
1818

19-
import java.util.ArrayList;
20-
import java.util.Collections;
21-
import java.util.HashMap;
22-
import java.util.List;
23-
import java.util.concurrent.BlockingQueue;
24-
import java.util.concurrent.Executors;
25-
import java.util.concurrent.LinkedBlockingQueue;
26-
import java.util.concurrent.ScheduledExecutorService;
27-
import java.util.concurrent.ThreadPoolExecutor;
28-
import java.util.concurrent.TimeUnit;
2919
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
3020
import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyContext;
3121
import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyStatus;
@@ -48,6 +38,17 @@
4838
import org.apache.rocketmq.remoting.common.RemotingHelper;
4939
import org.slf4j.Logger;
5040

41+
import java.util.ArrayList;
42+
import java.util.Collections;
43+
import java.util.HashMap;
44+
import java.util.List;
45+
import java.util.concurrent.BlockingQueue;
46+
import java.util.concurrent.Executors;
47+
import java.util.concurrent.LinkedBlockingQueue;
48+
import java.util.concurrent.ScheduledExecutorService;
49+
import java.util.concurrent.ThreadPoolExecutor;
50+
import java.util.concurrent.TimeUnit;
51+
5152
public class ConsumeMessageOrderlyService implements ConsumeMessageService {
5253
private static final Logger log = ClientLogger.getLog();
5354
private final static long MAX_TIME_CONSUME_CONTINUOUSLY =
@@ -143,7 +144,7 @@ public ConsumeMessageDirectlyResult consumeMessageDirectly(MessageExt msg, Strin
143144

144145
final long beginTime = System.currentTimeMillis();
145146

146-
log.info("consumeMessageDirectly receive new messge: {}", msg);
147+
log.info("consumeMessageDirectly receive new message: {}", msg);
147148

148149
try {
149150
ConsumeOrderlyStatus status = this.messageListener.consumeMessage(msgs, context);

‎store/src/main/java/org/apache/rocketmq/store/CommitLog.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616
*/
1717
package org.apache.rocketmq.store;
1818

19-
import java.nio.ByteBuffer;
20-
import java.util.ArrayList;
21-
import java.util.HashMap;
22-
import java.util.List;
23-
import java.util.Map;
24-
import java.util.concurrent.CountDownLatch;
25-
import java.util.concurrent.TimeUnit;
2619
import org.apache.rocketmq.common.ServiceThread;
2720
import org.apache.rocketmq.common.UtilAll;
2821
import org.apache.rocketmq.common.constant.LoggerName;
@@ -39,6 +32,14 @@
3932
import org.slf4j.Logger;
4033
import org.slf4j.LoggerFactory;
4134

35+
import java.nio.ByteBuffer;
36+
import java.util.ArrayList;
37+
import java.util.HashMap;
38+
import java.util.List;
39+
import java.util.Map;
40+
import java.util.concurrent.CountDownLatch;
41+
import java.util.concurrent.TimeUnit;
42+
4243
/**
4344
* Store all metadata downtime for recovery, data protection reliability
4445
*/
@@ -183,7 +184,7 @@ else if (dispatchRequest.isSuccess() && size == 0) {
183184
index++;
184185
if (index >= mappedFiles.size()) {
185186
// Current branch can not happen
186-
log.info("recover last 3 physics file over, last maped file " + mappedFile.getFileName());
187+
log.info("recover last 3 physics file over, last mapped file " + mappedFile.getFileName());
187188
break;
188189
} else {
189190
mappedFile = mappedFiles.get(index);
@@ -417,7 +418,7 @@ public void recoverAbnormally() {
417418
for (; index >= 0; index--) {
418419
mappedFile = mappedFiles.get(index);
419420
if (this.isMappedFileMatchedRecover(mappedFile)) {
420-
log.info("recover from this maped file " + mappedFile.getFileName());
421+
log.info("recover from this mapped file " + mappedFile.getFileName());
421422
break;
422423
}
423424
}
@@ -459,7 +460,7 @@ else if (size == 0) {
459460
if (index >= mappedFiles.size()) {
460461
// The current branch under normal circumstances should
461462
// not happen
462-
log.info("recover physics file over, last maped file " + mappedFile.getFileName());
463+
log.info("recover physics file over, last mapped file " + mappedFile.getFileName());
463464
break;
464465
} else {
465466
mappedFile = mappedFiles.get(index);
@@ -585,7 +586,7 @@ public PutMessageResult putMessage(final MessageExtBrokerInner msg) {
585586
mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise
586587
}
587588
if (null == mappedFile) {
588-
log.error("create maped file1 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
589+
log.error("create mapped file1 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
589590
beginTimeInLock = 0;
590591
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null);
591592
}
@@ -600,7 +601,7 @@ public PutMessageResult putMessage(final MessageExtBrokerInner msg) {
600601
mappedFile = this.mappedFileQueue.getLastMappedFile(0);
601602
if (null == mappedFile) {
602603
// XXX: warn and notify me
603-
log.error("create maped file2 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
604+
log.error("create mapped file2 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
604605
beginTimeInLock = 0;
605606
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result);
606607
}
@@ -735,7 +736,7 @@ public PutMessageResult putMessages(final MessageExtBatch messageExtBatch) {
735736
mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise
736737
}
737738
if (null == mappedFile) {
738-
log.error("Create maped file1 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
739+
log.error("Create mapped file1 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
739740
beginTimeInLock = 0;
740741
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null);
741742
}
@@ -750,7 +751,7 @@ public PutMessageResult putMessages(final MessageExtBatch messageExtBatch) {
750751
mappedFile = this.mappedFileQueue.getLastMappedFile(0);
751752
if (null == mappedFile) {
752753
// XXX: warn and notify me
753-
log.error("Create maped file2 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
754+
log.error("Create mapped file2 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
754755
beginTimeInLock = 0;
755756
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result);
756757
}

‎store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
*/
1717
package org.apache.rocketmq.store;
1818

19-
import java.io.File;
20-
import java.nio.ByteBuffer;
21-
import java.util.List;
2219
import org.apache.rocketmq.common.constant.LoggerName;
2320
import org.apache.rocketmq.store.config.StorePathConfigHelper;
2421
import org.slf4j.Logger;
2522
import org.slf4j.LoggerFactory;
2623

24+
import java.io.File;
25+
import java.nio.ByteBuffer;
26+
import java.util.List;
27+
2728
public class ConsumeQueue {
2829

2930
public static final int CQ_STORE_UNIT_SIZE = 20;
@@ -121,7 +122,7 @@ public void recover() {
121122
index++;
122123
if (index >= mappedFiles.size()) {
123124

124-
log.info("recover last consume queue file over, last maped file "
125+
log.info("recover last consume queue file over, last mapped file "
125126
+ mappedFile.getFileName());
126127
break;
127128
} else {

0 commit comments

Comments
 (0)