Skip to content

Fix resulting buffer from BufferProxy's out method being ignored. #255

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix resulting buffer from BufferProxy's out method being ignored. #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddca4bd
Fix comparator lost buffer ref from proxy in Dbi.
LambdAurora Jul 8, 2025
236b7c9
Use ByteBuffer for int serialization into bytes.
LambdAurora Jul 9, 2025
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
8 changes: 4 additions & 4 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 @@ -81,10 +81,10 @@ public final class Dbi<T> {
if (nativeCb) {
this.ccb =
(keyA, keyB) -> {
final T compKeyA = proxy.allocate();
final T compKeyB = proxy.allocate();
proxy.out(compKeyA, keyA, keyA.address());
proxy.out(compKeyB, keyB, keyB.address());
T compKeyA = proxy.allocate();
T compKeyB = proxy.allocate();
compKeyA = proxy.out(compKeyA, keyA, keyA.address());
compKeyB = proxy.out(compKeyB, keyB, keyB.address());
final int result = this.comparator.compare(compKeyA, compKeyB);
proxy.deallocate(compKeyA);
proxy.deallocate(compKeyB);
Expand Down
13 changes: 12 additions & 1 deletion src/test/java/org/lmdbjava/ComparatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@ public static Object[] data() {
final ComparatorRunner string = new StringRunner();
final ComparatorRunner db = new DirectBufferRunner();
final ComparatorRunner ba = new ByteArrayRunner();
final ComparatorRunner baUnsigned = new UnsignedByteArrayRunner();
final ComparatorRunner bb = new ByteBufferRunner();
final ComparatorRunner netty = new NettyRunner();
final ComparatorRunner gub = new GuavaUnsignedBytes();
final ComparatorRunner gsb = new GuavaSignedBytes();
return new Object[] {string, db, ba, bb, netty, gub, gsb};
return new Object[] {string, db, ba, baUnsigned, bb, netty, gub, gsb};
}

private static byte[] buffer(final int... bytes) {
Expand Down Expand Up @@ -140,6 +141,16 @@ public int compare(final byte[] o1, final byte[] o2) {
}
}

/** Tests {@link ByteArrayProxy} (unsigned). */
private static final class UnsignedByteArrayRunner implements ComparatorRunner {

@Override
public int compare(final byte[] o1, final byte[] o2) {
final Comparator<byte[]> c = PROXY_BA.getUnsignedComparator();
return c.compare(o1, o2);
}
}

/** Tests {@link ByteBufferProxy}. */
private static final class ByteBufferRunner implements ComparatorRunner {

Expand Down
97 changes: 69 additions & 28 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 @@ -46,9 +46,7 @@
import static org.lmdbjava.KeyRange.atMost;
import static org.lmdbjava.PutFlags.MDB_NODUPDATA;
import static org.lmdbjava.PutFlags.MDB_NOOVERWRITE;
import static org.lmdbjava.TestUtils.DB_1;
import static org.lmdbjava.TestUtils.ba;
import static org.lmdbjava.TestUtils.bb;
import static org.lmdbjava.TestUtils.*;

import java.io.File;
import java.io.IOException;
Expand All @@ -63,8 +61,7 @@
import java.util.concurrent.Future;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BiConsumer;
import org.agrona.concurrent.UnsafeBuffer;
import java.util.function.*;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
Expand All @@ -82,6 +79,7 @@ public final class DbiTest {

@Rule public final TemporaryFolder tmp = new TemporaryFolder();
private Env<ByteBuffer> env;
private Env<byte[]> envBa;

@After
public void after() {
Expand All @@ -97,6 +95,13 @@ public void before() throws IOException {
.setMaxReaders(2)
.setMaxDbs(2)
.open(path, MDB_NOSUBDIR);
final File pathBa = tmp.newFile();
envBa =
create(PROXY_BA)
.setMapSize(MEBIBYTES.toBytes(64))
.setMaxReaders(2)
.setMaxDbs(2)
.open(pathBa, MDB_NOSUBDIR);
}

@Test(expected = ConstantDerivedException.class)
Expand All @@ -117,20 +122,41 @@ public void customComparator() {
}
return lexical * -1;
};
final Dbi<ByteBuffer> db = env.openDbi(DB_1, reverseOrder, true, MDB_CREATE);
try (Txn<ByteBuffer> txn = env.txnWrite()) {
assertThat(db.put(txn, bb(2), bb(3)), is(true));
assertThat(db.put(txn, bb(4), bb(6)), is(true));
assertThat(db.put(txn, bb(6), bb(7)), is(true));
assertThat(db.put(txn, bb(8), bb(7)), is(true));
doCustomComparator(env, reverseOrder, TestUtils::bb, ByteBuffer::getInt);
}

@Test
public void customComparatorByteArray() {
final Comparator<byte[]> reverseOrder =
(o1, o2) -> {
final int lexical = PROXY_BA.getComparator().compare(o1, o2);
if (lexical == 0) {
return 0;
}
return lexical * -1;
};
doCustomComparator(envBa, reverseOrder, TestUtils::ba, TestUtils::fromBa);
}

private <T> void doCustomComparator(
Env<T> env,
Comparator<T> comparator,
IntFunction<T> serializer,
ToIntFunction<T> deserializer) {
final Dbi<T> db = env.openDbi(DB_1, comparator, true, MDB_CREATE);
try (Txn<T> txn = env.txnWrite()) {
assertThat(db.put(txn, serializer.apply(2), serializer.apply(3)), is(true));
assertThat(db.put(txn, serializer.apply(4), serializer.apply(6)), is(true));
assertThat(db.put(txn, serializer.apply(6), serializer.apply(7)), is(true));
assertThat(db.put(txn, serializer.apply(8), serializer.apply(7)), is(true));
txn.commit();
}
try (Txn<ByteBuffer> txn = env.txnRead();
CursorIterable<ByteBuffer> ci = db.iterate(txn, atMost(bb(4)))) {
final Iterator<KeyVal<ByteBuffer>> iter = ci.iterator();
assertThat(iter.next().key().getInt(), is(8));
assertThat(iter.next().key().getInt(), is(6));
assertThat(iter.next().key().getInt(), is(4));
try (Txn<T> txn = env.txnRead();
CursorIterable<T> ci = db.iterate(txn, atMost(serializer.apply(4)))) {
final Iterator<KeyVal<T>> iter = ci.iterator();
assertThat(deserializer.applyAsInt(iter.next().key()), is(8));
assertThat(deserializer.applyAsInt(iter.next().key()), is(6));
assertThat(deserializer.applyAsInt(iter.next().key()), is(4));
}
}

Expand All @@ -143,9 +169,24 @@ public void dbOpenMaxDatabases() {

@Test
public void dbiWithComparatorThreadSafety() {
doDbiWithComparatorThreadSafety(
env, PROXY_OPTIMAL::getComparator, TestUtils::bb, ByteBuffer::getInt);
}

@Test
public void dbiWithComparatorThreadSafetyByteArray() {
doDbiWithComparatorThreadSafety(
envBa, PROXY_BA::getComparator, TestUtils::ba, TestUtils::fromBa);
}

public <T> void doDbiWithComparatorThreadSafety(
Env<T> env,
Function<DbiFlags[], Comparator<T>> comparator,
IntFunction<T> serializer,
ToIntFunction<T> deserializer) {
final DbiFlags[] flags = new DbiFlags[] {MDB_CREATE, MDB_INTEGERKEY};
final Comparator<ByteBuffer> c = PROXY_OPTIMAL.getComparator(flags);
final Dbi<ByteBuffer> db = env.openDbi(DB_1, c, true, flags);
final Comparator<T> c = comparator.apply(flags);
final Dbi<T> db = env.openDbi(DB_1, c, true, flags);

final List<Integer> keys = range(0, 1_000).boxed().collect(toList());

Expand All @@ -155,25 +196,25 @@ public void dbiWithComparatorThreadSafety() {
pool.submit(
() -> {
while (proceed.get()) {
try (Txn<ByteBuffer> txn = env.txnRead()) {
db.get(txn, bb(50));
try (Txn<T> txn = env.txnRead()) {
db.get(txn, serializer.apply(50));
}
}
});

for (final Integer key : keys) {
try (Txn<ByteBuffer> txn = env.txnWrite()) {
db.put(txn, bb(key), bb(3));
try (Txn<T> txn = env.txnWrite()) {
db.put(txn, serializer.apply(key), serializer.apply(3));
txn.commit();
}
}

try (Txn<ByteBuffer> txn = env.txnRead();
CursorIterable<ByteBuffer> ci = db.iterate(txn)) {
final Iterator<KeyVal<ByteBuffer>> iter = ci.iterator();
try (Txn<T> txn = env.txnRead();
CursorIterable<T> ci = db.iterate(txn)) {
final Iterator<KeyVal<T>> iter = ci.iterator();
final List<Integer> result = new ArrayList<>();
while (iter.hasNext()) {
result.add(iter.next().key().getInt());
result.add(deserializer.applyAsInt(iter.next().key()));
}

assertThat(result, Matchers.contains(keys.toArray(new Integer[0])));
Expand Down Expand Up @@ -339,7 +380,7 @@ public void putCommitGetByteArray() throws IOException {
try (Txn<byte[]> txn = envBa.txnWrite()) {
final byte[] found = db.get(txn, ba(5));
assertNotNull(found);
assertThat(new UnsafeBuffer(txn.val()).getInt(0), is(5));
assertThat(fromBa(txn.val()), is(5));
}
}
}
Expand Down
10 changes: 7 additions & 3 deletions src/test/java/org/lmdbjava/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,13 @@ final class TestUtils {
private TestUtils() {}

static byte[] ba(final int value) {
final MutableDirectBuffer b = new UnsafeBuffer(new byte[4]);
b.putInt(0, value);
return b.byteArray();
byte[] bytes = new byte[4];
ByteBuffer.wrap(bytes).putInt(value);
return bytes;
}

static int fromBa(final byte[] ba) {
return ByteBuffer.wrap(ba).getInt();
}

static ByteBuffer bb(final int value) {
Expand Down