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/12/10 06:51:56 UTC
[GitHub] sijie closed pull request #3150: [Message Routing] Support default
MessageRouter initialization as RoundRobinPartition
sijie closed pull request #3150: [Message Routing] Support default MessageRouter initialization as RoundRobinPartition
URL: https://github.com/apache/pulsar/pull/3150
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-client/src/main/java/org/apache/pulsar/client/impl/PartitionedProducerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedProducerImpl.java
index 9daf303aca..9b862dfb28 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedProducerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PartitionedProducerImpl.java
@@ -74,20 +74,20 @@ private MessageRouter getMessageRouter() {
MessageRoutingMode messageRouteMode = conf.getMessageRoutingMode();
switch (messageRouteMode) {
- case CustomPartition:
- messageRouter = checkNotNull(conf.getCustomMessageRouter());
- break;
- case RoundRobinPartition:
- messageRouter = new RoundRobinPartitionMessageRouterImpl(
- conf.getHashingScheme(),
- ThreadLocalRandom.current().nextInt(topicMetadata.numPartitions()),
- conf.isBatchingEnabled(),
- TimeUnit.MICROSECONDS.toMillis(conf.getBatchingMaxPublishDelayMicros()));
- break;
- case SinglePartition:
- default:
- messageRouter = new SinglePartitionMessageRouterImpl(
- ThreadLocalRandom.current().nextInt(topicMetadata.numPartitions()), conf.getHashingScheme());
+ case CustomPartition:
+ messageRouter = checkNotNull(conf.getCustomMessageRouter());
+ break;
+ case SinglePartition:
+ messageRouter = new SinglePartitionMessageRouterImpl(
+ ThreadLocalRandom.current().nextInt(topicMetadata.numPartitions()), conf.getHashingScheme());
+ break;
+ case RoundRobinPartition:
+ default:
+ messageRouter = new RoundRobinPartitionMessageRouterImpl(
+ conf.getHashingScheme(),
+ ThreadLocalRandom.current().nextInt(topicMetadata.numPartitions()),
+ conf.isBatchingEnabled(),
+ TimeUnit.MICROSECONDS.toMillis(conf.getBatchingMaxPublishDelayMicros()));
}
return messageRouter;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
index 5f5aa4b6ad..de654003ac 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
@@ -749,7 +749,7 @@ public synchronized void updateServiceUrl(String serviceUrl) throws PulsarClient
.thenCompose(pair -> cnxPool.getConnection(pair.getLeft(), pair.getRight()));
}
- /** visiable for pulsar-functions **/
+ /** visible for pulsar-functions **/
public Timer timer() {
return timer;
}
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java
new file mode 100644
index 0000000000..e28e471980
--- /dev/null
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java
@@ -0,0 +1,114 @@
+/**
+ * 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.impl;
+
+import io.netty.util.Timer;
+
+import org.apache.pulsar.client.api.*;
+import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
+import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Field;
+import java.util.concurrent.CompletableFuture;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+/**
+ * Unit Tests of {@link PartitionedProducerImpl}.
+ */
+public class PartitionedProducerImplTest {
+
+ private static final String TOPIC_NAME = "testTopicName";
+ private PulsarClientImpl client;
+ private ProducerBuilderImpl producerBuilderImpl;
+ private Schema schema;
+ private ProducerInterceptors producerInterceptors;
+ private CompletableFuture<Producer> producerCreatedFuture;
+
+ @BeforeTest
+ public void setup() {
+ client = mock(PulsarClientImpl.class);
+ schema = mock(Schema.class);
+ producerInterceptors = mock(ProducerInterceptors.class);
+ producerCreatedFuture = mock(CompletableFuture.class);
+ ClientConfigurationData clientConfigurationData = mock(ClientConfigurationData.class);
+ Timer timer = mock(Timer.class);
+
+ producerBuilderImpl = new ProducerBuilderImpl(client, Schema.BYTES);
+
+ when(client.getConfiguration()).thenReturn(clientConfigurationData);
+ when(client.timer()).thenReturn(timer);
+ when(client.newProducer()).thenReturn(producerBuilderImpl);
+ }
+
+ @Test
+ public void testSinglePartitionMessageRouterImplInstance() throws NoSuchFieldException, IllegalAccessException {
+ ProducerConfigurationData producerConfigurationData = new ProducerConfigurationData();
+ producerConfigurationData.setMessageRoutingMode(MessageRoutingMode.SinglePartition);
+
+ MessageRouter messageRouter = getMessageRouter(producerConfigurationData);
+ assertTrue(messageRouter instanceof SinglePartitionMessageRouterImpl);
+ }
+
+ @Test
+ public void testRoundRobinPartitionMessageRouterImplInstance() throws NoSuchFieldException, IllegalAccessException {
+ ProducerConfigurationData producerConfigurationData = new ProducerConfigurationData();
+ producerConfigurationData.setMessageRoutingMode(MessageRoutingMode.RoundRobinPartition);
+
+ MessageRouter messageRouter = getMessageRouter(producerConfigurationData);
+ assertTrue(messageRouter instanceof RoundRobinPartitionMessageRouterImpl);
+ }
+
+ @Test
+ public void testCustomMessageRouterInstance() throws NoSuchFieldException, IllegalAccessException {
+ ProducerConfigurationData producerConfigurationData = new ProducerConfigurationData();
+ producerConfigurationData.setMessageRoutingMode(MessageRoutingMode.CustomPartition);
+ producerConfigurationData.setCustomMessageRouter(new CustomMessageRouter());
+
+ MessageRouter messageRouter = getMessageRouter(producerConfigurationData);
+ assertTrue(messageRouter instanceof CustomMessageRouter);
+ }
+
+ private MessageRouter getMessageRouter(ProducerConfigurationData producerConfigurationData)
+ throws NoSuchFieldException, IllegalAccessException {
+ PartitionedProducerImpl impl = new PartitionedProducerImpl(
+ client, TOPIC_NAME, producerConfigurationData,
+ 2, producerCreatedFuture, schema, producerInterceptors);
+
+ Field routerPolicy = impl.getClass().getDeclaredField("routerPolicy");
+ routerPolicy.setAccessible(true);
+ MessageRouter messageRouter = (MessageRouter) routerPolicy.get(impl);
+ assertNotNull(messageRouter);
+ return messageRouter;
+ }
+
+ private class CustomMessageRouter implements MessageRouter {
+ @Override
+ public int choosePartition(Message<?> msg, TopicMetadata metadata) {
+ int partitionIndex = Integer.parseInt(msg.getKey()) % metadata.numPartitions();
+ return partitionIndex;
+ }
+ }
+
+}
----------------------------------------------------------------
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