Reserve methods to support PutFlags (fixes lmdbjava#30)

bp-alex · bp-alex · commit 4a278b37d952 · 2016-11-22T11:22:50.000+11:00
diff --git a/src/main/java/org/lmdbjava/Cursor.java b/src/main/java/org/lmdbjava/Cursor.java
@@ -246,9 +246,10 @@ public void renew(final Txn<T> newTxn) {
    *
    * @param key  key to store in the database (not null)
    * @param size size of the value to be stored in the database (not null)
+   * @param op   options for this operation
    * @return a buffer that can be used to modify the value
    */
-  public T reserve(final T key, final int size) {
+  public T reserve(final T key, final int size, final PutFlags... op) {
     if (SHOULD_CHECK) {
       requireNonNull(key);
       checkNotClosed();
@@ -257,7 +258,7 @@ public T reserve(final T key, final int size) {
     }
     txn.keyIn(key);
     txn.valIn(size);
-    final int flags = mask(MDB_RESERVE);
+    final int flags = mask(op) | MDB_RESERVE.getMask();
     checkRc(LIB.mdb_cursor_put(ptrCursor, txn.pointerKey(), txn.pointerVal(),
                                flags));
     txn.valOut();
diff --git a/src/main/java/org/lmdbjava/Dbi.java b/src/main/java/org/lmdbjava/Dbi.java
@@ -318,9 +318,11 @@ public void put(final Txn<T> txn, final T key, final T val,
    * @param txn  transaction handle (not null; not committed; must be R-W)
    * @param key  key to store in the database (not null)
    * @param size size of the value to be stored in the database
+   * @param op   options for this operation
    * @return a buffer that can be used to modify the value
    */
-  public T reserve(final Txn<T> txn, final T key, final int size) {
+  public T reserve(final Txn<T> txn, final T key, final int size,
+                   final PutFlags... op) {
     if (SHOULD_CHECK) {
       requireNonNull(txn);
       requireNonNull(key);
@@ -329,9 +331,9 @@ public T reserve(final Txn<T> txn, final T key, final int size) {
     }
     txn.keyIn(key);
     txn.valIn(size);
-    final int mask = mask(MDB_RESERVE);
+    final int flags = mask(op) | MDB_RESERVE.getMask();
     checkRc(LIB.mdb_put(txn.pointer(), ptr, txn.pointerKey(), txn.pointerVal(),
-                        mask));
+                        flags));
     txn.valOut(); // marked as in,out in LMDB C docs
     return txn.val();
   }
diff --git a/src/test/java/org/lmdbjava/DbiTest.java b/src/test/java/org/lmdbjava/DbiTest.java
@@ -206,7 +206,7 @@ public void putReserve() {
     final ByteBuffer key = bb(5);
     try (Txn<ByteBuffer> txn = env.txnWrite()) {
       assertNull(db.get(txn, key));
-      final ByteBuffer val = db.reserve(txn, key, 32);
+      final ByteBuffer val = db.reserve(txn, key, 32, MDB_NOOVERWRITE);
       val.putLong(MAX_VALUE);
       assertNotNull(db.get(txn, key));
       txn.commit();
