Github user rmetzger commented on a diff in the pull request:
https://github.com/apache/flink/pull/659#discussion_r29855133
--- Diff:
flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTask.java
---
@@ -24,56 +24,110 @@
import org.apache.flink.runtime.io.network.partition.consumer.InputGate;
import org.apache.flink.runtime.plugable.DeserializationDelegate;
import org.apache.flink.streaming.api.graph.StreamEdge;
+import org.apache.flink.streaming.api.operators.TwoInputStreamOperator;
import org.apache.flink.streaming.runtime.io.CoReaderIterator;
import org.apache.flink.streaming.runtime.io.CoRecordReader;
-import org.apache.flink.streaming.runtime.io.IndexedReaderIterator;
import org.apache.flink.streaming.runtime.io.InputGateFactory;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import
org.apache.flink.streaming.runtime.streamrecord.StreamRecordSerializer;
-import org.apache.flink.util.MutableObjectIterator;
+import org.apache.flink.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public class CoStreamTask<IN1, IN2, OUT> extends StreamTask<IN1, OUT> {
+public class TwoInputStreamTask<IN1, IN2, OUT> extends StreamTask<OUT,
TwoInputStreamOperator<IN1, IN2, OUT>> {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(TwoInputStreamTask.class);
protected StreamRecordSerializer<IN1> inputDeserializer1 = null;
protected StreamRecordSerializer<IN2> inputDeserializer2 = null;
- MutableObjectIterator<StreamRecord<IN1>> inputIter1;
- MutableObjectIterator<StreamRecord<IN2>> inputIter2;
-
CoRecordReader<DeserializationDelegate<StreamRecord<IN1>>,
DeserializationDelegate<StreamRecord<IN2>>> coReader;
CoReaderIterator<StreamRecord<IN1>, StreamRecord<IN2>> coIter;
- private static int numTasks;
+ @Override
+ public void invoke() throws Exception {
+ this.isRunning = true;
- public CoStreamTask() {
- numTasks = newTask();
- instanceID = numTasks;
- }
+ boolean operatorOpen = false;
- private void setDeserializers() {
- inputDeserializer1 =
configuration.getTypeSerializerIn1(userClassLoader);
- inputDeserializer2 =
configuration.getTypeSerializerIn2(userClassLoader);
- }
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Task {} invoked", getName());
+ }
- @Override
- public void setInputsOutputs() {
- outputHandler = new OutputHandler<OUT>(this);
+ try {
+
+ openOperator();
+ operatorOpen = true;
+
+ int next;
+ StreamRecord<IN1> reuse1 =
inputDeserializer1.createInstance();
+ StreamRecord<IN2> reuse2 =
inputDeserializer2.createInstance();
+
+ while (isRunning) {
+ try {
+ next = coIter.next(reuse1, reuse2);
+ } catch (IOException e) {
+ if (isRunning) {
+ throw new
RuntimeException("Could not read next record.", e);
+ } else {
+ // Task already cancelled do
nothing
+ next = 0;
+ }
+ } catch (IllegalStateException e) {
+ if (isRunning) {
+ throw new
RuntimeException("Could not read next record.", e);
+ } else {
+ // Task already cancelled do
nothing
+ next = 0;
+ }
+ }
+
+ if (next == 0) {
+ break;
+ } else if (next == 1) {
+
streamOperator.receiveElement1(reuse1.getObject());
+ reuse1 =
inputDeserializer1.createInstance();
+ } else {
+
streamOperator.receiveElement2(reuse2.getObject());
+ reuse2 =
inputDeserializer2.createInstance();
+ }
+ }
- setConfigInputs();
+ closeOperator();
+ operatorOpen = false;
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Task {} invocation finished",
getName());
+ }
+
+ } catch (Exception e) {
+
+ if (operatorOpen) {
+ try {
+ closeOperator();
+ } catch (Throwable t) {
--- End diff --
I have the impression that there is a lot of very similar code ;)
This is the third construct like this ;)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
