Fix index usage in tx

Resolves: #7322
orientechnologies · Apr 18, 2017 · 184bcd2 · 184bcd2
1 parent d948bc0
commit 184bcd2
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexTxAwareMultiValue.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexTxAwareMultiValue.java
@@ -170,10 +170,10 @@ public PureTxBetweenIndexBackwardCursor(Object fromKey, boolean fromInclusive, O
       else
         lastKey = indexChanges.getLowerKey(toKey);
 
-      if (firstKey != null && ODefaultComparator.INSTANCE.compare(firstKey, toKey) > 0) {
+      if (firstKey != null && ODefaultComparator.INSTANCE.compare(firstKey, fromKey) < 0) {
         nextKey = null;
       } else {
-        nextKey = firstKey;
+        nextKey = lastKey;
       }
     }
 

diff --git a/core/src/main/java/com/orientechnologies/orient/core/index/OIndexTxAwareOneValue.java b/core/src/main/java/com/orientechnologies/orient/core/index/OIndexTxAwareOneValue.java
@@ -87,7 +87,11 @@ public PureTxBetweenIndexForwardCursor(Object fromKey, boolean fromInclusive, Ob
       else
         lastKey = indexChanges.getLowerKey(toKey);
 
-      nextKey = firstKey;
+      if (firstKey != null && ODefaultComparator.INSTANCE.compare(firstKey, toKey) > 0) {
+        nextKey = null;
+      } else {
+        nextKey = firstKey;
+      }
     }
 
     @Override
@@ -134,7 +138,11 @@ public PureTxBetweenIndexBackwardCursor(Object fromKey, boolean fromInclusive, O
       else
         lastKey = indexChanges.getLowerKey(toKey);
 
-      nextKey = lastKey;
+      if (firstKey != null && ODefaultComparator.INSTANCE.compare(firstKey, fromKey) < 0) {
+        nextKey = null;
+      } else {
+        nextKey = lastKey;
+      }
     }
 
     @Override

diff --git a/core/src/test/java/com/orientechnologies/orient/core/tx/TransactionQueryIndexTests.java b/core/src/test/java/com/orientechnologies/orient/core/tx/TransactionQueryIndexTests.java
@@ -14,7 +14,6 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Created by tglman on 12/04/17.
@@ -51,6 +50,28 @@ public void test() {
     assertEquals(0L, res.stream().count());
   }
 
+  @Test
+  public void test2() {
+    OClass clazz = database.createClass("Test2");
+    clazz.createProperty("foo", OType.STRING);
+    clazz.createProperty("bar", OType.STRING);
+    clazz.createIndex("Test2.foo_bar", OClass.INDEX_TYPE.NOTUNIQUE, "foo", "bar");
+
+    database.begin();
+    ODocument doc = database.newInstance("Test2");
+    doc.setProperty("foo", "abcdefg");
+    doc.setProperty("bar", "abcdefg");
+    database.save(doc);
+    OResultSet res = database.query("select from Test2 where foo='abcdefg' and bar = 'abcdefg' ");
+
+    assertEquals(1L, res.stream().count());
+
+    res = database.query("select from Test2 where foo='aaaaa' and bar = 'aaa'");
+
+    System.out.println(res.getExecutionPlan().get().prettyPrint(0, 0));
+    assertEquals(0L, res.stream().count());
+  }
+
   @After
   public void after() {
     database.close();