Skip to content

Delete PartitionedConsumerImpl, use TopicsConsumerImpl instead #1365

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.

Sign up for GitHub

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

Merged
merlimat merged 5 commits into from
Apr 4, 2018
Merged

Delete PartitionedConsumerImpl, use TopicsConsumerImpl instead #1365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1ece30
delete partitionedConsumer, use topicsConsumer instead
jiazhai Mar 11, 2018
f7e140b
change following comments
jiazhai Mar 13, 2018
cae262d
rebase master, rename TopicsConsumerImpl to MultiTopicsConsumerImpl
jiazhai Apr 2, 2018
7aea977
avoid dup calling getPartitionedTopicMetadata
jiazhai Apr 3, 2018
0aaa48c
rebase master, fix test error
jiazhai Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.client.impl.MessageIdImpl;
import org.apache.pulsar.client.impl.TopicMessageImpl;
import org.apache.pulsar.common.api.proto.PulsarApi.CommandSubscribe.SubType;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.util.FutureUtil;
Expand Down Expand Up @@ -323,13 +324,11 @@ public void testSimpleConsumerEventsWithPartition() throws Exception {
final String subName = "sub1";
final int numMsgs = 100;
Set<String> uniqueMessages = new HashSet<>();

admin.persistentTopics().createPartitionedTopic(topicName, numPartitions);

ConsumerBuilder<byte[]> consumerBuilder = pulsarClient.newConsumer().topic(topicName).subscriptionName(subName)
.subscriptionType(SubscriptionType.Failover);


// 1. two consumers on the same subscription
ActiveInactiveListenerEvent listener1 = new ActiveInactiveListenerEvent();
ActiveInactiveListenerEvent listener2 = new ActiveInactiveListenerEvent();
Expand Down Expand Up @@ -374,7 +373,7 @@ public void testSimpleConsumerEventsWithPartition() throws Exception {
}
totalMessages++;
consumer1.acknowledge(msg);
MessageIdImpl msgId = (MessageIdImpl) msg.getMessageId();
MessageIdImpl msgId = (MessageIdImpl) (((TopicMessageImpl)msg).getInnerMessageId());
receivedPtns.add(msgId.getPartitionIndex());
}

Expand All @@ -391,7 +390,7 @@ public void testSimpleConsumerEventsWithPartition() throws Exception {
}
totalMessages++;
consumer2.acknowledge(msg);
MessageIdImpl msgId = (MessageIdImpl) msg.getMessageId();
MessageIdImpl msgId = (MessageIdImpl) (((TopicMessageImpl)msg).getInnerMessageId());
receivedPtns.add(msgId.getPartitionIndex());
}
assertTrue(Sets.difference(listener1.inactivePtns, receivedPtns).isEmpty());
Expand Down
7 changes: 5 additions & 2 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageIdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ public void partitionedProducerSendAsync() throws PulsarClientException, PulsarA
Assert.assertEquals(messageIds.size(), numberOfMessages, "Not all messages published successfully");

for (int i = 0; i < numberOfMessages; i++) {
MessageId messageId = consumer.receive().getMessageId();
MessageId topicMessageId = consumer.receive().getMessageId();
MessageId messageId = ((TopicMessageIdImpl)topicMessageId).getInnerMessageId();
log.info("Message ID Received = " + messageId);
Assert.assertTrue(messageIds.remove(messageId), "Failed to receive Message");
}
Expand Down Expand Up @@ -247,7 +248,9 @@ public void partitionedProducerSend() throws PulsarClientException, PulsarAdminE
Assert.assertEquals(messageIds.size(), numberOfMessages, "Not all messages published successfully");

