flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srich...@apache.org
Subject [1/2] flink git commit: [hotfix][network] minor improvements in UnionInputGate
Date Wed, 28 Feb 2018 16:35:32 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.5 f14532760 -> 926566651


[hotfix][network] minor improvements in UnionInputGate

(cherry picked from commit 4203557)


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/18ff2ce1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/18ff2ce1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/18ff2ce1

Branch: refs/heads/release-1.5
Commit: 18ff2ce15bdb1e7bd246e438e47527a24559c86d
Parents: f145327
Author: Nico Kruber <nico@data-artisans.com>
Authored: Mon Feb 26 17:50:10 2018 +0100
Committer: Stefan Richter <s.richter@data-artisans.com>
Committed: Wed Feb 28 17:35:06 2018 +0100

----------------------------------------------------------------------
 .../io/network/partition/consumer/UnionInputGate.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/18ff2ce1/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java
index 393e087..44cdd52 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/UnionInputGate.java
@@ -38,7 +38,7 @@ import static org.apache.flink.util.Preconditions.checkState;
 /**
  * Input gate wrapper to union the input from multiple input gates.
  *
- * <p> Each input gate has input channels attached from which it reads data. At each
input gate, the
+ * <p>Each input gate has input channels attached from which it reads data. At each
input gate, the
  * input channels have unique IDs from 0 (inclusive) to the number of input channels (exclusive).
  *
  * <pre>
@@ -49,7 +49,7 @@ import static org.apache.flink.util.Preconditions.checkState;
  * +--------------+--------------+
  * </pre>
  *
- * The union input gate maps these IDs from 0 to the *total* number of input channels across
all
+ * <p>The union input gate maps these IDs from 0 to the *total* number of input channels
across all
  * unioned input gates, e.g. the channels of input gate 0 keep their original indexes and
the
  * channel indexes of input gate 1 are set off by 2 to 2--4.
  *
@@ -183,11 +183,11 @@ public class UnionInputGate implements InputGate, InputGateListener
{
 		bufferOrEvent.setChannelIndex(channelIndexOffset + bufferOrEvent.getChannelIndex());
 		bufferOrEvent.setMoreAvailable(bufferOrEvent.moreAvailable() || inputGateWithData.moreInputGatesAvailable);
 
-		return Optional.ofNullable(bufferOrEvent);
+		return Optional.of(bufferOrEvent);
 	}
 
 	@Override
-	public Optional<BufferOrEvent> pollNextBufferOrEvent() throws IOException, InterruptedException
{
+	public Optional<BufferOrEvent> pollNextBufferOrEvent() throws UnsupportedOperationException
{
 		throw new UnsupportedOperationException();
 	}
 
@@ -217,7 +217,7 @@ public class UnionInputGate implements InputGate, InputGateListener {
 		private final BufferOrEvent bufferOrEvent;
 		private final boolean moreInputGatesAvailable;
 
-		public InputGateWithData(InputGate inputGate, BufferOrEvent bufferOrEvent, boolean moreInputGatesAvailable)
{
+		InputGateWithData(InputGate inputGate, BufferOrEvent bufferOrEvent, boolean moreInputGatesAvailable)
{
 			this.inputGate = checkNotNull(inputGate);
 			this.bufferOrEvent = checkNotNull(bufferOrEvent);
 			this.moreInputGatesAvailable = moreInputGatesAvailable;


Mime
View raw message