From 8763691e7731a88979c4247edd81da2378aaa797 Mon Sep 17 00:00:00 2001 From: Tefek <493msi@gmail.com> Date: Thu, 3 Sep 2020 02:53:09 +0200 Subject: [PATCH] Marked plutodb as deprecated until made stable --- .../java/cz/tefek/pluto/lmdb/ILMDBValueRecipe.java | 12 ++++++------ .../java/cz/tefek/pluto/lmdb/LMDBDatabase.java | 14 ++++++++++++-- .../java/cz/tefek/pluto/lmdb/LMDBIntegerKey.java | 2 +- .../main/java/cz/tefek/pluto/lmdb/LMDBLongKey.java | 2 +- .../java/cz/tefek/pluto/lmdb/LMDBStringKey.java | 2 +- .../java/cz/tefek/pluto/lmdb/LMDBTransaction.java | 14 ++++++++------ .../java/cz/tefek/pluto/lmdb/package-info.java | 5 +++++ 7 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 plutodb/src/main/java/cz/tefek/pluto/lmdb/package-info.java diff --git a/plutodb/src/main/java/cz/tefek/pluto/lmdb/ILMDBValueRecipe.java b/plutodb/src/main/java/cz/tefek/pluto/lmdb/ILMDBValueRecipe.java index ad04b63..b61f467 100644 --- a/plutodb/src/main/java/cz/tefek/pluto/lmdb/ILMDBValueRecipe.java +++ b/plutodb/src/main/java/cz/tefek/pluto/lmdb/ILMDBValueRecipe.java @@ -6,18 +6,18 @@ import java.nio.ByteBuffer; public interface ILMDBValueRecipe { - public int sizeOf(); + int sizeOf(); - public void serialize(ByteBuffer output); + void serialize(ByteBuffer output); - public void deserialize(ByteBuffer input); + void deserialize(ByteBuffer input); - public static int sizeOfUTF8(CharSequence string) + static int sizeOfUTF8(CharSequence string) { return Integer.BYTES + MemoryUtil.memLengthUTF8(string, false); } - public static void putUTF8(CharSequence string, ByteBuffer output) + static void putUTF8(CharSequence string, ByteBuffer output) { int strLen = MemoryUtil.memUTF8(string, false, output, output.position() + Integer.BYTES); output.putInt(strLen); @@ -25,7 +25,7 @@ public interface ILMDBValueRecipe output.position(output.position() + strLen); } - public static String getUTF8(ByteBuffer input) + static String getUTF8(ByteBuffer input) { var strLen = input.getInt(); var string = MemoryUtil.memUTF8(input, strLen); diff --git a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBDatabase.java b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBDatabase.java index d24ce2b..bf3e2e1 100644 --- a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBDatabase.java +++ b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBDatabase.java @@ -42,7 +42,12 @@ public class LMDBDatabase var valueStruct = MDBVal.mallocStack(stack).mv_data(data).mv_size(size); - assert LMDB.mdb_put(this.transaction.getAddress(), this.handle, keyStruct, valueStruct, 0) == LMDB.MDB_SUCCESS; + int retval = LMDB.mdb_put(this.transaction.getAddress(), this.handle, keyStruct, valueStruct, 0); + + if (retval != LMDB.MDB_SUCCESS) + { + throw new RuntimeException(String.format("Error: mdb_put failed with the following error code: %d", retval)); + } } } @@ -68,7 +73,12 @@ public class LMDBDatabase var valueStruct = MDBVal.mallocStack(stack); - assert LMDB.mdb_get(this.transaction.getAddress(), this.handle, keyStruct, valueStruct) == LMDB.MDB_SUCCESS; + int retval = LMDB.mdb_get(this.transaction.getAddress(), this.handle, keyStruct, valueStruct); + + if (retval != LMDB.MDB_SUCCESS) + { + throw new RuntimeException(String.format("Error: mdb_get failed with the following error code: %d", retval)); + } valueToUpdate.deserialize(valueStruct.mv_data()); diff --git a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBIntegerKey.java b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBIntegerKey.java index 15fd7b0..6ed6fb0 100644 --- a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBIntegerKey.java +++ b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBIntegerKey.java @@ -5,7 +5,7 @@ import org.lwjgl.util.lmdb.MDBVal; public class LMDBIntegerKey extends LMDBKey { - private int key; + private final int key; private LMDBIntegerKey(int key) { diff --git a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBLongKey.java b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBLongKey.java index d7bfb81..245e99b 100644 --- a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBLongKey.java +++ b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBLongKey.java @@ -5,7 +5,7 @@ import org.lwjgl.util.lmdb.MDBVal; public class LMDBLongKey extends LMDBKey { - private long key; + private final long key; private LMDBLongKey(long key) { diff --git a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBStringKey.java b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBStringKey.java index ee0b903..f75a897 100644 --- a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBStringKey.java +++ b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBStringKey.java @@ -5,7 +5,7 @@ import org.lwjgl.util.lmdb.MDBVal; public class LMDBStringKey extends LMDBKey { - private String key; + private final String key; private LMDBStringKey(String key) { diff --git a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBTransaction.java b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBTransaction.java index af1b565..1cf5569 100644 --- a/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBTransaction.java +++ b/plutodb/src/main/java/cz/tefek/pluto/lmdb/LMDBTransaction.java @@ -73,11 +73,7 @@ public class LMDBTransaction implements AutoCloseable { return new LMDBDatabase(this, dbHandle, recipeClazz); } - catch (NoSuchMethodException e) - { - e.printStackTrace(); - } - catch (IllegalAccessException e) + catch (NoSuchMethodException | IllegalAccessException e) { e.printStackTrace(); } @@ -87,7 +83,13 @@ public class LMDBTransaction implements AutoCloseable public void commit() { - LMDB.mdb_txn_commit(this.ptr); + int returnCode = LMDB.mdb_txn_commit(this.ptr); + + if (returnCode != LMDB.MDB_SUCCESS) + { + throw new RuntimeException(String.format("Error: mdb_txn_commit failed with the following error code: %d", returnCode)); + } + this.uncommited = false; } diff --git a/plutodb/src/main/java/cz/tefek/pluto/lmdb/package-info.java b/plutodb/src/main/java/cz/tefek/pluto/lmdb/package-info.java new file mode 100644 index 0000000..efbf11f --- /dev/null +++ b/plutodb/src/main/java/cz/tefek/pluto/lmdb/package-info.java @@ -0,0 +1,5 @@ +/** + * @deprecated Usage discouraged until tested well enough. + * */ +@Deprecated +package cz.tefek.pluto.lmdb; \ No newline at end of file