fix: corrected execution of order by when the index do not cover nested properties, issue #10732

tglman · tglman · commit fe9c2145aeaa · 2026-03-16T18:16:36.000+07:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/OSelectExecutionPlanner.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/OSelectExecutionPlanner.java
@@ -2566,6 +2566,9 @@ private boolean fullySorted(OOrderBy orderBy, OAndBlock conditions, OIndex idx)
     String order = null;
 
     for (OOrderByItem item : orderBy.getItems()) {
+      if (item.getModifier() != null) {
+        return false;
+      }
       if (order == null) {
         order = item.getType();
       } else if (!order.equals(item.getType())) {
diff --git a/core/src/test/java/com/orientechnologies/orient/core/sql/executor/OSelectStatementExecutionTest.java b/core/src/test/java/com/orientechnologies/orient/core/sql/executor/OSelectStatementExecutionTest.java
@@ -14,6 +14,7 @@
 import com.orientechnologies.orient.core.id.ORID;
 import com.orientechnologies.orient.core.id.ORecordId;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
+import com.orientechnologies.orient.core.metadata.schema.OClass.INDEX_TYPE;
 import com.orientechnologies.orient.core.metadata.schema.OProperty;
 import com.orientechnologies.orient.core.metadata.schema.OSchema;
 import com.orientechnologies.orient.core.metadata.schema.OType;
@@ -410,6 +411,66 @@ public void testSelectOrderWithProjections2() {
     result.close();
   }
 
+  @Test
+  public void testSelectOrderLinkSetIndex() {
+    String className = "testSelectOrderLinkSetIndex";
+    OClass c1 = db.getMetadata().getSchema().createClass(className);
+    c1.createProperty("Name", OType.STRING);
+    String className2 = "testSelectOrderLinkSetIndexLink";
+    OClass c2 = db.getMetadata().getSchema().createClass(className2);
+    OProperty p = c2.createProperty("NativeState", OType.LINKSET, c1);
+    p.createIndex(INDEX_TYPE.NOTUNIQUE);
+
+    db.command("INSERT INTO " + className + " SET Name = 'M'").close();
+    ;
+    db.command("INSERT INTO " + className + " SET Name = 'P'").close();
+    ;
+    db.command("INSERT INTO " + className + " SET Name = 'G'").close();
+    ;
+
+    db.command(
+            "INSERT INTO "
+                + className2
+                + " SET NativeState = (SELECT FROM "
+                + className
+                + " WHERE Name = 'M')")
+        .close();
+    ;
+    db.command(
+            "INSERT INTO "
+                + className2
+                + " SET NativeState = (SELECT FROM "
+                + className
+                + " WHERE Name = 'P')")
+        .close();
+    ;
+    db.command(
+            "INSERT INTO "
+                + className2
+                + " SET NativeState = (SELECT FROM "
+                + className
+                + " WHERE Name = 'G')")
+        .close();
+    ;
+
+    OResultSet result =
+        db.query(
+            "SELECT NativeState, NativeState[0].Name AS _NativeState_Name \n"
+                + "FROM "
+                + className2
+                + " WHERE NativeState IN (SELECT FROM "
+                + className
+                + " WHERE Name IN ['M','P','G']) \n"
+                + "ORDER BY NativeState[0].Name DESC");
+    printExecutionPlan(result);
+    List<String> names =
+        result.stream()
+            .map((x) -> (String) x.getProperty("_NativeState_Name"))
+            .collect(Collectors.toList());
+    assertEquals(Arrays.asList("P", "M", "G"), names);
+    result.close();
+  }
+
   @Test
   public void testSelectFullScanWithFilter1() {
     String className = "testSelectFullScanWithFilter1";
