Skip to content

Add support for listing Dbi flags #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2020
Merged

Add support for listing Dbi flags #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/main/java/org/lmdbjava/Dbi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@

package org.lmdbjava;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;

import static java.util.Objects.requireNonNull;
import static jnr.ffi.Memory.allocateDirect;

import jnr.ffi.NativeType;
import static jnr.ffi.NativeType.ADDRESS;
import jnr.ffi.Pointer;
import jnr.ffi.byref.PointerByReference;
Expand Down Expand Up @@ -489,6 +494,29 @@ public Stat stat(final Txn<T> txn) {
stat.f5_ms_entries.longValue());
}

/*
* Return DbiFlags for this Dbi.
*
* @param txn transaction handle (not null; not committed)
* @return the list of flags this Dbi was created with
*/
public List<DbiFlags> listFlags(final Txn<T> txn) {
final Pointer resultPtr = allocateDirect(RUNTIME, NativeType.UINT);
checkRc(LIB.mdb_dbi_flags(txn.pointer(), ptr, resultPtr));

final int flags = resultPtr.getInt(0);

final List<DbiFlags> result = new ArrayList<>();

for (final DbiFlags flag : DbiFlags.values()) {
if (MaskedFlag.isSet(flags, flag)) {
result.add(flag);
}
}

return result;
}

private void clean() {
if (cleaned) {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/lmdbjava/Library.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ int mdb_cursor_put(@In Pointer cursor, @In Pointer key, @In Pointer data,

void mdb_dbi_close(@In Pointer env, @In Pointer dbi);

int mdb_dbi_flags(@In Pointer txn, @In Pointer dbi, int flags);
int mdb_dbi_flags(@In Pointer txn, @In Pointer dbi, @Out Pointer flags);

int mdb_dbi_open(@In Pointer txn, @In byte[] name, int flags,
@In Pointer dbiPtr);
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/org/lmdbjava/DbiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import org.hamcrest.Matchers;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.collection.IsEmptyCollection.empty;
import org.junit.After;
Expand All @@ -62,6 +63,7 @@
import org.lmdbjava.Dbi.DbFullException;
import static org.lmdbjava.DbiFlags.MDB_CREATE;
import static org.lmdbjava.DbiFlags.MDB_DUPSORT;
import static org.lmdbjava.DbiFlags.MDB_REVERSEKEY;
import org.lmdbjava.Env.MapFullException;
import static org.lmdbjava.Env.create;
import static org.lmdbjava.EnvFlags.MDB_NOSUBDIR;
Expand Down Expand Up @@ -474,4 +476,14 @@ public void testParallelWritesStress() {
}
});
}

@Test
public void listsFlags() {
final Dbi<ByteBuffer> dbi = env.openDbi(DB_1, MDB_CREATE, MDB_DUPSORT, MDB_REVERSEKEY);

try (Txn<ByteBuffer> txn = env.txnRead()) {
final List<DbiFlags> flags = dbi.listFlags(txn);
assertThat(flags, containsInAnyOrder(MDB_DUPSORT, MDB_REVERSEKEY));
}
}
}