Skip to content

[FLINK-12967][runtime] Change the processing that the input reaches the end to comply with the InputSelectable contract #8864

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
pnowojski merged 1 commit into from
Jun 25, 2019
Merged

[FLINK-12967][runtime] Change the processing that the input reaches the end to comply with the InputSelectable contract #8864

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions ...rc/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputSelectableProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,9 @@ private void waitForOneInput(StreamTaskInput input)

private boolean checkFinished() throws Exception {
if (getInput(lastReadInputIndex).isFinished()) {
inputSelection = (lastReadInputIndex == 0) ? InputSelection.SECOND : InputSelection.FIRST;

synchronized (lock) {
operatorChain.endInput(getInputId(lastReadInputIndex));
inputSelection = inputSelector.nextSelection();
}
}

Expand Down
17 changes: 14 additions & 3 deletions ...rc/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskSelectiveReadingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.flink.runtime.jobgraph.OperatorID;
import org.apache.flink.streaming.api.graph.StreamConfig;
import org.apache.flink.streaming.api.operators.AbstractStreamOperator;
import org.apache.flink.streaming.api.operators.BoundedMultiInput;
import org.apache.flink.streaming.api.operators.InputSelectable;
import org.apache.flink.streaming.api.operators.InputSelection;
import org.apache.flink.streaming.api.operators.TwoInputStreamOperator;
Expand Down Expand Up @@ -239,7 +240,7 @@ public void processElement2(StreamRecord<Integer> element) {
* Test operator for sequential reading.
*/
public static class SequentialReadingStreamOperator extends AbstractStreamOperator<String>
implements TwoInputStreamOperator<String, Integer, String>, InputSelectable {
implements TwoInputStreamOperator<String, Integer, String>, InputSelectable, BoundedMultiInput {

private final String name;

Expand All @@ -265,13 +266,18 @@ public void processElement1(StreamRecord<String> element) {
@Override
public void processElement2(StreamRecord<Integer> element) {
output.collect(element.replace("[" + name + "-2]: " + element.getValue()));
}

this.inputSelection = InputSelection.SECOND;
@Override
public void endInput(int inputId) {
if (inputId == 1) {
inputSelection = InputSelection.SECOND;
}
}
}

private static class SpecialRuleReadingStreamOperator extends AbstractStreamOperator<String>
implements TwoInputStreamOperator<String, Integer, String>, InputSelectable {
implements TwoInputStreamOperator<String, Integer, String>, InputSelectable, BoundedMultiInput {

private final String name;

Expand Down Expand Up @@ -338,6 +344,11 @@ public void processElement2(StreamRecord<Integer> element) {

inputSelection = InputSelection.SECOND;
}

@Override
public void endInput(int inputId) {
inputSelection = (inputId == 1) ? InputSelection.SECOND : InputSelection.FIRST;
}
}

private static class TestReadFinishedInputStreamOperator extends AbstractStreamOperator<String>
Expand Down