for (int i = 0; i < numberOfMessages; i++) {
Assert.assertTrue(messageIds.remove(consumer.receive().getMessageId()), "Failed to receive Message");
MessageId topicMessageId = consumer.receive().getMessageId();
MessageId messageId = ((TopicMessageIdImpl)topicMessageId).getInnerMessageId();
Assert.assertTrue(messageIds.remove(messageId), "Failed to receive Message");
}
log.info("Message IDs = " + messageIds);
Assert.assertEquals(messageIds.size(), 0, "Not all messages received successfully");
Expand Down
76 changes: 38 additions & 38 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,21 +161,21 @@ public void testBinaryProtoToGetTopicsOfNamespace() throws Exception {
.subscribe();

// 4. verify consumer get methods, to get right number of partitions and topics.
assertSame(pattern, ((PatternTopicsConsumerImpl<?>) consumer).getPattern());
List<String> topics = ((PatternTopicsConsumerImpl<?>) consumer).getPartitionedTopics();
List<ConsumerImpl<byte[]>> consumers = ((PatternTopicsConsumerImpl<byte[]>) consumer).getConsumers();
assertSame(pattern, ((PatternMultiTopicsConsumerImpl<?>) consumer).getPattern());
List<String> topics = ((PatternMultiTopicsConsumerImpl<?>) consumer).getPartitionedTopics();
List<ConsumerImpl<byte[]>> consumers = ((PatternMultiTopicsConsumerImpl<byte[]>) consumer).getConsumers();

assertEquals(topics.size(), 6);
assertEquals(consumers.size(), 6);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getTopics().size(), 3);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getTopics().size(), 3);

topics.forEach(topic -> log.debug("topic: {}", topic));
consumers.forEach(c -> log.debug("consumer: {}", c.getTopic()));

IntStream.range(0, topics.size()).forEach(index ->
assertTrue(topics.get(index).equals(consumers.get(index).getTopic())));

((PatternTopicsConsumerImpl<?>) consumer).getTopics().forEach(topic -> log.debug("getTopics topic: {}", topic));
((PatternMultiTopicsConsumerImpl<?>) consumer).getTopics().forEach(topic -> log.debug("getTopics topic: {}", topic));

// 5. produce data
for (int i = 0; i < totalMessages / 3; i++) {
Expand Down Expand Up @@ -235,8 +235,8 @@ public void testTopicsListMinus() throws Exception {
List<String> oldNames = Lists.newArrayList(topicName1, topicName2, topicName3, topicName4);
List<String> newNames = Lists.newArrayList(topicName3, topicName4, topicName5, topicName6);

List<String> addedNames = PatternTopicsConsumerImpl.topicsListsMinus(newNames, oldNames);
List<String> removedNames = PatternTopicsConsumerImpl.topicsListsMinus(oldNames, newNames);
List<String> addedNames = PatternMultiTopicsConsumerImpl.topicsListsMinus(newNames, oldNames);
List<String> removedNames = PatternMultiTopicsConsumerImpl.topicsListsMinus(oldNames, newNames);

assertTrue(addedNames.size() == 2 &&
addedNames.contains(topicName5) &&
Expand All @@ -246,21 +246,21 @@ public void testTopicsListMinus() throws Exception {
removedNames.contains(topicName2));

// totally 2 different list, should return content of first lists.
List<String> addedNames2 = PatternTopicsConsumerImpl.topicsListsMinus(addedNames, removedNames);
List<String> addedNames2 = PatternMultiTopicsConsumerImpl.topicsListsMinus(addedNames, removedNames);
assertTrue(addedNames2.size() == 2 &&
addedNames2.contains(topicName5) &&
addedNames2.contains(topicName6));

// 2 same list, should return empty list.
List<String> addedNames3 = PatternTopicsConsumerImpl.topicsListsMinus(addedNames, addedNames);
List<String> addedNames3 = PatternMultiTopicsConsumerImpl.topicsListsMinus(addedNames, addedNames);
assertEquals(addedNames3.size(), 0);

// empty list minus: addedNames2.size = 2, addedNames3.size = 0
List<String> addedNames4 = PatternTopicsConsumerImpl.topicsListsMinus(addedNames2, addedNames3);
List<String> addedNames4 = PatternMultiTopicsConsumerImpl.topicsListsMinus(addedNames2, addedNames3);
assertTrue(addedNames4.size() == addedNames2.size());
addedNames4.forEach(name -> assertTrue(addedNames2.contains(name)));

List<String> addedNames5 = PatternTopicsConsumerImpl.topicsListsMinus(addedNames3, addedNames2);
List<String> addedNames5 = PatternMultiTopicsConsumerImpl.topicsListsMinus(addedNames3, addedNames2);
assertEquals(addedNames5.size(), 0);
}

Expand Down Expand Up @@ -290,10 +290,10 @@ public void testStartEmptyPatternConsumer() throws Exception {
.subscribe();

// 3. verify consumer get methods, to get 0 number of partitions and topics.
assertSame(pattern, ((PatternTopicsConsumerImpl<?>) consumer).getPattern());
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 0);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getConsumers().size(), 0);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getTopics().size(), 0);
assertSame(pattern, ((PatternMultiTopicsConsumerImpl<?>) consumer).getPattern());
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 0);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getConsumers().size(), 0);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getTopics().size(), 0);

