Use byte[] (not String) for Dbi name (lmdbjava#37)

benalexau · benalexau · commit 4ff5660dddf8 · 2017-01-10T14:19:20.000+11:00
Includes overloaded method that accepts String and uses UTF-8.
diff --git a/src/main/java/org/lmdbjava/Dbi.java b/src/main/java/org/lmdbjava/Dbi.java
@@ -20,6 +20,7 @@
 
 package org.lmdbjava;
 
+import java.util.Arrays;
 import static java.util.Objects.requireNonNull;
 import static jnr.ffi.Memory.allocateDirect;
 import static jnr.ffi.NativeType.ADDRESS;
@@ -48,13 +49,13 @@
 public final class Dbi<T> {
 
   private final Env<T> env;
-  private final String name;
+  private final byte[] name;
   private final Pointer ptr;
 
-  Dbi(final Env<T> env, final Txn<T> txn, final String name,
+  Dbi(final Env<T> env, final Txn<T> txn, final byte[] name,
       final DbiFlags... flags) {
     this.env = env;
-    this.name = name;
+    this.name = name == null ? null : Arrays.copyOf(name, name.length);
     final int flagsMask = mask(flags);
     final Pointer dbiPtr = allocateDirect(RUNTIME, ADDRESS);
     checkRc(LIB.mdb_dbi_open(txn.pointer(), name, flagsMask, dbiPtr));
@@ -191,10 +192,10 @@ public T get(final Txn<T> txn, final T key) {
   /**
    * Obtains the name of this database.
    *
-   * @return the name (may be null or empty)
+   * @return the name (may be null)
    */
-  public String getName() {
-    return name;
+  public byte[] getName() {
+    return name == null ? null : Arrays.copyOf(name, name.length);
   }
 
   /**
diff --git a/src/main/java/org/lmdbjava/Env.java b/src/main/java/org/lmdbjava/Env.java
@@ -23,6 +23,7 @@
 import java.io.File;
 import static java.lang.Boolean.getBoolean;
 import java.nio.ByteBuffer;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 import jnr.ffi.Pointer;
 import jnr.ffi.byref.PointerByReference;
@@ -211,13 +212,25 @@ public boolean isReadOnly() {
   }
 
   /**
-   * Open the {@link Dbi}.
+   * Convenience method that opens a {@link Dbi} with a UTF-8 database name.
    *
    * @param name  name of the database (or null if no name is required)
    * @param flags to open the database with
    * @return a database that is ready to use
    */
   public Dbi<T> openDbi(final String name, final DbiFlags... flags) {
+    final byte[] nameBytes = name == null ? null : name.getBytes(UTF_8);
+    return openDbi(nameBytes, flags);
+  }
+
+  /**
+   * Open the {@link Dbi}.
+   *
+   * @param name  name of the database (or null if no name is required)
+   * @param flags to open the database with
+   * @return a database that is ready to use
+   */
+  public Dbi<T> openDbi(final byte[] name, final DbiFlags... flags) {
     try (Txn<T> txn = readOnly ? txnRead() : txnWrite()) {
       final Dbi<T> dbi = new Dbi<>(this, txn, name, flags);
       txn.commit(); // even RO Txns require a commit to retain Dbi in Env
diff --git a/src/main/java/org/lmdbjava/Library.java b/src/main/java/org/lmdbjava/Library.java
@@ -199,7 +199,7 @@ int mdb_cursor_put(@In Pointer cursor, @In Pointer key, @In Pointer data,
 
     int mdb_dbi_flags(@In Pointer txn, @In Pointer dbi, int flags);
 
-    int mdb_dbi_open(@In Pointer txn, @In String name, int flags,
+    int mdb_dbi_open(@In Pointer txn, @In byte[] name, int flags,
                      @In Pointer dbiPtr);
 
     int mdb_del(@In Pointer txn, @In Pointer dbi, @In Pointer key,
diff --git a/src/test/java/org/lmdbjava/DbiTest.java b/src/test/java/org/lmdbjava/DbiTest.java
@@ -27,6 +27,7 @@
 import static java.lang.System.getProperty;
 import java.nio.ByteBuffer;
 import static java.nio.ByteBuffer.allocateDirect;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.nCopies;
 import java.util.Random;
 import org.agrona.concurrent.UnsafeBuffer;
@@ -117,7 +118,7 @@ public void drop() {
   @Test
   public void getName() {
     final Dbi<ByteBuffer> db = env.openDbi(DB_1, MDB_CREATE);
-    assertThat(db.getName(), is(DB_1));
+    assertThat(db.getName(), is(DB_1.getBytes(UTF_8)));
   }
 
   @Test
