You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2020/06/29 02:24:32 UTC
[rocketmq] branch master updated (e923a35 -> 9f95a97)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
omit e923a35 [maven-release-plugin] prepare for next development iteration
add a2aa6c1 Fix Fastjson version for RCE problem
add 3974677 [maven-release-plugin] prepare for next development iteration
add 1558e05 [ISSUE #1857] Refactor the duplicated code
add b56fa6a fix #1883 fix wipeWritePerm doc desc
add e5a040d Merge pull request #1884 from coder-zzzz/apache_bugfix/#1883_wipeWritePerm_desc
add bebb4a8 fix transaction message doc
add 549f72f Merge pull request #1867 from 9526xu/fix-transaction-doc
add fe724b3 add delete IndexFile
add 189c6e3 Merge pull request #1817 from rushsky518/deleteFiles_unit_test
add 30ad172 [ISSUE #1741] Rename takeMessags to takeMessages
add 92b8cf9 [ISSUE #1505]Fix the ListSplitter of batch sample in docs
add bca05f7 [ISSUE #1574] change GET_ROUTEINTO_BY_TOPIC to GET_ROUTEINFO_BY_TOPIC
add 3d13dae [ISSUE#728]check ChannelHandlerContext whether is null
add c5e5f8d Correct the Java doc for MessageListenerOrderly.java (#1897)
add a991ea5 [ISSUE #1859] add codecov report for unit tests.
add 18a879b [ISSUE #1866] Fix typo in document
add 0a9822e [ISSUE #1895] Expose the flush disk timeout error
add 276536e [ISSUE #1901] Fix bug in sending request/reply message using broker 4.7.0
add 7760bb4 [ISSUE #1463] Skip encode the null value property as string "null" (#1899)
add dc815cc [ISSUE #1912]Polish the committed offset logic for the lite pull consumer.
add 14969aa feat(broker) prevent blocked by group transfer service
add dd822ae Merge pull request #1881 from duhenglucky/issue_1879
add 78b6d7b fixed typo in RequestResponseFuture. rename RequestResponseFuture.setSendReqeustOk to RequestResponseFuture.setSendRequestOk.
add 1706cec Merge pull request #1941 from ifplusor/fixed-typo-in-RequestResponseFuture
add 1052edc [ISSUE #1964]fix Doc error: Connection related command instructions
add bc692b4 [ISSUE #1906] The BooleanConstantExpression might lead to class loading deadlock
add 55d66ff fix #1957 DefaultMQProducer didn't shutdown completely
add 2b024c6 remove duplicate shutdown producer
add af07705 Merge pull request #1958 from coder-zzzz/apache_bugfix/#1957_DefaultProducer_Timer_didn't_cancle
add 16b38ba fix Broker2Client logs
add 7f10536 Merge pull request #1983 from areyouok/fix_Broker2Client_log
add a60d938 Fastjson has a serious security problem in 1.2.62,which will cause RCE
add a7a979f Merge pull request #2008 from wcc526/patch-2
add e95c90b add request-reply doc
add 408eead modify request-reply doc
add ff1a628 modify request-reply doc
add 6594c72 modify request-reply doc
add d70a745 modify request-reply doc
add 4d2dea1 modify request-reply doc
add 83c5820 Merge pull request #1982 from keranbingaa/develop
add 23bf87b fix issue #705 (#706)
add b155068 remove unused code
add 4a9f7a8 Merge pull request #2002 from rushsky518/unused_code
add 5873c76 [ISSUE #1689]add interfaces to remove unused statsItems in BrokerStatsManager. (#2029)
add 371fd95 clean code
add 24ee6be remove assert
add e1e2333 Merge pull request #2024 from rushsky518/mqclient
add 42a87ab fix #2020, use wakeup() instead of writing duplicate code
add b54681c Merge pull request #2028 from imaffe/affe-0520-use-wakeup
add a14cf63 fix increase hashSlot value
add a8f7730 Merge pull request #2018 from imaffe/affe-0520-fix-slotvalue
add 0597823 add a thread to do disk space detection
add 33b3688 shutdown the disk check service when the server closed
add d4c4baf isspacefull unit test
add dcb7c08 unit test of statistics persistence modified
add 9176e05 unit test of isSpaceFull function
add 336599b Merge pull request #1403 from qqeasonchen/dev_bing
add 0144b03 Merge pull request #1 from apache/develop
add 4feb8ca npe fix
add 41ce16b Merge pull request #2040 from lebron374/npe_fix_v1
add fae6825 comment fix
add ecdeb1b Merge pull request #2039 from lebron374/comment_fix_v1
add cf20a26 Fix typo in README
add f12cc81 Init english version of the README
add 67b8a2a Add @Override for RMQOrderListener.java (#1939)
add 3245bd3 select a new namesrv when namesrvAddrChoosed not in new addr list
add b3ec283 Merge pull request #2043 from wqliang/selectNamesrv
add 3f37c85 [ISSUE #1988] Fix the issue that can not update messageDelay correctly with mqadmin updateBrokerConfig command
add 70da3e0 Merge branch 'develop' into master
add 49a722f Merge pull request #2064 from wcc526/master
add 7953c4f [ISSUE #2044] Fix DefaultLitePullConsumerImpl NPE (#2059)
add 7e75688 [ISSUE #1931] Remove duplicated doAfterRpcHooks logic
add b6307df [ISSUE #1976]System topic should add permission checking globally (#1985)
add 764effe [ISSUE#2078] HmacSHA1 not avaliable when use openjdk
add 2c49e6b [ISSUE #2085]support graceful shutdown push consumer (#2084)
add 7a35995 [ISSUE #2082] Use StringBuilder instead of StringBuffer. (#2087)
add e9671cc [ISSUE #2088] Optimize rocketmq client's stats of RT to make sense
add 58a6a4c [ISSUE #2118] Fix AdminBrokerProcessorTest can not pass when machine's hostname contains illegal characters
add 8511354 chore(release):prepare to release RocketMQ 4.7.1
add 9f95a97 [maven-release-plugin] prepare release rocketmq-all-4.7.1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e923a35)
\
N -- N -- N refs/heads/master (9f95a97)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.travis.yml | 1 +
README.md | 1 +
acl/pom.xml | 2 +-
broker/pom.xml | 2 +-
.../apache/rocketmq/broker/BrokerController.java | 5 +-
.../rocketmq/broker/client/net/Broker2Client.java | 17 +-
.../broker/filter/ConsumerFilterManager.java | 2 +-
.../processor/AbstractSendMessageProcessor.java | 5 +-
.../broker/processor/AdminBrokerProcessor.java | 72 ++-
.../broker/processor/PullMessageProcessor.java | 3 +-
.../broker/processor/SendMessageProcessor.java | 6 +-
.../rocketmq/broker/topic/TopicConfigManager.java | 59 +-
.../rocketmq/broker/topic/TopicValidator.java | 69 --
.../queue/TransactionalMessageServiceImpl.java | 4 +-
.../queue/TransactionalMessageUtil.java | 5 +-
.../broker/processor/AdminBrokerProcessorTest.java | 96 ++-
.../processor/ReplyMessageProcessorTest.java | 5 +-
.../broker/processor/SendMessageProcessorTest.java | 4 +-
...faultTransactionalMessageCheckListenerTest.java | 4 +-
.../queue/TransactionalMessageBridgeTest.java | 4 +-
.../queue/TransactionalMessageServiceImplTest.java | 18 +-
client/pom.xml | 2 +-
.../org/apache/rocketmq/client/Validators.java | 17 +-
.../client/consumer/DefaultLitePullConsumer.java | 6 +-
.../client/consumer/DefaultMQPushConsumer.java | 15 +-
.../consumer/listener/MessageListenerOrderly.java | 3 +-
.../apache/rocketmq/client/impl/MQAdminImpl.java | 1 +
.../rocketmq/client/impl/MQClientAPIImpl.java | 110 ++--
.../ConsumeMessageConcurrentlyService.java | 5 +-
.../consumer/ConsumeMessageOrderlyService.java | 7 +-
.../impl/consumer/ConsumeMessageService.java | 2 +-
.../impl/consumer/DefaultLitePullConsumerImpl.java | 4 +-
.../impl/consumer/DefaultMQPushConsumerImpl.java | 10 +-
.../client/impl/consumer/ProcessQueue.java | 2 +-
.../client/impl/factory/MQClientInstance.java | 8 +-
.../impl/producer/DefaultMQProducerImpl.java | 69 +-
.../client/producer/DefaultMQProducer.java | 3 +-
.../client/producer/RequestResponseFuture.java | 4 +-
.../rocketmq/client/stat/ConsumerStatsManager.java | 4 +-
.../client/trace/AsyncTraceDispatcher.java | 4 +-
.../rocketmq/client/trace/TraceConstants.java | 4 +-
.../org/apache/rocketmq/client/ValidatorsTest.java | 40 +-
.../consumer/DefaultLitePullConsumerTest.java | 49 ++
.../client/consumer/DefaultMQPushConsumerTest.java | 29 +
.../client/impl/consumer/ProcessQueueTest.java | 10 +-
.../client/producer/DefaultMQProducerTest.java | 2 +-
.../client/producer/RequestResponseFutureTest.java | 2 +-
.../trace/DefaultMQConsumerWithTraceTest.java | 3 +-
.../trace/DefaultMQProducerWithTraceTest.java | 4 +-
common/pom.xml | 2 +-
.../org/apache/rocketmq/common/BrokerConfig.java | 13 +-
.../java/org/apache/rocketmq/common/MQVersion.java | 2 +-
.../java/org/apache/rocketmq/common/MixAll.java | 13 -
.../rocketmq/common/message/MessageDecoder.java | 3 +
.../apache/rocketmq/common/message/MessageExt.java | 14 +-
.../rocketmq/common/protocol/NamespaceUtil.java | 21 +-
.../rocketmq/common/protocol/RequestCode.java | 2 +-
.../rocketmq/common/stats/MomentStatsItemSet.java | 20 +
.../apache/rocketmq/common/stats/RTStatsItem.java | 35 +-
.../apache/rocketmq/common/stats/StatsItem.java | 33 +-
.../apache/rocketmq/common/stats/StatsItemSet.java | 57 +-
.../rocketmq/common/stats/StatsSnapshot.java | 10 +
.../rocketmq/common/topic/TopicValidator.java | 135 ++++
.../apache/rocketmq/common/BrokerConfigTest.java | 2 +
.../common/message/MessageDecoderTest.java | 21 +-
.../rocketmq/common/stats/StatsItemSetTest.java | 40 +-
.../rocketmq/common}/topic/TopicValidatorTest.java | 83 ++-
distribution/bin/mqadmin | 2 +-
distribution/bin/runbroker.sh | 2 +-
distribution/bin/runserver.sh | 2 +-
distribution/bin/tools.sh | 2 +-
distribution/pom.xml | 2 +-
docs/cn/RocketMQ_Example.md | 94 +--
docs/cn/image/consumer_reply.png | Bin 0 -> 52036 bytes
docs/cn/image/producer_send_request.png | Bin 0 -> 87577 bytes
docs/cn/operation.md | 6 +-
docs/cn/rpc_request.md | 146 +++++
docs/en/CLITools.md | 6 +-
docs/en/Example_Batch.md | 59 +-
docs/en/Example_Transaction.md | 4 +-
docs/en/README.md | 49 ++
docs/en/RocketMQ_Example.md | 15 +
docs/en/dledger/deploy_guide.md | 78 +++
docs/en/dledger/quick_start.md | 63 ++
docs/en/msg_trace/user_guide.md | 105 +++
docs/{cn => en}/operation.md | 714 ++++++++++-----------
example/pom.xml | 6 +-
filter/pom.xml | 2 +-
...ression.java => BooleanConstantExpression.java} | 38 +-
.../filter/expression/ComparisonExpression.java | 4 +-
.../filter/expression/ConstantExpression.java | 39 +-
.../rocketmq/filter/parser/SelectorParser.java | 7 +-
logappender/pom.xml | 2 +-
logging/pom.xml | 2 +-
namesrv/pom.xml | 2 +-
.../namesrv/processor/DefaultRequestProcessor.java | 23 +-
openmessaging/pom.xml | 2 +-
pom.xml | 8 +-
remoting/pom.xml | 2 +-
.../remoting/netty/NettyRemotingAbstract.java | 1 -
.../remoting/netty/NettyRemotingClient.java | 4 +
srvutil/pom.xml | 2 +-
store/pom.xml | 2 +-
.../java/org/apache/rocketmq/store/CommitLog.java | 20 +-
.../apache/rocketmq/store/DefaultMessageStore.java | 43 +-
.../rocketmq/store/dledger/DLedgerCommitLog.java | 3 +-
.../org/apache/rocketmq/store/ha/HAService.java | 7 +-
.../apache/rocketmq/store/ha/WaitNotifyObject.java | 7 +-
.../org/apache/rocketmq/store/index/IndexFile.java | 4 +-
.../store/schedule/ScheduleMessageService.java | 9 +-
.../rocketmq/store/stats/BrokerStatsManager.java | 20 +
.../store/DefaultMessageStoreCleanFilesTest.java | 108 +++-
.../test/java/stats/BrokerStatsManagerTest.java | 141 ++++
test/pom.xml | 2 +-
.../test/listener/rmq/order/RMQOrderListener.java | 3 +-
tools/pom.xml | 2 +-
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 4 +-
.../rocketmq/tools/monitor/MonitorService.java | 3 +-
118 files changed, 2167 insertions(+), 1013 deletions(-)
delete mode 100644 broker/src/main/java/org/apache/rocketmq/broker/topic/TopicValidator.java
copy broker/src/main/java/org/apache/rocketmq/broker/filtersrv/FilterServerUtil.java => common/src/main/java/org/apache/rocketmq/common/stats/RTStatsItem.java (51%)
create mode 100644 common/src/main/java/org/apache/rocketmq/common/topic/TopicValidator.java
rename {broker/src/test/java/org/apache/rocketmq/broker => common/src/test/java/org/apache/rocketmq/common}/topic/TopicValidatorTest.java (52%)
create mode 100644 docs/cn/image/consumer_reply.png
create mode 100644 docs/cn/image/producer_send_request.png
create mode 100644 docs/cn/rpc_request.md
create mode 100644 docs/en/README.md
create mode 100644 docs/en/RocketMQ_Example.md
create mode 100644 docs/en/dledger/deploy_guide.md
create mode 100644 docs/en/dledger/quick_start.md
create mode 100644 docs/en/msg_trace/user_guide.md
copy docs/{cn => en}/operation.md (56%)
copy filter/src/main/java/org/apache/rocketmq/filter/expression/{UnaryInExpression.java => BooleanConstantExpression.java} (58%)
create mode 100644 store/src/test/java/stats/BrokerStatsManagerTest.java