This is an automated email from the ASF dual-hosted git repository.
JingsongLi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 4ec5c1997e [flink] Optimize byte array comparison for sorters (#8192)
4ec5c1997e is described below
commit 4ec5c1997e338d28d405c2b47efa05ba7d245ab8
Author: Juntao Zhang <[email protected]>
AuthorDate: Wed Jun 10 22:58:38 2026 +0800
[flink] Optimize byte array comparison for sorters (#8192)
---
.../org/apache/paimon/flink/sorter/HilbertSorter.java | 19 +++++++++----------
.../org/apache/paimon/flink/sorter/ZorderSorter.java | 19 +++++++++----------
2 files changed, 18 insertions(+), 20 deletions(-)
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sorter/HilbertSorter.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sorter/HilbertSorter.java
index 65d034ca70..27867cd205 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sorter/HilbertSorter.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sorter/HilbertSorter.java
@@ -26,8 +26,7 @@ import org.apache.paimon.sort.hilbert.HilbertIndexer;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataTypes;
import org.apache.paimon.types.RowType;
-
-import
org.apache.paimon.shade.guava30.com.google.common.primitives.UnsignedBytes;
+import org.apache.paimon.utils.SortUtil;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.streaming.api.datastream.DataStream;
@@ -37,6 +36,8 @@ import org.apache.flink.table.data.RowData;
import java.util.Arrays;
import java.util.Collections;
+import static org.apache.paimon.utils.Preconditions.checkArgument;
+
/**
* This is a table sorter which will sort the records by the hilbert curve of
specified columns. It
* works on stream api. It computes the hilbert index by {@link
HilbertIndexer}. After add the
@@ -82,14 +83,12 @@ public class HilbertSorter extends TableSorter {
TypeInformation.of(byte[].class),
() ->
(b1, b2) -> {
- assert b1.length == b2.length;
- for (int i = 0; i < b1.length; i++) {
- int ret = UnsignedBytes.compare(b1[i], b2[i]);
- if (ret != 0) {
- return ret;
- }
- }
- return 0;
+ checkArgument(
+ b1.length == b2.length,
+ "Hilbert curve keys must have the same
length, but got %d and %d",
+ b1.length,
+ b2.length);
+ return SortUtil.compareBinary(b1, b2);
},
new SortUtils.KeyAbstract<byte[]>() {
@Override
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sorter/ZorderSorter.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sorter/ZorderSorter.java
index 7688bb609a..dcb121024f 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sorter/ZorderSorter.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sorter/ZorderSorter.java
@@ -26,8 +26,7 @@ import org.apache.paimon.sort.zorder.ZIndexer;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataTypes;
import org.apache.paimon.types.RowType;
-
-import
org.apache.paimon.shade.guava30.com.google.common.primitives.UnsignedBytes;
+import org.apache.paimon.utils.SortUtil;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.streaming.api.datastream.DataStream;
@@ -37,6 +36,8 @@ import org.apache.flink.table.data.RowData;
import java.util.Arrays;
import java.util.Collections;
+import static org.apache.paimon.utils.Preconditions.checkArgument;
+
/**
* This is a table sorter which will sort the records by the z-order of
specified columns. It works
* on stream api. It computes the z-order-index by {@link ZIndexer}. After add
the column of
@@ -82,14 +83,12 @@ public class ZorderSorter extends TableSorter {
TypeInformation.of(byte[].class),
() ->
(b1, b2) -> {
- assert b1.length == b2.length;
- for (int i = 0; i < b1.length; i++) {
- int ret = UnsignedBytes.compare(b1[i], b2[i]);
- if (ret != 0) {
- return ret;
- }
- }
- return 0;
+ checkArgument(
+ b1.length == b2.length,
+ "Z-order curve keys must have the same
length, but got %d and %d",
+ b1.length,
+ b2.length);
+ return SortUtil.compareBinary(b1, b2);
},
new SortUtils.KeyAbstract<byte[]>() {
@Override
