This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 614483450129069072b0da6bde4e993fdd63fd15 Author: Zhijiang <[email protected]> AuthorDate: Thu Jun 27 12:03:05 2019 +0800 [hotfix][network,tests] Use the simple constructor of ResultPartitionID in tests --- .../flink/runtime/io/network/partition/ResultPartitionID.java | 2 ++ .../runtime/io/network/netty/NettyMessageSerializationTest.java | 8 +++----- .../io/network/partition/consumer/SingleInputGateTest.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartitionID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartitionID.java index cee79a0..317d17f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartitionID.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/ResultPartitionID.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.io.network.partition; +import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.runtime.executiongraph.ExecutionAttemptID; import org.apache.flink.runtime.executiongraph.IntermediateResultPartition; import org.apache.flink.runtime.jobgraph.IntermediateResultPartitionID; @@ -39,6 +40,7 @@ public final class ResultPartitionID implements Serializable { private final ExecutionAttemptID producerId; + @VisibleForTesting public ResultPartitionID() { this(new IntermediateResultPartitionID(), new ExecutionAttemptID()); } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyMessageSerializationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyMessageSerializationTest.java index a8c473f..9d16dac 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyMessageSerializationTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/netty/NettyMessageSerializationTest.java @@ -20,13 +20,11 @@ package org.apache.flink.runtime.io.network.netty; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.runtime.event.task.IntegerTaskEvent; -import org.apache.flink.runtime.executiongraph.ExecutionAttemptID; import org.apache.flink.runtime.io.network.buffer.Buffer; import org.apache.flink.runtime.io.network.buffer.FreeingBufferRecycler; import org.apache.flink.runtime.io.network.buffer.NetworkBuffer; import org.apache.flink.runtime.io.network.partition.ResultPartitionID; import org.apache.flink.runtime.io.network.partition.consumer.InputChannelID; -import org.apache.flink.runtime.jobgraph.IntermediateResultPartitionID; import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.flink.shaded.netty4.io.netty.channel.embedded.EmbeddedChannel; @@ -97,7 +95,7 @@ public class NettyMessageSerializationTest { } { - NettyMessage.PartitionRequest expected = new NettyMessage.PartitionRequest(new ResultPartitionID(new IntermediateResultPartitionID(), new ExecutionAttemptID()), random.nextInt(), new InputChannelID(), random.nextInt()); + NettyMessage.PartitionRequest expected = new NettyMessage.PartitionRequest(new ResultPartitionID(), random.nextInt(), new InputChannelID(), random.nextInt()); NettyMessage.PartitionRequest actual = encodeAndDecode(expected); assertEquals(expected.partitionId, actual.partitionId); @@ -107,7 +105,7 @@ public class NettyMessageSerializationTest { } { - NettyMessage.TaskEventRequest expected = new NettyMessage.TaskEventRequest(new IntegerTaskEvent(random.nextInt()), new ResultPartitionID(new IntermediateResultPartitionID(), new ExecutionAttemptID()), new InputChannelID()); + NettyMessage.TaskEventRequest expected = new NettyMessage.TaskEventRequest(new IntegerTaskEvent(random.nextInt()), new ResultPartitionID(), new InputChannelID()); NettyMessage.TaskEventRequest actual = encodeAndDecode(expected); assertEquals(expected.event, actual.event); @@ -130,7 +128,7 @@ public class NettyMessageSerializationTest { } { - NettyMessage.AddCredit expected = new NettyMessage.AddCredit(new ResultPartitionID(new IntermediateResultPartitionID(), new ExecutionAttemptID()), random.nextInt(Integer.MAX_VALUE) + 1, new InputChannelID()); + NettyMessage.AddCredit expected = new NettyMessage.AddCredit(new ResultPartitionID(), random.nextInt(Integer.MAX_VALUE) + 1, new InputChannelID()); NettyMessage.AddCredit actual = encodeAndDecode(expected); assertEquals(expected.partitionId, actual.partitionId); diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGateTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGateTest.java index 39ec9e2..d737949 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGateTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/SingleInputGateTest.java @@ -196,7 +196,7 @@ public class SingleInputGateTest extends InputGateTestBase { inputGate.setBufferPool(bufferPool); // Local - ResultPartitionID localPartitionId = new ResultPartitionID(new IntermediateResultPartitionID(), new ExecutionAttemptID()); + ResultPartitionID localPartitionId = new ResultPartitionID(); InputChannelBuilder.newBuilder() .setPartitionId(localPartitionId) @@ -205,7 +205,7 @@ public class SingleInputGateTest extends InputGateTestBase { .buildLocalAndSetToGate(inputGate); // Unknown - ResultPartitionID unknownPartitionId = new ResultPartitionID(new IntermediateResultPartitionID(), new ExecutionAttemptID()); + ResultPartitionID unknownPartitionId = new ResultPartitionID(); InputChannelBuilder.newBuilder() .setChannelIndex(1)
