This is an automated email from the ASF dual-hosted git repository.
vongosling 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 6e7df55 Typo fix and some other polish
6e7df55 is described below
commit 6e7df5573d4ea4d0e6f5b55fecc667bd4288126e
Author: vongosling <vongosling@apache.org>
AuthorDate: Fri Jul 12 14:23:08 2019 +0800
Typo fix and some other polish
---
.../rocketmq/broker/latency/BrokerFastFailure.java | 4 ----
.../broker/filter/MessageStoreWithFilterTest.java | 4 ++--
docs/cn/best_practice.md | 2 +-
docs/en/Operations_Broker.md | 2 +-
docs/en/best_practice.md | 2 +-
.../rocketmq/store/AllocateMappedFileService.java | 2 +-
.../java/org/apache/rocketmq/store/CommitLog.java | 8 ++++----
.../apache/rocketmq/store/DefaultMessageStore.java | 4 ++--
.../java/org/apache/rocketmq/store/MappedFile.java | 9 +++------
.../rocketmq/store/SelectMappedBufferResult.java | 4 ----
.../apache/rocketmq/store/TransientStorePool.java | 2 +-
.../rocketmq/store/config/MessageStoreConfig.java | 20 ++++++++++----------
.../rocketmq/store/dledger/DLedgerCommitLog.java | 4 ++--
.../org/apache/rocketmq/store/ha/HAConnection.java | 2 +-
.../apache/rocketmq/store/AppendCallbackTest.java | 4 ++--
.../apache/rocketmq/store/BatchPutMessageTest.java | 4 ++--
.../org/apache/rocketmq/store/ConsumeQueueTest.java | 4 ++--
.../store/DefaultMessageStoreCleanFilesTest.java | 6 +++---
.../store/DefaultMessageStoreShutDownTest.java | 4 ++--
.../rocketmq/store/DefaultMessageStoreTest.java | 9 ++++-----
.../test/java/org/apache/rocketmq/store/HATest.java | 8 ++------
.../rocketmq/store/dledger/MessageStoreTestBase.java | 8 ++++----
.../rocketmq/store/dledger/MixCommitlogTest.java | 6 +++---
.../store/schedule/ScheduleMessageServiceTest.java | 4 ++--
.../rocketmq/test/base/IntegrationTestBase.java | 2 +-
.../base/dledger/DLedgerProduceAndConsumeIT.java | 3 +--
26 files changed, 57 insertions(+), 74 deletions(-)
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
b/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
index a018f68..d176b86 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
@@ -28,10 +28,6 @@ import org.apache.rocketmq.logging.InternalLoggerFactory;
import org.apache.rocketmq.remoting.netty.RequestTask;
import org.apache.rocketmq.remoting.protocol.RemotingSysResponseCode;
-/**
- * BrokerFastFailure will cover {@link BrokerController#sendThreadPoolQueue} and
- * {@link BrokerController#pullThreadPoolQueue}
- */
public class BrokerFastFailure {
private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
private final ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(new
ThreadFactoryImpl(
diff --git a/broker/src/test/java/org/apache/rocketmq/broker/filter/MessageStoreWithFilterTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/filter/MessageStoreWithFilterTest.java
index e544d90..34dc640 100644
--- a/broker/src/test/java/org/apache/rocketmq/broker/filter/MessageStoreWithFilterTest.java
+++ b/broker/src/test/java/org/apache/rocketmq/broker/filter/MessageStoreWithFilterTest.java
@@ -122,8 +122,8 @@ public class MessageStoreWithFilterTest {
public MessageStoreConfig buildStoreConfig(int commitLogFileSize, int cqFileSize,
boolean enableCqExt, int cqExtFileSize) {
MessageStoreConfig messageStoreConfig = new MessageStoreConfig();
- messageStoreConfig.setMapedFileSizeCommitLog(commitLogFileSize);
- messageStoreConfig.setMapedFileSizeConsumeQueue(cqFileSize);
+ messageStoreConfig.setMappedFileSizeCommitLog(commitLogFileSize);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(cqFileSize);
messageStoreConfig.setMappedFileSizeConsumeQueueExt(cqExtFileSize);
messageStoreConfig.setMessageIndexEnable(false);
messageStoreConfig.setEnableConsumeQueueExt(enableCqExt);
diff --git a/docs/cn/best_practice.md b/docs/cn/best_practice.md
index 3b64ed6..39febbc 100755
--- a/docs/cn/best_practice.md
+++ b/docs/cn/best_practice.md
@@ -188,7 +188,7 @@ msgId一定是全局唯一标识符，但是实际使用中，可能会存在相
| brokerId | 0 | broker id, 0 表示 master, 其他的正整数表示
slave |
| storePathCommitLog | $HOME/store/commitlog/
| 存储 commit log 的路径 |
| storePathConsumerQueue | $HOME/store/consumequeue/
| 存储 consume queue 的路径 |
-| mapedFileSizeCommitLog | 1024 * 1024 * 1024(1G) | commit log 的映射文件大小
|
+| mappedFileSizeCommitLog | 1024 * 1024 * 1024(1G) | commit log 的映射文件大小
|
| deleteWhen | 04 | 在每天的什么时间删除已经超过文件保留时间的 commit
log |
| fileReservedTime | 72 | 以小时计算的文件保留时间
|
| brokerRole | ASYNC_MASTER | SYNC_MASTER/ASYNC_MASTER/SLAVE
|
diff --git a/docs/en/Operations_Broker.md b/docs/en/Operations_Broker.md
index 2ec9f03..cf3ea58 100644
--- a/docs/en/Operations_Broker.md
+++ b/docs/en/Operations_Broker.md
@@ -16,7 +16,7 @@ ASYNC_FLUSH is recommended, for SYNC_FLUSH is expensive and will cause too
much
| brokerId | 0 | broker id, 0 means master, positive
integers mean slave |
| storePathCommitLog | $HOME/store/commitlog/
| file path for commit log |
| storePathConsumerQueue | $HOME/store/consumequeue/
| file path for consume queue |
-| mapedFileSizeCommitLog | 1024 * 1024 * 1024(1G) | mapped file size for commit log
|
+| mappedFileSizeCommitLog | 1024 * 1024 * 1024(1G) | mapped file size for commit log
|
| deleteWhen | 04 | When to delete the commitlog which is out of the reserve time
|
| fileReserverdTime | 72 | The number of hours to keep a commitlog before deleting it
|
| brokerRole | ASYNC_MASTER | SYNC_MASTER/ASYNC_MASTER/SLAVE
|
diff --git a/docs/en/best_practice.md b/docs/en/best_practice.md
index 0ee7387..be3b937 100755
--- a/docs/en/best_practice.md
+++ b/docs/en/best_practice.md
@@ -22,7 +22,7 @@
| brokerId | 0 | broker id, 0 means master, positive
integers mean slave |
| storePathCommitLog | $HOME/store/commitlog/
| file path for commit log |
| storePathConsumerQueue | $HOME/store/consumequeue/
| file path for consume queue |
-| mapedFileSizeCommitLog | 1024 * 1024 * 1024(1G) | mapped file size for commit log
|
+| mappedFileSizeCommitLog | 1024 * 1024 * 1024(1G) | mapped file size for commit log
|
| deleteWhen | 04 | When to delete the commitlog which is out of the reserve time
|
| fileReserverdTime | 72 | The number of hours to keep a commitlog before deleting it
|
| brokerRole | ASYNC_MASTER | SYNC_MASTER/ASYNC_MASTER/SLAVE
|
diff --git a/store/src/main/java/org/apache/rocketmq/store/AllocateMappedFileService.java
b/store/src/main/java/org/apache/rocketmq/store/AllocateMappedFileService.java
index f28af38..5323670 100644
--- a/store/src/main/java/org/apache/rocketmq/store/AllocateMappedFileService.java
+++ b/store/src/main/java/org/apache/rocketmq/store/AllocateMappedFileService.java
@@ -185,7 +185,7 @@ public class AllocateMappedFileService extends ServiceThread {
// pre write mappedFile
if (mappedFile.getFileSize() >= this.messageStore.getMessageStoreConfig()
- .getMapedFileSizeCommitLog()
+ .getMappedFileSizeCommitLog()
&&
this.messageStore.getMessageStoreConfig().isWarmMapedFileEnable()) {
mappedFile.warmMappedFile(this.messageStore.getMessageStoreConfig().getFlushDiskType(),
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 cbcc1a7..b0bf8bb 100644
--- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
@@ -65,7 +65,7 @@ public class CommitLog {
public CommitLog(final DefaultMessageStore defaultMessageStore) {
this.mappedFileQueue = new MappedFileQueue(defaultMessageStore.getMessageStoreConfig().getStorePathCommitLog(),
- defaultMessageStore.getMessageStoreConfig().getMapedFileSizeCommitLog(), defaultMessageStore.getAllocateMappedFileService());
+ defaultMessageStore.getMessageStoreConfig().getMappedFileSizeCommitLog(), defaultMessageStore.getAllocateMappedFileService());
this.defaultMessageStore = defaultMessageStore;
if (FlushDiskType.SYNC_FLUSH == defaultMessageStore.getMessageStoreConfig().getFlushDiskType())
{
@@ -144,7 +144,7 @@ public class CommitLog {
}
public SelectMappedBufferResult getData(final long offset, final boolean returnFirstOnNotFound)
{
- int mappedFileSize = this.defaultMessageStore.getMessageStoreConfig().getMapedFileSizeCommitLog();
+ int mappedFileSize = this.defaultMessageStore.getMessageStoreConfig().getMappedFileSizeCommitLog();
MappedFile mappedFile = this.mappedFileQueue.findMappedFileByOffset(offset, returnFirstOnNotFound);
if (mappedFile != null) {
int pos = (int) (offset % mappedFileSize);
@@ -828,7 +828,7 @@ public class CommitLog {
}
public SelectMappedBufferResult getMessage(final long offset, final int size) {
- int mappedFileSize = this.defaultMessageStore.getMessageStoreConfig().getMapedFileSizeCommitLog();
+ int mappedFileSize = this.defaultMessageStore.getMessageStoreConfig().getMappedFileSizeCommitLog();
MappedFile mappedFile = this.mappedFileQueue.findMappedFileByOffset(offset, offset
== 0);
if (mappedFile != null) {
int pos = (int) (offset % mappedFileSize);
@@ -838,7 +838,7 @@ public class CommitLog {
}
public long rollNextFile(final long offset) {
- int mappedFileSize = this.defaultMessageStore.getMessageStoreConfig().getMapedFileSizeCommitLog();
+ int mappedFileSize = this.defaultMessageStore.getMessageStoreConfig().getMappedFileSizeCommitLog();
return offset + mappedFileSize - offset % mappedFileSize;
}
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 4b64978..f539411 100644
--- a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
@@ -1144,7 +1144,7 @@ public class DefaultMessageStore implements MessageStore {
topic,
queueId,
StorePathConfigHelper.getStorePathConsumeQueue(this.messageStoreConfig.getStorePathRootDir()),
- this.getMessageStoreConfig().getMapedFileSizeConsumeQueue(),
+ this.getMessageStoreConfig().getMappedFileSizeConsumeQueue(),
this);
ConsumeQueue oldLogic = map.putIfAbsent(queueId, newLogic);
if (oldLogic != null) {
@@ -1309,7 +1309,7 @@ public class DefaultMessageStore implements MessageStore {
topic,
queueId,
StorePathConfigHelper.getStorePathConsumeQueue(this.messageStoreConfig.getStorePathRootDir()),
- this.getMessageStoreConfig().getMapedFileSizeConsumeQueue(),
+ this.getMessageStoreConfig().getMappedFileSizeConsumeQueue(),
this);
this.putConsumeQueue(topic, queueId, logic);
if (!logic.load()) {
diff --git a/store/src/main/java/org/apache/rocketmq/store/MappedFile.java b/store/src/main/java/org/apache/rocketmq/store/MappedFile.java
index 9319465..e2c1d16 100644
--- a/store/src/main/java/org/apache/rocketmq/store/MappedFile.java
+++ b/store/src/main/java/org/apache/rocketmq/store/MappedFile.java
@@ -49,7 +49,6 @@ public class MappedFile extends ReferenceResource {
private static final AtomicInteger TOTAL_MAPPED_FILES = new AtomicInteger(0);
protected final AtomicInteger wrotePosition = new AtomicInteger(0);
- //ADD BY ChenYang
protected final AtomicInteger committedPosition = new AtomicInteger(0);
private final AtomicInteger flushedPosition = new AtomicInteger(0);
protected int fileSize;
@@ -119,7 +118,6 @@ public class MappedFile extends ReferenceResource {
private static ByteBuffer viewed(ByteBuffer buffer) {
String methodName = "viewedBuffer";
-
Method[] methods = buffer.getClass().getMethods();
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals("attachment")) {
@@ -166,10 +164,10 @@ public class MappedFile extends ReferenceResource {
TOTAL_MAPPED_FILES.incrementAndGet();
ok = true;
} catch (FileNotFoundException e) {
- log.error("create file channel " + this.fileName + " Failed. ", e);
+ log.error("Failed to create file " + this.fileName, e);
throw e;
} catch (IOException e) {
- log.error("map file " + this.fileName + " Failed. ", e);
+ log.error("Failed to map file " + this.fileName, e);
throw e;
} finally {
if (!ok && this.fileChannel != null) {
@@ -207,7 +205,7 @@ public class MappedFile extends ReferenceResource {
if (currentPos < this.fileSize) {
ByteBuffer byteBuffer = writeBuffer != null ? writeBuffer.slice() : this.mappedByteBuffer.slice();
byteBuffer.position(currentPos);
- AppendMessageResult result = null;
+ AppendMessageResult result;
if (messageExt instanceof MessageExtBrokerInner) {
result = cb.doAppend(this.getFileFromOffset(), byteBuffer, this.fileSize
- currentPos, (MessageExtBrokerInner) messageExt);
} else if (messageExt instanceof MessageExtBatch) {
@@ -382,7 +380,6 @@ public class MappedFile extends ReferenceResource {
public SelectMappedBufferResult selectMappedBuffer(int pos, int size) {
int readPosition = getReadPosition();
if ((pos + size) <= readPosition) {
-
if (this.hold()) {
ByteBuffer byteBuffer = this.mappedByteBuffer.slice();
byteBuffer.position(pos);
diff --git a/store/src/main/java/org/apache/rocketmq/store/SelectMappedBufferResult.java b/store/src/main/java/org/apache/rocketmq/store/SelectMappedBufferResult.java
index 1f826fe..034b964 100644
--- a/store/src/main/java/org/apache/rocketmq/store/SelectMappedBufferResult.java
+++ b/store/src/main/java/org/apache/rocketmq/store/SelectMappedBufferResult.java
@@ -48,10 +48,6 @@ public class SelectMappedBufferResult {
this.byteBuffer.limit(this.size);
}
- /* public MappedFile getMappedFile() {
- return mappedFile;
- }*/
-
// @Override
// protected void finalize() {
// if (this.mappedFile != null) {
diff --git a/store/src/main/java/org/apache/rocketmq/store/TransientStorePool.java b/store/src/main/java/org/apache/rocketmq/store/TransientStorePool.java
index 0de0591..f692a99 100644
--- a/store/src/main/java/org/apache/rocketmq/store/TransientStorePool.java
+++ b/store/src/main/java/org/apache/rocketmq/store/TransientStorePool.java
@@ -39,7 +39,7 @@ public class TransientStorePool {
public TransientStorePool(final MessageStoreConfig storeConfig) {
this.storeConfig = storeConfig;
this.poolSize = storeConfig.getTransientStorePoolSize();
- this.fileSize = storeConfig.getMapedFileSizeCommitLog();
+ this.fileSize = storeConfig.getMappedFileSizeCommitLog();
this.availableBuffers = new ConcurrentLinkedDeque<>();
}
diff --git a/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
b/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
index cb17345..2543e96 100644
--- a/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
+++ b/store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
@@ -31,9 +31,9 @@ public class MessageStoreConfig {
+ File.separator + "commitlog";
// CommitLog file size,default is 1G
- private int mapedFileSizeCommitLog = 1024 * 1024 * 1024;
+ private int mappedFileSizeCommitLog = 1024 * 1024 * 1024;
// ConsumeQueue file size,default is 30W
- private int mapedFileSizeConsumeQueue = 300000 * ConsumeQueue.CQ_STORE_UNIT_SIZE;
+ private int mappedFileSizeConsumeQueue = 300000 * ConsumeQueue.CQ_STORE_UNIT_SIZE;
// enable consume queue ext
private boolean enableConsumeQueueExt = false;
// ConsumeQueue extend file size, 48M
@@ -188,22 +188,22 @@ public class MessageStoreConfig {
this.warmMapedFileEnable = warmMapedFileEnable;
}
- public int getMapedFileSizeCommitLog() {
- return mapedFileSizeCommitLog;
+ public int getMappedFileSizeCommitLog() {
+ return mappedFileSizeCommitLog;
}
- public void setMapedFileSizeCommitLog(int mapedFileSizeCommitLog) {
- this.mapedFileSizeCommitLog = mapedFileSizeCommitLog;
+ public void setMappedFileSizeCommitLog(int mappedFileSizeCommitLog) {
+ this.mappedFileSizeCommitLog = mappedFileSizeCommitLog;
}
- public int getMapedFileSizeConsumeQueue() {
+ public int getMappedFileSizeConsumeQueue() {
- int factor = (int) Math.ceil(this.mapedFileSizeConsumeQueue / (ConsumeQueue.CQ_STORE_UNIT_SIZE
* 1.0));
+ int factor = (int) Math.ceil(this.mappedFileSizeConsumeQueue / (ConsumeQueue.CQ_STORE_UNIT_SIZE
* 1.0));
return (int) (factor * ConsumeQueue.CQ_STORE_UNIT_SIZE);
}
- public void setMapedFileSizeConsumeQueue(int mapedFileSizeConsumeQueue) {
- this.mapedFileSizeConsumeQueue = mapedFileSizeConsumeQueue;
+ public void setMappedFileSizeConsumeQueue(int mappedFileSizeConsumeQueue) {
+ this.mappedFileSizeConsumeQueue = mappedFileSizeConsumeQueue;
}
public boolean isEnableConsumeQueueExt() {
diff --git a/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java b/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
index a48c1be..8f795d9 100644
--- a/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
@@ -80,7 +80,7 @@ public class DLedgerCommitLog extends CommitLog {
dLedgerConfig.setGroup(defaultMessageStore.getMessageStoreConfig().getdLegerGroup());
dLedgerConfig.setPeers(defaultMessageStore.getMessageStoreConfig().getdLegerPeers());
dLedgerConfig.setStoreBaseDir(defaultMessageStore.getMessageStoreConfig().getStorePathRootDir());
- dLedgerConfig.setMappedFileSizeForEntryData(defaultMessageStore.getMessageStoreConfig().getMapedFileSizeCommitLog());
+ dLedgerConfig.setMappedFileSizeForEntryData(defaultMessageStore.getMessageStoreConfig().getMappedFileSizeCommitLog());
dLedgerConfig.setDeleteWhen(defaultMessageStore.getMessageStoreConfig().getDeleteWhen());
dLedgerConfig.setFileReservedHours(defaultMessageStore.getMessageStoreConfig().getFileReservedTime()
+ 1);
id = Integer.valueOf(dLedgerConfig.getSelfId().substring(1)) + 1;
@@ -514,7 +514,7 @@ public class DLedgerCommitLog extends CommitLog {
@Override
public long rollNextFile(final long offset) {
- int mappedFileSize = this.defaultMessageStore.getMessageStoreConfig().getMapedFileSizeCommitLog();
+ int mappedFileSize = this.defaultMessageStore.getMessageStoreConfig().getMappedFileSizeCommitLog();
return offset + mappedFileSize - offset % mappedFileSize;
}
diff --git a/store/src/main/java/org/apache/rocketmq/store/ha/HAConnection.java b/store/src/main/java/org/apache/rocketmq/store/ha/HAConnection.java
index ce1b50b..11af1e2 100644
--- a/store/src/main/java/org/apache/rocketmq/store/ha/HAConnection.java
+++ b/store/src/main/java/org/apache/rocketmq/store/ha/HAConnection.java
@@ -227,7 +227,7 @@ public class HAConnection {
masterOffset =
masterOffset
- (masterOffset % HAConnection.this.haService.getDefaultMessageStore().getMessageStoreConfig()
- .getMapedFileSizeCommitLog());
+ .getMappedFileSizeCommitLog());
if (masterOffset < 0) {
masterOffset = 0;
diff --git a/store/src/test/java/org/apache/rocketmq/store/AppendCallbackTest.java b/store/src/test/java/org/apache/rocketmq/store/AppendCallbackTest.java
index 7f88d36..fbb2a74 100644
--- a/store/src/test/java/org/apache/rocketmq/store/AppendCallbackTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/AppendCallbackTest.java
@@ -47,8 +47,8 @@ public class AppendCallbackTest {
@Before
public void init() throws Exception {
MessageStoreConfig messageStoreConfig = new MessageStoreConfig();
- messageStoreConfig.setMapedFileSizeCommitLog(1024 * 8);
- messageStoreConfig.setMapedFileSizeConsumeQueue(1024 * 4);
+ messageStoreConfig.setMappedFileSizeCommitLog(1024 * 8);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(1024 * 4);
messageStoreConfig.setMaxHashSlotNum(100);
messageStoreConfig.setMaxIndexNum(100 * 10);
messageStoreConfig.setStorePathRootDir(System.getProperty("user.home") + File.separator
+ "unitteststore");
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 3817849..0c8e5bb 100644
--- a/store/src/test/java/org/apache/rocketmq/store/BatchPutMessageTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/BatchPutMessageTest.java
@@ -66,8 +66,8 @@ public class BatchPutMessageTest {
private MessageStore buildMessageStore() throws Exception {
MessageStoreConfig messageStoreConfig = new MessageStoreConfig();
- messageStoreConfig.setMapedFileSizeCommitLog(1024 * 8);
- messageStoreConfig.setMapedFileSizeConsumeQueue(1024 * 4);
+ messageStoreConfig.setMappedFileSizeCommitLog(1024 * 8);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(1024 * 4);
messageStoreConfig.setMaxHashSlotNum(100);
messageStoreConfig.setMaxIndexNum(100 * 10);
messageStoreConfig.setFlushDiskType(FlushDiskType.SYNC_FLUSH);
diff --git a/store/src/test/java/org/apache/rocketmq/store/ConsumeQueueTest.java b/store/src/test/java/org/apache/rocketmq/store/ConsumeQueueTest.java
index 470d70b..c973030 100644
--- a/store/src/test/java/org/apache/rocketmq/store/ConsumeQueueTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/ConsumeQueueTest.java
@@ -86,8 +86,8 @@ public class ConsumeQueueTest {
public MessageStoreConfig buildStoreConfig(int commitLogFileSize, int cqFileSize,
boolean enableCqExt, int cqExtFileSize) {
MessageStoreConfig messageStoreConfig = new MessageStoreConfig();
- messageStoreConfig.setMapedFileSizeCommitLog(commitLogFileSize);
- messageStoreConfig.setMapedFileSizeConsumeQueue(cqFileSize);
+ messageStoreConfig.setMappedFileSizeCommitLog(commitLogFileSize);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(cqFileSize);
messageStoreConfig.setMappedFileSizeConsumeQueueExt(cqExtFileSize);
messageStoreConfig.setMessageIndexEnable(false);
messageStoreConfig.setEnableConsumeQueueExt(enableCqExt);
diff --git a/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
b/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
index b987cd3..fd510f1 100644
--- a/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
@@ -281,7 +281,7 @@ public class DefaultMessageStoreCleanFilesTest {
}
private int getMsgCountPerConsumeQueueMappedFile() {
- int size = messageStore.getMessageStoreConfig().getMapedFileSizeConsumeQueue();
+ int size = messageStore.getMessageStoreConfig().getMappedFileSizeConsumeQueue();
return size / CQ_STORE_UNIT_SIZE;// 7 in this case
}
@@ -322,8 +322,8 @@ public class DefaultMessageStoreCleanFilesTest {
private void initMessageStore(String deleteWhen, int diskMaxUsedSpaceRatio, double diskSpaceCleanForciblyRatio)
throws Exception {
MessageStoreConfig messageStoreConfig = new MessageStoreConfigForTest();
- messageStoreConfig.setMapedFileSizeCommitLog(mappedFileSize);
- messageStoreConfig.setMapedFileSizeConsumeQueue(mappedFileSize);
+ messageStoreConfig.setMappedFileSizeCommitLog(mappedFileSize);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(mappedFileSize);
messageStoreConfig.setMaxHashSlotNum(10000);
messageStoreConfig.setMaxIndexNum(100 * 100);
messageStoreConfig.setFlushDiskType(FlushDiskType.SYNC_FLUSH);
diff --git a/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreShutDownTest.java
b/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreShutDownTest.java
index 78457db..e43bb4b 100644
--- a/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreShutDownTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreShutDownTest.java
@@ -64,8 +64,8 @@ public class DefaultMessageStoreShutDownTest {
public DefaultMessageStore buildMessageStore() throws Exception {
MessageStoreConfig messageStoreConfig = new MessageStoreConfig();
- messageStoreConfig.setMapedFileSizeCommitLog(1024 * 1024 * 10);
- messageStoreConfig.setMapedFileSizeConsumeQueue(1024 * 1024 * 10);
+ messageStoreConfig.setMappedFileSizeCommitLog(1024 * 1024 * 10);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(1024 * 1024 * 10);
messageStoreConfig.setMaxHashSlotNum(10000);
messageStoreConfig.setMaxIndexNum(100 * 100);
messageStoreConfig.setFlushDiskType(FlushDiskType.SYNC_FLUSH);
diff --git a/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreTest.java b/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreTest.java
index d0f7293..7859774 100644
--- a/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreTest.java
@@ -40,7 +40,6 @@ import org.apache.rocketmq.store.config.StorePathConfigHelper;
import org.apache.rocketmq.store.stats.BrokerStatsManager;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@@ -76,8 +75,8 @@ public class DefaultMessageStoreTest {
MessageBody = StoreMessage.getBytes();
MessageStoreConfig messageStoreConfig = new MessageStoreConfig();
- messageStoreConfig.setMapedFileSizeCommitLog(1024 * 8);
- messageStoreConfig.setMapedFileSizeConsumeQueue(1024 * 4);
+ messageStoreConfig.setMappedFileSizeCommitLog(1024 * 8);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(1024 * 4);
messageStoreConfig.setMaxHashSlotNum(100);
messageStoreConfig.setMaxIndexNum(100 * 10);
MessageStore master = new DefaultMessageStore(messageStoreConfig, null, new MyMessageArrivingListener(),
new BrokerConfig());
@@ -106,8 +105,8 @@ public class DefaultMessageStoreTest {
private MessageStore buildMessageStore() throws Exception {
MessageStoreConfig messageStoreConfig = new MessageStoreConfig();
- messageStoreConfig.setMapedFileSizeCommitLog(1024 * 1024 * 10);
- messageStoreConfig.setMapedFileSizeConsumeQueue(1024 * 1024 * 10);
+ messageStoreConfig.setMappedFileSizeCommitLog(1024 * 1024 * 10);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(1024 * 1024 * 10);
messageStoreConfig.setMaxHashSlotNum(10000);
messageStoreConfig.setMaxIndexNum(100 * 100);
messageStoreConfig.setFlushDiskType(FlushDiskType.SYNC_FLUSH);
diff --git a/store/src/test/java/org/apache/rocketmq/store/HATest.java b/store/src/test/java/org/apache/rocketmq/store/HATest.java
index 83efcc1..64495c3 100644
--- a/store/src/test/java/org/apache/rocketmq/store/HATest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/HATest.java
@@ -22,7 +22,6 @@ import org.apache.rocketmq.common.UtilAll;
import org.apache.rocketmq.store.config.BrokerRole;
import org.apache.rocketmq.store.config.FlushDiskType;
import org.apache.rocketmq.store.config.MessageStoreConfig;
-import org.apache.rocketmq.store.ha.HAService;
import org.apache.rocketmq.store.stats.BrokerStatsManager;
import org.junit.After;
import org.junit.Before;
@@ -35,10 +34,7 @@ import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import java.util.HashMap;
-import java.util.Map;
import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import static org.assertj.core.api.Assertions.assertThat;
@@ -141,8 +137,8 @@ public class HATest {
}
private void buildMessageStoreConfig(MessageStoreConfig messageStoreConfig){
- messageStoreConfig.setMapedFileSizeCommitLog(1024 * 1024 * 10);
- messageStoreConfig.setMapedFileSizeConsumeQueue(1024 * 1024 * 10);
+ messageStoreConfig.setMappedFileSizeCommitLog(1024 * 1024 * 10);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(1024 * 1024 * 10);
messageStoreConfig.setMaxHashSlotNum(10000);
messageStoreConfig.setMaxIndexNum(100 * 100);
messageStoreConfig.setFlushDiskType(FlushDiskType.SYNC_FLUSH);
diff --git a/store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
b/store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
index e45178a..2da2fb7 100644
--- a/store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
+++ b/store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
@@ -43,8 +43,8 @@ public class MessageStoreTestBase extends StoreTestBase {
System.setProperty("dledger.disk.ratio.clean", "0.95");
baseDirs.add(base);
MessageStoreConfig storeConfig = new MessageStoreConfig();
- storeConfig.setMapedFileSizeCommitLog(1024 * 100);
- storeConfig.setMapedFileSizeConsumeQueue(1024);
+ storeConfig.setMappedFileSizeCommitLog(1024 * 100);
+ storeConfig.setMappedFileSizeConsumeQueue(1024);
storeConfig.setMaxHashSlotNum(100);
storeConfig.setMaxIndexNum(100 * 10);
storeConfig.setStorePathRootDir(base);
@@ -98,8 +98,8 @@ public class MessageStoreTestBase extends StoreTestBase {
protected DefaultMessageStore createMessageStore(String base, boolean createAbort) throws
Exception {
baseDirs.add(base);
MessageStoreConfig storeConfig = new MessageStoreConfig();
- storeConfig.setMapedFileSizeCommitLog(1024 * 100);
- storeConfig.setMapedFileSizeConsumeQueue(1024);
+ storeConfig.setMappedFileSizeCommitLog(1024 * 100);
+ storeConfig.setMappedFileSizeConsumeQueue(1024);
storeConfig.setMaxHashSlotNum(100);
storeConfig.setMaxIndexNum(100 * 10);
storeConfig.setStorePathRootDir(base);
diff --git a/store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java b/store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
index a5242a3..4aaa029 100644
--- a/store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
@@ -36,7 +36,7 @@ public class MixCommitlogTest extends MessageStoreTestBase {
{
DefaultMessageStore originalStore = createMessageStore(base, false);
doPutMessages(originalStore, topic, 0, 1000, 0);
- Assert.assertEquals(11, originalStore.getMaxPhyOffset()/originalStore.getMessageStoreConfig().getMapedFileSizeCommitLog());
+ Assert.assertEquals(11, originalStore.getMaxPhyOffset()/originalStore.getMessageStoreConfig().getMappedFileSizeCommitLog());
Thread.sleep(500);
Assert.assertEquals(0, originalStore.getMinOffsetInQueue(topic, 0));
Assert.assertEquals(1000, originalStore.getMaxOffsetInQueue(topic, 0));
@@ -83,7 +83,7 @@ public class MixCommitlogTest extends MessageStoreTestBase {
Assert.assertEquals(1000, originalStore.getMaxOffsetInQueue(topic, 0));
Assert.assertEquals(0, originalStore.dispatchBehindBytes());
dividedOffset = originalStore.getCommitLog().getMaxOffset();
- dividedOffset = dividedOffset - dividedOffset % originalStore.getMessageStoreConfig().getMapedFileSizeCommitLog()
+ originalStore.getMessageStoreConfig().getMapedFileSizeCommitLog();
+ dividedOffset = dividedOffset - dividedOffset % originalStore.getMessageStoreConfig().getMappedFileSizeCommitLog()
+ originalStore.getMessageStoreConfig().getMappedFileSizeCommitLog();
doGetMessages(originalStore, topic, 0, 1000, 0);
originalStore.shutdown();
}
@@ -144,7 +144,7 @@ public class MixCommitlogTest extends MessageStoreTestBase {
Assert.assertEquals(1000, originalStore.getMaxOffsetInQueue(topic, 0));
Assert.assertEquals(0, originalStore.dispatchBehindBytes());
dividedOffset = originalStore.getCommitLog().getMaxOffset();
- dividedOffset = dividedOffset - dividedOffset % originalStore.getMessageStoreConfig().getMapedFileSizeCommitLog()
+ originalStore.getMessageStoreConfig().getMapedFileSizeCommitLog();
+ dividedOffset = dividedOffset - dividedOffset % originalStore.getMessageStoreConfig().getMappedFileSizeCommitLog()
+ originalStore.getMessageStoreConfig().getMappedFileSizeCommitLog();
originalStore.shutdown();
}
long maxPhysicalOffset;
diff --git a/store/src/test/java/org/apache/rocketmq/store/schedule/ScheduleMessageServiceTest.java
b/store/src/test/java/org/apache/rocketmq/store/schedule/ScheduleMessageServiceTest.java
index befbefd..fd860e6 100644
--- a/store/src/test/java/org/apache/rocketmq/store/schedule/ScheduleMessageServiceTest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/schedule/ScheduleMessageServiceTest.java
@@ -91,8 +91,8 @@ public class ScheduleMessageServiceTest {
public void init() throws Exception {
messageStoreConfig = new MessageStoreConfig();
messageStoreConfig.setMessageDelayLevel(testMessageDelayLevel);
- messageStoreConfig.setMapedFileSizeCommitLog(commitLogFileSize);
- messageStoreConfig.setMapedFileSizeConsumeQueue(cqFileSize);
+ messageStoreConfig.setMappedFileSizeCommitLog(commitLogFileSize);
+ messageStoreConfig.setMappedFileSizeConsumeQueue(cqFileSize);
messageStoreConfig.setMappedFileSizeConsumeQueueExt(cqExtFileSize);
messageStoreConfig.setMessageIndexEnable(false);
messageStoreConfig.setEnableConsumeQueueExt(true);
diff --git a/test/src/test/java/org/apache/rocketmq/test/base/IntegrationTestBase.java b/test/src/test/java/org/apache/rocketmq/test/base/IntegrationTestBase.java
index 0eacd58..c484e87 100644
--- a/test/src/test/java/org/apache/rocketmq/test/base/IntegrationTestBase.java
+++ b/test/src/test/java/org/apache/rocketmq/test/base/IntegrationTestBase.java
@@ -135,7 +135,7 @@ public class IntegrationTestBase {
brokerConfig.setEnablePropertyFilter(true);
storeConfig.setStorePathRootDir(baseDir);
storeConfig.setStorePathCommitLog(baseDir + SEP + "commitlog");
- storeConfig.setMapedFileSizeCommitLog(COMMIT_LOG_SIZE);
+ storeConfig.setMappedFileSizeCommitLog(COMMIT_LOG_SIZE);
storeConfig.setMaxIndexNum(INDEX_NUM);
storeConfig.setMaxHashSlotNum(INDEX_NUM * 4);
return createAndStartBroker(storeConfig, brokerConfig);
diff --git a/test/src/test/java/org/apache/rocketmq/test/base/dledger/DLedgerProduceAndConsumeIT.java
b/test/src/test/java/org/apache/rocketmq/test/base/dledger/DLedgerProduceAndConsumeIT.java
index e2d9db1..2961f6b 100644
--- a/test/src/test/java/org/apache/rocketmq/test/base/dledger/DLedgerProduceAndConsumeIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/base/dledger/DLedgerProduceAndConsumeIT.java
@@ -35,7 +35,6 @@ import org.apache.rocketmq.test.base.IntegrationTestBase;
import org.apache.rocketmq.test.factory.ConsumerFactory;
import org.apache.rocketmq.test.factory.ProducerFactory;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import static org.apache.rocketmq.test.base.IntegrationTestBase.nextPort;
@@ -58,7 +57,7 @@ public class DLedgerProduceAndConsumeIT {
storeConfig.setStorePathRootDir(baseDir);
storeConfig.setStorePathCommitLog(baseDir + SEP + "commitlog");
storeConfig.setHaListenPort(nextPort());
- storeConfig.setMapedFileSizeCommitLog(10 * 1024 * 1024);
+ storeConfig.setMappedFileSizeCommitLog(10 * 1024 * 1024);
storeConfig.setEnableDLegerCommitLog(true);
storeConfig.setdLegerGroup(brokerName);
storeConfig.setdLegerSelfId(selfId);
|