Skip to content

Commit 9e0ab42

Browse files
author
Ankit Gupta
committed
Fix bug + formatting
1 parent 3f8b412 commit 9e0ab42

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

java/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sample: java
1616
javac -cp $(ROCKSDB_JAR) RocksDBSample.java
1717
@rm -rf /tmp/rocksdbjni
1818
@rm -rf /tmp/rocksdbjni_not_found
19-
java -ea -Djava.library.path=. -cp ".:./*" -Xcheck:jni RocksDBSample /tmp/rocksdbjni
19+
java -ea -Djava.library.path=.:../ -cp ".:./*" -Xcheck:jni RocksDBSample /tmp/rocksdbjni
2020
@rm -rf /tmp/rocksdbjni
2121
@rm -rf /tmp/rocksdbjni_not_found
2222

java/RocksDBSample.java

+20
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import java.util.Arrays;
77
import java.util.List;
8+
import java.util.Map;
89
import java.util.ArrayList;
910
import org.rocksdb.*;
1011
import org.rocksdb.util.SizeUnit;
@@ -219,6 +220,25 @@ public static void main(String[] args) {
219220

220221
iterator.close();
221222
System.out.println("iterator tests passed.");
223+
224+
iterator = db.newIterator();
225+
List<byte[]> keys = new ArrayList<byte[]>();
226+
for (iterator.seekToLast(); iterator.isValid(); iterator.prev()) {
227+
keys.add(iterator.key());
228+
}
229+
iterator.close();
230+
231+
Map<byte[], byte[]> values = db.multiGet(keys);
232+
assert(values.size() == keys.size());
233+
for(byte[] value1 : values.values()) {
234+
assert(value1 != null);
235+
}
236+
237+
values = db.multiGet(new ReadOptions(), keys);
238+
assert(values.size() == keys.size());
239+
for(byte[] value1 : values.values()) {
240+
assert(value1 != null);
241+
}
222242
} catch (RocksDBException e) {
223243
System.err.println(e);
224244
}

java/rocksjni/rocksjni.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ jobject multi_get_helper(JNIEnv* env, jobject jdb, rocksdb::DB* db,
310310
* Method: multiGet
311311
* Signature: (JLjava/util/List;I)Ljava/util/List;
312312
*/
313-
jobject Java_org_rocksdb_RocksDB_multiGet(
313+
jobject Java_org_rocksdb_RocksDB_multiGet__JLjava_util_List_2I(
314314
JNIEnv* env, jobject jdb, jlong jdb_handle,
315315
jobject jkey_list, jint jkeys_count) {
316316
return multi_get_helper(env, jdb, reinterpret_cast<rocksdb::DB*>(jdb_handle),
@@ -322,7 +322,7 @@ jobject Java_org_rocksdb_RocksDB_multiGet(
322322
* Method: multiGet
323323
* Signature: (JJLjava/util/List;I)Ljava/util/List;
324324
*/
325-
jobject Java_org_rocksdb_RocksDB_multiGet(
325+
jobject Java_org_rocksdb_RocksDB_multiGet__JJLjava_util_List_2I(
326326
JNIEnv* env, jobject jdb, jlong jdb_handle,
327327
jlong jropt_handle, jobject jkey_list, jint jkeys_count) {
328328
return multi_get_helper(env, jdb, reinterpret_cast<rocksdb::DB*>(jdb_handle),

0 commit comments

Comments
 (0)