This is an automated email from the ASF dual-hosted git repository.
dongeforever pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from 0f76489 [ROCKETMQ-290] Fix memory leak in WaitNotifyObject#waitingThreadTable (#178)
add 13298d0 [maven-release-plugin] prepare for next development iteration
add 4678272 [HOTFIX] Remove imported dirty file frrm pull request
add c606c3c [HOTFIX] Exclude test cert files from rat check
add 7ae0d4e [HOTFIX] Move pull request template to .github
add 69043c0 4.2.0 has been released, go to next development iteration 4.3.0-SNAPSHOT
add c7fea66 [ROCKETMQ-335] Reload server certificate, private key and root ca when these
are changed (#207)
add cc0b3d0 [ROCKETMQ-336] Wrong format System.out.printf used in mqadmin (#208)
add d849e0a Update the out of date test certificates
add a096580 [ROCKETMQ-351] Add a default value to expressionType and polish the judgement.
(#214)
add 04e97de [ROCKETMQ-332] Fix concurrent bug in MappedFileQueue#findMappedFileByOffset,
which may cause message loss
add 9151a32 [ROCKETMQ-332] Verify the offset by firstMappedFile and lastMappedFile
add b391594 Merge pull request #220 from zhouxinyu/ROCKETMQ-332
add 305f571 [ROCKETMQ-367] Add logging component. (#224)
add c19fa25 [ROCKETMQ-367] Rename BasicLoggerTest to pass the compile process
add bf3f87c [ROCKETMQ-356] Change MQVersion to 4.3.0-SNAPSHOT
add 46f9147 [ROCKETMQ-359] Replace slf4j api used in RocketMQ with InternalLogger (#221)
add e744222 [ROCKETMQ-319] Improve broker register performance and reduce memory usage
(#205)
add 06d6307 [ROCKETMQ-319] Replace additional logger with InternalLogger
add 5db240f Add slf4j-api pom for nameserver and broker (#257)
add d035ccb [ISSUE #270] broker force register nameserver . (#271)
add bf848c1 Check if pull message service has shutdown before scheduling pull requests
(#277)
add 48476ae Standardize the startup class structure (#243)
add 2169e3c Make code compatible to OMS 0.3.0
add e428de2 Fix Open Messaging Spec version
add d6807c8 Fix code style issue
add 6124695 Use access point url as name server conditionally
add 173f77d BugFix: access point parsed as name server address when enabled for push
/ pull consumers
add c508cb3 Accomodate updated openmessaging api
add 9f4934f [ISSUE #66] duplicate compress message body if retry to send msg when…
(#294)
add 12a51c4 Use uber jar for netty-tcnative
add 9c0e536 Tag language of clients initialized through OMS as 'OMS'
add 0499586 Show client IP only when required
add c264de9 Format output
add 2e488e5 BugFix: Make internal logger additivitiy configurable
add 2047f94 [BugFix] When deleting topics, instruct both master and slave nodes to delete
it such that consume queues are all deleted
add 97322ea Fix Concurrent issue of StoreStatsService
add 6eccf75 Explicitly specify repository from oss.sonatype.org as snapshot artifacts
are deployed over there
add 9d11b56 Issue #311 improve broker register topicrouter info performance
add a0a602f modify travis.yml to never report ci failed
add 0ae3e4a fix RMQAsyncSend Thread-safe bugs
add b58e927 fix checkstyle
add 91a6703 add travis check
add 8422e74 Shutdown all thread pools when broker quits
add 1970813 Shutdown all started executors of broker
add 9dc3b5f Bugfix for the unstable test
add e74ff1c Remove deprecated filter module and fix the test
add cc0759f Delete filterservdependency in distribution module
add ed3c408 Use openmessaging 0.3.1-alpha
add 788c757 Delete filterservdependency in distribution module
add 4d76016 Polish parts slow UT
add 201d8e3 Add getter for properties of name server startup
add 424622e Merge branch 'develop' of github.com:apache/rocketmq into develop
add 9932819 Fix the problem of the capitalization in class name
add 92f0e1f Optimize broker topic route registration to relieve stress on Java GC
add d2e11c1 Fix typo
add 650f46b Exclude RAT checking on files in the target directories
add 94f3b5a [ISSUE #353]Optimzation For Unit Test (#356)
add 840e04c [ISSUE #354]Add thread-sleep for rebalance before producer send in the integration-test
(#355)
add b75af6b [ROCKETMQ-353] Add sendMessageCommand and consumeMessageCommand (#332)
add 6ae619c Invoke callback at once when channel is close (#95)
add 461e516 [ROCKETMQ-203]Support client to allocate message queue in machine room nearby
priority (#109)
add fc54c2a ROCKETMQ-223-Rename DEFAULT_TOPIC (#119)
add 6eed5f1 [ROCKETMQ-296] fix DefaultMessageStoreTest bug: wait more time for consume
queue build (#165)
add 17648c6 #ROCKETMQ-340# improve code for avoid ClassCastException. (#210)
add 3ccd6f9 Fix issues brought about while merging pull requests
add b054a9d [ISSUE #292] Add support of transactional message feature (#358)
add 76233ed [ISSUE #359]Fix logging check period (#360)
add d8c446e [ISSUE #314] Heartbeat handler use independently thread pool (#315)
add ed433a3 Fix the get connection bug when sending transactional message (#368)
add bc0c04b [ROCKETMQ-355][POLISH]Async send method polish - fix the timeout semantic
(#318)
add 3f7dda3 [ISSUE #377] FIX Admin subcommand consumeMessage should quit when catching
an exception (#378)
add 439796f [ISSUE #375] Replace the message_magic_code and blank_magic_code value
add ba91ec8 FIX admin subcommand consumeMessage can pull message with timestamp greater
then now (#380)
add 9623f3c Change MQVersion current verison to 4.3.0
add 76e3679 [maven-release-plugin] prepare release rocketmq-all-4.3.0
add 795eae6 [maven-release-plugin] prepare for next development iteration
new 2b692c9 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:
.github/PULL_REQUEST_TEMPLATE.md | 10 +-
broker/pom.xml | 6 +-
.../apache/rocketmq/broker/BrokerController.java | 240 +++-
.../org/apache/rocketmq/broker/BrokerStartup.java | 32 +-
.../broker/client/ClientHousekeepingService.java | 6 +-
.../rocketmq/broker/client/ConsumerGroupInfo.java | 6 +-
.../rocketmq/broker/client/ConsumerManager.java | 6 +-
.../rocketmq/broker/client/ProducerManager.java | 46 +-
.../rocketmq/broker/client/net/Broker2Client.java | 54 +-
.../client/rebalance/RebalanceLockManager.java | 6 +-
.../filter/CommitLogDispatcherCalcBitMap.java | 6 +-
.../broker/filter/ConsumerFilterManager.java | 6 +-
.../broker/filter/ExpressionMessageFilter.java | 6 +-
.../broker/filtersrv/FilterServerManager.java | 6 +-
.../broker/filtersrv/FilterServerUtil.java | 5 +-
.../rocketmq/broker/latency/BrokerFastFailure.java | 15 +-
.../broker/longpolling/PullRequestHoldService.java | 6 +-
.../broker/offset/ConsumerOffsetManager.java | 6 +-
.../apache/rocketmq/broker/out/BrokerOuterAPI.java | 166 ++-
.../processor/AbstractSendMessageProcessor.java | 6 +-
.../broker/processor/AdminBrokerProcessor.java | 17 +-
.../broker/processor/ClientManageProcessor.java | 6 +-
.../broker/processor/ConsumerManageProcessor.java | 6 +-
.../broker/processor/EndTransactionProcessor.java | 221 ++--
.../broker/processor/ForwardRequestProcessor.java | 6 +-
.../broker/processor/PullMessageProcessor.java | 6 +-
.../broker/processor/QueryMessageProcessor.java | 6 +-
.../broker/processor/SendMessageProcessor.java | 57 +-
.../rocketmq/broker/slave/SlaveSynchronize.java | 6 +-
.../subscription/SubscriptionGroupManager.java | 6 +-
.../rocketmq/broker/topic/TopicConfigManager.java | 22 +-
.../AbstractTransactionalMessageCheckListener.java | 111 ++
.../broker/transaction/OperationResult.java | 41 +-
.../broker/transaction/TransactionRecord.java | 5 +-
.../broker/transaction/TransactionStore.java | 4 +
.../TransactionalMessageCheckService.java | 80 ++
.../transaction/TransactionalMessageService.java | 81 ++
.../transaction/jdbc/JDBCTransactionStore.java | 6 +-
.../DefaultTransactionalMessageCheckListener.java | 30 +-
.../broker/transaction/queue/GetResult.java | 26 +-
.../queue/TransactionalMessageBridge.java | 339 ++++++
.../queue/TransactionalMessageServiceImpl.java | 498 ++++++++
.../queue/TransactionalMessageUtil.java | 26 +-
.../broker/util/PositiveAtomicCounter.java | 23 +-
.../rocketmq/broker/util/ServiceProvider.java | 191 +++
.../rocketmq/broker/BrokerControllerTest.java | 11 +-
.../apache/rocketmq/broker/BrokerOuterAPITest.java | 193 +++
.../processor/EndTransactionProcessorTest.java | 152 +++
.../broker/processor/SendMessageProcessorTest.java | 59 +-
...faultTransactionalMessageCheckListenerTest.java | 78 ++
.../queue/TransactionalMessageBridgeTest.java | 189 +++
.../queue/TransactionalMessageServiceImplTest.java | 249 ++++
.../util/LogTransactionalMessageCheckListener.java | 11 +-
.../rocketmq/broker/util/ServiceProviderTest.java | 32 +-
.../util/TransactionalMessageServiceImpl.java | 67 ++
...ction.AbstractTransactionalMessageCheckListener | 1 +
....broker.transaction.TransactionalMessageService | 1 +
client/pom.xml | 3 +-
.../org/apache/rocketmq/client/ClientConfig.java | 15 +-
.../java/org/apache/rocketmq/client/MQHelper.java | 4 +-
.../org/apache/rocketmq/client/Validators.java | 4 +-
.../consumer/MQPullConsumerScheduleService.java | 4 +-
.../rebalance/AllocateMachineRoomNearby.java | 144 +++
.../rebalance/AllocateMessageQueueAveragely.java | 4 +-
.../AllocateMessageQueueAveragelyByCircle.java | 4 +-
.../AllocateMessageQueueConsistentHash.java | 4 +-
.../consumer/store/LocalFileOffsetStore.java | 4 +-
.../consumer/store/RemoteBrokerOffsetStore.java | 4 +-
.../client/impl/ClientRemotingProcessor.java | 9 +-
.../apache/rocketmq/client/impl/MQAdminImpl.java | 4 +-
.../rocketmq/client/impl/MQClientAPIImpl.java | 35 +-
.../rocketmq/client/impl/MQClientManager.java | 4 +-
.../ConsumeMessageConcurrentlyService.java | 4 +-
.../consumer/ConsumeMessageOrderlyService.java | 4 +-
.../impl/consumer/DefaultMQPullConsumerImpl.java | 4 +-
.../impl/consumer/DefaultMQPushConsumerImpl.java | 8 +-
.../client/impl/consumer/ProcessQueue.java | 4 +-
.../client/impl/consumer/PullAPIWrapper.java | 8 +-
.../client/impl/consumer/PullMessageService.java | 33 +-
.../client/impl/consumer/RebalanceImpl.java | 4 +-
.../client/impl/consumer/RebalanceService.java | 4 +-
.../client/impl/factory/MQClientInstance.java | 6 +-
.../impl/producer/DefaultMQProducerImpl.java | 296 +++--
.../client/impl/producer/MQProducerInner.java | 7 +-
.../rocketmq/client/latency/MQFaultStrategy.java | 4 +-
.../apache/rocketmq/client/log/ClientLogger.java | 145 +--
.../client/producer/DefaultMQProducer.java | 6 +-
.../rocketmq/client/producer/MQProducer.java | 3 +-
...ctionExecuter.java => TransactionListener.java} | 21 +-
.../client/producer/TransactionMQProducer.java | 50 +-
.../rocketmq/client/stat/ConsumerStatsManager.java | 8 +-
.../src/main/resources/log4j2_rocketmq_client.xml | 48 -
.../src/main/resources/log4j_rocketmq_client.xml | 58 -
.../org/apache/rocketmq/client/ValidatorsTest.java | 4 +-
.../client/consumer/DefaultMQPushConsumerTest.java | 3 +-
.../rebalance/AllocateMachineRoomNearByTest.java | 237 ++++
.../AllocateMessageQueueConsitentHashTest.java | 1 -
.../rocketmq/client/impl/MQClientAPIImplTest.java | 2 +-
.../rocketmq/client/log/ClientLoggerTest.java | 52 -
.../client/producer/DefaultMQProducerTest.java | 112 +-
common/pom.xml | 2 +-
.../org/apache/rocketmq/common/BrokerConfig.java | 115 +-
.../org/apache/rocketmq/common/ConfigManager.java | 16 +-
.../org/apache/rocketmq/common/Configuration.java | 11 +-
.../org/apache/rocketmq/common/DataVersion.java | 9 +
.../java/org/apache/rocketmq/common/MQVersion.java | 2 +-
.../java/org/apache/rocketmq/common/MixAll.java | 16 +-
.../org/apache/rocketmq/common/ServiceThread.java | 6 +-
.../apache/rocketmq/common/ThreadFactoryImpl.java | 11 +-
.../java/org/apache/rocketmq/common/UtilAll.java | 7 +-
.../rocketmq/common/filter/ExpressionType.java | 2 +-
.../apache/rocketmq/common/message/Message.java | 19 +-
.../rocketmq/common/message/MessageAccessor.java | 7 +
.../rocketmq/common/message/MessageConst.java | 3 +
.../rocketmq/common/message/MessageDecoder.java | 2 +-
.../rocketmq/common/namesrv/NamesrvConfig.java | 6 +-
.../rocketmq/common/namesrv/TopAddressing.java | 8 +-
.../rocketmq/common/protocol/MQProtosHelper.java | 6 +-
.../rocketmq/common/protocol/RequestCode.java | 2 +
.../common/protocol/body/RegisterBrokerBody.java | 154 +++
.../header/CheckTransactionStateRequestHeader.java | 9 +
.../header/EndTransactionRequestHeader.java | 16 +-
...der.java => QueryDataVersionRequestHeader.java} | 6 +-
...er.java => QueryDataVersionResponseHeader.java} | 25 +-
.../namesrv/RegisterBrokerRequestHeader.java | 21 +-
.../protocol/heartbeat/SubscriptionData.java | 4 +-
.../rocketmq/common/queue/ConcurrentTreeMap.java | 8 +-
.../rocketmq/common/stats/MomentStatsItem.java | 6 +-
.../rocketmq/common/stats/MomentStatsItemSet.java | 6 +-
.../apache/rocketmq/common/stats/StatsItem.java | 6 +-
.../apache/rocketmq/common/stats/StatsItemSet.java | 6 +-
.../apache/rocketmq/common/utils/ThreadUtils.java | 6 +-
.../rocketmq/common/RegisterBrokerBodyTest.java | 51 +
distribution/pom.xml | 13 +-
distribution/release.xml | 2 -
example/pom.xml | 4 +-
.../rocketmq/example/benchmark/Producer.java | 4 +-
.../example/benchmark/TransactionProducer.java | 83 +-
.../example/openmessaging/SimpleProducer.java | 54 +-
.../example/openmessaging/SimplePullConsumer.java | 54 +-
.../example/openmessaging/SimplePushConsumer.java | 19 +-
.../apache/rocketmq/example/simple/Producer.java | 2 +-
.../example/simple/PullScheduleService.java | 2 +-
.../transaction/TransactionExecuterImpl.java | 41 -
...tenerImpl.java => TransactionListenerImpl.java} | 41 +-
.../example/transaction/TransactionProducer.java | 34 +-
filter/pom.xml | 2 +-
.../org/apache/rocketmq/filter/ParserTest.java | 15 +-
filtersrv/pom.xml | 56 -
.../rocketmq/filtersrv/FilterServerOuterAPI.java | 74 --
.../apache/rocketmq/filtersrv/FiltersrvConfig.java | 133 ---
.../rocketmq/filtersrv/FiltersrvController.java | 202 ----
.../rocketmq/filtersrv/FiltersrvStartup.java | 165 ---
.../apache/rocketmq/filtersrv/filter/DynaCode.java | 387 ------
.../filtersrv/filter/FilterClassFetchMethod.java | 22 -
.../rocketmq/filtersrv/filter/FilterClassInfo.java | 50 -
.../filtersrv/filter/FilterClassLoader.java | 24 -
.../filtersrv/filter/FilterClassManager.java | 169 ---
.../filter/HttpFilterClassFetchMethod.java | 50 -
.../processor/DefaultRequestProcessor.java | 347 ------
.../filtersrv/stats/FilterServerStatsManager.java | 58 -
logappender/pom.xml | 2 +-
.../org/apache/rocketmq/logappender/Log4jTest.java | 3 +-
.../apache/rocketmq/logappender/LogbackTest.java | 6 +-
{common => logging}/pom.xml | 19 +-
.../rocketmq/logging/InnerLoggerFactory.java | 482 ++++++++
.../apache/rocketmq/logging/InternalLogger.java | 63 +
.../rocketmq/logging/InternalLoggerFactory.java | 89 ++
.../rocketmq/logging/Slf4jLoggerFactory.java | 158 +++
.../apache/rocketmq/logging/inner/Appender.java | 228 ++++
.../org/apache/rocketmq/logging/inner/Layout.java | 26 +-
.../org/apache/rocketmq/logging/inner/Level.java | 156 +++
.../org/apache/rocketmq/logging/inner/Logger.java | 467 ++++++++
.../rocketmq/logging/inner/LoggingBuilder.java | 1230 ++++++++++++++++++++
.../rocketmq/logging/inner/LoggingEvent.java | 121 ++
.../apache/rocketmq/logging/inner/SysLogger.java | 89 ++
.../org/apache/rocketmq/logging/package-info.java | 22 +-
.../apache/rocketmq/logging/BasicLoggerTest.java | 69 ++
.../rocketmq/logging/InnerLoggerFactoryTest.java | 92 ++
.../rocketmq/logging/InternalLoggerTest.java | 68 ++
.../rocketmq/logging/Slf4jLoggerFactoryTest.java | 80 ++
.../rocketmq/logging/inner/AppenderTest.java | 160 +++
.../apache/rocketmq/logging/inner/LayoutTest.java | 54 +
.../apache/rocketmq/logging/inner/LevelTest.java | 22 +-
.../logging/inner/LoggerRepositoryTest.java | 49 +
.../apache/rocketmq/logging/inner/LoggerTest.java | 115 ++
.../rocketmq/logging/inner/LoggingBuilderTest.java | 113 ++
.../logging/inner/MessageFormatterTest.java | 33 +-
.../src/test/resources/logback_test.xml | 24 +-
namesrv/pom.xml | 6 +-
.../apache/rocketmq/namesrv/NamesrvController.java | 57 +-
.../apache/rocketmq/namesrv/NamesrvStartup.java | 169 +--
.../rocketmq/namesrv/kvconfig/KVConfigManager.java | 7 +-
.../processor/ClusterTestRequestProcessor.java | 6 +-
.../namesrv/processor/DefaultRequestProcessor.java | 71 +-
.../routeinfo/BrokerHousekeepingService.java | 6 +-
.../namesrv/routeinfo/RouteInfoManager.java | 29 +-
.../processor/DefaultRequestProcessorTest.java | 7 +-
openmessaging/pom.xml | 2 +-
.../rocketmq/MessagingAccessPointImpl.java | 68 +-
.../rocketmq/config/ClientConfig.java | 128 +-
.../rocketmq/consumer/LocalMessageCache.java | 14 +-
.../rocketmq/consumer/PullConsumerImpl.java | 57 +-
.../rocketmq/consumer/PushConsumerImpl.java | 70 +-
.../rocketmq/domain/BytesMessageImpl.java | 57 +-
.../rocketmq/domain/RocketMQConstants.java | 12 +-
.../rocketmq/domain/SendResultImpl.java | 3 +-
.../rocketmq/producer/AbstractOMSProducer.java | 61 +-
.../rocketmq/producer/ProducerImpl.java | 45 +-
.../rocketmq/producer/SequenceProducerImpl.java | 95 --
.../rocketmq/promise/DefaultPromise.java | 22 +-
.../io/openmessaging/rocketmq/utils/BeanUtils.java | 6 +-
.../io/openmessaging/rocketmq/utils/OMSUtil.java | 64 +-
.../rocketmq/consumer/PullConsumerImplTest.java | 26 +-
.../rocketmq/consumer/PushConsumerImplTest.java | 20 +-
.../rocketmq/producer/ProducerImplTest.java | 16 +-
.../producer/SequenceProducerImplTest.java | 86 --
.../rocketmq/promise/DefaultPromiseTest.java | 38 +-
.../rocketmq/utils/BeanUtilsTest.java | 4 +-
pom.xml | 23 +-
remoting/pom.xml | 22 +-
.../apache/rocketmq/remoting/RemotingClient.java | 2 +
.../rocketmq/remoting/common/RemotingHelper.java | 6 +-
.../rocketmq/remoting/common/RemotingUtil.java | 7 +-
.../rocketmq/remoting/common/ServiceThread.java | 7 +-
.../rocketmq/remoting/netty/NettyDecoder.java | 6 +-
.../rocketmq/remoting/netty/NettyEncoder.java | 6 +-
.../rocketmq/remoting/netty/NettyLogger.java | 315 +++++
.../remoting/netty/NettyRemotingAbstract.java | 67 +-
.../remoting/netty/NettyRemotingClient.java | 28 +-
.../remoting/netty/NettyRemotingServer.java | 10 +-
.../rocketmq/remoting/netty/ResponseFuture.java | 20 +-
.../apache/rocketmq/remoting/netty/TlsHelper.java | 6 +-
.../rocketmq/remoting/protocol/LanguageCode.java | 3 +-
.../remoting/protocol/RemotingCommand.java | 6 +-
.../java/org/apache/rocketmq/remoting/TlsTest.java | 28 +
.../remoting/netty/NettyRemotingAbstractTest.java | 6 +-
.../remoting/netty/NettyRemotingClientTest.java | 8 +-
srvutil/pom.xml | 2 +-
.../apache/rocketmq/srvutil/FileWatchService.java | 106 ++
.../rocketmq/srvutil/ShutdownHookThread.java | 7 +-
.../rocketmq/srvutil/FileWatchServiceTest.java | 151 +++
store/pom.xml | 2 +-
.../rocketmq/store/AllocateMappedFileService.java | 6 +-
.../java/org/apache/rocketmq/store/CommitLog.java | 14 +-
.../org/apache/rocketmq/store/ConsumeQueue.java | 8 +-
.../org/apache/rocketmq/store/ConsumeQueueExt.java | 6 +-
.../apache/rocketmq/store/DefaultMessageStore.java | 8 +-
.../java/org/apache/rocketmq/store/MappedFile.java | 6 +-
.../org/apache/rocketmq/store/MappedFileQueue.java | 51 +-
.../rocketmq/store/MessageExtBrokerInner.java | 7 +-
.../org/apache/rocketmq/store/StoreCheckpoint.java | 6 +-
.../apache/rocketmq/store/StoreStatsService.java | 21 +-
.../apache/rocketmq/store/TransientStorePool.java | 6 +-
.../org/apache/rocketmq/store/ha/HAConnection.java | 6 +-
.../org/apache/rocketmq/store/ha/HAService.java | 6 +-
.../apache/rocketmq/store/ha/WaitNotifyObject.java | 6 +-
.../org/apache/rocketmq/store/index/IndexFile.java | 6 +-
.../apache/rocketmq/store/index/IndexService.java | 6 +-
.../store/schedule/ScheduleMessageService.java | 6 +-
.../apache/rocketmq/store/stats/BrokerStats.java | 6 +-
.../rocketmq/store/stats/BrokerStatsManager.java | 9 +-
.../apache/rocketmq/store/ConsumeQueueTest.java | 2 -
...t.java => DefaultMessageStoreShutDownTest.java} | 6 +-
.../rocketmq/store/DefaultMessageStoreTest.java | 32 +-
.../apache/rocketmq/store/MappedFileQueueTest.java | 18 +
.../rocketmq/store/StoreStatsServiceTest.java | 90 ++
test/pom.xml | 2 +-
.../test/client/rmq/RMQAsyncSendProducer.java | 20 +-
.../test/client/rmq/RMQNormalProducer.java | 6 +-
.../test/clientinterface/AbstractMQProducer.java | 4 +-
.../rocketmq/test/clientinterface/MQProducer.java | 4 +-
.../{SendResult.java => ResultWrapper.java} | 2 +-
.../rocketmq/test/base/IntegrationTestBase.java | 6 +-
.../balance/NormalMsgDynamicBalanceIT.java | 3 +
.../producer/async/AsyncSendExceptionIT.java | 6 +-
.../async/AsyncSendWithMessageQueueIT.java | 2 +-
tools/pom.xml | 2 +-
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 2 +-
.../tools/admin/DefaultMQAdminExtImpl.java | 4 +-
.../apache/rocketmq/tools/command/CommandUtil.java | 36 +-
.../rocketmq/tools/command/MQAdminStartup.java | 4 +
.../command/cluster/CLusterSendMsgRTCommand.java | 2 +-
.../consumer/ConsumerProgressSubCommand.java | 33 +-
.../tools/command/consumer/ConsumerSubCommand.java | 2 +-
.../consumer/StartMonitoringSubCommand.java | 4 +-
.../command/message/ConsumeMessageCommand.java | 306 +++++
.../command/message/PrintMessageSubCommand.java | 4 +-
.../tools/command/message/SendMessageCommand.java | 156 +++
.../tools/command/topic/DeleteTopicSubCommand.java | 4 +-
.../tools/command/topic/UpdateTopicSubCommand.java | 2 +-
.../tools/monitor/DefaultMonitorListener.java | 4 +-
.../rocketmq/tools/monitor/MonitorService.java | 4 +-
.../command/message/ConsumeMessageCommandTest.java | 156 +++
.../command/message/SendMessageCommandTest.java | 90 ++
295 files changed, 11042 insertions(+), 3868 deletions(-)
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/transaction/AbstractTransactionalMessageCheckListener.java
copy filter/src/main/java/org/apache/rocketmq/filter/expression/MQFilterException.java =>
broker/src/main/java/org/apache/rocketmq/broker/transaction/OperationResult.java (58%)
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionalMessageCheckService.java
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionalMessageService.java
copy client/src/main/java/org/apache/rocketmq/client/QueryResult.java => broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/DefaultTransactionalMessageCheckListener.java
(54%)
copy example/src/main/java/org/apache/rocketmq/example/simple/CachedQueue.java => broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/GetResult.java
(63%)
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
copy tools/src/main/java/org/apache/rocketmq/tools/monitor/MonitorConfig.java => broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageUtil.java
(60%)
copy common/src/main/java/org/apache/rocketmq/common/filter/impl/Op.java => broker/src/main/java/org/apache/rocketmq/broker/util/PositiveAtomicCounter.java
(64%)
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/util/ServiceProvider.java
create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/BrokerOuterAPITest.java
create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/processor/EndTransactionProcessorTest.java
create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/transaction/queue/DefaultTransactionalMessageCheckListenerTest.java
create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridgeTest.java
create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImplTest.java
rename client/src/main/java/org/apache/rocketmq/client/producer/TransactionCheckListener.java
=> broker/src/test/java/org/apache/rocketmq/broker/util/LogTransactionalMessageCheckListener.java
(73%)
copy common/src/test/java/org/apache/rocketmq/common/MQVersionTest.java => broker/src/test/java/org/apache/rocketmq/broker/util/ServiceProviderTest.java
(53%)
create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/util/TransactionalMessageServiceImpl.java
create mode 100644 broker/src/test/resources/META-INF/service/org.apache.rocketmq.broker.transaction.AbstractTransactionalMessageCheckListener
create mode 100644 broker/src/test/resources/META-INF/service/org.apache.rocketmq.broker.transaction.TransactionalMessageService
create mode 100644 client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMachineRoomNearby.java
rename client/src/main/java/org/apache/rocketmq/client/producer/{LocalTransactionExecuter.java
=> TransactionListener.java} (53%)
delete mode 100644 client/src/main/resources/log4j2_rocketmq_client.xml
delete mode 100644 client/src/main/resources/log4j_rocketmq_client.xml
create mode 100644 client/src/test/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMachineRoomNearByTest.java
delete mode 100644 client/src/test/java/org/apache/rocketmq/client/log/ClientLoggerTest.java
copy common/src/main/java/org/apache/rocketmq/common/protocol/header/namesrv/{UnRegisterBrokerRequestHeader.java
=> QueryDataVersionRequestHeader.java} (92%)
copy common/src/main/java/org/apache/rocketmq/common/protocol/header/namesrv/{DeleteKVConfigRequestHeader.java
=> QueryDataVersionResponseHeader.java} (71%)
create mode 100644 common/src/test/java/org/apache/rocketmq/common/RegisterBrokerBodyTest.java
delete mode 100644 example/src/main/java/org/apache/rocketmq/example/transaction/TransactionExecuterImpl.java
rename example/src/main/java/org/apache/rocketmq/example/transaction/{TransactionCheckListenerImpl.java
=> TransactionListenerImpl.java} (54%)
delete mode 100644 filtersrv/pom.xml
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FilterServerOuterAPI.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvConfig.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvController.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/FiltersrvStartup.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/DynaCode.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/FilterClassFetchMethod.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/FilterClassInfo.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/FilterClassLoader.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/FilterClassManager.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/HttpFilterClassFetchMethod.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/processor/DefaultRequestProcessor.java
delete mode 100644 filtersrv/src/main/java/org/apache/rocketmq/filtersrv/stats/FilterServerStatsManager.java
copy {common => logging}/pom.xml (75%)
create mode 100644 logging/src/main/java/org/apache/rocketmq/logging/InnerLoggerFactory.java
create mode 100644 logging/src/main/java/org/apache/rocketmq/logging/InternalLogger.java
create mode 100644 logging/src/main/java/org/apache/rocketmq/logging/InternalLoggerFactory.java
create mode 100644 logging/src/main/java/org/apache/rocketmq/logging/Slf4jLoggerFactory.java
create mode 100755 logging/src/main/java/org/apache/rocketmq/logging/inner/Appender.java
copy filter/src/main/java/org/apache/rocketmq/filter/expression/EmptyEvaluationContext.java
=> logging/src/main/java/org/apache/rocketmq/logging/inner/Layout.java (72%)
create mode 100755 logging/src/main/java/org/apache/rocketmq/logging/inner/Level.java
create mode 100755 logging/src/main/java/org/apache/rocketmq/logging/inner/Logger.java
create mode 100644 logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java
create mode 100644 logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingEvent.java
create mode 100755 logging/src/main/java/org/apache/rocketmq/logging/inner/SysLogger.java
copy broker/src/main/java/org/apache/rocketmq/broker/mqtrace/ConsumeMessageHook.java =>
logging/src/main/java/org/apache/rocketmq/logging/package-info.java (63%)
create mode 100644 logging/src/test/java/org/apache/rocketmq/logging/BasicLoggerTest.java
create mode 100644 logging/src/test/java/org/apache/rocketmq/logging/InnerLoggerFactoryTest.java
create mode 100644 logging/src/test/java/org/apache/rocketmq/logging/InternalLoggerTest.java
create mode 100644 logging/src/test/java/org/apache/rocketmq/logging/Slf4jLoggerFactoryTest.java
create mode 100644 logging/src/test/java/org/apache/rocketmq/logging/inner/AppenderTest.java
create mode 100644 logging/src/test/java/org/apache/rocketmq/logging/inner/LayoutTest.java
copy common/src/test/java/org/apache/rocketmq/common/RemotingUtilTest.java => logging/src/test/java/org/apache/rocketmq/logging/inner/LevelTest.java
(67%)
create mode 100644 logging/src/test/java/org/apache/rocketmq/logging/inner/LoggerRepositoryTest.java
create mode 100644 logging/src/test/java/org/apache/rocketmq/logging/inner/LoggerTest.java
create mode 100644 logging/src/test/java/org/apache/rocketmq/logging/inner/LoggingBuilderTest.java
copy logappender/src/test/java/org/apache/rocketmq/logappender/Log4jTest.java => logging/src/test/java/org/apache/rocketmq/logging/inner/MessageFormatterTest.java
(54%)
rename client/src/main/resources/logback_rocketmq_client.xml => logging/src/test/resources/logback_test.xml
(69%)
copy common/src/main/java/org/apache/rocketmq/common/filter/impl/Operand.java => openmessaging/src/main/java/io/openmessaging/rocketmq/domain/RocketMQConstants.java
(80%)
delete mode 100644 openmessaging/src/main/java/io/openmessaging/rocketmq/producer/SequenceProducerImpl.java
delete mode 100644 openmessaging/src/test/java/io/openmessaging/rocketmq/producer/SequenceProducerImplTest.java
create mode 100644 remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyLogger.java
create mode 100644 srvutil/src/main/java/org/apache/rocketmq/srvutil/FileWatchService.java
create mode 100644 srvutil/src/main/test/org/apache/rocketmq/srvutil/FileWatchServiceTest.java
rename store/src/test/java/org/apache/rocketmq/store/{DefaultMessageStoreShuwDownTest.java
=> DefaultMessageStoreShutDownTest.java} (95%)
create mode 100644 store/src/test/java/org/apache/rocketmq/store/StoreStatsServiceTest.java
rename test/src/main/java/org/apache/rocketmq/test/sendresult/{SendResult.java => ResultWrapper.java}
(98%)
create mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/message/ConsumeMessageCommand.java
create mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/message/SendMessageCommand.java
create mode 100644 tools/src/test/java/org/apache/rocketmq/tools/command/message/ConsumeMessageCommandTest.java
create mode 100644 tools/src/test/java/org/apache/rocketmq/tools/command/message/SendMessageCommandTest.java
|