Fix multiGet corruption test and implementation.

facebook · Aug 29, 2024 · b06d612 · b06d612
1 parent 6cabf2c
commit b06d612
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/java/rocksjni/jni_multiget_helpers.cc b/java/rocksjni/jni_multiget_helpers.cc
@@ -158,16 +158,16 @@ jobjectArray MultiGetJNIValues::byteArrays(
       }
 
       env->DeleteLocalRef(jentry_value);
+    } else if (s[i].code() == ROCKSDB_NAMESPACE::Status::Code::kCorruption) {
+      ROCKSDB_NAMESPACE::RocksDBExceptionJni::ThrowNew(env, s[i]);
+      return nullptr;
     } else if (s[i].code() != ROCKSDB_NAMESPACE::Status::Code::kNotFound) {
       // The only way to return an error for a single key is to exception the
       // entire multiGet() Previous behaviour was to return a nullptr value for
       // this case and potentially succesfully return values for other keys; we
       // retain this behaviour. To change it, we need to do the following:
       // ROCKSDB_NAMESPACE::RocksDBExceptionJni::ThrowNew(env, s[i]);
       // return nullptr;
-    } else if (s[i].code() == ROCKSDB_NAMESPACE::Status::Code::kCorruption) {
-      ROCKSDB_NAMESPACE::RocksDBExceptionJni::ThrowNew(env, s[i]);
-      return nullptr;
     }
   }
   return jresults;

diff --git a/java/src/test/java/org/rocksdb/MultiGetCorruptionTest.java b/java/src/test/java/org/rocksdb/MultiGetCorruptionTest.java
@@ -6,6 +6,8 @@
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -47,11 +49,22 @@ public void multiGetKeyException() throws RocksDBException, IOException {
     createCorruptedDatabase();
     try (Options options = new Options().setCreateIfMissing(true).setParanoidChecks(true);
          RocksDB db = RocksDB.openReadOnly(options, dbFolder.getRoot().getAbsolutePath())) {
-      // exception.expect(RocksDBException.class);
+      exception.expect(RocksDBException.class);
+      exception.expect(new TypeSafeMatcher<RocksDBException>() {
+        @Override
+        protected boolean matchesSafely(RocksDBException e) {
+          return e.getStatus().getCode() == Status.Code.Corruption;
+        }
+
+        @Override
+        public void describeTo(Description description) {
+          description.appendText("Status.Code is not equal to Corruption");
+        }
+      });
+
       List<byte[]> keys = new ArrayList<>();
       keys.add(KEY);
-      List<byte[]> result = db.multiGetAsList(keys);
-      assertThat(result).isNotNull();
+      db.multiGetAsList(keys);
     }
   }