You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2019/01/23 12:34:45 UTC
[rocketmq] branch snode updated (4c1db35 -> 2be22d2)
This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a change to branch snode
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from 4c1db35 Merge pull request #703 from zongtanghu/snode
new 048ea47 Rewrite client management module
new 2be22d2 Import ACL module from develop branch
The 608 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:
acl/pom.xml | 4 +
.../rocketmq/broker/client/ConsumerGroupInfo.java | 2 -
.../rocketmq/broker/client/ConsumerManager.java | 3 +-
.../flowcontrol/AbstractFlowControlService.java | 23 +-
.../common/protocol/heartbeat/ConsumeType.java | 4 +-
pom.xml | 6 +
.../netty/NettyChannelHandlerContextImpl.java | 2 +-
.../rocketmq/remoting/netty/NettyChannelImpl.java | 17 +-
.../remoting/netty/NettyRemotingAbstract.java | 26 +-
.../transport/NettyRemotingClientAbstract.java | 7 +-
.../transport/NettyRemotingServerAbstract.java | 1 -
.../transport/rocketmq/NettyRemotingServer.java | 10 +-
.../org/apache/rocketmq/snode/SnodeController.java | 82 +++++--
.../org/apache/rocketmq/snode/SnodeStartup.java | 1 +
.../org/apache/rocketmq/snode/client/Client.java | 126 ++++++++++
.../rocketmq/snode/client/ClientChannelInfo.java | 100 --------
.../snode/client/ClientHousekeepingService.java | 79 +++---
...{ConsumerGroupEvent.java => ClientManager.java} | 31 +--
.../rocketmq/snode/client/ConsumerGroupInfo.java | 270 ---------------------
.../rocketmq/snode/client/ConsumerManager.java | 259 --------------------
.../client/DefaultConsumerIdsChangeListener.java | 64 -----
.../rocketmq/snode/client/ProducerManager.java | 221 -----------------
...hangeListener.java => SlowConsumerService.java} | 6 +-
.../snode/client/SubscriptionGroupManager.java | 12 +-
.../rocketmq/snode/client/SubscriptionManager.java | 35 +--
.../snode/client/impl/ClientManagerImpl.java | 182 ++++++++++++++
.../rocketmq/snode/client/impl/ClientRole.java | 9 +-
.../snode/client/impl/ConsumerManagerImpl.java | 33 +--
.../snode/client/impl/IOTClientManagerImpl.java | 18 +-
.../snode/client/impl/ProducerManagerImpl.java | 20 +-
.../snode/client/impl/SlowConsumerServiceImpl.java | 13 +-
.../rocketmq/snode/client/impl/Subscription.java | 63 ++---
.../snode/client/impl/SubscriptionManagerImpl.java | 218 +++++++++++++++++
.../apache/rocketmq/snode/config/SnodeConfig.java | 2 +
.../rocketmq/snode/constant/SnodeConstant.java | 11 +
.../RequestSizeFlowControlServiceImpl.java | 5 +-
.../snode/offset/ConsumerOffsetManager.java | 59 -----
.../snode/processor/ConsumerManageProcessor.java | 27 +--
.../snode/processor/HeartbeatProcessor.java | 118 ++++-----
.../snode/processor/PullMessageProcessor.java | 15 +-
.../{AdminService.java => ClientService.java} | 5 +-
...ricsService.java => ConsumerOffsetService.java} | 3 +-
.../apache/rocketmq/snode/service/PushService.java | 3 -
.../snode/service/impl/ClientServiceImpl.java | 63 +++++
.../snode/service/impl/PushServiceImpl.java | 34 +--
.../snode/service/impl/ScheduledServiceImpl.java | 8 +-
46 files changed, 980 insertions(+), 1320 deletions(-)
create mode 100644 snode/src/main/java/org/apache/rocketmq/snode/client/Client.java
delete mode 100644 snode/src/main/java/org/apache/rocketmq/snode/client/ClientChannelInfo.java
rename snode/src/main/java/org/apache/rocketmq/snode/client/{ConsumerGroupEvent.java => ClientManager.java} (65%)
delete mode 100644 snode/src/main/java/org/apache/rocketmq/snode/client/ConsumerGroupInfo.java
delete mode 100644 snode/src/main/java/org/apache/rocketmq/snode/client/ConsumerManager.java
delete mode 100644 snode/src/main/java/org/apache/rocketmq/snode/client/DefaultConsumerIdsChangeListener.java
delete mode 100644 snode/src/main/java/org/apache/rocketmq/snode/client/ProducerManager.java
rename snode/src/main/java/org/apache/rocketmq/snode/client/{ConsumerIdsChangeListener.java => SlowConsumerService.java} (80%)
copy client/src/main/java/org/apache/rocketmq/client/impl/consumer/MQConsumerInner.java => snode/src/main/java/org/apache/rocketmq/snode/client/SubscriptionManager.java (56%)
create mode 100644 snode/src/main/java/org/apache/rocketmq/snode/client/impl/ClientManagerImpl.java
copy acl/src/main/java/org/apache/rocketmq/acl/AccessResource.java => snode/src/main/java/org/apache/rocketmq/snode/client/impl/ClientRole.java (87%)
copy broker/src/main/java/org/apache/rocketmq/broker/processor/ForwardRequestProcessor.java => snode/src/main/java/org/apache/rocketmq/snode/client/impl/ConsumerManagerImpl.java (54%)
copy logappender/src/test/java/org/apache/rocketmq/logappender/Log4jPropertiesTest.java => snode/src/main/java/org/apache/rocketmq/snode/client/impl/IOTClientManagerImpl.java (67%)
copy logappender/src/test/java/org/apache/rocketmq/logappender/Log4jXmlTest.java => snode/src/main/java/org/apache/rocketmq/snode/client/impl/ProducerManagerImpl.java (67%)
copy common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerListByGroupResponseHeader.java => snode/src/main/java/org/apache/rocketmq/snode/client/impl/SlowConsumerServiceImpl.java (68%)
copy common/src/main/java/org/apache/rocketmq/common/protocol/body/ConsumerConnection.java => snode/src/main/java/org/apache/rocketmq/snode/client/impl/Subscription.java (59%)
create mode 100644 snode/src/main/java/org/apache/rocketmq/snode/client/impl/SubscriptionManagerImpl.java
copy snode/src/main/java/org/apache/rocketmq/snode/service/{AdminService.java => ClientService.java} (91%)
copy snode/src/main/java/org/apache/rocketmq/snode/service/{MetricsService.java => ConsumerOffsetService.java} (95%)
create mode 100644 snode/src/main/java/org/apache/rocketmq/snode/service/impl/ClientServiceImpl.java