// 4. create producer
String messagePredicate = "my-message-" + key + "-";
Expand All @@ -310,15 +310,15 @@ public void testStartEmptyPatternConsumer() throws Exception {

// 5. call recheckTopics to subscribe each added topics above
log.debug("recheck topics change");
PatternTopicsConsumerImpl<byte[]> consumer1 = ((PatternTopicsConsumerImpl<byte[]>) consumer);
PatternMultiTopicsConsumerImpl<byte[]> consumer1 = ((PatternMultiTopicsConsumerImpl<byte[]>) consumer);
consumer1.run(consumer1.getRecheckPatternTimeout());
Thread.sleep(100);

// 6. verify consumer get methods, to get number of partitions and topics, value 6=1+2+3.
assertSame(pattern, ((PatternTopicsConsumerImpl<?>) consumer).getPattern());
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 6);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getConsumers().size(), 6);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getTopics().size(), 3);
assertSame(pattern, ((PatternMultiTopicsConsumerImpl<?>) consumer).getPattern());
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 6);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getConsumers().size(), 6);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getTopics().size(), 3);


// 7. produce data
Expand Down Expand Up @@ -384,13 +384,13 @@ public void testAutoSubscribePatternConsumer() throws Exception {
.receiverQueueSize(4)
.subscribe();

assertTrue(consumer instanceof PatternTopicsConsumerImpl);
assertTrue(consumer instanceof PatternMultiTopicsConsumerImpl);

// 4. verify consumer get methods, to get 6 number of partitions and topics: 6=1+2+3
assertSame(pattern, ((PatternTopicsConsumerImpl<?>) consumer).getPattern());
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 6);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getConsumers().size(), 6);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getTopics().size(), 3);
assertSame(pattern, ((PatternMultiTopicsConsumerImpl<?>) consumer).getPattern());
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 6);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getConsumers().size(), 6);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getTopics().size(), 3);

// 5. produce data to topic 1,2,3; verify should receive all the message
for (int i = 0; i < totalMessages / 3; i++) {
Expand Down Expand Up @@ -419,12 +419,12 @@ public void testAutoSubscribePatternConsumer() throws Exception {

// 7. call recheckTopics to subscribe each added topics above, verify topics number: 10=1+2+3+4
log.debug("recheck topics change");
PatternTopicsConsumerImpl<byte[]> consumer1 = ((PatternTopicsConsumerImpl<byte[]>) consumer);
PatternMultiTopicsConsumerImpl<byte[]> consumer1 = ((PatternMultiTopicsConsumerImpl<byte[]>) consumer);
consumer1.run(consumer1.getRecheckPatternTimeout());
Thread.sleep(100);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 10);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getConsumers().size(), 10);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getTopics().size(), 4);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 10);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getConsumers().size(), 10);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getTopics().size(), 4);

