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

Commitc289763

Browse files
committed
#267 Fix to establish start key when iterating backwards from a start key using DUPSORT
1 parent787d6d3 commitc289763

File tree

8 files changed

+52
-103
lines changed

8 files changed

+52
-103
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ dependency-reduced-pom.xml
1616
gpg-sign.json
1717
mvn-sync.json
1818
secrets.tar
19-
openldap
2019
pom.xml.versionsBackup

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
*/
1616
packageorg.lmdbjava;
1717

18-
importstaticorg.lmdbjava.CursorIterable.State.*;
18+
importstaticorg.lmdbjava.CursorIterable.State.RELEASED;
19+
importstaticorg.lmdbjava.CursorIterable.State.REQUIRES_INITIAL_OP;
20+
importstaticorg.lmdbjava.CursorIterable.State.REQUIRES_ITERATOR_OP;
21+
importstaticorg.lmdbjava.CursorIterable.State.REQUIRES_NEXT_OP;
22+
importstaticorg.lmdbjava.CursorIterable.State.TERMINATED;
1923
importstaticorg.lmdbjava.GetOp.MDB_SET_RANGE;
2024

2125
importjava.util.Comparator;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
importstaticorg.lmdbjava.ByteArrayProxy.PROXY_BA;
2323
importstaticorg.lmdbjava.ByteBufProxy.PROXY_NETTY;
2424
importstaticorg.lmdbjava.ByteBufferProxy.PROXY_OPTIMAL;
25-
importstaticorg.lmdbjava.ComparatorTest.ComparatorResult.*;
25+
importstaticorg.lmdbjava.ComparatorTest.ComparatorResult.EQUAL_TO;
26+
importstaticorg.lmdbjava.ComparatorTest.ComparatorResult.GREATER_THAN;
27+
importstaticorg.lmdbjava.ComparatorTest.ComparatorResult.LESS_THAN;
28+
importstaticorg.lmdbjava.ComparatorTest.ComparatorResult.get;
2629
importstaticorg.lmdbjava.DirectBufferProxy.PROXY_DB;
2730

2831
importcom.google.common.primitives.SignedBytes;

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

Lines changed: 13 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,22 @@
1919
importstaticcom.jakewharton.byteunits.BinaryByteUnit.KIBIBYTES;
2020
importstaticjava.nio.ByteBuffer.allocateDirect;
2121
importstaticorg.assertj.core.api.Assertions.assertThat;
22-
importstaticorg.lmdbjava.DbiFlags.*;
22+
importstaticorg.lmdbjava.DbiFlags.MDB_CREATE;
23+
importstaticorg.lmdbjava.DbiFlags.MDB_DUPSORT;
24+
importstaticorg.lmdbjava.DbiFlags.MDB_INTEGERKEY;
2325
importstaticorg.lmdbjava.Env.create;
2426
importstaticorg.lmdbjava.EnvFlags.MDB_NOSUBDIR;
25-
importstaticorg.lmdbjava.TestUtils.*;
27+
importstaticorg.lmdbjava.TestUtils.DB_1;
28+
importstaticorg.lmdbjava.TestUtils.POSIX_MODE;
29+
importstaticorg.lmdbjava.TestUtils.bb;
2630

27-
importjava.io.*;
31+
importjava.io.File;
32+
importjava.io.FileReader;
33+
importjava.io.IOException;
34+
importjava.io.Reader;
35+
importjava.io.StringWriter;
36+
importjava.io.UncheckedIOException;
37+
importjava.io.Writer;
2838
importjava.nio.ByteBuffer;
2939
importjava.nio.ByteOrder;
3040
importjava.nio.file.Path;
@@ -231,96 +241,6 @@ private long getLong(final ByteBuffer byteBuffer, final ByteOrder byteOrder) {
231241
}
232242
}
233243

