fix: correct class cast exception on index query lookup: issue #10530

tglman · tglman · commit 4928dddda01e · 2025-09-01T14:48:11.000+01:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/FetchFromIndexStep.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/FetchFromIndexStep.java
@@ -319,10 +319,32 @@ private void processInCondition() {
     if (OMultiValue.isMultiValue(rightValue)) {
       customIterator = new OMultiCollectionIterator<>();
       Set<Object> itemsSet;
+      Comparator<Object> com =
+          new Comparator<Object>() {
+
+            @Override
+            public int compare(Object o1, Object o2) {
+              if (o1 instanceof Collection && o2 instanceof Collection) {
+                Collection c1 = (Collection) o1;
+                Collection c2 = (Collection) o2;
+                if (c1.size() != c2.size()) {
+                  return c1.size() - c2.size();
+                }
+                Iterator i1 = c1.iterator();
+                Iterator i2 = c2.iterator();
+                while (i1.hasNext() && i2.hasNext()) {
+                  int comp = ((Comparable) i1.next()).compareTo(i2.next());
+                  if (comp != 0) return comp;
+                }
+                return 1;
+              }
+              return ((Comparable) o1).compareTo(o2);
+            }
+          };
       if (orderAsc) {
-        itemsSet = new TreeSet<>();
+        itemsSet = new TreeSet<>(com);
       } else {
-        itemsSet = new TreeSet<>((Comparator<Object>) Collections.reverseOrder());
+        itemsSet = new TreeSet<>((Comparator<Object>) Collections.reverseOrder(com));
       }
       for (Object item : OMultiValue.getMultiValueIterable(rightValue)) {
         if (item instanceof OResult) {
@@ -333,6 +355,8 @@ private void processInCondition() {
                 ((OResult) item).getProperty(((OResult) item).getPropertyNames().iterator().next());
           }
         }
+        if (item instanceof List) {}
+
         itemsSet.add(item);
       }
       for (Object item : itemsSet) {
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
@@ -928,6 +928,29 @@ public void testFetchFromClustersNumberOrderByRidAsc() {
     result.close();
   }
 
+  @Test
+  public void testFetchFromClassWithIndexComposite() {
+    db.command("create class CompositeIndexWithoutNullValues").close();
+    db.command("create property CompositeIndexWithoutNullValues.one String").close();
+    db.command("create property CompositeIndexWithoutNullValues.two String").close();
+    db.command(
+            "create index CompositeIndexWithoutNullValues.one_two on"
+                + " CompositeIndexWithoutNullValues (one, two) NOTUNIQUE METADATA"
+                + " {ignoreNullValues: true}")
+        .close();
+
+    db.command("insert into CompositeIndexWithoutNullValues set one = 'foo', two = 'beer' ")
+        .close();
+    db.command("insert into CompositeIndexWithoutNullValues set one = 'foo', two = 'bar'").close();
+    List<OResult> results =
+        db
+            .query(
+                "select from index:CompositeIndexWithoutNullValues.one_two where key in [['beer','foo']]")
+            .stream()
+            .collect(Collectors.toList());
+    assertEquals(results.size(), 0);
+  }
+
   @Test
   public void testQueryAsTarget() {
     String className = "testQueryAsTarget";
