This is an automated email from the ASF dual-hosted git repository.
tigerlee pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from 1b420ce Updated Notice file to 2022 (#3735)
add 6b8a2b2 trivial cleanups (#3403)
add 78443c3 [ISSUE 3420]rocketmq_client.log will not record the
asynchronous sending failure exception，will only throw out the reason for the
final time failure to the business (#3421)
add d2776fc [ISSUE #3370] group same Exceptions
add 1657475 [ISSUE#3430] fix the problem that setting parameter
mqClientApiTimeout doesn't take effect (#3431)
add 2385f04 [ISSUE #3381] Fix bug of when role change but not register
again (#3442)
add fe72057 fix(broker): can not clear topic unitSubFlag (#3429)
add c6aeb78 [ISSUE #3459] Fix the problem of Put messages to commitLog
always failure after encountering any exception (#3460)
add a51598d Validators.checkMessage() is used twice. (#3435)
add 7b05208 [ISSUE #3467] Fail fast on loading files with error
mappedFileSize
add 2d9a7e1 [ISSUE #3463] Fix the issue of commitLog path error (#3464)
add b35f3e4 [ISSUE #3286] Replace Timer with ScheduledExecutorService
(#3287)
add 861ef50 add defaultRequestProcessor test
add 4b8b307 Merge pull request #3269 from
zhaohai1299002788/add-defaultRequestProcessor-test
add 4bb99e6 [ISSUE #3487] Benchmark supports custom AK/SK
add 0c85c7b [ISSUE #3527] Fix some request header setting errors and
naming issues (#3530)
add be6ded9 [ISSUE #3528] The value of ChannelOption.SO_BACKLOG can not
be hard-coded. (#3529)
add 87b0be0 [ISSUE #2516]: Fix the value of
sendThreadPoolQueueHeadWaitTimeMills is 0 most of the time (#3509)
add 2624763 doc-optimization (#3523)
add a823068 fix notes wrong (#3543) (#3544)
add 5a0da02 changed 'item' to 'items' (#3563)
add eff9530 typo int readme[ecosystem] (#3557)
add d6f3ed6 [ISSUE #3567] fix: The value of configuration item
(PushConsumer#consumeThreadMin) in document and code are different.
add 16cabf0 removed typos and spelling errors from comments in quickstart
(#3572)
add 5d5d5f5 optimizing: For a big set, replace sequential iteration
addition with a parallel stream when calculating results. (#3540)
add 4daade3 Removed if-else statements of ROLLBACK and COMMIT
add 4d49551 add single quotes for namesrvAddr option example, to avoid
command splits caused by semicolons (#3592)
add 5694db1 [ISSUE #3579]：Fix spelling mistake in getter/setter method
of mQClientFactory SSUE
add 3084713 [ISSUE #3551] Fix admin cloneoffset
add 83accb6 [Issue #3476] Fix last separator of properties string is
missing when using batch send. (#3479)
add a779d69 Unnecessary boxing of primitives (#3596)
add b5ade62 [Issue #3565] Removing message filter impldev (#3575)
add a47f1ef [Issue #3394] fix duplicate keys in trace message (#3395)
add b5a8334 [ISSUE #3604] Some important interface methods add comment
add f395fa6 [ISSUE #3601] Fix dledger put batch msg stats bug (#3600)
add e2a4b37 fix(client): fetch and commit offset use master broker firstly
add 50d45f2 [ISSUE 3585] [Part F] eliminate regex match in topic/group
name check (#3594)
add 1e314f4 [ISSUE #3593] entrySet() replace keySet() (#3595)
add 38b20fb [ISSUE 3585] [Part H] Avoid unnecessary StringBuilder
resizing on critical path (#3612)
add 7f1c14c [ISSUE #3453]Producer cannot shutdown completely (#3454)
add cbf9b2a [ISSUE #3602] add AdminBrokerProcessor Test (#3599)
add 8b58328 Polish the doc for tracing parts. (#3573)
add 4593ad4 bump up log4j-core version to 2.15.0 (#3621)
add dcbf276 [ISSUE 3585] [Part I] Avoid unnecessary StringBuffer resizing
and String Formatting (#3619)
add 4f18b0d [ISSUE 3585] [Part A] eliminate reverse DNS lookup in
MessageExt (#3586)
add ed258b3 [ISSUE 3585] [Part D] improve performance of createUniqID(),
from 2.41% to 0.42% in flame graph of producer side. (#3590)
add 1635856 [ISSUE #2535] Polish log variable. (#2536)
add 67225fd [ISSUE 3585] [Part E] eliminate duplicated getNamespace()
call when where is no namespace (#3591)
add 3a5cdfa [ISSUE
#3624]DefaultMQPushConsumerTest.testPullMessage_ExceptionOccursWhenComputePullFromWhere
throws RejectedExecution (#3626)
add fcb2486 [ISSUE
#3627]org.apache.rocketmq.broker.processor.SendMessageProcessorTest#testProcessRequest_WithMsgBack
failed (#3629)
add e1571ee 修复协议解析漏洞 (#3475)
add 7d1b001 fix npe of SendMessageProcessorTest (#3632)
add 4a8263b [ISSUE #3635] remove log4j dependency in client pom (#3636)
add 5fea69b [ISSUE #3644] exchange parameters
add fe98bed [ISSUE #3645] Remove TBW102 topic not found warn log in
rocketmq-client.log
add 64ad790 [ISSUE #3624]Fix producer/consumer re-start may fail
introduced in #3454 (#3639)
add 5081d15 [ISSUE #3637] Add enableDetailStat in BrokerConfig so we can
disable stat of queue level. (#3638)
add a2d9424 Fix bug that the broker will hang after merge the pr that fix
the headWaitTimeMills of sendThreadPoolQueue (#3631)
add ecb061a fix code style of PR #3475 (#3650)
add ed710ab bump up log4j-slf4j-impl version to 2.15.0 (#3623)
add 17d25ea [ISSUE #3651] for add netty channel option
WRITE_BUFFER_WATER_MARK
add 8cb1468 [ISSUE #3654] Polish travis.yml to run integration tests
(#3655)
add 7591227 [ISSUE #1486] fix CleanUnusedTopicCommand performs wrong
(#1487)
add 6ac5f49 [ISSUE #2472] Add producer best practice for english
add e425c09 [ISSUE #1097] Fix null pointer problem when consumption start
time is null (#1098)
add e4394b6 [ISSUE 3585] [Part C] cache the result of
parseChannelRemoteAddr() and eliminate this method in flame graph. (used 4.84%
cpu before this commit in producer side) (#3589)
add 86c1216 [ISSUE #1843] fix: broker panic when producer send to retry
topic (#1844)
add f620a50 [ISSUE #2383] Export putMessageFailedTimes with broker status
(#2385)
add 0bc011c [ISSUE 3613] bug fix, solve message hash conflict in index
file #3616
add f1b2c4f Fix spelling error in DefaultMessageStore, use getServiceName
for GroupCommitService logging (#3663)
add 75557b8 [ISSUE #1750] Fix display of SocketAddress is
'ocalhost/127.0.0.1:9876'
add 6d247cb [ISSUE 3585] [Part J] Use MappedByteBuffer instead of
FileChannel to write consume queue and slave commitlog. (#3657)
add 8540da4 [ISSUE #3674] Improve the test cases of the tools module
(#3672)
add 28d7849 [ISSUE #3539] Add parameter verification
add 9f9b109 fix(test): rename error logger name
add 6ebb4e4 fix topicRouteMap maintain error relationship
add c98d5a8 optimize namesrv default address docs
add ac0cebc Merge pull request #3214 from slievrly/develop_doc_0804
add 3f4329c [ISSUE #3692] docs: Modify the title content about the
message query documentation. (#3693)
add 0ceb9e6 [ISSUE #3696]Optimize the query consumer connection display
(#3697)
add 43009b7 [ISSUE #3685] Fix param spelling error (#3678)
add 13f561b [ISSUE #2969] Add a skip accumulation message command in
mqadmin.
add e154529 Merge pull request #2970 from
zhangjidi2016/add_skipAccumulatedMessage_command
add 9be760a add pull consumer
add 18c7979 Merge pull request #1085 from andrexuDeveloper/develop
add 92bf68c [ISSUE #3687] Fix wrong method comment about transaction
message.
add a7b5903 Merge pull request #3689 from
XiaoyiPeng/wrong_method_comment_about_transaction_msg
add e0406b2 [ISSUE #3173]Isolate Broker logs when multiple Broker
services are deployed on the same machine
add 47175d8 use dLegerSelfId instead of brokerId in dleger mode
add 764cfba retrigger ci
add fc5180e isolate broker's log can be configured
add 3738214 add comment
add ed5f4e4 Merge pull request #3174 from zhangjidi2016/broker_log
add d564dcd [ISSUE #3709] Resolve export metadata errors while multiple
brokers. (#3727)
add 938e201 [ISSUE #3733] Upgrade dledger version to 0.2.3 (#3734)
add 1ef1af6 [ISSUE #3728] docs: Make the 'Uses of keys' entry in the
document 'Best practices' more complete. (#3729)
add acac49f [ISSUE #3738] Remove useless callee of String.valueOf (#3739)
add 0b612ff [ISSUE #3223]Optimize startup script to support greater jdk
version (#3224)
add 5233f12 rollback spelling fix to avoid incompatile (#3749)
add 8d28d3f [ISSUE #3751] docs: Fix typos and other little error in the
document 'Configuration_Client.md' (#3752)
add 14b63ee [RIP-28] light message queue(LMQ) (#3694)
add 2035e6f fix build error in RIP-28 at getmQclientFactory (#3753)
add bfaef39 fix build error in RIP-28 at getmQClientFactory (#3754)
add 80bcfbc [Issue #3556] Fix:When broker is down, rocketmq client can
not retry under Async send model (#3555)
add c5da66d Check producerTable or consumerTable is empty when
updateTopicRouteInfoFromNameServer (#2581)
add 6dff04f [ISSUE #3642] Display GID and Topic with namespace (#3648)
add c832523 [ISSUE #3757] docs: Polish the document 'Design_Query.md'.
(#3758)
add 4f39218 Avoid new lines in log (#3762)
add 1be3cc3 chore(client) change client jdk version to 1.6
add e1056ef Merge pull request #3683 from duhenglucky/develop_jdk
add 1fd7833 variable "timestamp" should be -1 when the timestamp
parameter is set to "now"
add a62b70b Merge pull request #1077 from
ssssssnake/issue-resetOffsetByTime
add 1b3b3a8 Adding exception message with broker addr when occuring
broker connect timeout (#3772)
add 41f58e4 [ISSUE #3774] docs: Polish the document
'Example_Transaction.md'. (#3775)
add 84cde5f #3015 when slaveAckOffset greater than local commitLog
offset, break connection and return (#3016)
add 97198fa [ISSUE #3449] Delayed message supports asynchronous delivery
(#3458)
add b46496d Remove useless code (#3695)
add e50bf54 Update README.md
add ad5fd7f Update README.md
add e8cae43 Update README.md
add bda0ae0 [ISSUE #3724]: Polish the unit test of class
ConsumeMessageConcurrentlyService. (#3725)
add 35334e2 [ISSUE #3782] docs: Fix the default value of parameter
'sendMsgTimeout'. (#3783)
add 8fdfb42 [ISSUES #3048]add example of OnewayProducer and
ScheduledMessage (#3053)
add 493c91a deprecated DefaultMQPullConsumer (#3796)
add 8ce2cdb perf: avoid multiple expansion when the number of elements in
the `MessageConst` class is determined (#3721)
add 30d1c58 [ISSUE #3801] Polish the document 'CLITools.md'. (#3802)
add d5be91f [ISSUE #3789] optimize: Tag the name of consuming thread
whith consumeGroup. (#3795)
add f219170 [ISSUE #3786] fix: The length of properties value should be
checked before converting them to short. (#3788)
add 7496081 fix ISSUE 2812 (#3813)
add 32dd2d8 [Issue-3816] upgrade log4jv2 to 2.17.1 (#3817)
add 3251114 [Issue-3814] use snakeyaml 1.30 (#3815)
add dbbc88a guava 31.0.1-jre (#3821)
add d5c8800 add tests for AllocateMessageQueueAveragely (#3811)
add 810b757 [ISSUE #3797] Improve DefaultMQProducerImpl code (#3809)
add ca92d36 Update design.md (#3835)
add 8fa9ca5 [ISSUE 3825] Use default
SO_SNDBUF/SO_RCVBUF/WRITE_BUFFER_WATER_MARK value. (#3826)
add 4992f4e [ISSUE ##3832] in order to improve the performance by change
the variable location of queueId (#3833)
add 8b78f61 [ISSUE #3674]Add unit test for
AllocateMessageQueueAveragelyByCircle (#3839)
add 48e8c19 add tests for computePullFromWhereWithException (#3844)
add 459b9d0 Re-enable testing on ARM64 (#3850)
add a45c7bc [ISSUE #3852]Move the Logappender module to external (#3851)
add fc01404 fix(log) add log for interruptedException (#3854)
add 7428d65 [ISSUE #3827]Improve Performance of transactional message and
schedule message (#3828)
add cc478bd fix scheduleAtFixedRate bug (#3861)
add fef8670 [ISSUE #3863] Updated Notice file to 2022 (#3864)
add c1bb6aa [ISSUE #2986] Support for multiple ACL files in a fixed
directory (#3761)
add 2369a91 depreciated unused class (#3846)
add 35c95eb prepare to release rocketmq 4.9.3 version
add c7989f8 [maven-release-plugin] prepare release rocketmq-all-4.9.3
add b606d9c [maven-release-plugin] prepare for next development iteration
new 2622ba3 Merge branch 'develop'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 13 +-
README.md | 22 +-
acl/pom.xml | 2 +-
.../org/apache/rocketmq/acl/AccessValidator.java | 13 +
.../org/apache/rocketmq/acl/common/AclUtils.java | 2 +-
.../rocketmq/acl/plain/PlainAccessValidator.java | 19 +-
.../rocketmq/acl/plain/PlainPermissionManager.java | 427 +++++++++---
.../acl/plain/RemoteAddressStrategyFactory.java | 4 +-
.../apache/rocketmq/acl/common/AclUtilsTest.java | 13 +-
.../acl/plain/PlainAccessValidatorTest.java | 739 ++++++++++++++-------
.../acl/plain/PlainPermissionManagerTest.java | 59 +-
.../test/resources/conf/{ => acl}/plain_acl.yml | 44 +-
.../test/resources/conf/plain_acl_format_error.yml | 26 -
acl/src/test/resources/conf/plain_acl_null.yml | 18 -
broker/pom.xml | 6 +-
.../apache/rocketmq/broker/BrokerController.java | 39 +-
.../rocketmq/broker/BrokerPathConfigHelper.java | 4 +
.../org/apache/rocketmq/broker/BrokerStartup.java | 16 +-
.../broker/filter/ConsumerFilterManager.java | 17 +-
.../broker/filter/MessageEvaluationContext.java | 5 +-
.../longpolling/LmqPullRequestHoldService.java | 62 ++
.../broker/longpolling/ManyPullRequest.java | 4 +
.../broker/longpolling/PullRequestHoldService.java | 10 +-
.../broker/offset/ConsumerOffsetManager.java | 6 +-
.../broker/offset/LmqConsumerOffsetManager.java | 109 +++
.../broker/plugin/AbstractPluginMessageStore.java | 539 +++++++--------
.../processor/AbstractSendMessageProcessor.java | 3 +-
.../broker/processor/AdminBrokerProcessor.java | 8 +
.../broker/processor/PullMessageProcessor.java | 2 +-
.../broker/processor/SendMessageProcessor.java | 18 +-
.../subscription/LmqSubscriptionGroupManager.java | 46 ++
.../broker/topic/LmqTopicConfigManager.java | 49 ++
.../rocketmq/broker/topic/TopicConfigManager.java | 6 +-
.../queue/TransactionalMessageBridge.java | 8 +-
.../queue/TransactionalMessageServiceImpl.java | 4 +-
.../rocketmq/broker/BrokerControllerTest.java | 33 +
.../broker/BrokerPathConfigHelperTest.java | 42 ++
.../broker/filter/MessageStoreWithFilterTest.java | 2 +-
.../offset/LmqConsumerOffsetManagerTest.java | 81 +++
.../broker/processor/AdminBrokerProcessorTest.java | 264 ++++++++
.../broker/processor/SendMessageProcessorTest.java | 4 +-
client/pom.xml | 22 +-
.../org/apache/rocketmq/client/ClientConfig.java | 12 +-
.../java/org/apache/rocketmq/client/MQHelper.java | 1 +
.../org/apache/rocketmq/client/Validators.java | 52 +-
.../client/consumer/DefaultMQPullConsumer.java | 1 +
.../client/consumer/DefaultMQPushConsumer.java | 5 +-
.../rebalance/AllocateMachineRoomNearby.java | 7 +-
.../AllocateMessageQueueByMachineRoom.java | 11 +
.../consumer/store/LocalFileOffsetStore.java | 11 +-
.../consumer/store/RemoteBrokerOffsetStore.java | 8 +-
.../client/impl/ClientRemotingProcessor.java | 6 +-
.../apache/rocketmq/client/impl/MQAdminImpl.java | 5 +-
.../rocketmq/client/impl/MQClientAPIImpl.java | 151 +++--
.../ConsumeMessageConcurrentlyService.java | 14 +-
.../consumer/ConsumeMessageOrderlyService.java | 14 +-
.../impl/consumer/DefaultLitePullConsumerImpl.java | 4 +-
.../client/impl/consumer/ProcessQueue.java | 12 +-
.../client/impl/factory/MQClientInstance.java | 43 +-
.../impl/producer/DefaultMQProducerImpl.java | 73 +-
.../client/producer/DefaultMQProducer.java | 1 -
.../client/producer/LocalTransactionExecuter.java | 2 +-
...stFutureTable.java => RequestFutureHolder.java} | 54 +-
.../client/producer/TransactionCheckListener.java | 3 +-
.../rocketmq/client/trace/TraceDataEncoder.java | 5 +-
.../hook/ConsumeMessageOpenTracingHookImpl.java | 2 +-
.../org/apache/rocketmq/client/ValidatorsTest.java | 2 +-
.../consumer/DefaultLitePullConsumerTest.java | 19 +-
.../client/consumer/DefaultMQPushConsumerTest.java | 31 +-
.../AllocateMessageQueueAveragelyByCircleTest.java | 68 ++
.../AllocateMessageQueueAveragelyTest.java | 57 ++
.../store/RemoteBrokerOffsetStoreTest.java | 3 +-
.../rocketmq/client/impl/MQClientAPIImplTest.java | 36 +-
.../ConsumeMessageConcurrentlyServiceTest.java | 59 +-
.../consumer/ConsumeMessageOrderlyServiceTest.java | 177 +++++
.../impl/consumer/RebalanceLitePullImplTest.java | 100 +++
.../impl/consumer/RebalancePushImplTest.java | 74 ++-
.../client/producer/DefaultMQProducerTest.java | 11 +-
.../DefaultMQConsumerWithOpenTracingTest.java | 30 +-
.../trace/DefaultMQConsumerWithTraceTest.java | 7 +-
.../DefaultMQLitePullConsumerWithTraceTest.java | 1 -
.../client/trace/TraceDataEncoderTest.java | 33 +-
.../trace/TransactionMQProducerWithTraceTest.java | 36 +-
common/pom.xml | 2 +-
.../org/apache/rocketmq/common/BrokerConfig.java | 41 ++
.../org/apache/rocketmq/common/Configuration.java | 19 +-
.../java/org/apache/rocketmq/common/MQVersion.java | 2 +-
.../java/org/apache/rocketmq/common/MixAll.java | 5 +
.../java/org/apache/rocketmq/common/UtilAll.java | 14 +
.../common/message/MessageClientIDSetter.java | 27 +-
.../rocketmq/common/message/MessageConst.java | 5 +-
.../rocketmq/common/message/MessageDecoder.java | 5 +-
.../apache/rocketmq/common/message/MessageExt.java | 4 +
.../protocol/body/ClusterAclVersionInfo.java | 15 +-
.../common/protocol/body/ConsumerRunningInfo.java | 8 +-
.../header/GetBrokerAclConfigResponseHeader.java | 10 +
...va => DeleteTopicFromNamesrvRequestHeader.java} | 2 +-
.../rocketmq/common/sysflag/TopicSysFlag.java | 3 -
.../rocketmq/common/topic/TopicValidator.java | 47 +-
.../org/apache/rocketmq/common/MixAllTest.java | 12 +
.../common/message/MessageClientIDSetterTest.java | 22 +
distribution/NOTICE-BIN | 2 +-
distribution/benchmark/runclass.sh | 3 +-
distribution/bin/runbroker.cmd | 3 +-
distribution/bin/runbroker.sh | 25 +-
distribution/bin/runserver.cmd | 3 +-
distribution/bin/runserver.sh | 3 +-
distribution/bin/tools.cmd | 3 +-
distribution/bin/tools.sh | 3 +-
distribution/conf/{ => acl}/plain_acl.yml | 44 +-
distribution/conf/logback_broker.xml | 48 +-
distribution/pom.xml | 2 +-
docs/cn/Example_LMQ.md | 85 +++
...Multiple_ACL_Files_\350\256\276\350\256\241.md" | 137 ++++
docs/cn/architecture.md | 6 +-
docs/cn/best_practice.md | 6 +-
.../java/API_Reference_ DefaultPullConsumer.md | 143 ++++
.../client/java/API_Reference_DefaultMQProducer.md | 26 +-
docs/cn/design.md | 2 +-
docs/cn/image/LMQ_1.png | Bin 0 -> 304040 bytes
docs/en/CLITools.md | 6 +-
docs/en/Configuration_Client.md | 16 +-
docs/en/Design_Query.md | 6 +-
docs/en/Example_Transaction.md | 10 +-
docs/en/best_practice.md | 79 +++
example/pom.xml | 2 +-
.../rocketmq/example/benchmark/AclClient.java | 12 +-
.../rocketmq/example/benchmark/Consumer.java | 15 +-
.../rocketmq/example/benchmark/Producer.java | 15 +-
.../example/benchmark/TransactionProducer.java | 17 +-
.../rocketmq/example/ordermessage/Consumer.java | 4 -
.../rocketmq/example/quickstart/Consumer.java | 4 +-
.../ScheduledMessageConsumer.java} | 39 +-
.../ScheduledMessageProducer.java} | 35 +-
.../OnewayProducer.java} | 37 +-
.../rocketmq/example/simple/PullConsumer.java | 2 +-
example/src/main/resources/MessageFilterImpl.java | 39 --
filter/pom.xml | 2 +-
logappender/pom.xml | 80 ---
.../logappender/common/ProducerInstance.java | 97 ---
.../logappender/log4j/RocketmqLog4jAppender.java | 189 ------
.../logappender/log4j2/RocketmqLog4j2Appender.java | 226 -------
.../logback/RocketmqLogbackAppender.java | 179 -----
.../rocketmq/logappender/AbstractTestCase.java | 72 --
.../rocketmq/logappender/Log4jPropertiesTest.java | 32 -
.../org/apache/rocketmq/logappender/Log4jTest.java | 42 --
.../apache/rocketmq/logappender/Log4jXmlTest.java | 32 -
.../apache/rocketmq/logappender/LogbackTest.java | 52 --
.../apache/rocketmq/logappender/log4j2Test.java | 44 --
.../src/test/resources/log4j-example.properties | 33 -
logappender/src/test/resources/log4j-example.xml | 56 --
logappender/src/test/resources/log4j2-example.xml | 41 --
logappender/src/test/resources/logback-example.xml | 81 ---
logging/pom.xml | 2 +-
.../rocketmq/logging/inner/LoggingBuilder.java | 2 +-
.../rocketmq/logging/inner/LoggingEvent.java | 3 +
namesrv/pom.xml | 6 +-
.../apache/rocketmq/namesrv/NamesrvStartup.java | 2 +-
.../namesrv/processor/DefaultRequestProcessor.java | 6 +-
.../processor/DefaultRequestProcessorTest.java | 149 ++++-
openmessaging/pom.xml | 2 +-
.../io/openmessaging/rocketmq/utils/BeanUtils.java | 9 +-
pom.xml | 20 +-
remoting/pom.xml | 2 +-
.../rocketmq/remoting/common/RemotingHelper.java | 31 +-
.../rocketmq/remoting/common/RemotingUtil.java | 9 +-
.../rocketmq/remoting/netty/NettyClientConfig.java | 19 +
.../remoting/netty/NettyRemotingAbstract.java | 5 +-
.../remoting/netty/NettyRemotingClient.java | 21 +-
.../remoting/netty/NettyRemotingServer.java | 19 +-
.../rocketmq/remoting/netty/NettyServerConfig.java | 27 +
.../rocketmq/remoting/netty/NettySystemConfig.java | 17 +-
.../remoting/protocol/RemotingCommand.java | 10 +-
.../remoting/protocol/RocketMQSerializable.java | 9 +-
...gClientTest.java => NettyServerConfigTest.java} | 21 +-
.../remoting/protocol/RemotingCommandTest.java | 60 +-
.../protocol/RocketMQSerializableTest.java | 74 ++-
srvutil/pom.xml | 2 +-
.../rocketmq/srvutil/AclFileWatchService.java | 162 +++++
.../org/apache/rocketmq/srvutil/ServerUtil.java | 2 +-
store/pom.xml | 4 +-
.../java/org/apache/rocketmq/store/CommitLog.java | 122 ++--
.../apache/rocketmq/store/CommitLogDispatcher.java | 4 +
.../org/apache/rocketmq/store/ConsumeQueue.java | 56 +-
.../apache/rocketmq/store/DefaultMessageStore.java | 146 +++-
.../apache/rocketmq/store/FlushDiskWatcher.java | 78 +++
.../java/org/apache/rocketmq/store/MappedFile.java | 10 +-
.../org/apache/rocketmq/store/MappedFileQueue.java | 4 +-
.../rocketmq/store/MessageArrivingListener.java | 11 +
.../org/apache/rocketmq/store/MessageStore.java | 10 +
.../org/apache/rocketmq/store/MultiDispatch.java | 157 +++++
.../apache/rocketmq/store/PutMessageStatus.java | 1 +
.../apache/rocketmq/store/StoreStatsService.java | 70 +-
.../rocketmq/store/config/MessageStoreConfig.java | 65 ++
.../rocketmq/store/dledger/DLedgerCommitLog.java | 4 +-
.../org/apache/rocketmq/store/ha/HAConnection.java | 15 +-
.../org/apache/rocketmq/store/ha/HAService.java | 9 +-
.../store/schedule/ScheduleMessageService.java | 643 ++++++++++++++----
.../rocketmq/store/stats/BrokerStatsManager.java | 109 ++-
.../store/stats/LmqBrokerStatsManager.java | 120 ++++
.../apache/rocketmq/store/BatchPutMessageTest.java | 4 +-
.../apache/rocketmq/store/ConsumeQueueTest.java | 141 +++-
.../store/DefaultMessageStoreCleanFilesTest.java | 2 +-
.../store/DefaultMessageStoreShutDownTest.java | 2 +-
.../rocketmq/store/DefaultMessageStoreTest.java | 18 +-
.../rocketmq/store/FlushDiskWatcherTest.java | 84 +++
.../java/org/apache/rocketmq/store/HATest.java | 2 +-
.../apache/rocketmq/store/MultiDispatchTest.java | 98 +++
.../rocketmq/store/ScheduleMessageServiceTest.java | 118 +++-
.../store/dledger/MessageStoreTestBase.java | 4 +-
.../store/schedule/ScheduleMessageServiceTest.java | 2 +-
.../test/java/stats/BrokerStatsManagerTest.java | 2 +-
test/pom.xml | 23 +-
.../rocketmq/test/lmq/benchmark/BenchLmqStore.java | 305 +++++++++
.../rocketmq/test/message/MessageQueueMsg.java | 8 +-
.../org/apache/rocketmq/test/util/FileUtil.java | 7 +-
.../org/apache/rocketmq/test/util/MQAdmin.java | 9 +-
.../org/apache/rocketmq/test/util/StatUtil.java | 478 +++++++++++++
.../org/apache/rocketmq/test/base/BaseConf.java | 7 +-
.../producer/exception/msg/MessageExceptionIT.java | 2 +-
.../client/producer/querymsg/QueryMsgByKeyIT.java | 57 ++
.../rocketmq/test/delay/NormalMsgDelayIT.java | 2 +-
.../rocketmq/test/lmq/TestBenchLmqStore.java | 100 +++
tools/pom.xml | 6 +-
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 2 +-
.../tools/admin/DefaultMQAdminExtImpl.java | 4 +-
.../apache/rocketmq/tools/command/CommandUtil.java | 7 +-
.../rocketmq/tools/command/MQAdminStartup.java | 2 +
.../acl/ClusterAclConfigVersionListSubCommand.java | 32 +-
.../broker/BrokerConsumeStatsSubCommad.java | 6 +-
.../command/broker/CleanUnusedTopicCommand.java | 2 +-
.../command/broker/GetBrokerConfigCommand.java | 22 +-
.../connection/ConsumerConnectionSubCommand.java | 14 +-
.../consumer/ConsumerProgressSubCommand.java | 18 +-
.../consumer/GetConsumerConfigSubCommand.java | 10 +-
.../tools/command/export/ExportConfigsCommand.java | 7 +-
.../command/export/ExportMetadataCommand.java | 73 +-
.../command/namesrv/GetNamesrvConfigCommand.java | 10 +-
.../command/offset/CloneGroupOffsetCommand.java | 2 +-
.../command/offset/ResetOffsetByTimeCommand.java | 2 +-
...ommand.java => SkipAccumulationSubCommand.java} | 61 +-
.../command/queue/QueryConsumeQueueCommand.java | 6 +-
.../tools/command/stats/StatsAllSubCommand.java | 12 +-
.../tools/command/topic/TopicListSubCommand.java | 6 +-
.../command/broker/BrokerStatusSubCommandTest.java | 68 +-
.../broker/CleanExpiredCQSubCommandTest.java | 56 +-
.../broker/CleanUnusedTopicCommandTest.java | 56 +-
.../command/broker/GetBrokerConfigCommandTest.java | 73 +-
.../broker/UpdateBrokerConfigSubCommandTest.java | 52 +-
.../ConsumerConnectionSubCommandTest.java | 87 +--
.../ProducerConnectionSubCommandTest.java | 80 +--
.../consumer/ConsumerProgressSubCommandTest.java | 103 ++-
.../consumer/ConsumerStatusSubCommandTest.java | 113 +---
.../consumer/GetConsumerConfigSubCommandTest.java | 104 +--
.../command/message/ConsumeMessageCommandTest.java | 43 +-
.../message/QueryMsgByUniqueKeySubCommandTest.java | 6 +-
.../message/QueryMsgTraceByIdSubCommandTest.java | 126 ++--
.../namesrv/AddWritePermSubCommandTest.java | 38 ++
.../namesrv/GetNamesrvConfigCommandTest.java | 77 +--
.../command/namesrv/UpdateKvConfigCommandTest.java | 56 +-
.../namesrv/WipeWritePermSubCommandTest.java | 82 +--
.../offset/GetConsumerStatusCommandTest.java | 70 +-
.../offset/ResetOffsetByTimeCommandTest.java | 88 +--
.../SkipAccumulationCommandTest.java} | 16 +-
.../tools/command/server/NameServerMocker.java | 67 ++
.../tools/command/server/ServerResponseMocker.java | 153 +++++
266 files changed, 8102 insertions(+), 4054 deletions(-)
copy acl/src/test/resources/conf/{ => acl}/plain_acl.yml (61%)
delete mode 100644 acl/src/test/resources/conf/plain_acl_format_error.yml
delete mode 100644 acl/src/test/resources/conf/plain_acl_null.yml
create mode 100644
broker/src/main/java/org/apache/rocketmq/broker/longpolling/LmqPullRequestHoldService.java
create mode 100644
broker/src/main/java/org/apache/rocketmq/broker/offset/LmqConsumerOffsetManager.java
create mode 100644
broker/src/main/java/org/apache/rocketmq/broker/subscription/LmqSubscriptionGroupManager.java
create mode 100644
broker/src/main/java/org/apache/rocketmq/broker/topic/LmqTopicConfigManager.java
create mode 100644
broker/src/test/java/org/apache/rocketmq/broker/BrokerPathConfigHelperTest.java
create mode 100644
broker/src/test/java/org/apache/rocketmq/broker/offset/LmqConsumerOffsetManagerTest.java
rename
client/src/main/java/org/apache/rocketmq/client/producer/{RequestFutureTable.java
=> RequestFutureHolder.java} (52%)
create mode 100644
client/src/test/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragelyByCircleTest.java
create mode 100644
client/src/test/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragelyTest.java
create mode 100644
client/src/test/java/org/apache/rocketmq/client/impl/consumer/RebalanceLitePullImplTest.java
rename
common/src/main/java/org/apache/rocketmq/common/protocol/header/namesrv/{DeleteTopicInNamesrvRequestHeader.java
=> DeleteTopicFromNamesrvRequestHeader.java} (94%)
rename distribution/conf/{ => acl}/plain_acl.yml (61%)
create mode 100644 docs/cn/Example_LMQ.md
create mode 100644
"docs/cn/acl/RocketMQ_Multiple_ACL_Files_\350\256\276\350\256\241.md"
create mode 100644 docs/cn/client/java/API_Reference_ DefaultPullConsumer.md
create mode 100644 docs/cn/image/LMQ_1.png
copy
example/src/main/java/org/apache/rocketmq/example/{filter/SqlFilterConsumer.java
=> schedule/ScheduledMessageConsumer.java} (66%)
copy
example/src/main/java/org/apache/rocketmq/example/{filter/TagFilterProducer.java
=> schedule/ScheduledMessageProducer.java} (60%)
copy
example/src/main/java/org/apache/rocketmq/example/{filter/SqlFilterProducer.java
=> simple/OnewayProducer.java} (61%)
delete mode 100644 example/src/main/resources/MessageFilterImpl.java
delete mode 100644 logappender/pom.xml
delete mode 100644
logappender/src/main/java/org/apache/rocketmq/logappender/common/ProducerInstance.java
delete mode 100644
logappender/src/main/java/org/apache/rocketmq/logappender/log4j/RocketmqLog4jAppender.java
delete mode 100644
logappender/src/main/java/org/apache/rocketmq/logappender/log4j2/RocketmqLog4j2Appender.java
delete mode 100644
logappender/src/main/java/org/apache/rocketmq/logappender/logback/RocketmqLogbackAppender.java
delete mode 100644
logappender/src/test/java/org/apache/rocketmq/logappender/AbstractTestCase.java
delete mode 100644
logappender/src/test/java/org/apache/rocketmq/logappender/Log4jPropertiesTest.java
delete mode 100644
logappender/src/test/java/org/apache/rocketmq/logappender/Log4jTest.java
delete mode 100644
logappender/src/test/java/org/apache/rocketmq/logappender/Log4jXmlTest.java
delete mode 100644
logappender/src/test/java/org/apache/rocketmq/logappender/LogbackTest.java
delete mode 100644
logappender/src/test/java/org/apache/rocketmq/logappender/log4j2Test.java
delete mode 100644 logappender/src/test/resources/log4j-example.properties
delete mode 100644 logappender/src/test/resources/log4j-example.xml
delete mode 100644 logappender/src/test/resources/log4j2-example.xml
delete mode 100644 logappender/src/test/resources/logback-example.xml
copy
remoting/src/test/java/org/apache/rocketmq/remoting/netty/{NettyRemotingClientTest.java
=> NettyServerConfigTest.java} (65%)
create mode 100644
srvutil/src/main/java/org/apache/rocketmq/srvutil/AclFileWatchService.java
create mode 100644
store/src/main/java/org/apache/rocketmq/store/FlushDiskWatcher.java
create mode 100644
store/src/main/java/org/apache/rocketmq/store/MultiDispatch.java
create mode 100644
store/src/main/java/org/apache/rocketmq/store/stats/LmqBrokerStatsManager.java
create mode 100644
store/src/test/java/org/apache/rocketmq/store/FlushDiskWatcherTest.java
create mode 100644
store/src/test/java/org/apache/rocketmq/store/MultiDispatchTest.java
create mode 100644
test/src/main/java/org/apache/rocketmq/test/lmq/benchmark/BenchLmqStore.java
create mode 100644
test/src/main/java/org/apache/rocketmq/test/util/StatUtil.java
create mode 100644
test/src/test/java/org/apache/rocketmq/test/lmq/TestBenchLmqStore.java
copy
tools/src/main/java/org/apache/rocketmq/tools/command/offset/{ResetOffsetByTimeCommand.java
=> SkipAccumulationSubCommand.java} (72%)
copy
tools/src/test/java/org/apache/rocketmq/tools/command/{namesrv/UpdateKvConfigCommandTest.java
=> offset/SkipAccumulationCommandTest.java} (85%)
create mode 100644
tools/src/test/java/org/apache/rocketmq/tools/command/server/NameServerMocker.java
create mode 100644
tools/src/test/java/org/apache/rocketmq/tools/command/server/ServerResponseMocker.java
