You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by pa...@apache.org on 2026/04/14 00:17:04 UTC

(flink) branch master updated (39c4348e7e0 -> 5c2a4ccb91e)

This is an automated email from the ASF dual-hosted git repository.

panyuepeng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


    from 39c4348e7e0 [FLINK-39427][build] Use Apache Parent POM 35
     new f9ed1d2de96 [hotfix][test] Use Long#compare to replace equivalent statements to improve readability.
     new 5c2a4ccb91e [hotfix][test] Move some auto-closable variables into try-block to manage the closing of objects for MassiveStringSorting.java and MassiveStringValueSorting.java

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../runtime/operators/hash/CompactingHashTableTest.java  |  2 +-
 .../flink/runtime/operators/hash/HashTableTest.java      |  2 +-
 .../operators/hash/InPlaceMutableHashTableTest.java      |  2 +-
 .../test/manual/HashTableRecordWidthCombinations.java    |  2 +-
 .../apache/flink/test/manual/MassiveStringSorting.java   | 12 ++----------
 .../flink/test/manual/MassiveStringValueSorting.java     | 16 ++--------------
 6 files changed, 8 insertions(+), 28 deletions(-)


(flink) 01/02: [hotfix][test] Use Long#compare to replace equivalent statements to improve readability.

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

panyuepeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit f9ed1d2de96963f4c6c0431ce5ebc867f1dda1ce
Author: Yuepeng Pan <pa...@apache.org>
AuthorDate: Thu Apr 9 20:20:42 2026 +0800

    [hotfix][test] Use Long#compare to replace equivalent statements to improve readability.
---
 .../apache/flink/runtime/operators/hash/CompactingHashTableTest.java    | 2 +-
 .../java/org/apache/flink/runtime/operators/hash/HashTableTest.java     | 2 +-
 .../flink/runtime/operators/hash/InPlaceMutableHashTableTest.java       | 2 +-
 .../org/apache/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 61846a8afe6..757cf5d549b 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 @@ class CompactingHashTableTest extends MutableHashTableTestBase {
                     public int compareToReference(Tuple2<Long, String> 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 b948dae8342..3fce3955dcd 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 @@ class HashTableTest {
                     public int compareToReference(Tuple2<Long, byte[]> 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 418814ff99c..3a944bac709 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 @@ class InPlaceMutableHashTableTest extends MutableHashTableTestBase {
                     public int compareToReference(Tuple2<Long, String> 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 9988134755b..5cc613b351d 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 class HashTableRecordWidthCombinations {
                     public int compareToReference(Tuple2<Long, byte[]> candidate) {
                         long x = ref;
                         long y = candidate.f0;
-                        return (x < y) ? -1 : ((x == y) ? 0 : 1);
+                        return Long.compare(x, y);
                     }
                 };
 


(flink) 02/02: [hotfix][test] Move some auto-closable variables into try-block to manage the closing of objects for MassiveStringSorting.java and MassiveStringValueSorting.java

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

panyuepeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 5c2a4ccb91ea8f6c8925c3f8cffa9078a966c5e8
Author: Yuepeng Pan <pa...@apache.org>
AuthorDate: Thu Apr 9 20:43:09 2026 +0800

    [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 <si...@gmail.com>
---
 .../apache/flink/test/manual/MassiveStringSorting.java   | 12 ++----------
 .../flink/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 16ffa29f301..88d97ad8533 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 @@ public class MassiveStringSorting {
         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 @@ public class MassiveStringSorting {
                 wrt.write(str);
                 wrt.newLine();
             }
-        } finally {
-            wrt.close();
         }
 
         return f;
@@ -393,9 +389,7 @@ public class MassiveStringSorting {
         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 @@ public class MassiveStringSorting {
                 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 1b3550f71d8..699c95f5739 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 @@ public class MassiveStringValueSorting {
         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 @@ public class MassiveStringValueSorting {
                 wrt.write(str);
                 wrt.newLine();
             }
-        } finally {
-            if (wrt != null) {
-                wrt.close();
-            }
         }
 
         return f;
@@ -421,9 +415,7 @@ public class MassiveStringValueSorting {
         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 @@ public class MassiveStringValueSorting {
                 wrt.write(str);
                 wrt.newLine();
             }
-        } finally {
-            if (wrt != null) {
-                wrt.close();
-            }
         }
 
         return f;