-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[refactor][client] Introduce PulsarApiMessageId to access fields of MessageIdData #18890
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
BewareMyPower
wants to merge
1
commit into
apache:master
from
BewareMyPower:bewaremypower/introduce-msg-id-data-wrapper
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
125 changes: 125 additions & 0 deletions
125
pulsar-broker/src/test/java/org/apache/pulsar/client/api/CustomMessageIdTest.java
This file contains hidden or 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,125 @@ | ||
| /* | ||
| * 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.pulsar.client.api; | ||
|
|
||
| import static org.testng.Assert.assertEquals; | ||
| import static org.testng.Assert.assertNotNull; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.concurrent.TimeUnit; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Cleanup; | ||
| import org.testng.annotations.AfterClass; | ||
| import org.testng.annotations.BeforeClass; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| @Test(groups = "broker-api") | ||
| public class CustomMessageIdTest extends ProducerConsumerBase { | ||
|
|
||
| @BeforeClass | ||
| @Override | ||
| protected void setup() throws Exception { | ||
| super.internalSetup(); | ||
| super.producerBaseSetup(); | ||
|
|
||
| } | ||
|
|
||
| @AfterClass(alwaysRun = true) | ||
| @Override | ||
| protected void cleanup() throws Exception { | ||
| super.internalCleanup(); | ||
| } | ||
|
|
||
| @Test(timeOut = 30000) | ||
| public void testSeek() throws Exception { | ||
| final String topic = "persistent://my-property/my-ns/test-seek-" + System.currentTimeMillis(); | ||
| final var msgIdList = produceMessages(topic); | ||
| @Cleanup final var consumer = pulsarClient.newConsumer(Schema.STRING) | ||
| .topic(topic) | ||
| .subscriptionName("sub") | ||
| .subscribe(); | ||
| final int ackIndex = msgIdList.size() / 2 + 1; | ||
| consumer.seek(msgIdList.get(ackIndex)); | ||
| final var msg = consumer.receive(3, TimeUnit.SECONDS); | ||
| assertNotNull(msg); | ||
| assertEquals(msg.getValue(), "msg-" + (ackIndex + 1)); | ||
| } | ||
|
|
||
| @Test(timeOut = 30000) | ||
| public void testAck() throws Exception { | ||
| final String topic = "persistent://my-property/my-ns/test-ack-" + System.currentTimeMillis(); | ||
| @Cleanup final var consumer = pulsarClient.newConsumer(Schema.STRING) | ||
| .topic(topic) | ||
| .subscriptionName("sub") | ||
| .isAckReceiptEnabled(true) | ||
| .subscribe(); | ||
| produceMessages(topic); | ||
| final int ackIndex = 3; | ||
| NonBatchedMessageId messageIdToAck = null; | ||
| for (int i = 0; i < 10; i++) { | ||
| var msg = consumer.receive(); | ||
| var msgId = (PulsarApiMessageId) msg.getMessageId(); | ||
| if (i == ackIndex) { | ||
| messageIdToAck = new NonBatchedMessageId(msgId.getLedgerId(), msgId.getEntryId()); | ||
| } | ||
| } | ||
| assertNotNull(messageIdToAck); | ||
| consumer.acknowledgeCumulative(messageIdToAck); | ||
| consumer.redeliverUnacknowledgedMessages(); | ||
| var msg = consumer.receive(3, TimeUnit.SECONDS); | ||
| assertNotNull(msg); | ||
| assertEquals(msg.getValue(), "msg-" + (ackIndex + 1)); | ||
| } | ||
|
|
||
| private List<NonBatchedMessageId> produceMessages(String topic) throws PulsarClientException { | ||
| @Cleanup final var producer = pulsarClient.newProducer(Schema.STRING) | ||
| .topic(topic) | ||
| .enableBatching(false) | ||
| .create(); | ||
| final var msgIdList = new ArrayList<NonBatchedMessageId>(); | ||
| for (int i = 0; i < 10; i++) { | ||
| final var msgId = (PulsarApiMessageId) producer.send("msg-" + i); | ||
| msgIdList.add(new NonBatchedMessageId(msgId.getLedgerId(), msgId.getEntryId())); | ||
| } | ||
| return msgIdList; | ||
| } | ||
|
|
||
| @AllArgsConstructor | ||
| private static class NonBatchedMessageId implements PulsarApiMessageId { | ||
| // For non-batched message id in a single topic, only ledger id and entry id are required | ||
|
|
||
| private final long ledgerId; | ||
| private final long entryId; | ||
|
|
||
| @Override | ||
| public byte[] toByteArray() { | ||
| return new byte[0]; // dummy implementation | ||
| } | ||
|
|
||
| @Override | ||
| public long getLedgerId() { | ||
| return ledgerId; | ||
| } | ||
|
|
||
| @Override | ||
| public long getEntryId() { | ||
| return entryId; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ | |
|
|
||
| import java.util.BitSet; | ||
|
|
||
| @Deprecated | ||
| public class BatchMessageAcker { | ||
|
|
||
| private BatchMessageAcker() { | ||
|
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test shows another benefit of this design. Now we can extend
PulsarApiMessageIdto create our ownMessageIdimplementations forseekandacknowledgeAPIs. So thePulsarApiMessageIdinterface is very flexiable and scalable. Take this PR (apache/flink#21069) for example, we don't need to use the APIs frompulsar-clientmodule to create a message id that represents a previous message id. /cc @tisonkun @syhily