You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by do...@apache.org on 2021/11/30 06:24:39 UTC
[rocketmq] branch 5.0.0-alpha updated (4506f34 -> c2c56ea)
This is an automated email from the ASF dual-hosted git repository.
dongeforever pushed a change to branch 5.0.0-alpha
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from 4506f34 Resolve some conflicts in the merge that prevent compilation from succeeding
add e862ac8 Add definition for logic queue
add 3e2c920 Add update_static_topic code
add 7bbc7dd Add the register logic for mapping topic
add 7707275 Finish the register process in namesrv
add a64ad01 Add some notes, and revert the id map, set the globalId first
add 40d8626 Finish the topicRoute2endPoints for static topic
add c0ffc5b Finish the producer to get the real broker addr
add f308cd3 Convert mq to broker name
add 08618d5 Finish the findBrokerAddr for admin publish subscribe
add 6133887 Fix
add 1f89733 Polish compile errrors
add 71af9c7 Finish the logic for SendProcessor
add 36a82fa Polish the rewrite logic for SendProcessor
add 5e04a27 Finish the rewrite topic for pull and send process
add f5285b0 Polish and add some test
add 32f58c7 Polish the topic queue mapping context, and process the conext for ConsumerManager
add 311d5f4 Try to abstract the rpc layer for BrokerOuterAPI
add 8d49c16 Polish the rpc usage for PullProcessor
add 507553b Finish the rewrite logic for SEARCH_OFFSET_BY_TIMESTAMP
add 5274294 Finish the rewrite logic for AdminBrokerProcessor
add fdbc7ff Polish typo
add 912613d Abstract the rpc layer
add 077cf09 Add request header builder
add da12c9e Correct the invoke for PullMessageProcessor
add 86b3ff7 Finish the processor
add 6381e6e Rename the rpc header
add 4070da8 Finish typo
add 86c9f10 Fix code to RpcRequest
add 215c0e4 Add the adminExt
add 0c6ee5c Add epoch, dirty to the topic mapping detail
add f12eceb Add the UpdateStaticTopicSubCommand
add 295a6bd Polish the update utils
add a5af2cf Finish the UpdateStaticTopicSubCommand
add c673cb7 Use timestamp as the epoch to prevent some unknown problem
add 45946d4 Ignore the existed queueId in static topi creation
add 25a588b Init the remapping command
add e9cafe9 Polish the remapping logic
add cabc383 Finish the remapping command
add ffcc548 Refactor the code package for static topic
add 82364fc Polish the tools
add 165e133 Enable to run from file for createStaticTopic command
add f225fd0 Polish the code for command
add f05cfb9 Polish the static topic commands
add 4e9b097 Check the correctness of logic items
add d18d787 Add the check logic for admin process update-and-create static topic
add cf8b846 Polish the lock and persist for updateTopicQueueMapping
add 4018435 Polish the static topic command
add daf4749 Polish the use of route data
add 3d68590 Polish the code
add 2f4bf29 Polish the code structure for static topic command
add e93536a Add IT Test for static topic
add fa39815 Catch the exception
add 6c64028 Polish the json problem
add a8ef92e Fix the serialize probelm
add 8962581 Fix serialize problem
add a493ca4 Add the allocator test
add cb7e032 Finish the test for createStaticTopic
add 1074ef7 Polish the variable name in StaticTopicIT
add 1dacb66 Test utils for static topic
add a172c76 Finish the test for utils of createStaticTopic
add 5ce093e Add test for remapping static topic
add 2ee5897 Fix the stability of remapping
add 0c4ef24 Add the cn doc for Static Topic Logic Queue
add cc40d34 Polish the doc for static topic
add c1d4b8b Polish the concept for static topic doc
add ed2d626 Add a basic produce test for static topic
add 6f2b120 Finish the basic create,produce,consume of the static topic
add fe8b7de Delete the unused code from old implementation
add c2c56ea Fix the command name for remapping
No new revisions were added by this update.
Summary of changes:
.../apache/rocketmq/broker/BrokerController.java | 113 +-
.../rocketmq/broker/BrokerPathConfigHelper.java | 4 +
.../client/rebalance/RebalanceLockManager.java | 9 +-
.../broker/domain/LogicalQueuesInfoInBroker.java | 116 --
.../apache/rocketmq/broker/out/BrokerOuterAPI.java | 39 +-
.../processor/AbstractSendMessageProcessor.java | 174 +--
.../broker/processor/AdminBrokerProcessor.java | 916 +++++----------
.../broker/processor/ConsumerManageProcessor.java | 15 +-
.../broker/processor/PullMessageProcessor.java | 266 +++--
.../broker/processor/SendMessageProcessor.java | 91 +-
.../rocketmq/broker/topic/TopicConfigManager.java | 115 +-
.../broker/topic/TopicQueueMappingManager.java | 232 ++++
.../broker/processor/AdminBrokerProcessorTest.java | 294 +----
.../broker/processor/PullMessageProcessorTest.java | 111 +-
.../broker/processor/SendMessageProcessorTest.java | 73 +-
.../broker/topic/TopicConfigManagerTest.java | 68 +-
.../client/consumer/DefaultMQPushConsumer.java | 2 +-
.../rocketmq/client/consumer/PullResult.java | 1 +
.../consumer/store/RemoteBrokerOffsetStore.java | 8 +-
.../apache/rocketmq/client/impl/MQAdminImpl.java | 192 +---
.../rocketmq/client/impl/MQClientAPIImpl.java | 244 +---
.../ConsumeMessageConcurrentlyService.java | 2 +-
.../impl/consumer/DefaultLitePullConsumerImpl.java | 42 +-
.../impl/consumer/DefaultMQPullConsumerImpl.java | 10 +-
.../impl/consumer/DefaultMQPushConsumerImpl.java | 55 +-
.../client/impl/consumer/PullAPIWrapper.java | 356 +-----
.../client/impl/consumer/PullResultExt.java | 12 +
.../impl/consumer/PullResultWithLogicalQueues.java | 96 --
.../client/impl/consumer/RebalanceImpl.java | 7 +-
.../client/impl/factory/MQClientInstance.java | 133 +--
.../impl/producer/DefaultMQProducerImpl.java | 236 +---
.../client/producer/SendResultForLogicalQueue.java | 46 -
.../DefaultMQPullConsumerLogicalQueueTest.java | 248 -----
.../DefaultMQProducerLogicalQueueTest.java | 311 ------
.../client/producer/DefaultMQProducerTest.java | 28 +-
.../DefaultMQProducerWithOpenTracingTest.java | 14 +-
.../trace/DefaultMQProducerWithTraceTest.java | 26 +-
.../TransactionMQProducerWithOpenTracingTest.java | 16 +-
.../trace/TransactionMQProducerWithTraceTest.java | 40 +-
.../java/org/apache/rocketmq/common/MixAll.java | 17 +-
.../org/apache/rocketmq/common/TopicConfig.java | 6 +
.../rocketmq/common/protocol/RequestCode.java | 11 +-
.../rocketmq/common/protocol/ResponseCode.java | 9 +
...eateMessageQueueForLogicalQueueRequestBody.java | 50 -
.../protocol/body/MigrateLogicalQueueBody.java | 42 -
.../common/protocol/body/RegisterBrokerBody.java | 32 +-
.../body/ReuseTopicLogicalQueueRequestBody.java | 59 -
.../body/SealTopicLogicalQueueRequestBody.java | 49 -
.../TopicConfigAndMappingSerializeWrapper.java | 45 +
.../protocol/body/TopicConfigSerializeWrapper.java | 11 -
...java => TopicQueueMappingSerializeWrapper.java} | 20 +-
.../UpdateTopicLogicalQueueMappingRequestBody.java | 49 -
.../protocol/header/CreateTopicRequestHeader.java | 12 +
.../DeleteTopicLogicalQueueRequestHeader.java | 37 -
.../GetEarliestMsgStoretimeRequestHeader.java | 8 +-
.../protocol/header/GetMaxOffsetRequestHeader.java | 17 +-
.../protocol/header/GetMinOffsetRequestHeader.java | 8 +-
.../header/GetTopicConfigRequestHeader.java | 10 +
.../protocol/header/PullMessageRequestHeader.java | 8 +-
.../protocol/header/PullMessageResponseHeader.java | 11 +
.../header/QueryConsumerOffsetRequestHeader.java | 8 +-
...QueryTopicLogicalQueueMappingRequestHeader.java | 37 -
.../protocol/header/SearchOffsetRequestHeader.java | 8 +-
.../protocol/header/SendMessageRequestHeader.java | 8 +-
.../header/UpdateConsumerOffsetRequestHeader.java | 8 +-
.../header/namesrv/GetRouteInfoRequestHeader.java | 20 -
.../protocol/route/LogicalQueueRouteData.java | 309 ------
.../common/protocol/route/LogicalQueuesInfo.java | 87 --
.../protocol/route/LogicalQueuesInfoUnordered.java | 108 --
.../common/protocol/route/TopicRouteData.java | 28 +-
.../protocol/route/TopicRouteDataNameSrv.java | 64 --
.../apache/rocketmq/common/rpc/ClientMetadata.java | 145 +++
.../apache/rocketmq/common/rpc/RequestBuilder.java | 65 ++
.../org/apache/rocketmq/common/rpc/RpcClient.java | 19 +
.../apache/rocketmq/common/rpc/RpcClientHook.java | 13 +
.../apache/rocketmq/common/rpc/RpcClientImpl.java | 208 ++++
.../apache/rocketmq/common/rpc/RpcClientUtils.java | 39 +
.../apache/rocketmq/common/rpc/RpcException.java | 24 +
.../org/apache/rocketmq/common/rpc/RpcRequest.java | 31 +-
.../RpcRequestHeader.java} | 53 +-
.../apache/rocketmq/common/rpc/RpcResponse.java | 70 ++
.../TopicQueueRequestHeader.java} | 26 +-
.../common/statictopic/LogicQueueMappingItem.java | 188 ++++
.../statictopic/TopicConfigAndQueueMapping.java | 63 ++
.../statictopic/TopicQueueMappingContext.java | 93 ++
.../statictopic/TopicQueueMappingDetail.java | 152 +++
.../common/statictopic/TopicQueueMappingInfo.java | 127 +++
.../common/statictopic/TopicQueueMappingOne.java | 80 ++
.../common/statictopic/TopicQueueMappingUtils.java | 609 ++++++++++
.../statictopic/TopicRemappingDetailWrapper.java | 88 ++
.../rocketmq/common/sysflag/MessageSysFlag.java | 1 -
.../rocketmq/common/RegisterBrokerBodyTest.java | 3 +-
.../org/apache/rocketmq/common/UtilAllTest.java | 3 +
.../GenericMapSuperclassDeserializerTest.java | 57 -
.../common/statictopic/TopicMappingUtilsTest.java | 303 +++++
.../common/statictopic/TopicQueueMappingTest.java | 56 +
..._Topic_Logic_Queue_\350\256\276\350\256\241.md" | 380 +++++++
.../processor/ClusterTestRequestProcessor.java | 2 +-
.../namesrv/processor/DefaultRequestProcessor.java | 19 +-
.../namesrv/routeinfo/RouteInfoManager.java | 75 +-
.../processor/DefaultRequestProcessorTest.java | 21 +-
.../remoting/netty/NettyRemotingClient.java | 1 +
.../remoting/protocol/RemotingCommand.java | 34 +-
.../test/client/rmq/RMQNormalProducer.java | 9 +
.../test/clientinterface/AbstractMQProducer.java | 1 +
.../org/apache/rocketmq/test/base/BaseConf.java | 18 +
.../apache/rocketmq/test/smoke/LogicalQueueIT.java | 1170 --------------------
.../apache/rocketmq/test/smoke/StaticTopicIT.java | 157 +++
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 82 +-
.../tools/admin/DefaultMQAdminExtImpl.java | 223 ++--
.../apache/rocketmq/tools/admin/MQAdminExt.java | 46 +-
.../rocketmq/tools/command/MQAdminStartup.java | 24 +-
.../DeleteTopicLogicalQueueMappingCommand.java | 91 --
.../MigrateTopicLogicalQueueCommand.java | 210 ----
.../QueryTopicLogicalQueueMappingCommand.java | 123 --
.../UpdateTopicLogicalQueueMappingCommand.java | 159 ---
.../UpdateTopicLogicalQueueNumCommand.java | 285 -----
.../topic/RemappingStaticTopicSubCommand.java | 215 ++++
.../command/topic/UpdateStaticTopicSubCommand.java | 237 ++++
.../tools/command/topic/UpdateTopicSubCommand.java | 20 -
.../tools/admin/DefaultMQAdminExtTest.java | 38 +-
121 files changed, 5069 insertions(+), 7044 deletions(-)
delete mode 100644 broker/src/main/java/org/apache/rocketmq/broker/domain/LogicalQueuesInfoInBroker.java
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/topic/TopicQueueMappingManager.java
delete mode 100644 client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullResultWithLogicalQueues.java
delete mode 100644 client/src/main/java/org/apache/rocketmq/client/producer/SendResultForLogicalQueue.java
delete mode 100644 client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerLogicalQueueTest.java
delete mode 100644 client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerLogicalQueueTest.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/body/CreateMessageQueueForLogicalQueueRequestBody.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/body/MigrateLogicalQueueBody.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/body/ReuseTopicLogicalQueueRequestBody.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/body/SealTopicLogicalQueueRequestBody.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/body/TopicConfigAndMappingSerializeWrapper.java
copy common/src/main/java/org/apache/rocketmq/common/protocol/body/{SubscriptionGroupWrapper.java => TopicQueueMappingSerializeWrapper.java} (63%)
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/body/UpdateTopicLogicalQueueMappingRequestBody.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/header/DeleteTopicLogicalQueueRequestHeader.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/header/QueryTopicLogicalQueueMappingRequestHeader.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/route/LogicalQueueRouteData.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/route/LogicalQueuesInfo.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/route/LogicalQueuesInfoUnordered.java
delete mode 100644 common/src/main/java/org/apache/rocketmq/common/protocol/route/TopicRouteDataNameSrv.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/rpc/ClientMetadata.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/rpc/RequestBuilder.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/rpc/RpcClient.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/rpc/RpcClientHook.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/rpc/RpcClientImpl.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/rpc/RpcClientUtils.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/rpc/RpcException.java
copy remoting/src/main/java/org/apache/rocketmq/remoting/protocol/SerializeType.java => common/src/main/java/org/apache/rocketmq/common/rpc/RpcRequest.java (65%)
copy common/src/main/java/org/apache/rocketmq/common/{protocol/header/namesrv/PutKVConfigRequestHeader.java => rpc/RpcRequestHeader.java} (57%)
create mode 100644 common/src/main/java/org/apache/rocketmq/common/rpc/RpcResponse.java
copy common/src/main/java/org/apache/rocketmq/common/{protocol/route/MessageQueueRouteState.java => rpc/TopicQueueRequestHeader.java} (63%)
create mode 100644 common/src/main/java/org/apache/rocketmq/common/statictopic/LogicQueueMappingItem.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/statictopic/TopicConfigAndQueueMapping.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingContext.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingDetail.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingInfo.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingOne.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingUtils.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/statictopic/TopicRemappingDetailWrapper.java
delete mode 100644 common/src/test/java/org/apache/rocketmq/common/fastjson/GenericMapSuperclassDeserializerTest.java
create mode 100644 common/src/test/java/org/apache/rocketmq/common/statictopic/TopicMappingUtilsTest.java
create mode 100644 common/src/test/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingTest.java
create mode 100644 "docs/cn/statictopic/RocketMQ_Static_Topic_Logic_Queue_\350\256\276\350\256\241.md"
delete mode 100644 test/src/test/java/org/apache/rocketmq/test/smoke/LogicalQueueIT.java
create mode 100644 test/src/test/java/org/apache/rocketmq/test/smoke/StaticTopicIT.java
delete mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/logicalqueue/DeleteTopicLogicalQueueMappingCommand.java
delete mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/logicalqueue/MigrateTopicLogicalQueueCommand.java
delete mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/logicalqueue/QueryTopicLogicalQueueMappingCommand.java
delete mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/logicalqueue/UpdateTopicLogicalQueueMappingCommand.java
delete mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/logicalqueue/UpdateTopicLogicalQueueNumCommand.java
create mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/topic/RemappingStaticTopicSubCommand.java
create mode 100644 tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateStaticTopicSubCommand.java