-
Notifications
You must be signed in to change notification settings - Fork 11.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ISSUE #6797]Support batch ack when reput buffer ak to store in PopBu…
…fferMergeService (#6798) * add back for PopReviveService * add batch ack for PopReviveService
- Loading branch information
1 parent
eef581b
commit 985319b
Showing
7 changed files
with
246 additions
and
19 deletions.
There are no files selected for viewing
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
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
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
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
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
50 changes: 50 additions & 0 deletions
50
store/src/main/java/org/apache/rocketmq/store/pop/BatchAckMsg.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.rocketmq.store.pop; | ||
|
|
||
| import com.alibaba.fastjson.annotation.JSONField; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
|
|
||
| public class BatchAckMsg extends AckMsg { | ||
| @JSONField(name = "aol", alternateNames = {"ackOffsetList"}) | ||
| private List<Long> ackOffsetList = new ArrayList(32); | ||
|
|
||
|
|
||
| public List<Long> getAckOffsetList() { | ||
| return ackOffsetList; | ||
| } | ||
|
|
||
| public void setAckOffsetList(List<Long> ackOffsetList) { | ||
| this.ackOffsetList = ackOffsetList; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| final StringBuilder sb = new StringBuilder("BatchAckMsg{"); | ||
| sb.append("ackOffsetList=").append(ackOffsetList); | ||
| sb.append(", startOffset=").append(getStartOffset()); | ||
| sb.append(", consumerGroup='").append(getConsumerGroup()).append('\''); | ||
| sb.append(", topic='").append(getTopic()).append('\''); | ||
| sb.append(", queueId=").append(getQueueId()); | ||
| sb.append(", popTime=").append(getPopTime()); | ||
| sb.append(", brokerName=").append(getBrokerName()); | ||
| sb.append('}'); | ||
| return sb.toString(); | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
store/src/test/java/org/apache/rocketmq/store/pop/BatchAckMsgTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.rocketmq.store.pop; | ||
|
|
||
| import com.alibaba.fastjson.JSON; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class BatchAckMsgTest { | ||
|
|
||
| @Test | ||
| public void testSerializeAndDeSerialize() { | ||
| String longString = "{\"ackOffsetList\":[100, 101],\"consumerGroup\":\"group\"," + | ||
| "\"popTime\":1679454922000,\"queueId\":3,\"startOffset\":200,\"topic\":\"topic\"}"; | ||
|
|
||
| BatchAckMsg batchAckMsg = new BatchAckMsg(); | ||
| List<Long> aol = new ArrayList<>(32); | ||
| aol.add(100L); | ||
| aol.add(101L); | ||
|
|
||
| batchAckMsg.setAckOffsetList(aol); | ||
| batchAckMsg.setStartOffset(200L); | ||
| batchAckMsg.setConsumerGroup("group"); | ||
| batchAckMsg.setTopic("topic"); | ||
| batchAckMsg.setQueueId(3); | ||
| batchAckMsg.setPopTime(1679454922000L); | ||
|
|
||
| String jsonString = JSON.toJSONString(batchAckMsg); | ||
| BatchAckMsg batchAckMsg1 = JSON.parseObject(jsonString, BatchAckMsg.class); | ||
| BatchAckMsg batchAckMsg2 = JSON.parseObject(longString, BatchAckMsg.class); | ||
|
|
||
| Assert.assertEquals(batchAckMsg1.getAckOffsetList(), batchAckMsg2.getAckOffsetList()); | ||
| Assert.assertEquals(batchAckMsg1.getTopic(), batchAckMsg2.getTopic()); | ||
| Assert.assertEquals(batchAckMsg1.getConsumerGroup(), batchAckMsg2.getConsumerGroup()); | ||
| Assert.assertEquals(batchAckMsg1.getQueueId(), batchAckMsg2.getQueueId()); | ||
| Assert.assertEquals(batchAckMsg1.getStartOffset(), batchAckMsg2.getStartOffset()); | ||
| Assert.assertEquals(batchAckMsg1.getPopTime(), batchAckMsg2.getPopTime()); | ||
| } | ||
| } |