Fix GetPrimitiveArrayCritical

(Sometimes) when the function is NOT returning a copy and the array is released with JNI_ABORT mode, the writes to the array will be rolled back (maybe always).
facebook · Oct 28, 2020 · cf2891b · cf2891b
1 parent f5d247f
commit cf2891b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/java/rocksjni/rocksjni.cc b/java/rocksjni/rocksjni.cc
@@ -1216,9 +1216,8 @@ jint rocksdb_get_unsafe_helper(
     return kStatusError;
   }
 
-  jboolean is_copy;
   jlong* ret_arr = reinterpret_cast<jlong*>(
-      env->GetPrimitiveArrayCritical(jret_data, &is_copy));
+      env->GetPrimitiveArrayCritical(jret_data, nullptr));
   if (nullptr == ret_arr) {
     // Exception occurred
     *has_exception = true;
@@ -1227,8 +1226,7 @@ jint rocksdb_get_unsafe_helper(
   ret_arr[0] = reinterpret_cast<jlong>(value_slice);
   ret_arr[1] = reinterpret_cast<jlong>(value_slice->data());
 
-  env->ReleasePrimitiveArrayCritical(jret_data, ret_arr,
-                                     is_copy ? 0 : JNI_ABORT);
+  env->ReleasePrimitiveArrayCritical(jret_data, ret_arr, 0);
 
   *has_exception = false;
 

diff --git a/java/src/test/java/org/rocksdb/RocksDBTest.java b/java/src/test/java/org/rocksdb/RocksDBTest.java
@@ -278,7 +278,7 @@ public void getUnsafe() throws RocksDBException {
          final ReadOptions optr = new ReadOptions()) {
       final byte[] key1 = "key1".getBytes();
       final byte[] value1 = "value1".getBytes();
-      db.put(key1, value1);
+      db.put(db.getDefaultColumnFamily(), key1, value1);
       try (PinnableSlice pinnableSlice = db.getUnsafe(db.getDefaultColumnFamily(), optr, key1)) {
         for (int i = 0; i < pinnableSlice.capacity(); ++i) {
           assertEquals(value1[i], pinnableSlice.get());