// 8. produce data to topic3 and topic4, verify should receive all the message
for (int i = 0; i < totalMessages / 2; i++) {
Expand Down Expand Up @@ -487,13 +487,13 @@ public void testAutoUnbubscribePatternConsumer() throws Exception {
.receiverQueueSize(4)
.subscribe();

assertTrue(consumer instanceof PatternTopicsConsumerImpl);
assertTrue(consumer instanceof PatternMultiTopicsConsumerImpl);

// 4. verify consumer get methods, to get 0 number of partitions and topics: 6=1+2+3
assertSame(pattern, ((PatternTopicsConsumerImpl<?>) consumer).getPattern());
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 6);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getConsumers().size(), 6);
assertEquals(((PatternTopicsConsumerImpl<?>) consumer).getTopics().size(), 3);
assertSame(pattern, ((PatternMultiTopicsConsumerImpl<?>) consumer).getPattern());
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getPartitionedTopics().size(), 6);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getConsumers().size(), 6);
assertEquals(((PatternMultiTopicsConsumerImpl<?>) consumer).getTopics().size(), 3);

// 5. produce data to topic 1,2,3; verify should receive all the message
for (int i = 0; i < totalMessages / 3; i++) {
Expand Down Expand Up @@ -521,12 +521,12 @@ public void testAutoUnbubscribePatternConsumer() throws Exception {

// 7. call recheckTopics to unsubscribe topic 1,3 , verify topics number: 2=6-1-3
log.debug("recheck topics change");
PatternTopicsConsumerImpl<byte[]> consumer1 = ((PatternTopicsConsumerImpl<byte[]>) consumer);
PatternMultiTopicsConsumerImpl<byte[]> consumer1 = ((PatternMultiTopicsConsumerImpl<byte[]>) consumer);
consumer1.run(consumer1.getRecheckPatternTimeout());
Thread.sleep(100);
assertEquals(((PatternTopicsConsumerImpl<byte[]>) consumer).getPartitionedTopics().size(), 2);
assertEquals(((PatternTopicsConsumerImpl<byte[]>) consumer).getConsumers().size(), 2);
assertEquals(((PatternTopicsConsumerImpl<byte[]>) consumer).getTopics().size(), 1);
assertEquals(((PatternMultiTopicsConsumerImpl<byte[]>) consumer).getPartitionedTopics().size(), 2);
assertEquals(((PatternMultiTopicsConsumerImpl<byte[]>) consumer).getConsumers().size(), 2);
assertEquals(((PatternMultiTopicsConsumerImpl<byte[]>) consumer).getTopics().size(), 1);

// 8. produce data to topic2, verify should receive all the message
for (int i = 0; i < totalMessages; i++) {
Expand Down
6 changes: 3 additions & 3 deletions ...r/src/test/java/org/apache/pulsar/client/impl/PerMessageUnAcknowledgedRedeliveryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ public void testFailoverAckedNormalTopic() throws Exception {
}

private static long getUnackedMessagesCountInPartitionedConsumer(Consumer<byte[]> c) {
PartitionedConsumerImpl<byte[]> pc = (PartitionedConsumerImpl<byte[]>) c;
MultiTopicsConsumerImpl<byte[]> pc = (MultiTopicsConsumerImpl<byte[]>) c;
return pc.getUnAckedMessageTracker().size()
+ pc.getConsumers().stream().mapToLong(consumer -> consumer.getUnAckedMessageTracker().size()).sum();
}
Expand Down Expand Up @@ -405,8 +405,8 @@ public void testSharedAckedPartitionedTopic() throws Exception {
assertEquals(received, 5);

// 7. Simulate ackTimeout
((PartitionedConsumerImpl<byte[]>) consumer).getUnAckedMessageTracker().toggle();
((PartitionedConsumerImpl<byte[]>) consumer).getConsumers().forEach(c -> c.getUnAckedMessageTracker().toggle());
((MultiTopicsConsumerImpl<byte[]>) consumer).getUnAckedMessageTracker().toggle();
((MultiTopicsConsumerImpl<byte[]>) consumer).getConsumers().forEach(c -> c.getUnAckedMessageTracker().toggle());

// 8. producer publish more messages
for (int i = 0; i < totalMessages / 3; i++) {
Expand Down
Loading