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 2018/08/01 06:43:07 UTC
[rocketmq] 01/01: Merge branch 'develop'
This is an automated email from the ASF dual-hosted git repository.
dongeforever pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 2b692c912d18c0f9889fd73358581bcccf37bbbe
Merge: 0f76489 795eae6
Author: dongeforever <do...@apache.org>
AuthorDate: Wed Aug 1 14:41:07 2018 +0800
Merge branch 'develop'
.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 ++
...TransactionRecord.java => OperationResult.java} | 37 +-
.../broker/transaction/TransactionRecord.java | 5 +-
.../broker/transaction/TransactionStore.java | 4 +
.../TransactionalMessageCheckService.java | 80 ++
.../transaction/TransactionalMessageService.java | 81 ++
.../transaction/jdbc/JDBCTransactionStore.java | 6 +-
.../DefaultTransactionalMessageCheckListener.java | 31 +-
.../broker/transaction/queue/GetResult.java | 24 +-
.../queue/TransactionalMessageBridge.java | 339 ++++++
.../queue/TransactionalMessageServiceImpl.java | 498 ++++++++
.../TransactionalMessageUtil.java} | 27 +-
.../PositiveAtomicCounter.java} | 28 +-
.../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 | 41 +
.../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 +-
...CheckListener.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} | 16 +-
.../namesrv/QueryDataVersionResponseHeader.java | 36 +-
.../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/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 | 25 +-
.../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 | 21 +-
.../logging/inner/LoggerRepositoryTest.java | 49 +
.../apache/rocketmq/logging/inner/LoggerTest.java | 115 ++
.../rocketmq/logging/inner/LoggingBuilderTest.java | 113 ++
.../logging/inner/MessageFormatterTest.java | 40 +-
.../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 | 10 +-
.../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 ++
292 files changed, 11098 insertions(+), 3750 deletions(-)
diff --cc pom.xml
index b22649c,5785d9c..00a2d8b
--- a/pom.xml
+++ b/pom.xml
@@@ -249,12 -249,14 +249,15 @@@
<version>0.12</version>
<configuration>
<excludes>
+ <exclude>.gitignore</exclude>
<exclude>.travis.yml</exclude>
<exclude>CONTRIBUTING.md</exclude>
- <exclude>**/README.md</exclude>
- <exclude>.github/**/*</exclude>
- <exclude>**/test/resources/**/*</exclude>
+ <exclude>bin/README.md</exclude>
+ <exclude>.github/*</exclude>
+ <exclude>src/test/resources/certs/*</exclude>
+ <exclude>src/test/resources/META-INF/service/*</exclude>
+ <exclude>*/target/**</exclude>
+ <exclude>*/*.iml</exclude>
</excludes>
</configuration>
</plugin>