Fix index usage on getVertices() when property order is inverted

Resolves: #7375
orientechnologies · May 2, 2017 · 6fe392e · 6fe392e
1 parent 5499f44
commit 6fe392e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientBaseGraph.java b/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientBaseGraph.java
@@ -900,6 +900,9 @@ public Vertex getVertexByKey(final String iKey, Object iValue) {
    * @return Vertices as Iterable
    */
   public Iterable<Vertex> getVertices(final String label, final String[] iKey, Object[] iValue) {
+    if (iKey.length != iValue.length) {
+      throw new IllegalArgumentException("key names and values must be arrays of the same size");
+    }
     makeActive();
     final OClass clazz = getDatabase().getMetadata().getImmutableSchemaSnapshot().getClass(label);
     if (clazz != null) {
@@ -911,7 +914,12 @@ public Iterable<Vertex> getVertices(final String label, final String[] iKey, Obj
           if ("lucene".equalsIgnoreCase(idx.getAlgorithm())) {
             continue;
           }
-          List<Object> keys = Arrays.asList(convertKeys(idx, iValue));
+          Object[] sortedParams = new Object[iValue.length];
+          List<String> indexFields = idx.getDefinition().getFields();
+          for (int i = 0; i < iKey.length; i++) {
+            sortedParams[indexFields.indexOf(iKey[i])] = iValue[i];
+          }
+          List<Object> keys = Arrays.asList(convertKeys(idx, sortedParams));
           Object key;
           if (keys.size() == 1) {
             key = keys.get(0);

diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/IndexTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/IndexTest.java
@@ -42,9 +42,7 @@
 import com.orientechnologies.orient.test.domain.business.Account;
 import com.orientechnologies.orient.test.domain.whiz.Profile;
 import com.tinkerpop.blueprints.Vertex;
-import com.tinkerpop.blueprints.impls.orient.OrientEdgeType;
-import com.tinkerpop.blueprints.impls.orient.OrientGraph;
-import com.tinkerpop.blueprints.impls.orient.OrientVertexType;
+import com.tinkerpop.blueprints.impls.orient.*;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Optional;
@@ -2205,6 +2203,26 @@ public void testNullValuesCountHashNotUniqueTwo() {
     Assert.assertEquals(index.getSize(), 2);
   }
 
+  @Test
+  public void testParamsOrder() {
+
+    OrientBaseGraph graph = new OrientGraphNoTx("memory:IndexTest_testParamsOrder", "admin", "admin");
+
+    graph.command(new OCommandSQL("CREATE CLASS Task extends V")).execute();
+    graph.command(new OCommandSQL("CREATE PROPERTY Task.projectId STRING (MANDATORY TRUE, NOTNULL, MAX 20)")).execute();
+    graph.command(new OCommandSQL("CREATE PROPERTY Task.seq SHORT ( MANDATORY TRUE, NOTNULL, MIN 0)")).execute();
+    graph.command(new OCommandSQL("CREATE INDEX TaskPK ON Task (projectId, seq) UNIQUE")).execute();
+
+    graph.command(new OCommandSQL("INSERT INTO Task (projectId, seq) values ( 'foo', 2)")).execute();
+    graph.command(new OCommandSQL("INSERT INTO Task (projectId, seq) values ( 'bar', 3)")).execute();
+    Iterable<Vertex> x = graph.getVertices("Task", new String[] { "seq", "projectId" }, new Object[] { (short) 2, "foo" });
+    Iterator<Vertex> iter = x.iterator();
+    Assert.assertTrue(iter.hasNext());
+    iter.next();
+    Assert.assertFalse(iter.hasNext());
+    graph.drop();
+  }
+
   private static void checkIndexKeys(OrientGraph graph, String indexName) {
     Iterable<ODocument> indexDataDocs = (Iterable<ODocument>) graph.getRawGraph()
         .query(new OSQLSynchQuery<ODocument>("select from index:" + indexName));