You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by do...@apache.org on 2021/12/24 06:14:46 UTC

[rocketmq] 01/01: Merge remote-tracking branch 'origin/5.0.0-alpha' into 5.0.0-alpha-static-topic

This is an automated email from the ASF dual-hosted git repository.

dongeforever pushed a commit to branch 5.0.0-alpha
in repository https://gitbox.apache.org/repos/asf/rocketmq.git

commit f7c63fe901d5077d9f1c735920521df13644de55
Merge: 7f7cf1b 16a3195
Author: dongeforever <do...@apache.org>
AuthorDate: Fri Dec 24 14:13:30 2021 +0800

    Merge remote-tracking branch 'origin/5.0.0-alpha' into 5.0.0-alpha-static-topic

 .../apache/rocketmq/broker/BrokerController.java   |   17 +-
 .../broker/plugin/AbstractPluginMessageStore.java  |    6 +-
 .../broker/processor/AdminBrokerProcessor.java     |   27 +-
 .../broker/processor/SendMessageProcessor.java     |   32 +-
 .../broker/pagecache/OneMessageTransferTest.java   |    8 +-
 .../broker/processor/AdminBrokerProcessorTest.java |    4 +-
 .../broker/processor/PopMessageProcessorTest.java  |    4 +-
 .../client/consumer/DefaultMQPullConsumer.java     |    7 +
 .../client/consumer/DefaultMQPushConsumer.java     |   11 +
 .../rocketmq/client/consumer/MQPullConsumer.java   |    7 +
 .../rocketmq/client/impl/MQClientAPIImpl.java      |    3 +-
 .../impl/consumer/DefaultMQPullConsumerImpl.java   |   34 +
 .../impl/consumer/DefaultMQPushConsumerImpl.java   |    1 +
 .../client/impl/consumer/PullAPIWrapper.java       |   58 +
 .../client/producer/DefaultMQProducer.java         |    1 +
 .../java/org/apache/rocketmq/common/UtilAll.java   |   13 +
 .../rocketmq/common/message/MessageConst.java      |    2 +
 .../rocketmq/common/message/MessageDecoder.java    |   49 +
 .../protocol/header/PullMessageRequestHeader.java  |   10 +
 .../protocol/header/SendMessageResponseHeader.java |    9 +
 .../rocketmq/common/sysflag/MessageSysFlag.java    |    5 +
 .../common/message/MessageDecoderTest.java         |    4 +-
 .../rocketmq/store/AllocateMappedFileService.java  |   12 +-
 .../rocketmq/store/AppendMessageCallback.java      |    2 -
 .../apache/rocketmq/store/AppendMessageResult.java |   12 +
 .../java/org/apache/rocketmq/store/CommitLog.java  |  730 ++++--
 .../org/apache/rocketmq/store/ConsumeQueue.java    |  164 +-
 .../org/apache/rocketmq/store/ConsumeQueueExt.java |    1 +
 .../apache/rocketmq/store/DefaultMessageStore.java |  541 ++--
 .../org/apache/rocketmq/store/DispatchRequest.java |   45 +
 .../apache/rocketmq/store/FileQueueSnapshot.java   |   90 +
 .../apache/rocketmq/store/GetMessageResult.java    |   23 +-
 .../org/apache/rocketmq/store/MappedFileQueue.java |   97 +-
 .../apache/rocketmq/store}/MessageExtBatch.java    |   17 +-
 .../org/apache/rocketmq/store/MessageStore.java    |  169 +-
 .../rocketmq/store/MultiPathMappedFileQueue.java   |    1 +
 .../apache/rocketmq/store/PutMessageContext.java   |   31 +
 .../rocketmq/store/SelectMappedBufferResult.java   |   11 +-
 .../org/apache/rocketmq/store/StoreCheckpoint.java |    7 +-
 .../java/org/apache/rocketmq/store/StoreUtil.java  |   48 +
 .../apache/rocketmq/store/StreamMessageStore.java  | 2573 ++++++++++++++++++++
 .../java/org/apache/rocketmq/store/Swappable.java  |   33 +-
 .../org/apache/rocketmq/store/TopicQueueLock.java  |   29 +
 .../rocketmq/store/config/MessageStoreConfig.java  |  292 ++-
 .../store/config/StorePathConfigHelper.java        |    3 +
 .../rocketmq/store/dledger/DLedgerCommitLog.java   |  217 +-
 .../org/apache/rocketmq/store/ha/HAService.java    |    8 +-
 .../org/apache/rocketmq/store/index/IndexFile.java |    5 +-
 .../apache/rocketmq/store/index/IndexService.java  |    8 +-
 .../rocketmq/store/logfile/AbstractMappedFile.java |   28 +-
 .../DefaultMappedFile.java}                        |  202 +-
 .../apache/rocketmq/store/logfile/MappedFile.java  |  331 +++
 .../rocketmq/store/queue/BatchConsumeQueue.java    |  952 ++++++++
 .../rocketmq/store/queue/BatchOffsetIndex.java     |   57 +
 .../org/apache/rocketmq/store/queue/CQType.java    |   30 +-
 .../store/queue/ConsumeQueueInterface.java         |  112 +
 .../rocketmq/store/queue/ConsumeQueueStore.java    |  176 ++
 .../org/apache/rocketmq/store/queue/CqUnit.java    |  115 +
 .../FileQueueLifeCycle.java}                       |   32 +-
 .../rocketmq/store/queue/ReferredIterator.java     |   30 +-
 .../store/schedule/ScheduleMessageService.java     |   65 +-
 .../apache/rocketmq/store/stats/BrokerStats.java   |    6 +-
 .../apache/rocketmq/store/util/PerfCounter.java    |  370 +++
 .../{StoreUtil.java => util/QueueTypeUtils.java}   |   26 +-
 .../apache/rocketmq/store/AppendCallbackTest.java  |    2 -
 .../apache/rocketmq/store/BatchPutMessageTest.java |    1 -
 .../apache/rocketmq/store/ConsumeQueueTest.java    |   63 +-
 .../store/DefaultMessageStoreCleanFilesTest.java   |    8 +-
 .../store/DefaultMessageStoreShutDownTest.java     |    4 +-
 .../rocketmq/store/DefaultMessageStoreTest.java    |   78 +-
 .../apache/rocketmq/store/MappedFileQueueTest.java |  156 +-
 .../org/apache/rocketmq/store/MappedFileTest.java  |    4 +-
 .../store/MultiPathMappedFileQueueTest.java        |    1 +
 .../org/apache/rocketmq/store/StoreTestBase.java   |   14 +-
 .../store/dledger/DLedgerCommitlogTest.java        |    6 +-
 .../store/queue/BatchConsumeMessageTest.java       |  306 +++
 .../store/queue/BatchConsumeQueueTest.java         |  315 +++
 .../rocketmq/store/queue/ConsumeQueueTest.java     |   85 +
 .../apache/rocketmq/store/queue/QueueTestBase.java |   89 +
 .../org/apache/rocketmq/test/base/BaseConf.java    |   22 +-
 .../rocketmq/test/base/IntegrationTestBase.java    |   31 +
 .../base/dledger/DLedgerProduceAndConsumeIT.java   |    2 +
 .../test/client/producer/batch/BatchSendIT.java    |  162 ++
 .../client/producer/oneway/OneWaySendWithMQIT.java |   10 -
 .../rocketmq/test/statictopic/StaticTopicIT.java   |    2 +-
 85 files changed, 8419 insertions(+), 955 deletions(-)