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/12/15 09:57:10 UTC
[rocketmq] branch 5.0.0-alpha updated (c2c56ea -> 3a14786)
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 c2c56ea Fix the command name for remapping
add f7f32e7 Add the test for remapping static topic
add e952dd6 Finish the produce and consume test for remapped static topic
add e002c74 Polish doc for static topic
add 085f239 Polish newline for doc
add ae7b675 Finish the logic for RETRY message of logic queue
add fad17e1 Finish the logic for double-read-check
add 74565fd Fix the computePullFromWhereWithException
add 5b77793 Polish the resetZero logic for logic queue
add 2dd6594 Refactor the admin code, reduce exposing apis
add 4f96f72 Fix the max offset logic for logicOffset = -1
add a71ee3b Add test for logicOffset = -1
add 3a621e6 Add code reading guide to doc
add aa505d2 Polish doc
add d677d85 Polish doc
add 527382e Clean the items more than second gen
add 12915b8 Add clean item logic for topic queue mapping
add 9cae8c1 Add decode encode test for topic queue manager
add c06564f Try polishing the clear logic, need more polishment
add 1ca218f Add TopicQueueMappingCleanService
add ad993e3 Use 3 brokers for IT test
add 1d7807b Finish the test for topic queue mapping clean serice
add 8b747f9 Try using the new style to handble get min offset
add 48db31b Finish the test for topicStats
add a9addc3 Add tests for command
add ad90cc1 Finish the slave sync logic for topic queue mapping
add a165b4a Add the scope to Static topic
add 1a204a1 Polish doc, scope of static topic
add 8aea6bf Polish doc, introduce geo-recovery cluster
add f51143f Polish doc
add 5ebc327 Polish doc
add 6a3eac9 Add the scope concept to logic queue
add ba2c768 Fix check stype
add 1c69b64 Fix check style
add d4a656c Fix unit test
new 3a14786 Fix checkstyle
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:
.../apache/rocketmq/broker/BrokerController.java | 57 ++-
.../apache/rocketmq/broker/out/BrokerOuterAPI.java | 32 +-
.../broker/processor/AdminBrokerProcessor.java | 257 +++++++++---
.../broker/processor/ConsumerManageProcessor.java | 96 ++++-
.../broker/processor/PullMessageProcessor.java | 167 ++++++--
.../broker/processor/SendMessageProcessor.java | 18 +-
.../rocketmq/broker/slave/SlaveSynchronize.java | 23 +-
.../topic/TopicQueueMappingCleanService.java | 332 +++++++++++++++
.../broker/topic/TopicQueueMappingManager.java | 107 +++--
.../apache/rocketmq/broker/BrokerOuterAPITest.java | 2 +-
.../apache/rocketmq/broker/BrokerStartupTest.java | 20 +-
.../broker/processor/AdminBrokerProcessorTest.java | 4 +-
.../broker/topic/TopicConfigManagerTest.java | 76 ----
.../broker/topic/TopicQueueMappingManagerTest.java | 112 ++++++
.../consumer/store/RemoteBrokerOffsetStore.java | 22 +-
.../client/exception/OffsetNotFoundException.java | 18 +-
.../rocketmq/client/impl/MQClientAPIImpl.java | 45 +--
.../impl/consumer/DefaultMQPullConsumerImpl.java | 2 +-
.../impl/consumer/DefaultMQPushConsumerImpl.java | 64 ++-
.../client/impl/consumer/PullAPIWrapper.java | 21 +-
.../client/impl/consumer/RebalancePushImpl.java | 15 +-
.../client/impl/factory/MQClientInstance.java | 52 +--
.../store/RemoteBrokerOffsetStoreTest.java | 10 +-
.../java/org/apache/rocketmq/common/MixAll.java | 5 +-
.../apache/rocketmq/common/admin/TopicOffset.java | 9 +
.../TopicConfigAndMappingSerializeWrapper.java | 23 ++
.../protocol/header/GetMaxOffsetRequestHeader.java | 8 -
.../header/GetTopicConfigRequestHeader.java | 13 +-
.../header/GetTopicStatsInfoRequestHeader.java | 4 +-
.../header/QueryConsumerOffsetRequestHeader.java | 10 +
.../apache/rocketmq/common/rpc/ClientMetadata.java | 91 +++--
.../apache/rocketmq/common/rpc/RequestBuilder.java | 32 +-
.../org/apache/rocketmq/common/rpc/RpcClient.java | 16 +
.../apache/rocketmq/common/rpc/RpcClientHook.java | 18 +-
.../apache/rocketmq/common/rpc/RpcClientImpl.java | 147 ++++++-
.../apache/rocketmq/common/rpc/RpcClientUtils.java | 19 +
.../apache/rocketmq/common/rpc/RpcException.java | 16 +
.../rocketmq/common/rpc/RpcRequestHeader.java | 32 +-
.../apache/rocketmq/common/rpc/RpcResponse.java | 4 +-
.../common/rpc/TopicQueueRequestHeader.java | 14 +-
...eRequestHeader.java => TopicRequestHeader.java} | 22 +-
.../common/statictopic/LogicQueueMappingItem.java | 36 +-
.../statictopic/TopicQueueMappingContext.java | 46 ++-
.../statictopic/TopicQueueMappingDetail.java | 34 +-
.../common/statictopic/TopicQueueMappingInfo.java | 74 +++-
.../common/statictopic/TopicQueueMappingUtils.java | 121 +++++-
.../statictopic/TopicRemappingDetailWrapper.java | 16 +
.../rocketmq/common/sysflag/PullSysFlag.java | 4 +
.../apache/rocketmq/common/ConfigManagerTest.java | 5 +-
.../common/statictopic/TopicQueueMappingTest.java | 9 +-
...lsTest.java => TopicQueueMappingUtilsTest.java} | 12 +-
..._Topic_Logic_Queue_\350\256\276\350\256\241.md" | 125 +++++-
docs/cn/statictopic/The_Scope_Of_Static_Topic.md | 116 ++++++
.../namesrv/routeinfo/RouteInfoManager.java | 1 +
.../remoting/protocol/RemotingCommand.java | 13 +-
.../remoting/protocol/RemotingCommandTest.java | 101 ++++-
.../test/client/rmq/RMQNormalConsumer.java | 5 +
.../test/client/rmq/RMQNormalProducer.java | 4 +-
.../org/apache/rocketmq/test/util/MQAdmin.java | 166 --------
.../rocketmq/test/util/MQAdminTestUtils.java | 274 +++++++++++++
.../org/apache/rocketmq/test/base/BaseConf.java | 22 +-
.../rocketmq/test/base/IntegrationTestBase.java | 7 +-
.../apache/rocketmq/test/smoke/StaticTopicIT.java | 157 --------
.../rocketmq/test/statictopic/StaticTopicIT.java | 446 +++++++++++++++++++++
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 11 -
.../tools/admin/DefaultMQAdminExtImpl.java | 129 +-----
.../apache/rocketmq/tools/admin/MQAdminExt.java | 5 -
.../apache/rocketmq/tools/admin/MQAdminUtils.java | 232 +++++++++++
.../topic/RemappingStaticTopicSubCommand.java | 36 +-
.../command/topic/UpdateStaticTopicSubCommand.java | 55 +--
.../tools/admin/DefaultMQAdminExtTest.java | 43 +-
.../command/message/ConsumeMessageCommandTest.java | 4 +-
72 files changed, 3121 insertions(+), 1223 deletions(-)
create mode 100644 broker/src/main/java/org/apache/rocketmq/broker/topic/TopicQueueMappingCleanService.java
delete mode 100644 broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java
create mode 100644 broker/src/test/java/org/apache/rocketmq/broker/topic/TopicQueueMappingManagerTest.java
copy common/src/main/java/org/apache/rocketmq/common/filter/impl/Op.java => client/src/main/java/org/apache/rocketmq/client/exception/OffsetNotFoundException.java (66%)
copy common/src/main/java/org/apache/rocketmq/common/rpc/{TopicQueueRequestHeader.java => TopicRequestHeader.java} (71%)
rename common/src/test/java/org/apache/rocketmq/common/statictopic/{TopicMappingUtilsTest.java => TopicQueueMappingUtilsTest.java} (97%)
create mode 100644 docs/cn/statictopic/The_Scope_Of_Static_Topic.md
delete mode 100644 test/src/main/java/org/apache/rocketmq/test/util/MQAdmin.java
create mode 100644 test/src/main/java/org/apache/rocketmq/test/util/MQAdminTestUtils.java
delete mode 100644 test/src/test/java/org/apache/rocketmq/test/smoke/StaticTopicIT.java
create mode 100644 test/src/test/java/org/apache/rocketmq/test/statictopic/StaticTopicIT.java
create mode 100644 tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminUtils.java
[rocketmq] 01/01: Fix checkstyle
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dongeforever pushed a commit to branch 5.0.0-alpha
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 3a14786320592f6ff01797c7c650922c35851aa6
Author: dongeforever <do...@apache.org>
AuthorDate: Wed Dec 15 17:18:23 2021 +0800
Fix checkstyle
---
.../rocketmq/client/impl/MQClientAPIImpl.java | 26 ++++++++++------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
index 8f0138d..9823e81 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
@@ -16,6 +16,18 @@
*/
package org.apache.rocketmq.client.impl;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.client.ClientConfig;
import org.apache.rocketmq.client.consumer.AckCallback;
@@ -29,7 +41,6 @@ import org.apache.rocketmq.client.consumer.PullResult;
import org.apache.rocketmq.client.consumer.PullStatus;
import org.apache.rocketmq.client.exception.MQBrokerException;
import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.client.exception.MQRedirectException;
import org.apache.rocketmq.client.exception.OffsetNotFoundException;
import org.apache.rocketmq.client.hook.SendMessageContext;
import org.apache.rocketmq.client.impl.consumer.PullResultExt;
@@ -179,19 +190,6 @@ import org.apache.rocketmq.remoting.protocol.LanguageCode;
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
public class MQClientAPIImpl {
private final static InternalLogger log = ClientLogger.getLog();