Fix failing test

at055612 · at055612 · commit 77a3494a4008 · 2025-11-05T21:35:51.000Z
diff --git a/src/main/java/org/lmdbjava/Cursor.java b/src/main/java/org/lmdbjava/Cursor.java
@@ -110,8 +110,6 @@ public void delete(final PutFlags... flags) {
   }
 
   /**
-   * @deprecated Instead use {@link Cursor#delete(PutFlagSet)}.
-   * <hr>
    * Delete current key/data pair.
    *
    * <p>This function deletes the key/data pair to which the cursor refers.
diff --git a/src/main/java/org/lmdbjava/Dbi.java b/src/main/java/org/lmdbjava/Dbi.java
@@ -49,6 +49,8 @@
  */
 public final class Dbi<T> {
 
+  @SuppressWarnings("FieldCanBeLocal") // Needs to be instance variable for FFI
+  private final ComparatorCallback callbackComparator;
   private boolean cleaned;
   // Used for CursorIterable KeyRange testing and/or native callbacks
   private final Comparator<T> comparator;
@@ -90,26 +92,24 @@ public final class Dbi<T> {
     final Pointer dbiPtr = allocateDirect(RUNTIME, ADDRESS);
     checkRc(LIB.mdb_dbi_open(txn.pointer(), name, this.dbiFlagSet.getMask(), dbiPtr));
     ptr = dbiPtr.getPointer(0);
-    ComparatorCallback callbackComparator;
     if (nativeCb) {
       // LMDB will call back to this comparator for insertion/iteration order
-      callbackComparator = createCallbackComparator(proxy);
+      this.callbackComparator = createCallbackComparator(proxy);
       LIB.mdb_set_compare(txn.pointer(), ptr, callbackComparator);
+    } else {
+      callbackComparator = null;
     }
   }
 
-  private ComparatorCallback createCallbackComparator(BufferProxy<T> proxy) {
-    ComparatorCallback callbackComparator;
-    callbackComparator =
-        (keyA, keyB) -> {
-          final T compKeyA = proxy.out(proxy.allocate(), keyA);
-          final T compKeyB = proxy.out(proxy.allocate(), keyB);
-          final int result = this.comparator.compare(compKeyA, compKeyB);
-          proxy.deallocate(compKeyA);
-          proxy.deallocate(compKeyB);
-          return result;
-        };
-    return callbackComparator;
+  private ComparatorCallback createCallbackComparator(final BufferProxy<T> proxy) {
+    return (keyA, keyB) -> {
+      final T compKeyA = proxy.out(proxy.allocate(), keyA);
+      final T compKeyB = proxy.out(proxy.allocate(), keyB);
+      final int result = this.comparator.compare(compKeyA, compKeyB);
+      proxy.deallocate(compKeyA);
+      proxy.deallocate(compKeyB);
+      return result;
+    };
   }
 
   Pointer pointer() {
diff --git a/src/main/java/org/lmdbjava/DbiBuilder.java b/src/main/java/org/lmdbjava/DbiBuilder.java
@@ -420,9 +420,8 @@ private Comparator<T> getComparator(final DbiBuilder<T> dbiBuilder,
           break;
         case CALLBACK:
         case ITERATOR:
-          comparator = Objects.requireNonNull(
-              dbiBuilderStage2.comparatorFactory.create(dbiFlagSet),
-              () -> "comparatorFactory returned null");
+          comparator = dbiBuilderStage2.comparatorFactory.create(dbiFlagSet);
+          Objects.requireNonNull(comparator, "comparatorFactory returned null");
           break;
         case NATIVE:
           break;
diff --git a/src/test/java/org/lmdbjava/CursorIterableIntegerKeyTest.java b/src/test/java/org/lmdbjava/CursorIterableIntegerKeyTest.java
@@ -234,18 +234,16 @@ public void testIntegerKeyKeySize() {
       db.put(txn, bbNative(Long.MAX_VALUE), bb("val_" + ++val));
       txn.commit();
     }
-
-    try (Txn<ByteBuffer> txn = env.txnRead()) {
-      try (CursorIterable<ByteBuffer> iterable = db.iterate(txn)) {
-        for (KeyVal<ByteBuffer> keyVal : iterable) {
-          final String val = getString(keyVal.val());
-          final long key = getNativeLong(keyVal.key());
-          final int remaining = keyVal.key().remaining();
+//    try (Txn<ByteBuffer> txn = env.txnRead()) {
+//      try (CursorIterable<ByteBuffer> iterable = db.iterate(txn)) {
+//        for (KeyVal<ByteBuffer> keyVal : iterable) {
+//          final String val = getString(keyVal.val());
+//          final long key = getNativeLong(keyVal.key());
+//          final int remaining = keyVal.key().remaining();
 //          System.out.println("key: " + key + ", val: " + val + ", remaining: " + remaining);
-        }
-      }
-    }
-
+//        }
+//      }
+//    }
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,6 @@ public void delete(final PutFlags... flags) {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/**`
`113`		`- * @deprecated Instead use {@link Cursor#delete(PutFlagSet)}.`
`114`		`- * <hr>`
`115`	`113`	`* Delete current key/data pair.`
`116`	`114`	`*`
`117`	`115`	`* <p>This function deletes the key/data pair to which the cursor refers.`