Skip to content

KAFKA-12914: StreamSourceNode should return null topic name for pattern subscription #10846

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
mjsax merged 2 commits into from
Jun 15, 2021
Merged

KAFKA-12914: StreamSourceNode should return null topic name for pattern subscription #10846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
835133f
KAFKA-12914: StreamSourceNode should return `null` topic name for pat…
mjsax Jun 8, 2021
006560f
Change return type to Optional
mjsax Jun 11, 2021
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
11 changes: 6 additions & 5 deletions streams/src/main/java/org/apache/kafka/streams/kstream/internals/InternalStreamsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,16 +314,17 @@ private void mergeDuplicateSourceNodes() {
if (graphNode instanceof StreamSourceNode) {
final StreamSourceNode<?, ?> currentSourceNode = (StreamSourceNode<?, ?>) graphNode;

if (currentSourceNode.topicPattern() != null) {
if (!patternsToSourceNodes.containsKey(currentSourceNode.topicPattern())) {
patternsToSourceNodes.put(currentSourceNode.topicPattern(), currentSourceNode);
if (currentSourceNode.topicPattern().isPresent()) {
final Pattern topicPattern = currentSourceNode.topicPattern().get();
if (!patternsToSourceNodes.containsKey(topicPattern)) {
patternsToSourceNodes.put(topicPattern, currentSourceNode);
} else {
final StreamSourceNode<?, ?> mainSourceNode = patternsToSourceNodes.get(currentSourceNode.topicPattern());
final StreamSourceNode<?, ?> mainSourceNode = patternsToSourceNodes.get(topicPattern);
mainSourceNode.merge(currentSourceNode);
root.removeChild(graphNode);
}
} else {
for (final String topic : currentSourceNode.topicNames()) {
for (final String topic : currentSourceNode.topicNames().get()) {
if (!topicsToSourceNodes.containsKey(topic)) {
topicsToSourceNodes.put(topic, currentSourceNode);
} else {
Expand Down
9 changes: 5 additions & 4 deletions streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/SourceGraphNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import java.util.regex.Pattern;
import org.apache.kafka.common.serialization.Serde;
Expand Down Expand Up @@ -51,12 +52,12 @@ public SourceGraphNode(final String nodeName,
this.consumedInternal = consumedInternal;
}

public Set<String> topicNames() {
return Collections.unmodifiableSet(topicNames);
public Optional<Set<String>> topicNames() {
return topicNames == null ? Optional.empty() : Optional.of(Collections.unmodifiableSet(topicNames));
}

public Pattern topicPattern() {
return topicPattern;
public Optional<Pattern> topicPattern() {
return Optional.ofNullable(topicPattern);
}

public ConsumedInternal<K, V> consumedInternal() {
Expand Down
11 changes: 5 additions & 6 deletions streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/StreamSourceNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,30 +63,29 @@ public void merge(final StreamSourceNode<?, ?> other) {
@Override
public String toString() {
return "StreamSourceNode{" +
"topicNames=" + topicNames() +
", topicPattern=" + topicPattern() +
"topicNames=" + (topicNames().isPresent() ? topicNames().get() : null) +
", topicPattern=" + (topicPattern().isPresent() ? topicPattern().get() : null) +
", consumedInternal=" + consumedInternal() +
"} " + super.toString();
}

@Override
public void writeToTopology(final InternalTopologyBuilder topologyBuilder, final Properties props) {

if (topicPattern() != null) {
if (topicPattern().isPresent()) {
topologyBuilder.addSource(consumedInternal().offsetResetPolicy(),
nodeName(),
consumedInternal().timestampExtractor(),
consumedInternal().keyDeserializer(),
consumedInternal().valueDeserializer(),
topicPattern());
topicPattern().get());
} else {
topologyBuilder.addSource(consumedInternal().offsetResetPolicy(),
nodeName(),
consumedInternal().timestampExtractor(),
consumedInternal().keyDeserializer(),
consumedInternal().valueDeserializer(),
topicNames().toArray(new String[0]));

topicNames().get().toArray(new String[0]));
}
}

Expand Down
12 changes: 11 additions & 1 deletion streams/src/main/java/org/apache/kafka/streams/kstream/internals/graph/TableSourceNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.kafka.streams.kstream.internals.graph;

import java.util.Iterator;
import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.kstream.internals.ConsumedInternal;
import org.apache.kafka.streams.kstream.internals.KTableSource;
Expand Down Expand Up @@ -83,7 +84,16 @@ public static <K, V> TableSourceNodeBuilder<K, V> tableSourceNodeBuilder() {
@Override
@SuppressWarnings("unchecked")
public void writeToTopology(final InternalTopologyBuilder topologyBuilder, final Properties props) {
final String topicName = topicNames().iterator().next();
final String topicName;
if (topicNames().isPresent()) {
final Iterator<String> topicNames = topicNames().get().iterator();
topicName = topicNames.next();
if (topicNames.hasNext()) {
throw new IllegalStateException("A table source node must have a single topic as input");
}
} else {
throw new IllegalStateException("A table source node must have a single topic as input");
}

// TODO: we assume source KTables can only be timestamped-key-value stores for now.
// should be expanded for other types of stores as well.
Expand Down