This is an automated email from the ASF dual-hosted git repository.
kaili 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 3ac1977c7 [ISSUE #6012] change the type of queueId to int of
PopCheckPoint (#6013)
3ac1977c7 is described below
commit 3ac1977c78704eef35dd22fc380ff590fc765140
Author: lk <[email protected]>
AuthorDate: Thu Feb 9 13:57:37 2023 +0800
[ISSUE #6012] change the type of queueId to int of PopCheckPoint (#6013)
---
.../rocketmq/broker/processor/ChangeInvisibleTimeProcessor.java | 2 +-
.../org/apache/rocketmq/broker/processor/PopBufferMergeService.java | 2 +-
.../org/apache/rocketmq/broker/processor/PopMessageProcessor.java | 2 +-
.../java/org/apache/rocketmq/broker/processor/PopReviveService.java | 2 +-
.../apache/rocketmq/broker/processor/PopBufferMergeServiceTest.java | 2 +-
.../rocketmq/broker/processor/PopInflightMessageCounterTest.java | 2 +-
.../org/apache/rocketmq/broker/processor/PopReviveServiceTest.java | 2 +-
.../src/main/java/org/apache/rocketmq/store/pop/PopCheckPoint.java | 6 +++---
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/processor/ChangeInvisibleTimeProcessor.java
b/broker/src/main/java/org/apache/rocketmq/broker/processor/ChangeInvisibleTimeProcessor.java
index f4a472028..2ccdf07f6 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/processor/ChangeInvisibleTimeProcessor.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/processor/ChangeInvisibleTimeProcessor.java
@@ -212,7 +212,7 @@ public class ChangeInvisibleTimeProcessor implements
NettyRequestProcessor {
ck.setStartOffset(offset);
ck.setCId(requestHeader.getConsumerGroup());
ck.setTopic(requestHeader.getTopic());
- ck.setQueueId((byte) queueId);
+ ck.setQueueId(queueId);
ck.addDiff(0);
ck.setBrokerName(brokerName);
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
index e933f5347..4d6359c1d 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
@@ -425,7 +425,7 @@ public class PopBufferMergeService extends ServiceThread {
ck.setStartOffset(startOffset);
ck.setCId(group);
ck.setTopic(topic);
- ck.setQueueId((byte) queueId);
+ ck.setQueueId(queueId);
ck.setBrokerName(brokerName);
PopCheckPointWrapper pointWrapper = new
PopCheckPointWrapper(reviveQueueId, Long.MAX_VALUE, ck, nextBeginOffset, true);
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
index 647d2e8a9..cd4595326 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
@@ -809,7 +809,7 @@ public class PopMessageProcessor implements
NettyRequestProcessor {
ck.setStartOffset(offset);
ck.setCId(requestHeader.getConsumerGroup());
ck.setTopic(topic);
- ck.setQueueId((byte) queueId);
+ ck.setQueueId(queueId);
ck.setBrokerName(brokerName);
for (Long msgQueueOffset :
getMessageTmpResult.getMessageQueueOffset()) {
ck.addDiff((int) (msgQueueOffset - offset));
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
index fe654fe64..f451c6047 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
@@ -419,7 +419,7 @@ public class PopReviveService extends ServiceThread {
PopCheckPoint point = new PopCheckPoint();
point.setStartOffset(ackMsg.getStartOffset());
point.setPopTime(ackMsg.getPopTime());
- point.setQueueId((byte) ackMsg.getQueueId());
+ point.setQueueId(ackMsg.getQueueId());
point.setCId(ackMsg.getConsumerGroup());
point.setTopic(ackMsg.getTopic());
point.setNum((byte) 0);
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/processor/PopBufferMergeServiceTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/processor/PopBufferMergeServiceTest.java
index 1a53b9468..acc7a3da7 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/processor/PopBufferMergeServiceTest.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/processor/PopBufferMergeServiceTest.java
@@ -100,7 +100,7 @@ public class PopBufferMergeServiceTest {
ck.setCId(group);
ck.setTopic(topic);
int queueId = 0;
- ck.setQueueId((byte) queueId);
+ ck.setQueueId(queueId);
int reviveQid = 0;
long nextBeginOffset = 101L;
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/processor/PopInflightMessageCounterTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/processor/PopInflightMessageCounterTest.java
index 3b509196b..4e83ac749 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/processor/PopInflightMessageCounterTest.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/processor/PopInflightMessageCounterTest.java
@@ -53,7 +53,7 @@ public class PopInflightMessageCounterTest {
PopCheckPoint popCheckPoint = new PopCheckPoint();
popCheckPoint.setTopic(topic);
popCheckPoint.setCId(group);
- popCheckPoint.setQueueId((byte) 0);
+ popCheckPoint.setQueueId(0);
popCheckPoint.setPopTime(System.currentTimeMillis());
counter.decrementInFlightMessageNum(popCheckPoint);
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/processor/PopReviveServiceTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/processor/PopReviveServiceTest.java
index 89ffed7e3..1c3a0cd45 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/processor/PopReviveServiceTest.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/processor/PopReviveServiceTest.java
@@ -208,7 +208,7 @@ public class PopReviveServiceTest {
PopCheckPoint ck = new PopCheckPoint();
ck.setStartOffset(startOffset);
ck.setPopTime(popTime);
- ck.setQueueId((byte) 0);
+ ck.setQueueId(0);
ck.setCId(GROUP);
ck.setTopic(TOPIC);
ck.setNum((byte) 1);
diff --git
a/store/src/main/java/org/apache/rocketmq/store/pop/PopCheckPoint.java
b/store/src/main/java/org/apache/rocketmq/store/pop/PopCheckPoint.java
index a65e2d556..e041b66d9 100644
--- a/store/src/main/java/org/apache/rocketmq/store/pop/PopCheckPoint.java
+++ b/store/src/main/java/org/apache/rocketmq/store/pop/PopCheckPoint.java
@@ -32,7 +32,7 @@ public class PopCheckPoint implements
Comparable<PopCheckPoint> {
@JSONField(name = "n")
private byte num;
@JSONField(name = "q")
- private byte queueId;
+ private int queueId;
@JSONField(name = "t")
private String topic;
@JSONField(name = "c")
@@ -96,11 +96,11 @@ public class PopCheckPoint implements
Comparable<PopCheckPoint> {
this.num = num;
}
- public byte getQueueId() {
+ public int getQueueId() {
return queueId;
}
- public void setQueueId(byte queueId) {
+ public void setQueueId(int queueId) {
this.queueId = queueId;
}
