From 8fe878669d161f1adb05e48ced3a64c0968e24c2 Mon Sep 17 00:00:00 2001 From: Yuepeng Pan Date: Thu, 9 Apr 2026 20:20:42 +0800 Subject: [PATCH 1/2] [hotfix][test] Use Long#compare to replace equivalent statements to improve readability. --- .../flink/runtime/operators/hash/CompactingHashTableTest.java | 2 +- .../org/apache/flink/runtime/operators/hash/HashTableTest.java | 2 +- .../runtime/operators/hash/InPlaceMutableHashTableTest.java | 2 +- .../flink/test/manual/HashTableRecordWidthCombinations.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/CompactingHashTableTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/CompactingHashTableTest.java index 61846a8afe650..757cf5d549bd0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/CompactingHashTableTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/CompactingHashTableTest.java @@ -70,7 +70,7 @@ public boolean equalToReference(Tuple2 candidate) { public int compareToReference(Tuple2 candidate) { long x = ref; long y = candidate.f0; - return (x < y) ? -1 : ((x == y) ? 0 : 1); + return Long.compare(x, y); } }; } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableTest.java index b948dae834283..3fce3955dcda6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableTest.java @@ -99,7 +99,7 @@ public boolean equalToReference(Tuple2 candidate) { public int compareToReference(Tuple2 candidate) { long x = ref; long y = candidate.f0; - return (x < y) ? -1 : ((x == y) ? 0 : 1); + return Long.compare(x, y); } }; } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java index 418814ff99caf..3a944bac709ae 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java @@ -118,7 +118,7 @@ public boolean equalToReference(Tuple2 candidate) { public int compareToReference(Tuple2 candidate) { long x = ref; long y = candidate.f0; - return (x < y) ? -1 : ((x == y) ? 0 : 1); + return Long.compare(x, y); } }; } diff --git a/flink-tests/src/test/java/org/apache/flink/test/manual/HashTableRecordWidthCombinations.java b/flink-tests/src/test/java/org/apache/flink/test/manual/HashTableRecordWidthCombinations.java index 9988134755b4d..5cc613b351daa 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/manual/HashTableRecordWidthCombinations.java +++ b/flink-tests/src/test/java/org/apache/flink/test/manual/HashTableRecordWidthCombinations.java @@ -83,7 +83,7 @@ public boolean equalToReference(Tuple2 candidate) { public int compareToReference(Tuple2 candidate) { long x = ref; long y = candidate.f0; - return (x < y) ? -1 : ((x == y) ? 0 : 1); + return Long.compare(x, y); } }; From 135b2ad299475bdcbc7e9d8aeec2de82b619cf8f Mon Sep 17 00:00:00 2001 From: Yuepeng Pan Date: Thu, 9 Apr 2026 20:43:09 +0800 Subject: [PATCH 2/2] [hotfix][test] Move some auto-closable variables into try-block to manage the closing of objects for MassiveStringSorting.java and MassiveStringValueSorting.java Co-authored-by: spuru9 --- .../flink/test/manual/MassiveStringSorting.java | 12 ++---------- .../test/manual/MassiveStringValueSorting.java | 16 ++-------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringSorting.java b/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringSorting.java index 16ffa29f30110..88d97ad853344 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringSorting.java +++ b/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringSorting.java @@ -363,9 +363,7 @@ private File generateFileWithStrings(int numStrings, String prefix) throws IOExc bld.append(prefix); File f = File.createTempFile("strings", "txt"); - BufferedWriter wrt = null; - try { - wrt = new BufferedWriter(new FileWriter(f)); + try (BufferedWriter wrt = new BufferedWriter(new FileWriter(f))) { for (int i = 0; i < numStrings; i++) { bld.setLength(resetValue); @@ -380,8 +378,6 @@ private File generateFileWithStrings(int numStrings, String prefix) throws IOExc wrt.write(str); wrt.newLine(); } - } finally { - wrt.close(); } return f; @@ -393,9 +389,7 @@ private File generateFileWithStringTuples(int numStrings, String prefix) throws final StringBuilder bld = new StringBuilder(); File f = File.createTempFile("strings", "txt"); - BufferedWriter wrt = null; - try { - wrt = new BufferedWriter(new FileWriter(f)); + try (BufferedWriter wrt = new BufferedWriter(new FileWriter(f))) { for (int i = 0; i < numStrings; i++) { bld.setLength(0); @@ -420,8 +414,6 @@ private File generateFileWithStringTuples(int numStrings, String prefix) throws wrt.write(str); wrt.newLine(); } - } finally { - wrt.close(); } return f; diff --git a/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringValueSorting.java b/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringValueSorting.java index 1b3550f71d8a3..699c95f573996 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringValueSorting.java +++ b/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringValueSorting.java @@ -389,9 +389,7 @@ private File generateFileWithStrings(int numStrings, String prefix) throws IOExc bld.append(prefix); File f = File.createTempFile("strings", "txt"); - BufferedWriter wrt = null; - try { - wrt = new BufferedWriter(new FileWriter(f)); + try (BufferedWriter wrt = new BufferedWriter(new FileWriter(f))) { for (int i = 0; i < numStrings; i++) { bld.setLength(resetValue); @@ -406,10 +404,6 @@ private File generateFileWithStrings(int numStrings, String prefix) throws IOExc wrt.write(str); wrt.newLine(); } - } finally { - if (wrt != null) { - wrt.close(); - } } return f; @@ -421,9 +415,7 @@ private File generateFileWithStringTuples(int numStrings, String prefix) throws final StringBuilder bld = new StringBuilder(); File f = File.createTempFile("strings", "txt"); - BufferedWriter wrt = null; - try { - wrt = new BufferedWriter(new FileWriter(f)); + try (BufferedWriter wrt = new BufferedWriter(new FileWriter(f))) { for (int i = 0; i < numStrings; i++) { bld.setLength(0); @@ -448,10 +440,6 @@ private File generateFileWithStringTuples(int numStrings, String prefix) throws wrt.write(str); wrt.newLine(); } - } finally { - if (wrt != null) { - wrt.close(); - } } return f;