You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2017/08/29 12:30:52 UTC
[1/4] incubator-rocketmq git commit: Closes some timeout PRs,
closes #125, closes #124, closes #122, closes #71, closes #58
Repository: incubator-rocketmq
Updated Branches:
refs/heads/develop 08a0c403c -> 1b853e81a
Closes some timeout PRs, closes #125, closes #124, closes #122, closes #71, closes #58
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/421a22c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/421a22c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/421a22c7
Branch: refs/heads/develop
Commit: 421a22c73bfb5d1c4748f7d23b0a2a4fd5586192
Parents: 98bd032
Author: yukon <yu...@apache.org>
Authored: Tue Aug 1 20:35:28 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Tue Aug 1 20:35:28 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] incubator-rocketmq git commit: Polish chapter 'Learn it &
Contact us' in README
Posted by yu...@apache.org.
Polish chapter 'Learn it & Contact us' in README
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/2ddb744b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/2ddb744b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/2ddb744b
Branch: refs/heads/develop
Commit: 2ddb744b3157604ec87a82143c3100728589c6ec
Parents: 421a22c
Author: yukon <yu...@apache.org>
Authored: Mon Aug 21 16:18:21 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Mon Aug 21 16:19:32 2017 +0800
----------------------------------------------------------------------
README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/2ddb744b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 0047c7d..cbf4629 100644
--- a/README.md
+++ b/README.md
@@ -26,11 +26,11 @@ It offers a variety of features:
----------
## Learn it & Contact us
-* Mailing Lists: <http://rocketmq.incubator.apache.org/about/contact/>
+* Mailing Lists: <https://rocketmq.incubator.apache.org/about/contact/>
* Home: <https://rocketmq.incubator.apache.org>
-* Wiki: <https://cwiki.apache.org/confluence/display/ROCKETMQ/Apache+RocketMQ+Home>
+* Docs: <https://rocketmq.incubator.apache.org/docs/quick-start/>
* Issues: <https://issues.apache.org/jira/browse/RocketMQ>
-* Ask: <http://stackoverflow.com/questions/tagged/rocketmq> or <https://www.quora.com/topic/RocketMQ>
+* Ask: <https://stackoverflow.com/questions/tagged/rocketmq>
----------
@@ -41,7 +41,7 @@ It offers a variety of features:
----------
## Contributing
-We always welcome new contributions, whether for trivial cleanups, big new features or other material rewards. more details see [here](CONTRIBUTING.md)
+We always welcome new contributions, whether for trivial cleanups, big new features or other material rewards, more details see [here](CONTRIBUTING.md)
----------
## License
[3/4] incubator-rocketmq git commit: Polish the contributing guide
Posted by yu...@apache.org.
Polish the contributing guide
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/a8333a73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/a8333a73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/a8333a73
Branch: refs/heads/develop
Commit: a8333a73b82d83c16c750219541a64ad50eebc3d
Parents: 2ddb744
Author: yukon <yu...@apache.org>
Authored: Fri Aug 25 11:55:21 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Fri Aug 25 11:55:21 2017 +0800
----------------------------------------------------------------------
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/a8333a73/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index cbf4629..a27ba7b 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ It offers a variety of features:
----------
## Contributing
-We always welcome new contributions, whether for trivial cleanups, big new features or other material rewards, more details see [here](CONTRIBUTING.md)
+We always welcome new contributions, whether for trivial cleanups, big new features or other material rewards, more details see [here](http://rocketmq.apache.org/docs/how-to-contribute/)
----------
## License
[4/4] incubator-rocketmq git commit: Merge branch 'develop'
Posted by yu...@apache.org.
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/1b853e81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/1b853e81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/1b853e81
Branch: refs/heads/develop
Commit: 1b853e81a9023d8c03e34dcd44bdde77e678804d
Parents: a8333a7 08a0c40
Author: yukon <yu...@apache.org>
Authored: Tue Aug 29 20:30:02 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Tue Aug 29 20:30:02 2017 +0800
----------------------------------------------------------------------
.travis.yml | 13 -
benchmark/consumer.sh | 18 -
benchmark/producer.sh | 18 -
benchmark/runclass.sh | 43 ---
benchmark/tproducer.sh | 18 -
.../rocketmq/broker/BrokerController.java | 11 +-
.../rocketmq/broker/BrokerPathConfigHelper.java | 1 -
.../apache/rocketmq/broker/BrokerStartup.java | 8 +-
.../rocketmq/broker/client/ConsumerManager.java | 3 +-
.../client/rebalance/RebalanceLockManager.java | 44 +--
.../broker/filter/ConsumerFilterData.java | 3 -
.../broker/filter/ConsumerFilterManager.java | 14 +-
.../filter/ExpressionForRetryMessageFilter.java | 4 +-
.../broker/filter/ExpressionMessageFilter.java | 2 +-
.../broker/filtersrv/FilterServerManager.java | 3 -
.../broker/latency/BrokerFastFailure.java | 1 +
.../latency/BrokerFixedThreadPoolExecutor.java | 15 +-
.../NotifyMessageArrivingListener.java | 2 +-
.../longpolling/PullRequestHoldService.java | 2 +-
.../broker/offset/ConsumerOffsetManager.java | 3 +-
.../rocketmq/broker/out/BrokerOuterAPI.java | 12 +-
.../broker/pagecache/ManyMessageTransfer.java | 4 +-
.../broker/pagecache/OneMessageTransfer.java | 4 +-
.../broker/pagecache/QueryMessageTransfer.java | 4 +-
.../plugin/AbstractPluginMessageStore.java | 2 +-
.../processor/AbstractSendMessageProcessor.java | 8 +-
.../broker/processor/AdminBrokerProcessor.java | 129 ++++---
.../processor/EndTransactionProcessor.java | 3 +-
.../broker/processor/PullMessageProcessor.java | 41 +-
.../broker/processor/SendMessageProcessor.java | 55 ++-
.../subscription/SubscriptionGroupManager.java | 2 +-
.../broker/topic/TopicConfigManager.java | 6 +-
.../rocketmq/broker/BrokerControllerTest.java | 27 +-
.../CommitLogDispatcherCalcBitMapTest.java | 1 -
.../filter/ConsumerFilterManagerTest.java | 20 +-
.../filter/MessageStoreWithFilterTest.java | 280 +++++++-------
.../processor/PullMessageProcessorTest.java | 9 +-
.../processor/SendMessageProcessorTest.java | 13 +-
broker/src/test/resources/logback-test.xml | 1 -
.../org/apache/rocketmq/client/MQAdmin.java | 21 +-
.../org/apache/rocketmq/client/MQHelper.java | 1 -
.../org/apache/rocketmq/client/Validators.java | 14 -
.../client/consumer/DefaultMQPullConsumer.java | 9 +-
.../client/consumer/DefaultMQPushConsumer.java | 73 ++--
.../rocketmq/client/consumer/MQConsumer.java | 16 -
.../client/consumer/MQPullConsumer.java | 74 +---
.../client/consumer/MQPushConsumer.java | 18 +-
.../client/consumer/MessageSelector.java | 13 +-
.../listener/MessageListenerConcurrently.java | 4 +-
.../listener/MessageListenerOrderly.java | 7 +-
.../AllocateMessageQueueConsistentHash.java | 8 +-
.../consumer/store/LocalFileOffsetStore.java | 10 +-
.../client/consumer/store/OffsetStore.java | 15 -
.../consumer/store/RemoteBrokerOffsetStore.java | 4 +-
.../client/impl/ClientRemotingProcessor.java | 25 +-
.../rocketmq/client/impl/MQAdminImpl.java | 14 +-
.../rocketmq/client/impl/MQClientAPIImpl.java | 379 ++++++++++---------
.../ConsumeMessageConcurrentlyService.java | 66 ++--
.../consumer/ConsumeMessageOrderlyService.java | 92 ++---
.../impl/consumer/ConsumeMessageService.java | 8 +-
.../consumer/DefaultMQPullConsumerImpl.java | 104 ++---
.../consumer/DefaultMQPushConsumerImpl.java | 62 +--
.../client/impl/consumer/RebalanceImpl.java | 31 +-
.../client/impl/consumer/RebalancePullImpl.java | 3 +-
.../client/impl/consumer/RebalancePushImpl.java | 7 +-
.../client/impl/consumer/RebalanceService.java | 3 -
.../client/impl/factory/MQClientInstance.java | 33 +-
.../impl/producer/DefaultMQProducerImpl.java | 113 +++---
.../client/impl/producer/MQProducerInner.java | 6 +-
.../rocketmq/client/log/ClientLogger.java | 27 +-
.../client/producer/DefaultMQProducer.java | 58 ++-
.../producer/LocalTransactionExecuter.java | 2 +-
.../rocketmq/client/producer/SendCallback.java | 4 +-
.../rocketmq/client/producer/SendResult.java | 6 +-
.../consumer/DefaultMQPullConsumerTest.java | 20 +-
.../consumer/DefaultMQPushConsumerTest.java | 41 +-
.../AllocateMessageQueueConsitentHashTest.java | 45 ++-
.../store/RemoteBrokerOffsetStoreTest.java | 5 +-
.../client/impl/MQClientAPIImplTest.java | 15 +-
.../impl/factory/MQClientInstanceTest.java | 2 +-
.../rocketmq/client/log/ClientLogTest.java | 72 ----
.../rocketmq/client/log/ClientLoggerTest.java | 52 +++
.../client/producer/DefaultMQProducerTest.java | 18 +-
.../apache/rocketmq/common/BrokerConfig.java | 3 +-
.../apache/rocketmq/common/Configuration.java | 4 -
.../apache/rocketmq/common/CountDownLatch2.java | 8 +-
.../org/apache/rocketmq/common/DataVersion.java | 2 +-
.../java/org/apache/rocketmq/common/MixAll.java | 108 +++---
.../apache/rocketmq/common/ServiceThread.java | 2 +-
.../org/apache/rocketmq/common/TopicConfig.java | 10 -
.../org/apache/rocketmq/common/UtilAll.java | 17 +-
.../consistenthash/ConsistentHashRouter.java | 19 +-
.../rocketmq/common/consistenthash/Node.java | 1 -
.../common/consistenthash/VirtualNode.java | 1 -
.../rocketmq/common/filter/FilterAPI.java | 2 +-
.../rocketmq/common/filter/impl/PolishExpr.java | 1 -
.../org/apache/rocketmq/common/help/FAQUrl.java | 26 +-
.../common/message/MessageClientIDSetter.java | 2 +-
.../rocketmq/common/message/MessageDecoder.java | 9 +-
.../common/message/MessageExtBatch.java | 16 +-
.../rocketmq/common/protocol/RequestCode.java | 1 -
.../protocol/body/ConsumerRunningInfo.java | 94 ++---
.../header/GetConsumeStatsRequestHeader.java | 2 -
.../header/GetConsumerStatusRequestHeader.java | 1 -
.../GetEarliestMsgStoretimeRequestHeader.java | 1 -
.../header/QueryCorrectionOffsetHeader.java | 2 +-
.../header/SearchOffsetRequestHeader.java | 1 -
.../header/SendMessageRequestHeaderV2.java | 1 -
.../header/UnregisterClientRequestHeader.java | 1 -
.../header/UnregisterClientResponseHeader.java | 1 -
.../namesrv/GetRouteInfoResponseHeader.java | 33 --
.../RegisterOrderTopicRequestHeader.java | 2 +-
.../common/protocol/heartbeat/MessageModel.java | 1 -
.../rocketmq/common/sysflag/TopicSysFlag.java | 5 -
.../rocketmq/common/utils/HttpTinyClient.java | 6 -
.../rocketmq/common/utils/IOTinyUtils.java | 5 +-
.../apache/rocketmq/common/MQVersionTest.java | 2 +-
.../rocketmq/common/MessageBatchTest.java | 13 +-
.../org/apache/rocketmq/common/MixAllTest.java | 13 +-
.../rocketmq/common/filter/FilterAPITest.java | 27 +-
.../common/protocol/route/BrokerDataTest.java | 57 ---
distribution/benchmark/consumer.sh | 18 +
distribution/benchmark/producer.sh | 18 +
distribution/benchmark/runclass.sh | 43 +++
distribution/benchmark/tproducer.sh | 18 +
distribution/bin/mqadmin.xml | 36 +-
distribution/bin/mqbroker.xml | 40 +-
distribution/bin/mqfiltersrv.xml | 40 +-
distribution/bin/mqnamesrv.xml | 40 +-
.../conf/2m-2s-async/broker-a-s.properties | 1 -
.../conf/2m-2s-async/broker-a.properties | 1 -
.../conf/2m-2s-async/broker-b-s.properties | 1 -
.../conf/2m-2s-async/broker-b.properties | 1 -
.../conf/2m-2s-sync/broker-a-s.properties | 1 -
.../conf/2m-2s-sync/broker-a.properties | 1 -
.../conf/2m-2s-sync/broker-b-s.properties | 1 -
.../conf/2m-2s-sync/broker-b.properties | 1 -
.../conf/2m-noslave/broker-a.properties | 1 -
.../conf/2m-noslave/broker-b.properties | 1 -
distribution/conf/logback_broker.xml | 6 +-
.../example/batch/SimpleBatchProducer.java | 3 +-
.../example/batch/SplitBatchProducer.java | 17 +-
.../rocketmq/example/benchmark/Producer.java | 2 +-
.../rocketmq/example/filter/SqlConsumer.java | 2 +-
.../rocketmq/example/simple/AsyncProducer.java | 3 +-
.../rocketmq/example/simple/PushConsumer.java | 3 -
.../src/main/resources/MessageFilterImpl.java | 2 +-
.../apache/rocketmq/filter/FilterFactory.java | 8 -
.../org/apache/rocketmq/filter/FilterSpi.java | 6 -
.../filter/expression/BinaryExpression.java | 2 -
.../filter/expression/BooleanExpression.java | 2 -
.../filter/expression/ComparisonExpression.java | 4 -
.../filter/expression/ConstantExpression.java | 2 -
.../filter/expression/EvaluationContext.java | 5 -
.../filter/expression/UnaryExpression.java | 4 +-
.../filter/expression/UnaryInExpression.java | 2 +-
.../rocketmq/filter/parser/ParseException.java | 8 +-
.../rocketmq/filter/parser/SelectorParser.java | 9 +-
.../rocketmq/filter/parser/SelectorParser.jj | 1 -
.../parser/SelectorParserTokenManager.java | 19 +-
.../filter/parser/SimpleCharStream.java | 24 +-
.../rocketmq/filter/parser/TokenMgrError.java | 4 +-
.../rocketmq/filter/util/BloomFilter.java | 35 --
.../rocketmq/filter/util/BloomFilterData.java | 12 +-
.../apache/rocketmq/filter/BitsArrayTest.java | 4 +-
.../apache/rocketmq/filter/BloomFilterTest.java | 8 +-
.../apache/rocketmq/filter/ExpressionTest.java | 68 ++--
.../apache/rocketmq/filter/FilterSpiTest.java | 1 -
.../processor/DefaultRequestProcessor.java | 9 +-
.../logappender/common/ProducerInstance.java | 32 +-
.../log4j/RocketmqLog4jAppender.java | 11 +-
.../log4j2/RocketmqLog4j2Appender.java | 21 +-
.../logback/RocketmqLogbackAppender.java | 12 +-
.../rocketmq/logappender/AbstractTestCase.java | 150 ++------
.../apache/rocketmq/logappender/Log4jTest.java | 10 +-
.../rocketmq/logappender/LogbackTest.java | 10 +-
.../apache/rocketmq/logappender/log4j2Test.java | 10 +-
.../src/test/resources/log4j-example.properties | 9 +-
.../src/test/resources/log4j-example.xml | 32 +-
.../src/test/resources/log4j2-example.xml | 36 +-
.../src/test/resources/logback-example.xml | 12 +-
.../namesrv/kvconfig/KVConfigManager.java | 6 +-
.../processor/ClusterTestRequestProcessor.java | 3 +-
.../processor/DefaultRequestProcessor.java | 42 +-
.../namesrv/routeinfo/RouteInfoManager.java | 8 +-
.../rocketmq/namesrv/NamesrvControllerTest.java | 46 ---
.../namesrv/kvconfig/KVConfigManagerTest.java | 1 -
.../ClusterTestRequestProcessorTest.java | 3 +-
.../rocketmq/promise/DefaultPromise.java | 2 +-
.../consumer/LocalMessageCacheTest.java | 2 +-
.../rocketmq/consumer/PullConsumerImplTest.java | 8 +-
.../remoting/common/RemotingHelper.java | 31 +-
.../rocketmq/remoting/common/ServiceThread.java | 57 +--
.../rocketmq/remoting/netty/NettyDecoder.java | 2 +-
.../remoting/netty/NettyRemotingAbstract.java | 50 ++-
.../remoting/netty/NettyRemotingClient.java | 10 +-
.../remoting/netty/NettyRemotingServer.java | 3 +-
.../remoting/netty/NettyServerConfig.java | 5 -
.../remoting/netty/NettySystemConfig.java | 18 +-
.../remoting/protocol/RemotingCommand.java | 20 +-
.../remoting/protocol/RemotingCommandTest.java | 43 ++-
.../protocol/RemotingSerializableTest.java | 4 +-
.../rocketmq/store/AppendMessageCallback.java | 10 +-
.../org/apache/rocketmq/store/CommitLog.java | 118 +++---
.../org/apache/rocketmq/store/ConsumeQueue.java | 5 +-
.../apache/rocketmq/store/ConsumeQueueExt.java | 72 ++--
.../rocketmq/store/DefaultMessageStore.java | 110 +++---
.../apache/rocketmq/store/DispatchRequest.java | 18 -
.../org/apache/rocketmq/store/MappedFile.java | 18 +-
.../apache/rocketmq/store/MappedFileQueue.java | 1 -
.../rocketmq/store/MessageArrivingListener.java | 2 +-
.../apache/rocketmq/store/MessageFilter.java | 14 +-
.../org/apache/rocketmq/store/MessageStore.java | 38 +-
.../apache/rocketmq/store/PutMessageLock.java | 1 +
.../rocketmq/store/PutMessageReentrantLock.java | 1 -
.../rocketmq/store/PutMessageSpinLock.java | 2 -
.../org/apache/rocketmq/store/RunningFlags.java | 1 -
.../store/config/MessageStoreConfig.java | 4 +-
.../apache/rocketmq/store/ha/HAConnection.java | 11 -
.../org/apache/rocketmq/store/ha/HAService.java | 31 +-
.../apache/rocketmq/store/index/IndexFile.java | 3 +-
.../rocketmq/store/index/IndexHeader.java | 5 -
.../rocketmq/store/index/IndexService.java | 8 +-
.../store/schedule/ScheduleMessageService.java | 3 -
.../rocketmq/store/stats/BrokerStats.java | 3 -
.../store/stats/BrokerStatsManager.java | 10 +-
.../rocketmq/store/AppendCallbackTest.java | 44 ++-
.../rocketmq/store/ConsumeQueueExtTest.java | 38 +-
.../apache/rocketmq/store/ConsumeQueueTest.java | 24 +-
.../rocketmq/store/DefaultMessageStoreTest.java | 134 ++++---
.../rocketmq/store/MappedFileQueueTest.java | 11 +
.../apache/rocketmq/store/MappedFileTest.java | 10 +
.../rocketmq/store/StoreCheckpointTest.java | 10 +
.../rocketmq/store/index/IndexFileTest.java | 7 +
style/rmq_checkstyle.xml | 4 +-
.../test/client/rmq/RMQSqlConsumer.java | 1 +
.../org/apache/rocketmq/test/base/BaseConf.java | 2 +-
.../rocketmq/test/base/IntegrationTestBase.java | 16 +-
.../broadcast/order/OrderMsgBroadCastIT.java | 7 +-
.../client/consumer/filter/SqlFilterIT.java | 2 +-
.../test/client/producer/batch/BatchSendIT.java | 2 -
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 105 +++--
.../tools/admin/DefaultMQAdminExtImpl.java | 133 ++++---
.../apache/rocketmq/tools/admin/MQAdminExt.java | 84 ++--
.../command/broker/GetBrokerConfigCommand.java | 3 +-
.../command/cluster/ClusterListSubCommand.java | 26 +-
.../consumer/UpdateSubGroupSubCommand.java | 3 +-
.../command/message/DecodeMessageIdCommond.java | 3 +-
.../message/PrintMessageByQueueCommand.java | 12 +-
.../command/message/PrintMessageSubCommand.java | 5 +-
.../command/message/QueryMsgByIdSubCommand.java | 3 +-
.../message/QueryMsgByUniqueKeySubCommand.java | 3 +-
.../namesrv/GetNamesrvConfigCommand.java | 3 +-
.../namesrv/UpdateNamesrvConfigCommand.java | 3 +-
.../command/queue/QueryConsumeQueueCommand.java | 2 +-
.../command/topic/TopicClusterSubCommand.java | 3 +-
.../command/topic/TopicListSubCommand.java | 3 +-
.../command/topic/TopicRouteSubCommand.java | 3 +-
.../command/topic/TopicStatusSubCommand.java | 3 +-
.../command/topic/UpdateOrderConfCommand.java | 3 +-
.../topic/UpdateTopicPermSubCommand.java | 3 +-
.../command/topic/UpdateTopicSubCommand.java | 3 +-
.../namesrv/GetNamesrvConfigCommandTest.java | 2 +-
263 files changed, 2490 insertions(+), 2916 deletions(-)
----------------------------------------------------------------------