Revert "Updated to account for changes in latest mdbx release"

This reverts commit 8b01e75.
castortech · Oct 30, 2023 · bd270e5 · bd270e5
1 parent 8b01e75
commit bd270e5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 47 deletions.
diff --git a/mdbxjni/src/main/java/com/castortech/mdbxjni/JNI.java b/mdbxjni/src/main/java/com/castortech/mdbxjni/JNI.java
@@ -1060,21 +1060,18 @@ public static class MDBX_envinfo {
 		public long mi_latter_reader_txnid; 	/* ID of the last reader transaction */
 		@JniField(cast = "uint64_t")
 		public long mi_self_latter_reader_txnid; /* ID of the last reader transaction of caller process */
-
-		@JniField(accessor="mi_meta_txnid[0]", cast = "uint64_t")
+		@JniField(cast = "uint64_t")
 		public long mi_meta0_txnid;
-		@JniField(accessor="mi_meta_txnid[1]", cast = "uint64_t")
-		public long mi_meta1_txnid;
-		@JniField(accessor="mi_meta_txnid[1]", cast = "uint64_t")
-		public long mi_meta2_txnid;
-
-		@JniField(accessor="mi_meta_sign[0]", cast = "uint64_t")
+		@JniField(cast = "uint64_t")
 		public long mi_meta0_sign;
-		@JniField(accessor="mi_meta_sign[1]", cast = "uint64_t")
+		@JniField(cast = "uint64_t")
+		public long mi_meta1_txnid;
+		@JniField(cast = "uint64_t")
 		public long mi_meta1_sign;
-		@JniField(accessor="mi_meta_sign[2]", cast = "uint64_t")
+		@JniField(cast = "uint64_t")
+		public long mi_meta2_txnid;
+		@JniField(cast = "uint64_t")
 		public long mi_meta2_sign;
-
 		@JniField(cast = "uint32_t")
 		public long mi_maxreaders; /* max reader slots in the environment */
 		@JniField(cast = "uint32_t")
@@ -1087,20 +1084,18 @@ public static class MDBX_envinfo {
 		public long mi_bootid_current_x;
 		@JniField(accessor="mi_bootid.current.y", cast = "uint64_t")
 		public long mi_bootid_current_y;
-
-		@JniField(accessor="mi_bootid.meta[0].x", cast = "uint64_t")
+		@JniField(accessor="mi_bootid.meta0.x", cast = "uint64_t")
 		public long mi_bootid_meta0_x;
-		@JniField(accessor="mi_bootid.meta[0].y", cast = "uint64_t")
+		@JniField(accessor="mi_bootid.meta0.y", cast = "uint64_t")
 		public long mi_bootid_meta0_y;
-		@JniField(accessor="mi_bootid.meta[1].x", cast = "uint64_t")
+		@JniField(accessor="mi_bootid.meta1.x", cast = "uint64_t")
 		public long mi_bootid_meta1_x;
-		@JniField(accessor="mi_bootid.meta[1].y", cast = "uint64_t")
+		@JniField(accessor="mi_bootid.meta1.y", cast = "uint64_t")
 		public long mi_bootid_meta1_y;
-		@JniField(accessor="mi_bootid.meta[2].x", cast = "uint64_t")
+		@JniField(accessor="mi_bootid.meta2.x", cast = "uint64_t")
 		public long mi_bootid_meta2_x;
-		@JniField(accessor="mi_bootid.meta[2].y", cast = "uint64_t")
+		@JniField(accessor="mi_bootid.meta2.y", cast = "uint64_t")
 		public long mi_bootid_meta2_y;
-
 		@JniField(cast = "uint64_t")
 		public long mi_unsync_volume;
 		@JniField(cast = "uint64_t")
@@ -1158,21 +1153,18 @@ public String toString() {
 					", mi_meta1_sign=" + mi_meta1_sign +
 					", mi_meta2_txnid=" + mi_meta2_txnid +
 					", mi_meta2_sign=" + mi_meta2_sign +
-
 					", mi_maxreaders=" + mi_maxreaders +
 					", mi_numreaders=" + mi_numreaders +
 					", mi_dxb_pagesize=" + mi_dxb_pagesize +
 					", mi_sys_pagesize=" + mi_sys_pagesize +
 					", mi_bootid_current_x=" + mi_bootid_current_x +
 					", mi_bootid_current_y=" + mi_bootid_current_y +
-
 					", mi_bootid_meta0_x=" + mi_bootid_meta0_x +
 					", mi_bootid_meta0_y=" + mi_bootid_meta0_y +
 					", mi_bootid_meta1_x=" + mi_bootid_meta1_x +
 					", mi_bootid_meta1_y=" + mi_bootid_meta1_y +
 					", mi_bootid_meta2_x=" + mi_bootid_meta2_x +
 					", mi_bootid_meta2_y=" + mi_bootid_meta2_y +
-
 					", mi_unsync_volume=" + mi_unsync_volume +
 					", mi_autosync_threshold=" + mi_autosync_threshold +
 					", mi_since_sync_seconds16dot16=" + mi_since_sync_seconds16dot16 +
@@ -1620,32 +1612,9 @@ public static final native void mdbx_txn_reset(
 	public static final native int mdbx_txn_renew(
 			@JniArg(cast = "MDBX_txn *") long txn);
 
-	/**
-	 * \brief Unbind or closes all cursors of a given transaction.
-	 * \ingroup c_cursors
-	 *
-	 * Unbinds either closes all cursors associated (opened or renewed) with
-	 * a given transaction in a bulk with minimal overhead.
-	 *
-	 * \see mdbx_cursor_unbind()
-	 * \see mdbx_cursor_close()
-	 *
-	 * \param [in] txn      A transaction handle returned by \ref mdbx_txn_begin().
-	 * \param [in] unbind   If non-zero, unbinds cursors and leaves ones reusable.
-	 *                      Otherwise close and dispose cursors.
-	 *
-	 * \returns A negative error value on failure or the number of closed cursors
-	 *          on success, some possible errors are:
-	 * \retval MDBX_THREAD_MISMATCH  Given transaction is not owned
-	 *                               by current thread.
-	 * \retval MDBX_BAD_TXN          Given transaction is invalid or has
-	 *                               a child/nested transaction transaction.
-	 */
 	@JniMethod
 	public static final native int mdbx_txn_release_all_cursors(
-			@JniArg(cast = "MDBX_txn *") long txn,
-			@JniArg(cast = "int") int unbind
-	);
+			@JniArg(cast = "MDBX_txn *") long txn);
 
 	/**
 	 * Return information about the MDBX transaction.

diff --git a/mdbxjni/src/main/java/com/castortech/mdbxjni/Transaction.java b/mdbxjni/src/main/java/com/castortech/mdbxjni/Transaction.java
@@ -92,7 +92,7 @@ public void renew() {
 	}
 
 	public int releaseCursors() {
-		return mdbx_txn_release_all_cursors(pointer(), 0);
+		return mdbx_txn_release_all_cursors(pointer());
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ public void renew() { @@
     	}
     	public int releaseCursors() {
-    		return mdbx_txn_release_all_cursors(pointer(), 0);
+    		return mdbx_txn_release_all_cursors(pointer());
     	}
     	/**
@@ Expand Down @@