[ISSUE #6570] Fix the issue that expectLogicOffset is greater than currentLogicOffset in consumeQueue build when the message is illegal #6641
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…et in consumeQueue build when the message is illegal
# Conflicts: # store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreCleanFilesTest.java
Codecov Report
@@ Coverage Diff @@
## develop #6641 +/- ##
=============================================
- Coverage 43.13% 43.10% -0.04%
+ Complexity 9005 8994 -11
=============================================
Files 1107 1107
Lines 78297 78332 +35
Branches 10204 10212 +8
=============================================
- Hits 33776 33765 -11
- Misses 40302 40329 +27
- Partials 4219 4238 +19
... and 22 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
6 tasks
guyinyou
previously approved these changes
Apr 24, 2023
GenerousMan
previously approved these changes
Apr 24, 2023
caigy
reviewed
Apr 25, 2023
store/src/main/java/org/apache/rocketmq/store/queue/QueueOffsetOperator.java
Show resolved
Hide resolved
zhouxinyu
reviewed
Apr 25, 2023
store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java
Outdated
Show resolved
Hide resolved
caigy
approved these changes
Apr 25, 2023
tsunghanjacktsai
approved these changes
Apr 26, 2023
ni-ze
reviewed
Apr 26, 2023
| Long queueOffset = ConcurrentHashMapUtils.computeIfAbsent(this.topicQueueTable, topicQueueKey, k -> 0L); | ||
| this.topicQueueTable.put(topicQueueKey, queueOffset + messageNum); | ||
| return queueOffset; | ||
| topicQueueTable.put(topicQueueKey, queueOffset + messageNum); | ||
| } | ||
|
|
||
| public void updateQueueOffset(String topicQueueKey, long offset) { | ||
| this.topicQueueTable.put(topicQueueKey, offset); | ||
| } |
There was a problem hiding this comment.
updateQueueOffset seems not be used.
odbozhou
approved these changes
Apr 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make sure set the target branch to
developWhat is the purpose of the change
fix #6570
Brief changelog
Fix the issue that expectLogicOffset is greater than currentLogicOffset in consumeQueue build
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.[ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.mvn -B clean apache-rat:check findbugs:findbugs checkstyle:checkstyleto make sure basic checks pass. Runmvn clean install -DskipITsto make sure unit-test pass. Runmvn clean test-compile failsafe:integration-testto make sure integration-test pass.