Skip to content

cleanup KStreamJoin #18

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
Guozhang Wang (guozhangwang) merged 1 commit into from
Aug 28, 2015
Merged

cleanup KStreamJoin #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 1 addition & 36 deletions stream/src/main/java/org/apache/kafka/streaming/kstream/internals/KStreamJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,13 @@

package org.apache.kafka.streaming.kstream.internals;

import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.streaming.kstream.ValueJoiner;
import org.apache.kafka.streaming.kstream.Window;
import org.apache.kafka.streaming.processor.Processor;
import org.apache.kafka.streaming.processor.ProcessorContext;
import org.apache.kafka.streaming.processor.ProcessorDef;
import org.apache.kafka.streaming.processor.internals.ProcessorContextImpl;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;

class KStreamJoin<K, V, V1, V2> implements ProcessorDef {

Expand Down Expand Up @@ -74,7 +67,7 @@ public void init(ProcessorContext context) {
super.init(context);

// check if these two streams are joinable
if (!joinable())
if (!context.joinable())
throw new IllegalStateException("Streams are not joinable.");

final Window<K, V1> window1 = (Window<K, V1>) context.getStateStore(windowName1);
Expand Down Expand Up @@ -129,34 +122,6 @@ public void process(K key, V1 value) {
}
}

private boolean joinable() {
Set<TopicPartition> partitions = ((ProcessorContextImpl) this.context).task().partitions();
Map<Integer, List<String>> partitionsById = new HashMap<>();
int firstId = -1;
for (TopicPartition partition : partitions) {
if (!partitionsById.containsKey(partition.partition())) {
partitionsById.put(partition.partition(), new ArrayList<String>());
}
partitionsById.get(partition.partition()).add(partition.topic());

if (firstId < 0)
firstId = partition.partition();
}

List<String> topics = partitionsById.get(firstId);
for (List<String> topicsPerPartition : partitionsById.values()) {
if (topics.size() != topicsPerPartition.size())
return false;

for (String topic : topicsPerPartition) {
if (!topics.contains(topic))
return false;
}
}

return true;
}

// TODO: use the "outer-stream" topic as the resulted join stream topic
private void doJoin(K key, V1 value1, V2 value2) {
context.forward(key, joiner.apply(value1, value2));
Expand Down