You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/07/06 15:37:13 UTC
[GitHub] sijie closed pull request #2099: Issue 1455: MessageID has always
batch index 0 when sending messages in a batch
sijie closed pull request #2099: Issue 1455: MessageID has always batch index 0 when sending messages in a batch
URL: https://github.com/apache/incubator-pulsar/pull/2099
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentReplicator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentReplicator.java
index 42b99adace..d505c4417f 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentReplicator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentReplicator.java
@@ -212,7 +212,7 @@ protected ProducerSendCallback newObject(Handle<ProducerSendCallback> handle) {
};
@Override
- public void addCallback(SendCallback scb) {
+ public void addCallback(MessageImpl<?> msg, SendCallback scb) {
// noop
}
@@ -221,6 +221,11 @@ public SendCallback getNextSendCallback() {
return null;
}
+ @Override
+ public MessageImpl<?> getNextMessage() {
+ return null;
+ }
+
@Override
public CompletableFuture<MessageId> getFuture() {
return null;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
index e0df5ea75b..7d529f909d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
@@ -381,7 +381,7 @@ protected ProducerSendCallback newObject(Handle<ProducerSendCallback> handle) {
};
@Override
- public void addCallback(SendCallback scb) {
+ public void addCallback(MessageImpl<?> msg, SendCallback scb) {
// noop
}
@@ -390,6 +390,11 @@ public SendCallback getNextSendCallback() {
return null;
}
+ @Override
+ public MessageImpl<?> getNextMessage() {
+ return null;
+ }
+
@Override
public CompletableFuture<MessageId> getFuture() {
return null;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainer.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainer.java
index a97e5249cc..4d2ca09907 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainer.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainer.java
@@ -96,7 +96,7 @@ void add(MessageImpl<?> msg, SendCallback callback) {
}
if (previousCallback != null) {
- previousCallback.addCallback(callback);
+ previousCallback.addCallback(msg, callback);
}
previousCallback = callback;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
index afb6177568..a621a0ec3e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
@@ -207,6 +207,7 @@ public long getLastSequenceId() {
sendAsync(message, new SendCallback() {
SendCallback nextCallback = null;
+ MessageImpl<?> nextMsg = null;
long createdAt = System.nanoTime();
@Override
@@ -219,6 +220,11 @@ public SendCallback getNextSendCallback() {
return nextCallback;
}
+ @Override
+ public MessageImpl<?> getNextMessage() {
+ return nextMsg;
+ }
+
@Override
public void sendComplete(Exception e) {
if (e != null) {
@@ -230,20 +236,22 @@ public void sendComplete(Exception e) {
}
while (nextCallback != null) {
SendCallback sendCallback = nextCallback;
+ MessageImpl<?> msg = nextMsg;
if (e != null) {
stats.incrementSendFailed();
sendCallback.getFuture().completeExceptionally(e);
} else {
- sendCallback.getFuture().complete(message.getMessageId());
+ sendCallback.getFuture().complete(msg.getMessageId());
stats.incrementNumAcksReceived(System.nanoTime() - createdAt);
}
+ nextMsg = nextCallback.getNextMessage();
nextCallback = nextCallback.getNextSendCallback();
- sendCallback = null;
}
}
@Override
- public void addCallback(SendCallback scb) {
+ public void addCallback(MessageImpl<?> msg, SendCallback scb) {
+ nextMsg = msg;
nextCallback = scb;
}
});
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SendCallback.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SendCallback.java
index e773315679..ac8ff4a407 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SendCallback.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/SendCallback.java
@@ -37,10 +37,11 @@
/**
* used to specify a callback to be invoked on completion of a send operation for individual messages sent in a
* batch. Callbacks for messages in a batch get chained
- *
- * @param scb
+ *
+ * @param msg message sent
+ * @param scb callback associated with the message
*/
- void addCallback(SendCallback scb);
+ void addCallback(MessageImpl<?> msg, SendCallback scb);
/**
*
@@ -48,6 +49,13 @@
*/
SendCallback getNextSendCallback();
+ /**
+ * Return next message in chain
+ *
+ * @return next message in chain
+ */
+ MessageImpl<?> getNextMessage();
+
/**
*
* @return future associated with callback
diff --git a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/semantics/SemanticsTest.java b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/semantics/SemanticsTest.java
index 1ba6533169..701b38ecf4 100644
--- a/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/semantics/SemanticsTest.java
+++ b/tests/integration/semantics/src/test/java/org/apache/pulsar/tests/integration/semantics/SemanticsTest.java
@@ -19,18 +19,25 @@
package org.apache.pulsar.tests.integration.semantics;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionType;
+import org.apache.pulsar.client.impl.BatchMessageIdImpl;
import org.apache.pulsar.tests.topologies.PulsarClusterTestBase;
import org.testng.annotations.Test;
+import org.testng.collections.Lists;
/**
* Test pulsar produce/consume semantics
@@ -184,4 +191,61 @@ private static void checkMessagesIdempotencyEnabled(Consumer<String> consumer) t
receiveAndAssertMessage(consumer, 1L, "message-1");
receiveAndAssertMessage(consumer, 2L, "message-2");
}
+
+ @Test(dataProvider = "ServiceUrls")
+ public void testBatchProducing(String serviceUrl) throws Exception {
+ String topicName = generateTopicName("testbatchproducing", true);
+
+ int numMessages = 10;
+
+ List<MessageId> producedMsgIds;
+
+ try (PulsarClient client = PulsarClient.builder()
+ .serviceUrl(serviceUrl)
+ .build()) {
+
+ try (Consumer<String> consumer = client.newConsumer(Schema.STRING)
+ .topic(topicName)
+ .subscriptionName("my-sub")
+ .subscribe()) {
+
+ try (Producer<String> producer = client.newProducer(Schema.STRING)
+ .topic(topicName)
+ .enableBatching(true)
+ .batchingMaxMessages(5)
+ .batchingMaxPublishDelay(1, TimeUnit.HOURS)
+ .create()) {
+
+ List<CompletableFuture<MessageId>> sendFutures = Lists.newArrayList();
+ for (int i = 0; i < numMessages; i++) {
+ sendFutures.add(producer.sendAsync("batch-message-" + i));
+ }
+ CompletableFuture.allOf(sendFutures.toArray(new CompletableFuture[numMessages])).get();
+ producedMsgIds = sendFutures.stream().map(future -> future.join()).collect(Collectors.toList());
+ }
+
+ for (int i = 0; i < numMessages; i++) {
+ Message<String> m = consumer.receive();
+ assertEquals(producedMsgIds.get(i), m.getMessageId());
+ assertEquals("batch-message-" + i, m.getValue());
+ }
+ }
+ }
+
+ // inspect the message ids
+ for (int i = 0; i < 5; i++) {
+ assertTrue(producedMsgIds.get(i) instanceof BatchMessageIdImpl);
+ BatchMessageIdImpl mid = (BatchMessageIdImpl) producedMsgIds.get(i);
+ log.info("Message {} id : {}", i, mid);
+
+ assertEquals(i, mid.getBatchIndex());
+ }
+ for (int i = 5; i < 10; i++) {
+ assertTrue(producedMsgIds.get(i) instanceof BatchMessageIdImpl);
+ BatchMessageIdImpl mid = (BatchMessageIdImpl) producedMsgIds.get(i);
+ log.info("Message {} id : {}", i, mid);
+
+ assertEquals(i - 5, mid.getBatchIndex());
+ }
+ }
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services