This is an automated email from the ASF dual-hosted git repository.
lizhimin pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
from 6c9359fbfc [ISSUE #6824] Add golang e2e test (#6825)
add 6eac107005 [ISSUE #6633] [RIP-65] Improving Tiered Storage
Implementation (#6781)
No new revisions were added by this update.
Summary of changes:
.../apache/rocketmq/broker/BrokerController.java | 84 ++--
.../apache/rocketmq/common/PopAckConstants.java | 4 +
distribution/conf/tieredstorage/brokerS3.conf | 31 --
.../rocketmq/store/timer/TimerMessageStore.java | 488 ++++++++++++---------
.../apache/rocketmq/store/timer/TimerRequest.java | 16 +
style/spotbugs-suppressions.xml | 2 +-
tieredstore/BUILD.bazel | 2 -
tieredstore/pom.xml | 10 -
.../rocketmq/tieredstore/TieredDispatcher.java | 352 ++++++++-------
.../rocketmq/tieredstore/TieredMessageFetcher.java | 169 +++----
.../rocketmq/tieredstore/TieredMessageStore.java | 169 ++++---
.../rocketmq/tieredstore/common/AppendResult.java | 28 ++
.../rocketmq/tieredstore/common/BoundaryType.java | 11 +-
.../{BoundaryType.java => FileSegmentType.java} | 40 +-
...questFuture.java => InFlightRequestFuture.java} | 9 +-
...ightRequestKey.java => InFlightRequestKey.java} | 15 +-
.../tieredstore/common/MessageCacheKey.java | 19 +-
.../common/SelectMappedBufferResultWrapper.java | 27 +-
.../common/TieredMessageStoreConfig.java | 32 +-
.../tieredstore/common/TieredStoreExecutor.java | 16 +-
.../container/TieredContainerManager.java | 251 -----------
.../exception/TieredStoreErrorCode.java | 34 +-
.../exception/TieredStoreException.java | 1 +
.../rocketmq/tieredstore/file/CompositeAccess.java | 154 +++++++
.../CompositeFlatFile.java} | 233 ++++------
.../tieredstore/file/CompositeQueueFlatFile.java | 125 ++++++
.../{container => file}/TieredCommitLog.java | 83 ++--
.../{container => file}/TieredConsumeQueue.java | 58 +--
.../tieredstore/file/TieredFileAllocator.java | 56 +++
.../TieredFlatFile.java} | 258 +++++++----
.../tieredstore/file/TieredFlatFileManager.java | 277 ++++++++++++
.../{container => file}/TieredIndexFile.java | 105 +++--
.../tieredstore/metadata/FileSegmentMetadata.java | 27 +-
.../tieredstore/metadata/QueueMetadata.java | 1 +
.../metadata/TieredMetadataManager.java | 293 +++++--------
.../metadata/TieredMetadataSerializeWrapper.java | 61 ++-
.../tieredstore/metadata/TieredMetadataStore.java | 97 ++--
.../tieredstore/metadata/TopicMetadata.java | 24 +-
.../metrics/TieredStoreMetricsManager.java | 51 ++-
.../tieredstore/provider/FileSegmentAllocator.java | 102 +++++
.../tieredstore/provider/TieredFileSegment.java | 198 ++++-----
.../tieredstore/provider/TieredStoreProvider.java | 12 +-
.../inputstream/TieredCommitLogInputStream.java | 25 +-
.../inputstream/TieredFileSegmentInputStream.java | 22 +-
.../TieredFileSegmentInputStreamFactory.java | 35 +-
.../provider/posix/PosixFileSegment.java | 60 ++-
.../tieredstore/provider/s3/ChunkMetadata.java | 108 -----
.../tieredstore/provider/s3/S3FileSegment.java | 391 -----------------
.../provider/s3/S3FileSegmentMetadata.java | 183 --------
.../provider/s3/TieredStorageS3Client.java | 359 ---------------
.../tieredstore/util/MessageBufferUtil.java | 4 +-
.../rocketmq/tieredstore/util/TieredStoreUtil.java | 21 +-
...cherBaseTest.java => TieredDispatcherTest.java} | 113 ++---
...BaseTest.java => TieredMessageFetcherTest.java} | 134 +++---
.../tieredstore/TieredMessageStoreTest.java | 52 ++-
.../rocketmq/tieredstore/TieredStoreTestUtil.java | 18 +-
.../rocketmq/tieredstore/common/CommonTest.java | 56 ---
.../common/InFlightRequestFutureTest.java | 145 ++++++
.../tieredstore/container/TieredFileQueueTest.java | 238 ----------
.../container/TieredMessageQueueContainerTest.java | 197 ---------
.../file/CompositeQueueFlatFileTest.java | 197 +++++++++
.../TieredFlatFileManagerTest.java} | 46 +-
.../tieredstore/file/TieredFlatFileTest.java | 302 +++++++++++++
.../{container => file}/TieredIndexFileTest.java | 20 +-
...oreTest.java => TieredMetadataManagerTest.java} | 166 ++++---
.../metrics/TieredStoreMetricsManagerTest.java | 2 +-
.../provider/TieredFileSegmentInputStreamTest.java | 27 +-
...entBaseTest.java => TieredFileSegmentTest.java} | 60 ++-
.../provider/memory/MemoryFileSegment.java | 31 +-
.../memory/MemoryFileSegmentWithoutCheck.java | 17 +-
.../memory/TieredDispatcherForMemoryTest.java | 40 --
.../memory/TieredFileSegmentForMemoryTest.java | 33 --
.../memory/TieredMessageFetcherForMemoryTest.java | 27 --
.../provider/posix/PosixFileSegmentTest.java | 16 +-
.../tieredstore/provider/s3/MockS3AsyncClient.java | 221 ----------
.../tieredstore/provider/s3/MockS3TestBase.java | 69 ---
.../provider/s3/S3FileSegmentMetadataTest.java | 54 ---
.../tieredstore/provider/s3/S3FileSegmentTest.java | 236 ----------
.../provider/s3/S3MockStarterTestImpl.java | 38 --
.../provider/s3/TieredDispatcherForS3Test.java | 62 ---
.../provider/s3/TieredFileSegmentForS3Test.java | 58 ---
.../provider/s3/TieredMessageFetcherForS3Test.java | 46 --
.../provider/s3/TieredStorageS3ClientTest.java | 169 -------
.../tieredstore/util/MessageBufferUtilTest.java | 10 +-
84 files changed, 3475 insertions(+), 4658 deletions(-)
delete mode 100644 distribution/conf/tieredstorage/brokerS3.conf
copy
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/{BoundaryType.java
=> FileSegmentType.java} (61%)
rename
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/{InflightRequestFuture.java
=> InFlightRequestFuture.java} (89%)
rename
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/common/{InflightRequestKey.java
=> InFlightRequestKey.java} (84%)
delete mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/container/TieredContainerManager.java
create mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/file/CompositeAccess.java
rename
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/{container/TieredMessageQueueContainer.java
=> file/CompositeFlatFile.java} (65%)
create mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/file/CompositeQueueFlatFile.java
rename tieredstore/src/main/java/org/apache/rocketmq/tieredstore/{container =>
file}/TieredCommitLog.java (53%)
rename tieredstore/src/main/java/org/apache/rocketmq/tieredstore/{container =>
file}/TieredConsumeQueue.java (62%)
create mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/file/TieredFileAllocator.java
rename
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/{container/TieredFileQueue.java
=> file/TieredFlatFile.java} (64%)
create mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/file/TieredFlatFileManager.java
rename tieredstore/src/main/java/org/apache/rocketmq/tieredstore/{container =>
file}/TieredIndexFile.java (84%)
create mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/FileSegmentAllocator.java
delete mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/s3/ChunkMetadata.java
delete mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/s3/S3FileSegment.java
delete mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/s3/S3FileSegmentMetadata.java
delete mode 100644
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/provider/s3/TieredStorageS3Client.java
rename
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/{TieredDispatcherBaseTest.java
=> TieredDispatcherTest.java} (63%)
rename
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/{TieredMessageFetcherBaseTest.java
=> TieredMessageFetcherTest.java} (72%)
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/common/CommonTest.java
create mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/common/InFlightRequestFutureTest.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/container/TieredFileQueueTest.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/container/TieredMessageQueueContainerTest.java
create mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/file/CompositeQueueFlatFileTest.java
rename
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/{container/TieredContainerManagerTest.java
=> file/TieredFlatFileManagerTest.java} (65%)
create mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/file/TieredFlatFileTest.java
rename tieredstore/src/test/java/org/apache/rocketmq/tieredstore/{container =>
file}/TieredIndexFileTest.java (91%)
rename
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/metadata/{MetadataStoreTest.java
=> TieredMetadataManagerTest.java} (55%)
rename
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/{TieredFileSegmentBaseTest.java
=> TieredFileSegmentTest.java} (74%)
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/memory/TieredDispatcherForMemoryTest.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/memory/TieredFileSegmentForMemoryTest.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/memory/TieredMessageFetcherForMemoryTest.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/s3/MockS3AsyncClient.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/s3/MockS3TestBase.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/s3/S3FileSegmentMetadataTest.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/s3/S3FileSegmentTest.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/s3/S3MockStarterTestImpl.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/s3/TieredDispatcherForS3Test.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/s3/TieredFileSegmentForS3Test.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/s3/TieredMessageFetcherForS3Test.java
delete mode 100644
tieredstore/src/test/java/org/apache/rocketmq/tieredstore/provider/s3/TieredStorageS3ClientTest.java
