Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitddca4bd

Browse files
committed
Fix comparator lost buffer ref from proxy in Dbi.
TODO: address failing dbiWithComparatorThreadSafetyByteArray test.
1 parent154df33 commitddca4bd

File tree

4 files changed

+89
-31
lines changed

4 files changed

+89
-31
lines changed

‎src/main/java/org/lmdbjava/Dbi.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ public final class Dbi<T> {
8181
if (nativeCb) {
8282
this.ccb =
8383
(keyA,keyB) -> {
84-
finalTcompKeyA =proxy.allocate();
85-
finalTcompKeyB =proxy.allocate();
86-
proxy.out(compKeyA,keyA,keyA.address());
87-
proxy.out(compKeyB,keyB,keyB.address());
84+
TcompKeyA =proxy.allocate();
85+
TcompKeyB =proxy.allocate();
86+
compKeyA =proxy.out(compKeyA,keyA,keyA.address());
87+
compKeyB =proxy.out(compKeyB,keyB,keyB.address());
8888
finalintresult =this.comparator.compare(compKeyA,compKeyB);
8989
proxy.deallocate(compKeyA);
9090
proxy.deallocate(compKeyB);

‎src/test/java/org/lmdbjava/ComparatorTest.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,12 @@ public static Object[] data() {
6767
finalComparatorRunnerstring =newStringRunner();
6868
finalComparatorRunnerdb =newDirectBufferRunner();
6969
finalComparatorRunnerba =newByteArrayRunner();
70+
finalComparatorRunnerbaUnsigned =newUnsignedByteArrayRunner();
7071
finalComparatorRunnerbb =newByteBufferRunner();
7172
finalComparatorRunnernetty =newNettyRunner();
7273
finalComparatorRunnergub =newGuavaUnsignedBytes();
7374
finalComparatorRunnergsb =newGuavaSignedBytes();
74-
returnnewObject[] {string,db,ba,bb,netty,gub,gsb};
75+
returnnewObject[] {string,db,ba,baUnsigned,bb,netty,gub,gsb};
7576
}
7677

7778
privatestaticbyte[]buffer(finalint...bytes) {
@@ -140,6 +141,16 @@ public int compare(final byte[] o1, final byte[] o2) {
140141
}
141142
}
142143

144+
/** Tests {@link ByteArrayProxy} (unsigned). */
145+
privatestaticfinalclassUnsignedByteArrayRunnerimplementsComparatorRunner {
146+
147+
@Override
148+
publicintcompare(finalbyte[]o1,finalbyte[]o2) {
149+
finalComparator<byte[]>c =PROXY_BA.getUnsignedComparator();
150+
returnc.compare(o1,o2);
151+
}
152+
}
153+
143154
/** Tests {@link ByteBufferProxy}. */
144155
privatestaticfinalclassByteBufferRunnerimplementsComparatorRunner {
145156

‎src/test/java/org/lmdbjava/DbiTest.java‎

Lines changed: 68 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@
4646
importstaticorg.lmdbjava.KeyRange.atMost;
4747
importstaticorg.lmdbjava.PutFlags.MDB_NODUPDATA;
4848
importstaticorg.lmdbjava.PutFlags.MDB_NOOVERWRITE;
49-
importstaticorg.lmdbjava.TestUtils.DB_1;
50-
importstaticorg.lmdbjava.TestUtils.ba;
51-
importstaticorg.lmdbjava.TestUtils.bb;
49+
importstaticorg.lmdbjava.TestUtils.*;
5250

5351
importjava.io.File;
5452
importjava.io.IOException;
@@ -63,7 +61,7 @@
6361
importjava.util.concurrent.Future;
6462
importjava.util.concurrent.TimeoutException;
6563
importjava.util.concurrent.atomic.AtomicBoolean;
66-
importjava.util.function.BiConsumer;
64+
importjava.util.function.*;
6765
importorg.agrona.concurrent.UnsafeBuffer;
6866
importorg.hamcrest.Matchers;
6967
importorg.junit.After;
@@ -82,6 +80,7 @@ public final class DbiTest {
8280

8381
@RulepublicfinalTemporaryFoldertmp =newTemporaryFolder();
8482
privateEnv<ByteBuffer>env;
83+
privateEnv<byte[]>envBa;
8584

8685
@After
8786
publicvoidafter() {
@@ -97,6 +96,13 @@ public void before() throws IOException {
9796
.setMaxReaders(2)
9897
.setMaxDbs(2)
9998
.open(path,MDB_NOSUBDIR);
99+
finalFilepathBa =tmp.newFile();
100+
envBa =
101+
create(PROXY_BA)
102+
.setMapSize(MEBIBYTES.toBytes(64))
103+
.setMaxReaders(2)
104+
.setMaxDbs(2)
105+
.open(pathBa,MDB_NOSUBDIR);
100106
}
101107

102108
@Test(expected =ConstantDerivedException.class)
@@ -117,20 +123,41 @@ public void customComparator() {
117123
}
118124
returnlexical * -1;
119125
};
120-
finalDbi<ByteBuffer>db =env.openDbi(DB_1,reverseOrder,true,MDB_CREATE);
121-
try (Txn<ByteBuffer>txn =env.txnWrite()) {
122-
assertThat(db.put(txn,bb(2),bb(3)),is(true));
123-
assertThat(db.put(txn,bb(4),bb(6)),is(true));
124-
assertThat(db.put(txn,bb(6),bb(7)),is(true));
125-
assertThat(db.put(txn,bb(8),bb(7)),is(true));
126+
doCustomComparator(env,reverseOrder,TestUtils::bb,ByteBuffer::getInt);
127+
}
128+
129+
@Test
130+
publicvoidcustomComparatorByteArray() {
131+
finalComparator<byte[]>reverseOrder =
132+
(o1,o2) -> {
133+
finalintlexical =PROXY_BA.getComparator().compare(o1,o2);
134+
if (lexical ==0) {
135+
return0;
136+
}
137+
returnlexical * -1;
138+
};
139+
doCustomComparator(envBa,reverseOrder,TestUtils::ba,TestUtils::fromBa);
140+
}
141+
142+
private <T>voiddoCustomComparator(
143+
Env<T>env,
144+
Comparator<T>comparator,
145+
IntFunction<T>serializer,
146+
ToIntFunction<T>deserializer) {
147+
finalDbi<T>db =env.openDbi(DB_1,comparator,true,MDB_CREATE);
148+
try (Txn<T>txn =env.txnWrite()) {
149+
assertThat(db.put(txn,serializer.apply(2),serializer.apply(3)),is(true));
150+
assertThat(db.put(txn,serializer.apply(4),serializer.apply(6)),is(true));
151+
assertThat(db.put(txn,serializer.apply(6),serializer.apply(7)),is(true));
152+
assertThat(db.put(txn,serializer.apply(8),serializer.apply(7)),is(true));
126153
txn.commit();
127154
}
128-
try (Txn<ByteBuffer>txn =env.txnRead();
129-
CursorIterable<ByteBuffer>ci =db.iterate(txn,atMost(bb(4)))) {
130-
finalIterator<KeyVal<ByteBuffer>>iter =ci.iterator();
131-
assertThat(iter.next().key().getInt(),is(8));
132-
assertThat(iter.next().key().getInt(),is(6));
133-
assertThat(iter.next().key().getInt(),is(4));
155+
try (Txn<T>txn =env.txnRead();
156+
CursorIterable<T>ci =db.iterate(txn,atMost(serializer.apply(4)))) {
157+
finalIterator<KeyVal<T>>iter =ci.iterator();
158+
assertThat(deserializer.applyAsInt(iter.next().key()),is(8));
159+
assertThat(deserializer.applyAsInt(iter.next().key()),is(6));
160+
assertThat(deserializer.applyAsInt(iter.next().key()),is(4));
134161
}
135162
}
136163

@@ -143,9 +170,24 @@ public void dbOpenMaxDatabases() {
143170

144171
@Test
145172
publicvoiddbiWithComparatorThreadSafety() {
173+
doDbiWithComparatorThreadSafety(
174+
env,PROXY_OPTIMAL::getComparator,TestUtils::bb,ByteBuffer::getInt);
175+
}
176+
177+
@Test
178+
publicvoiddbiWithComparatorThreadSafetyByteArray() {
179+
doDbiWithComparatorThreadSafety(
180+
envBa,PROXY_BA::getComparator,TestUtils::ba,TestUtils::fromBa);
181+
}
182+
183+
public <T>voiddoDbiWithComparatorThreadSafety(
184+
Env<T>env,
185+
Function<DbiFlags[],Comparator<T>>comparator,
186+
IntFunction<T>serializer,
187+
ToIntFunction<T>deserializer) {
146188
finalDbiFlags[]flags =newDbiFlags[] {MDB_CREATE,MDB_INTEGERKEY};
147-
finalComparator<ByteBuffer>c =PROXY_OPTIMAL.getComparator(flags);
148-
finalDbi<ByteBuffer>db =env.openDbi(DB_1,c,true,flags);
189+
finalComparator<T>c =comparator.apply(flags);
190+
finalDbi<T>db =env.openDbi(DB_1,c,true,flags);
149191

150192
finalList<Integer>keys =range(0,1_000).boxed().collect(toList());
151193

@@ -155,25 +197,25 @@ public void dbiWithComparatorThreadSafety() {
155197
pool.submit(
156198
() -> {
157199
while (proceed.get()) {
158-
try (Txn<ByteBuffer>txn =env.txnRead()) {
159-
db.get(txn,bb(50));
200+
try (Txn<T>txn =env.txnRead()) {
201+
db.get(txn,serializer.apply(50));
160202
}
161203
}
162204
});
163205

164206
for (finalIntegerkey :keys) {
165-
try (Txn<ByteBuffer>txn =env.txnWrite()) {
166-
db.put(txn,bb(key),bb(3));
207+
try (Txn<T>txn =env.txnWrite()) {
208+
db.put(txn,serializer.apply(key),serializer.apply(3));
167209
txn.commit();
168210
}
169211
}
170212

171-
try (Txn<ByteBuffer>txn =env.txnRead();
172-
CursorIterable<ByteBuffer>ci =db.iterate(txn)) {
173-
finalIterator<KeyVal<ByteBuffer>>iter =ci.iterator();
213+
try (Txn<T>txn =env.txnRead();
214+
CursorIterable<T>ci =db.iterate(txn)) {
215+
finalIterator<KeyVal<T>>iter =ci.iterator();
174216
finalList<Integer>result =newArrayList<>();
175217
while (iter.hasNext()) {
176-
result.add(iter.next().key().getInt());
218+
result.add(deserializer.applyAsInt(iter.next().key()));
177219
}
178220

179221
assertThat(result,Matchers.contains(keys.toArray(newInteger[0])));

‎src/test/java/org/lmdbjava/TestUtils.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ static byte[] ba(final int value) {
4141
returnb.byteArray();
4242
}
4343

44+
staticintfromBa(finalbyte[]ba) {
45+
finalMutableDirectBufferb =newUnsafeBuffer(ba);
46+
returnb.getInt(0);
47+
}
48+
4449
staticByteBufferbb(finalintvalue) {
4550
finalByteBufferbb =allocateDirect(BYTES);
4651
bb.putInt(value).flip();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp