Skip to content

Merge 5.0.0 alpha to develop - #4008

Merged
duhenglucky merged 79 commits into
developfrom
5.0.0-alpha-merge
Jul 13, 2022
Merged

duhenglucky merged 79 commits into
developfrom
5.0.0-alpha-merge

Conversation

@duhenglucky

Copy link
Copy Markdown
Contributor

What is the purpose of the change

Merge RIP-19 pop consumer,RIP-21 logic queue, RIP-26 batch message features into develop.

Several PRs that have not been merged in 5.0.0-alpha will also be included

XXXXX

Brief changelog

RIP-19 pop consumer
RIP-21 logic queue
RIP-26 batch messages

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily. Notice, it would be helpful if you could finish the following 5 checklist(the last one is not necessary)before request the community to review your PR.

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test(over 80% coverage) to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean apache-rat:check findbugs:findbugs checkstyle:checkstyle to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

ayanamist and others added 30 commits March 9, 2021 11:04
[RIP-19] Pop Consuming (submodule "common")
[RIP-19] Pop Consuming (submodule "store")
Fix issue that when messages pop out but not ack so redeliver to retry topic, and next pop start from max offset so skip these messages incorrectly.
[RIP-19] Pop Consuming (submodule "broker")
[RIP-19] Pop Consuming (client)
[RIP-19] Pop Consuming (integration test)
# Conflicts:
#	client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
#	client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java
#	client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQConsumerWithTraceTest.java
#	pom.xml
[RIP-19] Server-side rebalance,  lightweight consumer client support
[RIP-21] Logic Queue submodule common & client
Erik1288 and others added 20 commits February 8, 2022 10:38
…in logic offset (#3722)

* [ISSUE #3708] add CorrectLogicOffsetService to periodically correct min logic offset; refactor QueueOffsetAssigner.

* Mock getDiskSpaceWarningLevelRatio and getDiskSpaceCleanForciblyRatio to get around configuration protection in unit-test.

* Fix check style.
…hareQueueNum.

Signed-off-by: zhangyang21 <zhangyang21@xiaomi.com>
# Conflicts:
#	acl/pom.xml
#	broker/pom.xml
#	client/pom.xml
#	common/pom.xml
#	common/src/main/java/org/apache/rocketmq/common/MQVersion.java
#	distribution/pom.xml
#	example/pom.xml
#	filter/pom.xml
#	logging/pom.xml
#	namesrv/pom.xml
#	openmessaging/pom.xml
#	pom.xml
#	remoting/pom.xml
#	srvutil/pom.xml
#	store/pom.xml
#	store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
#	test/pom.xml
#	tools/pom.xml
@duhenglucky duhenglucky added progress/wip Work in progress. Accept or refused to be continue. progress/discuss labels Mar 20, 2022
@codecov-commenter

codecov-commenter commented Mar 20, 2022 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 28.43792% with 3752 lines in your changes missing coverage. Please review.
✅ Project coverage is 45.80%. Comparing base (6ff00ed) to head (302de8b).
⚠️ Report is 7044 commits behind head on develop.

Files with missing lines Patch % Lines
...rocketmq/broker/processor/PopMessageProcessor.java 37.54% 285 Missing and 61 partials ⚠️
...consumer/ConsumeMessagePopConcurrentlyService.java 5.70% 215 Missing ⚠️
...cketmq/broker/processor/PopBufferMergeService.java 45.38% 162 Missing and 51 partials ⚠️
...e/rocketmq/client/impl/consumer/RebalanceImpl.java 19.15% 195 Missing and 16 partials ⚠️
...cketmq/broker/offset/ConsumerOrderInfoManager.java 2.39% 204 Missing ⚠️
...he/rocketmq/broker/processor/PopReviveService.java 24.52% 184 Missing and 16 partials ⚠️
...lient/impl/consumer/DefaultMQPushConsumerImpl.java 10.76% 190 Missing and 9 partials ⚠️
...ocketmq/broker/processor/AdminBrokerProcessor.java 22.51% 169 Missing and 10 partials ⚠️
...mq/broker/topic/TopicQueueMappingCleanService.java 12.10% 165 Missing and 2 partials ⚠️
...impl/consumer/ConsumeMessagePopOrderlyService.java 10.00% 161 Missing and 1 partial ⚠️
... and 99 more
Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #4008      +/-   ##
=============================================
- Coverage      47.89%   45.80%   -2.10%     
- Complexity      4995     5681     +686     
=============================================
  Files            633      722      +89     
  Lines          42526    50578    +8052     
  Branches        5573     6927    +1354     
=============================================
+ Hits           20369    23165    +2796     
- Misses         19658    24464    +4806     
- Partials        2499     2949     +450     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@coveralls

coveralls commented Mar 20, 2022 •

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-2.05%) to 49.817% when pulling 302de8b on 5.0.0-alpha-merge into 6ff00ed on develop.

@RongtongJin
RongtongJin deleted the 5.0.0-alpha-merge branch March 23, 2022 02:40
@duhenglucky
duhenglucky restored the 5.0.0-alpha-merge branch March 23, 2022 02:44
@duhenglucky duhenglucky reopened this Mar 23, 2022
@duhenglucky
duhenglucky merged commit e656a8e into develop Jul 13, 2022
@RongtongJin
RongtongJin deleted the 5.0.0-alpha-merge branch July 13, 2022 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

progress/discuss progress/wip Work in progress. Accept or refused to be continue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.