Fix AbstractByteBufferProxy.compareBuff and Improve ComparatorTest (PR #170) (fixes #169)

at055612 · web-flow · commit 823062383313 · 2021-03-12T11:58:54.000+11:00
diff --git a/src/main/java/org/lmdbjava/ByteBufferProxy.java b/src/main/java/org/lmdbjava/ByteBufferProxy.java
@@ -152,7 +152,7 @@ public static int compareBuff(final ByteBuffer o1, final ByteBuffer o2) {
         }
       }
 
-      return o1.capacity() - o2.capacity();
+      return o1.remaining() - o2.remaining();
     }
 
     static Field findField(final Class<?> c, final String name) {
diff --git a/src/test/java/org/lmdbjava/ComparatorTest.java b/src/test/java/org/lmdbjava/ComparatorTest.java
@@ -33,6 +33,7 @@
 import static org.lmdbjava.DirectBufferProxy.PROXY_DB;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 import java.util.Comparator;
 
 import com.google.common.primitives.SignedBytes;
@@ -156,9 +157,38 @@ private static class ByteBufferRunner implements ComparatorRunner {
 
     @Override
     public int compare(final byte[] o1, final byte[] o2) {
-      final ByteBuffer o1b = ByteBuffer.wrap(o1);
-      final ByteBuffer o2b = ByteBuffer.wrap(o2);
-      return PROXY_OPTIMAL.compare(o1b, o2b);
+      // Convert arrays to buffers that are larger than the array, with
+      // limit set at the array length. One buffer bigger than the other.
+      ByteBuffer o1b = arrayToBuffer(o1, o1.length * 3);
+      ByteBuffer o2b = arrayToBuffer(o2, o2.length * 2);
+      final int result = PROXY_OPTIMAL.compare(o1b, o2b);
+
+      // Now swap which buffer is bigger
+      o1b = arrayToBuffer(o1, o1.length * 2);
+      o2b = arrayToBuffer(o2, o2.length * 3);
+      final int result2 = PROXY_OPTIMAL.compare(o1b, o2b);
+
+      assertThat(result2, is(result));
+
+      // Now try with buffers sized to the array.
+      o1b = ByteBuffer.wrap(o1);
+      o2b = ByteBuffer.wrap(o2);
+      final int result3 = PROXY_OPTIMAL.compare(o1b, o2b);
+
+      assertThat(result3, is(result));
+
+      return result;
+    }
+
+    private ByteBuffer arrayToBuffer(final byte[] arr, final int bufferCapacity) {
+      if (bufferCapacity < arr.length) {
+        throw new IllegalArgumentException("bufferCapacity < arr.length");
+      }
+      final byte[] newArr = Arrays.copyOf(arr, bufferCapacity);
+      final ByteBuffer byteBuffer = ByteBuffer.wrap(newArr);
+      byteBuffer.limit(arr.length);
+      byteBuffer.position(0);
+      return byteBuffer;
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public static int compareBuff(final ByteBuffer o1, final ByteBuffer o2) {`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`- return o1.capacity() - o2.capacity();`
	`155`	`+ return o1.remaining() - o2.remaining();`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`static Field findField(final Class<?> c, final String name) {`