From 845c52c1f9851bca509169fbc10c4c31407418b6 Mon Sep 17 00:00:00 2001 From: Martin Hristov Date: Fri, 24 Feb 2023 13:20:59 +0200 Subject: [PATCH 1/5] Library.java : fix mdb_reader_check api, Env.java : readerCheck impl --- src/main/java/org/lmdbjava/Env.java | 10 ++++++++++ src/main/java/org/lmdbjava/Library.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/lmdbjava/Env.java b/src/main/java/org/lmdbjava/Env.java index 0a4c034b..af5618f0 100644 --- a/src/main/java/org/lmdbjava/Env.java +++ b/src/main/java/org/lmdbjava/Env.java @@ -41,6 +41,7 @@ import java.util.List; import jnr.ffi.Pointer; +import jnr.ffi.byref.IntByReference; import jnr.ffi.byref.PointerByReference; import org.lmdbjava.Library.MDB_envinfo; import org.lmdbjava.Library.MDB_stat; @@ -530,6 +531,14 @@ public AlreadyOpenException() { } } + + /* Check for stale entries in the reader lock table. */ + public int readerCheck() { + final IntByReference resultPtr = new IntByReference(); + checkRc(LIB.mdb_reader_check(ptr, resultPtr)); + return resultPtr.intValue(); + } + /** * Builder for configuring and opening Env. * @@ -595,6 +604,7 @@ public Env open(final File path, final EnvFlags... flags) { return open(path, 0664, flags); } + /** * Sets the map size. * diff --git a/src/main/java/org/lmdbjava/Library.java b/src/main/java/org/lmdbjava/Library.java index 44b17492..399fc1d7 100644 --- a/src/main/java/org/lmdbjava/Library.java +++ b/src/main/java/org/lmdbjava/Library.java @@ -291,7 +291,7 @@ int mdb_put(@In Pointer txn, @In Pointer dbi, @In Pointer key, @In Pointer data, int flags); - int mdb_reader_check(@In Pointer env, int dead); + int mdb_reader_check(@In Pointer env,@Out IntByReference dead); int mdb_set_compare(@In Pointer txn, @In Pointer dbi, ComparatorCallback cb); From 63966e35bfc0cd52734b3e916f7b294a3a8958b8 Mon Sep 17 00:00:00 2001 From: Martin Hristov Date: Fri, 24 Feb 2023 18:27:35 +0200 Subject: [PATCH 2/5] whitespace in Library.java --- src/main/java/org/lmdbjava/Library.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/lmdbjava/Library.java b/src/main/java/org/lmdbjava/Library.java index 399fc1d7..6eeb8221 100644 --- a/src/main/java/org/lmdbjava/Library.java +++ b/src/main/java/org/lmdbjava/Library.java @@ -291,7 +291,9 @@ int mdb_put(@In Pointer txn, @In Pointer dbi, @In Pointer key, @In Pointer data, int flags); - int mdb_reader_check(@In Pointer env,@Out IntByReference dead); + int mdb_reader_check( + @In Pointer env, + @Out IntByReference dead); int mdb_set_compare(@In Pointer txn, @In Pointer dbi, ComparatorCallback cb); From 37ee07b0f096ab2725abda6f1e69db3cab481899 Mon Sep 17 00:00:00 2001 From: Martin Hristov Date: Fri, 24 Feb 2023 18:51:13 +0200 Subject: [PATCH 3/5] upd --- src/main/java/org/lmdbjava/Library.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/lmdbjava/Library.java b/src/main/java/org/lmdbjava/Library.java index 6eeb8221..e48def73 100644 --- a/src/main/java/org/lmdbjava/Library.java +++ b/src/main/java/org/lmdbjava/Library.java @@ -291,9 +291,7 @@ int mdb_put(@In Pointer txn, @In Pointer dbi, @In Pointer key, @In Pointer data, int flags); - int mdb_reader_check( - @In Pointer env, - @Out IntByReference dead); + int mdb_reader_check(@In Pointer env, @Out IntByReference dead); int mdb_set_compare(@In Pointer txn, @In Pointer dbi, ComparatorCallback cb); From 8aae56b51630aab7ffd7d104715ee2f1a0c74051 Mon Sep 17 00:00:00 2001 From: Martin Hristov Date: Sat, 25 Feb 2023 10:16:36 +0200 Subject: [PATCH 4/5] update Env.java --- src/main/java/org/lmdbjava/Env.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/lmdbjava/Env.java b/src/main/java/org/lmdbjava/Env.java index af5618f0..a8bf6a0b 100644 --- a/src/main/java/org/lmdbjava/Env.java +++ b/src/main/java/org/lmdbjava/Env.java @@ -501,6 +501,15 @@ private void validatePath(final File path) { validateDirectoryEmpty(path); } + + /* Check for stale entries in the reader lock table. */ + public int readerCheck() { + final IntByReference resultPtr = new IntByReference(); + checkRc(LIB.mdb_reader_check(ptr, resultPtr)); + return resultPtr.intValue(); + } + + /** * Object has already been closed and the operation is therefore prohibited. */ @@ -531,14 +540,7 @@ public AlreadyOpenException() { } } - - /* Check for stale entries in the reader lock table. */ - public int readerCheck() { - final IntByReference resultPtr = new IntByReference(); - checkRc(LIB.mdb_reader_check(ptr, resultPtr)); - return resultPtr.intValue(); - } - + /** * Builder for configuring and opening Env. * From 4c95a6215d6b12f32885e0a297960ae4539ca694 Mon Sep 17 00:00:00 2001 From: Martin Hristov Date: Sat, 25 Feb 2023 12:29:22 +0200 Subject: [PATCH 5/5] remove tabs --- src/main/java/org/lmdbjava/Env.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/lmdbjava/Env.java b/src/main/java/org/lmdbjava/Env.java index a8bf6a0b..db8b0f4a 100644 --- a/src/main/java/org/lmdbjava/Env.java +++ b/src/main/java/org/lmdbjava/Env.java @@ -504,9 +504,9 @@ private void validatePath(final File path) { /* Check for stale entries in the reader lock table. */ public int readerCheck() { - final IntByReference resultPtr = new IntByReference(); - checkRc(LIB.mdb_reader_check(ptr, resultPtr)); - return resultPtr.intValue(); + final IntByReference resultPtr = new IntByReference(); + checkRc(LIB.mdb_reader_check(ptr, resultPtr)); + return resultPtr.intValue(); }