234-
//
235-
// @Test
236-
// void testSignedComparator() throws IOException {
237-
// test(ByteBuffer::compareTo, true, "testSignedComparator", 1, MDB_CREATE);
238-
// }
239-
//
240-
// @Test
241-
// void testUnsignedComparator() throws IOException {
242-
// test(AbstractByteBufferProxy::compareBuff, false, "testUnsignedComparator", 1, MDB_CREATE);
243-
// }
244-
//
245-
// @Test
246-
// void testSignedComparatorDupsort() throws IOException {
247-
// test(ByteBuffer::compareTo, true, "testSignedComparatorDupsort", 2, MDB_CREATE,
248-
// MDB_DUPSORT);
249-
// }
250-
//
251-
// @Test
252-
// void testUnsignedComparatorDupsort() throws IOException {
253-
// test(AbstractByteBufferProxy::compareBuff, false, "testUnsignedComparatorDupsort", 2,
254-
// MDB_CREATE, MDB_DUPSORT);
255-
// }
256-
//
257-
// private void test(final Comparator<ByteBuffer> comparator,
258-
// final boolean nativeCb,
259-
// final String testName,
260-
// final BiConsumer<Env<ByteBuffer>, Dbi<ByteBuffer>> dbPopulator,
261-
// final DbiFlags... flags) throws IOException {
262-
// final Path dbPath = Files.createTempFile("test", "db");
263-
// try (final Env<ByteBuffer> env =
264-
// create()
265-
// .setMapSize(KIBIBYTES.toBytes(256))
266-
// .setMaxReaders(1)
267-
// .setMaxDbs(1)
268-
// .open(dbPath.toFile(), POSIX_MODE, MDB_NOSUBDIR)) {
269-
// final Dbi<ByteBuffer> dbi = env.openDbi(DB_1, comparator, nativeCb, flags);
270-
// dbPopulator.accept(env, dbi);
271-
//
272-
// final File tests = new File("src/test/resources/CursorIterableRangeTest/tests.csv");
273-
// final File actual = tests.getParentFile().toPath().resolve(testName + ".actual").toFile();
274-
// final File expected = tests.getParentFile().toPath().resolve(testName +
275-
// ".expected").toFile();
276-
// final String csv = readFile(tests);
277-
// final String[] parts = csv.split("\n");
278-
// try (final Writer writer = new FileWriter(actual)) {
279-
// for (final String part : parts) {
280-
// final String[] params = part.split(",");
281-
// final KeyRangeType keyRangeType = KeyRangeType.valueOf(params[0].trim());
282-
// ByteBuffer start = null;
283-
// ByteBuffer stop = null;
284-
// if (params.length > 1 && params[1].trim().length() > 0) {
285-
// start = bb(Integer.parseInt(params[1].trim()));
286-
// }
287-
// if (params.length > 2 && params[2].trim().length() > 0) {
288-
// stop = bb(Integer.parseInt(params[2].trim()));
289-
// }
290-
//
291-
// for (int i = 0; i < 3; i++) {
292-
// if (params.length > i) {
293-
// writer.append(params[i].trim());
294-
// }
295-
// writer.append(",");
296-
// }
297-
//
298-
// final KeyRange<ByteBuffer> keyRange = new KeyRange<>(keyRangeType, start, stop);
299-
// try (Txn<ByteBuffer> txn = env.txnRead();
300-
// CursorIterable<ByteBuffer> c = dbi.iterate(txn, keyRange)) {
301-
// for (final KeyVal<ByteBuffer> kv : c) {
302-
// final int key = kv.key().getInt();
303-
// final int val = kv.val().getInt();
304-
// writer.append("[");
305-
// writer.append(String.valueOf(key));
306-
// writer.append(" ");
307-
// writer.append(String.valueOf(val));
308-
// writer.append("]");
309-
// }
310-
// }
311-
// writer.append("\n");
312-
// }
313-
// }
314-
//
315-
// // Compare files.
316-
// final String act = readFile(actual);
317-
// final String exp = readFile(expected);
318-
// assertThat(act).withFailMessage("Files are not equal").isEqualTo(exp);
319-
// } finally {
320-
// FileUtil.deleteFile(dbPath);
321-
// }
322-
// }
323-
324244
privateBiConsumer<Env<ByteBuffer>,Dbi<ByteBuffer>>createBasicDBPopulator() {
325245
return (env,dbi) -> {
326246
try (Txn<ByteBuffer>txn =env.txnWrite()) {

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,15 @@
3232
importstaticorg.lmdbjava.GetOp.MDB_SET_KEY;
3333
importstaticorg.lmdbjava.GetOp.MDB_SET_RANGE;
3434
importstaticorg.lmdbjava.PutFlags.MDB_NOOVERWRITE;
35-
importstaticorg.lmdbjava.SeekOp.*;
36-
importstaticorg.lmdbjava.TestUtils.*;
35+
importstaticorg.lmdbjava.SeekOp.MDB_FIRST;
36+
importstaticorg.lmdbjava.SeekOp.MDB_LAST;
37+
importstaticorg.lmdbjava.SeekOp.MDB_NEXT;
38+
importstaticorg.lmdbjava.SeekOp.MDB_PREV;
39+
importstaticorg.lmdbjava.TestUtils.DB_1;
40+
importstaticorg.lmdbjava.TestUtils.POSIX_MODE;
41+
importstaticorg.lmdbjava.TestUtils.bb;
42+
importstaticorg.lmdbjava.TestUtils.mdb;
43+
importstaticorg.lmdbjava.TestUtils.nb;
3744

3845
importio.netty.buffer.ByteBuf;
3946
importjava.nio.ByteBuffer;

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,32 @@
2929
importstaticorg.assertj.core.api.Assertions.assertThatThrownBy;
3030
importstaticorg.lmdbjava.ByteArrayProxy.PROXY_BA;
3131
importstaticorg.lmdbjava.ByteBufferProxy.PROXY_OPTIMAL;
32-
importstaticorg.lmdbjava.DbiFlags.*;
32+
importstaticorg.lmdbjava.DbiFlags.MDB_CREATE;
33+
importstaticorg.lmdbjava.DbiFlags.MDB_DUPSORT;
34+
importstaticorg.lmdbjava.DbiFlags.MDB_INTEGERKEY;
35+
importstaticorg.lmdbjava.DbiFlags.MDB_REVERSEKEY;
3336
importstaticorg.lmdbjava.Env.create;
3437
importstaticorg.lmdbjava.EnvFlags.MDB_NOSUBDIR;
3538
importstaticorg.lmdbjava.GetOp.MDB_SET_KEY;
3639
importstaticorg.lmdbjava.KeyRange.atMost;
3740
importstaticorg.lmdbjava.PutFlags.MDB_NODUPDATA;
3841
importstaticorg.lmdbjava.PutFlags.MDB_NOOVERWRITE;
39-
importstaticorg.lmdbjava.TestUtils.*;
42+
importstaticorg.lmdbjava.TestUtils.DB_1;
43+
importstaticorg.lmdbjava.TestUtils.ba;
44+
importstaticorg.lmdbjava.TestUtils.bb;
45+
importstaticorg.lmdbjava.TestUtils.fromBa;
4046

4147
importjava.nio.ByteBuffer;
4248
importjava.nio.file.Path;
4349
importjava.util.ArrayList;
4450
importjava.util.Comparator;
4551
importjava.util.Iterator;
4652
importjava.util.List;
47-
importjava.util.concurrent.*;
53+
importjava.util.concurrent.ExecutionException;
54+
importjava.util.concurrent.ExecutorService;
55+
importjava.util.concurrent.Executors;
56+
importjava.util.concurrent.Future;
57+
importjava.util.concurrent.TimeoutException;
4858
importjava.util.concurrent.atomic.AtomicBoolean;
4959
importjava.util.function.BiConsumer;
5060
importjava.util.function.Function;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@
4040
importorg.junit.jupiter.api.AfterEach;
4141
importorg.junit.jupiter.api.BeforeEach;
4242
importorg.junit.jupiter.api.Test;
43-
importorg.lmdbjava.Env.*;
43+
importorg.lmdbjava.Env.AlreadyClosedException;
44+
importorg.lmdbjava.Env.AlreadyOpenException;
45+
importorg.lmdbjava.Env.Builder;
46+
importorg.lmdbjava.Env.InvalidCopyDestination;
47+
importorg.lmdbjava.Env.MapFullException;
4448
importorg.lmdbjava.Txn.BadReaderLockException;
4549

4650
/** Test {@link Env}. */

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
importstaticorg.lmdbjava.DirectBufferProxy.PROXY_DB;
2828
importstaticorg.lmdbjava.Env.create;
2929
importstaticorg.lmdbjava.GetOp.MDB_SET;
30-
importstaticorg.lmdbjava.SeekOp.*;
30+
importstaticorg.lmdbjava.SeekOp.MDB_FIRST;
31+
importstaticorg.lmdbjava.SeekOp.MDB_LAST;
32+
importstaticorg.lmdbjava.SeekOp.MDB_PREV;
3133

3234
importjava.nio.ByteBuffer;
3335
importjava.nio.file.Path;

0 commit comments

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