You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by li...@apache.org on 2024/09/09 08:59:49 UTC
(rocketmq) branch develop updated: [ISSUE #8660] Should use read only getConsumeQueue instead of findConsumeQueue in read only func (#8659)
This is an automated email from the ASF dual-hosted git repository.
lizhimin pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new adf110fbaa [ISSUE #8660] Should use read only getConsumeQueue instead of findConsumeQueue in read only func (#8659)
adf110fbaa is described below
commit adf110fbaa9459160c155520f0e5db4a81284d42
Author: Vincent Lee <co...@gmail.com>
AuthorDate: Mon Sep 9 16:59:44 2024 +0800
[ISSUE #8660] Should use read only getConsumeQueue instead of findConsumeQueue in read only func (#8659)
---
.../org/apache/rocketmq/store/DefaultMessageStore.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
index f159c31a7b..8f564d5bc1 100644
--- a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
@@ -985,7 +985,7 @@ public class DefaultMessageStore implements MessageStore {
@Override
public long getMaxOffsetInQueue(String topic, int queueId, boolean committed) {
if (committed) {
- ConsumeQueueInterface logic = this.findConsumeQueue(topic, queueId);
+ ConsumeQueueInterface logic = this.getConsumeQueue(topic, queueId);
if (logic != null) {
return logic.getMaxOffsetInQueue();
}
@@ -1021,7 +1021,7 @@ public class DefaultMessageStore implements MessageStore {
@Override
public long getCommitLogOffsetInQueue(String topic, int queueId, long consumeQueueOffset) {
- ConsumeQueueInterface consumeQueue = findConsumeQueue(topic, queueId);
+ ConsumeQueueInterface consumeQueue = getConsumeQueue(topic, queueId);
if (consumeQueue != null) {
CqUnit cqUnit = consumeQueue.get(consumeQueueOffset);
if (cqUnit != null) {
@@ -1157,7 +1157,7 @@ public class DefaultMessageStore implements MessageStore {
@Override
public long getEarliestMessageTime(String topic, int queueId) {
- ConsumeQueueInterface logicQueue = this.findConsumeQueue(topic, queueId);
+ ConsumeQueueInterface logicQueue = this.getConsumeQueue(topic, queueId);
if (logicQueue != null) {
Pair<CqUnit, Long> pair = logicQueue.getEarliestUnitAndStoreTime();
if (pair != null && pair.getObject2() != null) {
@@ -1189,7 +1189,7 @@ public class DefaultMessageStore implements MessageStore {
@Override
public long getMessageStoreTimeStamp(String topic, int queueId, long consumeQueueOffset) {
- ConsumeQueueInterface logicQueue = this.findConsumeQueue(topic, queueId);
+ ConsumeQueueInterface logicQueue = this.getConsumeQueue(topic, queueId);
if (logicQueue != null) {
Pair<CqUnit, Long> pair = logicQueue.getCqUnitAndStoreTime(consumeQueueOffset);
if (pair != null && pair.getObject2() != null) {
@@ -1207,12 +1207,12 @@ public class DefaultMessageStore implements MessageStore {
@Override
public long getMessageTotalInQueue(String topic, int queueId) {
- ConsumeQueueInterface logicQueue = this.findConsumeQueue(topic, queueId);
+ ConsumeQueueInterface logicQueue = this.getConsumeQueue(topic, queueId);
if (logicQueue != null) {
return logicQueue.getMessageTotalInQueue();
}
- return -1;
+ return 0;
}
@Override
@@ -1496,7 +1496,7 @@ public class DefaultMessageStore implements MessageStore {
final long maxOffsetPy = this.commitLog.getMaxOffset();
- ConsumeQueueInterface consumeQueue = findConsumeQueue(topic, queueId);
+ ConsumeQueueInterface consumeQueue = getConsumeQueue(topic, queueId);
if (consumeQueue != null) {
CqUnit cqUnit = consumeQueue.get(consumeOffset);
@@ -1512,7 +1512,7 @@ public class DefaultMessageStore implements MessageStore {
@Override
public boolean checkInMemByConsumeOffset(final String topic, final int queueId, long consumeOffset, int batchSize) {
- ConsumeQueueInterface consumeQueue = findConsumeQueue(topic, queueId);
+ ConsumeQueueInterface consumeQueue = getConsumeQueue(topic, queueId);
if (consumeQueue != null) {
CqUnit firstCQItem = consumeQueue.get(consumeOffset);
if (firstCQItem == null) {