This is an automated email from the ASF dual-hosted git repository.
lizhanhui 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 70dc93abbc Fix tiered store README.md error about Configuration (#7436)
70dc93abbc is described below
commit 70dc93abbcb9bf161378d66fcaca55bedc78b905
Author: yangguodong <[email protected]>
AuthorDate: Wed Nov 8 21:14:54 2023 -0600
Fix tiered store README.md error about Configuration (#7436)
* Fix tiered store README.md error about Configuration
* Fix change tieredStoreFilePath to tieredStoreFilepath
* revert README.md change
---------
Co-authored-by: yangguodong.cn <[email protected]>
---
.../rocketmq/tieredstore/common/TieredMessageStoreConfig.java | 10 +++++-----
.../rocketmq/tieredstore/provider/posix/PosixFileSegment.java | 4 ++--
.../apache/rocketmq/tieredstore/file/TieredCommitLogTest.java | 2 +-
.../tieredstore/provider/posix/PosixFileSegmentTest.java | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/TieredMessageStoreConfig.java
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/TieredMessageStoreConfig.java
index 595db6b865..a112ea6b10 100644
---
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/TieredMessageStoreConfig.java
+++
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/TieredMessageStoreConfig.java
@@ -115,7 +115,7 @@ public class TieredMessageStoreConfig {
private long readAheadCacheExpireDuration = 10 * 1000;
private double readAheadCacheSizeThresholdRate = 0.3;
- private String tieredStoreFilePath = "";
+ private String tieredStoreFilepath = "";
private String objectStoreEndpoint = "";
@@ -350,12 +350,12 @@ public class TieredMessageStoreConfig {
this.readAheadCacheSizeThresholdRate = rate;
}
- public String getTieredStoreFilePath() {
- return tieredStoreFilePath;
+ public String getTieredStoreFilepath() {
+ return tieredStoreFilepath;
}
- public void setTieredStoreFilePath(String tieredStoreFilePath) {
- this.tieredStoreFilePath = tieredStoreFilePath;
+ public void setTieredStoreFilepath(String tieredStoreFilepath) {
+ this.tieredStoreFilepath = tieredStoreFilepath;
}
public void setObjectStoreEndpoint(String objectStoreEndpoint) {
diff --git
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegment.java
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegment.java
index 7e949cb28c..708ce33f91 100644
---
a/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegment.java
+++
b/tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegment.java
@@ -66,8 +66,8 @@ public class PosixFileSegment extends TieredFileSegment {
super(storeConfig, fileType, filePath, baseOffset);
// basePath
- String basePath =
StringUtils.defaultString(storeConfig.getTieredStoreFilePath(),
- StringUtils.appendIfMissing(storeConfig.getTieredStoreFilePath(),
File.separator));
+ String basePath =
StringUtils.defaultString(storeConfig.getTieredStoreFilepath(),
+ StringUtils.appendIfMissing(storeConfig.getTieredStoreFilepath(),
File.separator));
// fullPath:
basePath/hash_cluster/broker/topic/queueId/fileType/baseOffset
String brokerClusterName = storeConfig.getBrokerClusterName();
diff --git
a/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/file/TieredCommitLogTest.java
b/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/file/TieredCommitLogTest.java
index 6693d3cb79..80cdba9778 100644
---
a/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/file/TieredCommitLogTest.java
+++
b/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/file/TieredCommitLogTest.java
@@ -49,7 +49,7 @@ public class TieredCommitLogTest {
TieredMessageStoreConfig storeConfig = new TieredMessageStoreConfig();
storeConfig.setBrokerName("brokerName");
storeConfig.setStorePathRootDir(storePath);
- storeConfig.setTieredStoreFilePath(storePath + File.separator);
+ storeConfig.setTieredStoreFilepath(storePath + File.separator);
storeConfig.setTieredBackendServiceProvider("org.apache.rocketmq.tieredstore.provider.posix.PosixFileSegment");
storeConfig.setCommitLogRollingInterval(0);
storeConfig.setTieredStoreCommitLogMaxSize(1000);
diff --git
a/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegmentTest.java
b/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegmentTest.java
index db33ae847f..ede62b8ce9 100644
---
a/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegmentTest.java
+++
b/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegmentTest.java
@@ -42,7 +42,7 @@ public class PosixFileSegmentTest {
@Before
public void setUp() {
storeConfig = new TieredMessageStoreConfig();
- storeConfig.setTieredStoreFilePath(storePath);
+ storeConfig.setTieredStoreFilepath(storePath);
mq = new MessageQueue("OSSFileSegmentTest", "broker", 0);
TieredStoreExecutor.init();
}