This is an automated email from the ASF dual-hosted git repository. zhuzh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 331264ccf65d1887015667cb0c543a7c0fe862c4 Author: Zhu Zhu <[email protected]> AuthorDate: Fri Jul 8 10:52:57 2022 +0800 [hotfix] Remove the initialCapacity param from the constructor of DualKeyLinkedMap The initial capacity of a map does not make much sense and is not necessarily needed currently. --- .../org/apache/flink/runtime/scheduler/SharedSlot.java | 3 +-- .../org/apache/flink/runtime/util/DualKeyLinkedMap.java | 6 +++--- .../apache/flink/runtime/util/DualKeyLinkedMapTest.java | 16 +++++++--------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/SharedSlot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/SharedSlot.java index 656ce2a6fac..d46c6a191cf 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/SharedSlot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/SharedSlot.java @@ -101,8 +101,7 @@ class SharedSlot implements SlotOwner, PhysicalSlot.Payload { "Unexpected physical slot payload assignment failure!"); return physicalSlot; }); - this.requestedLogicalSlots = - new DualKeyLinkedMap<>(executionSlotSharingGroup.getExecutionVertexIds().size()); + this.requestedLogicalSlots = new DualKeyLinkedMap<>(); this.slotWillBeOccupiedIndefinitely = slotWillBeOccupiedIndefinitely; this.externalReleaseCallback = externalReleaseCallback; this.state = State.ALLOCATED; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/DualKeyLinkedMap.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/DualKeyLinkedMap.java index 857d39571a4..63d39bd5746 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/DualKeyLinkedMap.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/DualKeyLinkedMap.java @@ -50,9 +50,9 @@ public class DualKeyLinkedMap<A, B, V> { private Collection<V> values; - public DualKeyLinkedMap(int initialCapacity) { - this.aMap = new LinkedHashMap<>(initialCapacity); - this.bMap = new HashMap<>(initialCapacity); + public DualKeyLinkedMap() { + this.aMap = new LinkedHashMap<>(); + this.bMap = new HashMap<>(); } public int size() { diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/DualKeyLinkedMapTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/DualKeyLinkedMapTest.java index c60982f6306..cd506942189 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/DualKeyLinkedMapTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/DualKeyLinkedMapTest.java @@ -39,17 +39,15 @@ public class DualKeyLinkedMapTest extends TestLogger { @Test public void testKeySets() { final Random random = new Random(); - final int capacity = 10; - final Set<Tuple2<Integer, Integer>> keys = new HashSet<>(capacity); + final Set<Tuple2<Integer, Integer>> keys = new HashSet<>(); - for (int i = 0; i < capacity; i++) { + for (int i = 0; i < 10; i++) { int keyA = random.nextInt(); int keyB = random.nextInt(); keys.add(Tuple2.of(keyA, keyB)); } - final DualKeyLinkedMap<Integer, Integer, String> dualKeyMap = - new DualKeyLinkedMap<>(capacity); + final DualKeyLinkedMap<Integer, Integer, String> dualKeyMap = new DualKeyLinkedMap<>(); for (Tuple2<Integer, Integer> key : keys) { dualKeyMap.put(key.f0, key.f1, "foobar"); @@ -65,7 +63,7 @@ public class DualKeyLinkedMapTest extends TestLogger { @Test public void ensuresOneToOneMappingBetweenKeysSamePrimaryKey() { - final DualKeyLinkedMap<Integer, Integer, String> map = new DualKeyLinkedMap<>(2); + final DualKeyLinkedMap<Integer, Integer, String> map = new DualKeyLinkedMap<>(); final String secondValue = "barfoo"; map.put(1, 1, "foobar"); @@ -78,7 +76,7 @@ public class DualKeyLinkedMapTest extends TestLogger { @Test public void ensuresOneToOneMappingBetweenKeysSameSecondaryKey() { - final DualKeyLinkedMap<Integer, Integer, String> map = new DualKeyLinkedMap<>(2); + final DualKeyLinkedMap<Integer, Integer, String> map = new DualKeyLinkedMap<>(); final String secondValue = "barfoo"; map.put(1, 1, "foobar"); @@ -91,7 +89,7 @@ public class DualKeyLinkedMapTest extends TestLogger { @Test public void testPrimaryKeyOrderIsNotAffectedIfReInsertedWithSameSecondaryKey() { - final DualKeyLinkedMap<Integer, Integer, String> map = new DualKeyLinkedMap<>(2); + final DualKeyLinkedMap<Integer, Integer, String> map = new DualKeyLinkedMap<>(); final String value1 = "1"; map.put(1, 1, value1); @@ -106,7 +104,7 @@ public class DualKeyLinkedMapTest extends TestLogger { @Test public void testPrimaryKeyOrderIsNotAffectedIfReInsertedWithDifferentSecondaryKey() { - final DualKeyLinkedMap<Integer, Integer, String> map = new DualKeyLinkedMap<>(2); + final DualKeyLinkedMap<Integer, Integer, String> map = new DualKeyLinkedMap<>(); final String value1 = "1"; map.put(1, 1, value1);
