fix

shuwenwei · shuwenwei · commit 1051e394d7f3 · 2026-06-16T16:43:07.000+08:00
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/readTsFile/ExternalTsFileQueryResource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/readTsFile/ExternalTsFileQueryResource.java
@@ -283,9 +283,7 @@ private void sortPendingDeviceTasks() {
       if (deviceEntryComparator != null) {
         pendingDeviceTasks.sort(
             (left, right) ->
-                deviceEntryComparator.compare(
-                    sharedDeviceEntries.get(left.deviceEntryIndex),
-                    sharedDeviceEntries.get(right.deviceEntryIndex)));
+                compareDeviceEntryIndexes(left.deviceEntryIndex, right.deviceEntryIndex));
       } else {
         pendingDeviceTasks.sort(
             (left, right) ->
@@ -345,10 +343,7 @@ void finish() {
 
     private void sortDeviceEntries() {
       if (deviceEntryComparator != null) {
-        deviceEntryIndexes.sort(
-            (left, right) ->
-                deviceEntryComparator.compare(
-                    sharedDeviceEntries.get(left), sharedDeviceEntries.get(right)));
+        deviceEntryIndexes.sort(ExternalTsFileQueryResource.this::compareDeviceEntryIndexes);
       } else {
         deviceEntryIndexes.sort(
             (left, right) ->
@@ -368,6 +363,15 @@ private List<DeviceTask> getPendingDeviceTasks() {
     }
   }
 
+  private int compareDeviceEntryIndexes(int leftIndex, int rightIndex) {
+    int result =
+        deviceEntryComparator.compare(
+            sharedDeviceEntries.get(leftIndex), sharedDeviceEntries.get(rightIndex));
+    // Use the stable device entry index as a tie-breaker so list sorting and run-file merging keep
+    // the same deterministic order when the pushed-down comparator is not a total order.
+    return result != 0 ? result : Integer.compare(leftIndex, rightIndex);
+  }
+
   private void createDeviceTaskPartitions(int partitionCount) {
     if (partitionCount <= 0) {
       throw new IllegalArgumentException(
@@ -420,8 +424,9 @@ public class DeviceTaskRunReader implements AutoCloseable {
           usePriorityQueue
               ? new PriorityQueue<>(
                   (left, right) ->
-                      comparator.compare(
-                          left.getCurrentDeviceEntry(), right.getCurrentDeviceEntry()))
+                      compareDeviceEntryIndexes(
+                          left.getCurrentDeviceTask().deviceEntryIndex,
+                          right.getCurrentDeviceTask().deviceEntryIndex))
               : new ArrayDeque<>();
       for (Path runFile : partition.getRunFiles()) {
         DeviceTaskRunCursor cursor = new DiskDeviceTaskRunCursor(runFile, sharedDeviceEntries);
