Skip to content

Commit a3b9dea

Browse files
stroomdev66stroomdev66
committed
Merge branch 'gh-267' of github.com:lmdbjava/lmdbjava into iterator-performance
2 parents aecdf51 + c289763 commit a3b9dea

File tree

9 files changed

+44
-107
lines changed

9 files changed

+44
-107
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/ByteBufferProxy.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ abstract static class AbstractByteBufferProxy extends BufferProxy<ByteBuffer> {
119119
public static int compareBuff(final ByteBuffer o1, final ByteBuffer o2) {
120120
requireNonNull(o1);
121121
requireNonNull(o2);
122-
if (o1.equals(o2)) {
123-
return 0;
124-
}
125122
final int minLength = Math.min(o1.limit(), o2.limit());
126123
final int minWords = minLength / Long.BYTES;
127124

‎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
package org.lmdbjava;
1717

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

2125
import java.util.Comparator;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ private DirectBufferProxy() {}
7171
public static int compareBuff(final DirectBuffer o1, final DirectBuffer o2) {
7272
requireNonNull(o1);
7373
requireNonNull(o2);
74-
if (o1.equals(o2)) {
75-
return 0;
76-
}
74+
7775
final int minLength = Math.min(o1.capacity(), o2.capacity());
7876
final int minWords = minLength / Long.BYTES;
7977

‎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
import static org.lmdbjava.ByteArrayProxy.PROXY_BA;
2323
import static org.lmdbjava.ByteBufProxy.PROXY_NETTY;
2424
import static org.lmdbjava.ByteBufferProxy.PROXY_OPTIMAL;
25-
import static org.lmdbjava.ComparatorTest.ComparatorResult.*;
25+
import static org.lmdbjava.ComparatorTest.ComparatorResult.EQUAL_TO;
26+
import static org.lmdbjava.ComparatorTest.ComparatorResult.GREATER_THAN;
27+
import static org.lmdbjava.ComparatorTest.ComparatorResult.LESS_THAN;
28+
import static org.lmdbjava.ComparatorTest.ComparatorResult.get;
2629
import static org.lmdbjava.DirectBufferProxy.PROXY_DB;
2730

2831
import com.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
import static com.jakewharton.byteunits.BinaryByteUnit.KIBIBYTES;
2020
import static java.nio.ByteBuffer.allocateDirect;
2121
import static org.assertj.core.api.Assertions.assertThat;
22-
import static org.lmdbjava.DbiFlags.*;
22+
import static org.lmdbjava.DbiFlags.MDB_CREATE;
23+
import static org.lmdbjava.DbiFlags.MDB_DUPSORT;
24+
import static org.lmdbjava.DbiFlags.MDB_INTEGERKEY;
2325
import static org.lmdbjava.Env.create;
2426
import static org.lmdbjava.EnvFlags.MDB_NOSUBDIR;
25-
import static org.lmdbjava.TestUtils.*;
27+
import static org.lmdbjava.TestUtils.DB_1;
28+
import static org.lmdbjava.TestUtils.POSIX_MODE;
29+
import static org.lmdbjava.TestUtils.bb;
2630

27-
import java.io.*;
31+
import java.io.File;
32+
import java.io.FileReader;
33+
import java.io.IOException;
34+
import java.io.Reader;
35+
import java.io.StringWriter;
36+
import java.io.UncheckedIOException;
37+
import java.io.Writer;
2838
import java.nio.ByteBuffer;
2939
import java.nio.ByteOrder;
3040
import java.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
private BiConsumer<Env<ByteBuffer>, Dbi<ByteBuffer>> createBasicDBPopulator() {
325245
return (env, dbi) -> {
326246
try (Txn<ByteBuffer> txn = env.txnWrite()) {

‎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
import static org.assertj.core.api.Assertions.assertThatThrownBy;
3030
import static org.lmdbjava.ByteArrayProxy.PROXY_BA;
3131
import static org.lmdbjava.ByteBufferProxy.PROXY_OPTIMAL;
32-
import static org.lmdbjava.DbiFlags.*;
32+
import static org.lmdbjava.DbiFlags.MDB_CREATE;
33+
import static org.lmdbjava.DbiFlags.MDB_DUPSORT;
34+
import static org.lmdbjava.DbiFlags.MDB_INTEGERKEY;
35+
import static org.lmdbjava.DbiFlags.MDB_REVERSEKEY;
3336
import static org.lmdbjava.Env.create;
3437
import static org.lmdbjava.EnvFlags.MDB_NOSUBDIR;
3538
import static org.lmdbjava.GetOp.MDB_SET_KEY;
3639
import static org.lmdbjava.KeyRange.atMost;
3740
import static org.lmdbjava.PutFlags.MDB_NODUPDATA;
3841
import static org.lmdbjava.PutFlags.MDB_NOOVERWRITE;
39-
import static org.lmdbjava.TestUtils.*;
42+
import static org.lmdbjava.TestUtils.DB_1;
43+
import static org.lmdbjava.TestUtils.ba;
44+
import static org.lmdbjava.TestUtils.bb;
45+
import static org.lmdbjava.TestUtils.fromBa;
4046

4147
import java.nio.ByteBuffer;
4248
import java.nio.file.Path;
4349
import java.util.ArrayList;
4450
import java.util.Comparator;
4551
import java.util.Iterator;
4652
import java.util.List;
47-
import java.util.concurrent.*;
53+
import java.util.concurrent.ExecutionException;
54+
import java.util.concurrent.ExecutorService;
55+
import java.util.concurrent.Executors;
56+
import java.util.concurrent.Future;
57+
import java.util.concurrent.TimeoutException;
4858
import java.util.concurrent.atomic.AtomicBoolean;
4959
import java.util.function.BiConsumer;
5060
import java.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
import org.junit.jupiter.api.AfterEach;
4141
import org.junit.jupiter.api.BeforeEach;
4242
import org.junit.jupiter.api.Test;
43-
import org.lmdbjava.Env.*;
43+
import org.lmdbjava.Env.AlreadyClosedException;
44+
import org.lmdbjava.Env.AlreadyOpenException;
45+
import org.lmdbjava.Env.Builder;
46+
import org.lmdbjava.Env.InvalidCopyDestination;
47+
import org.lmdbjava.Env.MapFullException;
4448
import org.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
import static org.lmdbjava.DirectBufferProxy.PROXY_DB;
2828
import static org.lmdbjava.Env.create;
2929
import static org.lmdbjava.GetOp.MDB_SET;
30-
import static org.lmdbjava.SeekOp.*;
30+
import static org.lmdbjava.SeekOp.MDB_FIRST;
31+
import static org.lmdbjava.SeekOp.MDB_LAST;
32+
import static org.lmdbjava.SeekOp.MDB_PREV;
3133

3234
import java.nio.ByteBuffer;
3335
import java.nio.file.Path;

0 commit comments

Comments
 (0)