Fixes KeyRange Query IndexOutOfBoundsException (lmdbjava#101)

benalexau · web-flow · commit 0d571aec79a0 · 2018-12-07T17:02:26.000+11:00
* add range search test

* fix assert

* fixes key range search by using limit instead of capacity in ByteBufferProxy compare

* fix checkstyle build errors

* few more checkstyles changes

* remove pmd violate system.out.println which violates
diff --git a/src/main/java/org/lmdbjava/ByteBufferProxy.java b/src/main/java/org/lmdbjava/ByteBufferProxy.java
@@ -128,7 +128,7 @@ public static int compareBuff(final ByteBuffer o1, final ByteBuffer o2) {
       if (o1.equals(o2)) {
         return 0;
       }
-      final int minLength = Math.min(o1.capacity(), o2.capacity());
+      final int minLength = Math.min(o1.limit(), o2.limit());
       final int minWords = minLength / Long.BYTES;
 
       final boolean reverse1 = o1.order() == LITTLE_ENDIAN;
diff --git a/src/test/java/org/lmdbjava/TxnTest.java b/src/test/java/org/lmdbjava/TxnTest.java
@@ -25,13 +25,17 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import static java.nio.ByteBuffer.allocateDirect;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import org.junit.After;
+import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -262,4 +266,39 @@ public void zeroByteKeysRejected() throws IOException {
     dbi.put(key, bb(2));
   }
 
+
+  @Test
+  public void rangeSearch() {
+    final Dbi<ByteBuffer> db = env.openDbi(DB_1, MDB_CREATE);
+
+    final ByteBuffer key = allocateDirect(env.getMaxKeySize());
+    key.put("cherry".getBytes(UTF_8)).flip();
+    db.put(key, bb(1));
+
+    key.clear();
+    key.put("strawberry".getBytes(UTF_8)).flip();
+    db.put(key, bb(3));
+
+    key.clear();
+    key.put("pineapple".getBytes(UTF_8)).flip();
+    db.put(key, bb(2));
+
+    try (Txn<ByteBuffer> txn = env.txnRead()) {
+      final ByteBuffer start = allocateDirect(env.getMaxKeySize());
+      start.put("a".getBytes(UTF_8)).flip();
+
+      final ByteBuffer end = allocateDirect(env.getMaxKeySize());
+      end.put("z".getBytes(UTF_8)).flip();
+
+      final List<String> keysFound = new ArrayList<>();
+      final CursorIterator<ByteBuffer> ckr = db.iterate(txn, KeyRange.closed(start, end));
+      for (final CursorIterator.KeyVal<ByteBuffer> kv : ckr.iterable()) {
+        keysFound.add(UTF_8.decode(kv.key()).toString());
+      }
+
+      assertEquals(3, keysFound.size());
+
+    }
+  }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public static int compareBuff(final ByteBuffer o1, final ByteBuffer o2) {`
`128`	`128`	`if (o1.equals(o2)) {`
`129`	`129`	`return 0;`
`130`	`130`	`}`
`131`		`- final int minLength = Math.min(o1.capacity(), o2.capacity());`
	`131`	`+ final int minLength = Math.min(o1.limit(), o2.limit());`
`132`	`132`	`final int minWords = minLength / Long.BYTES;`
`133`	`133`
`134`	`134`	`final boolean reverse1 = o1.order() == LITTLE_ENDIAN;`