update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / java / src / test / java / org / rocksdb / ColumnFamilyTest.java

diff --git a/ceph/src/rocksdb/java/src/test/java/org/rocksdb/ColumnFamilyTest.java b/ceph/src/rocksdb/java/src/test/java/org/rocksdb/ColumnFamilyTest.java
index 84815b47661b677298f95135286cc06accf2a60f..cc8199ec4a179def1cdaa28ae099d9df06995fe9 100644 (file)
--- a/ceph/src/rocksdb/java/src/test/java/org/rocksdb/ColumnFamilyTest.java
+++ b/ceph/src/rocksdb/java/src/test/java/org/rocksdb/ColumnFamilyTest.java
@@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class ColumnFamilyTest {
 
   @ClassRule
-  public static final RocksMemoryResource rocksMemoryResource =
-      new RocksMemoryResource();
+  public static final RocksNativeLibraryResource ROCKS_NATIVE_LIBRARY_RESOURCE =
+      new RocksNativeLibraryResource();
 
   @Rule
   public TemporaryFolder dbFolder = new TemporaryFolder();
@@ -154,10 +154,10 @@ public class ColumnFamilyTest {
         assertThat(retVal).isEqualTo("newcfvalue");
         assertThat((db.get(columnFamilyHandleList.get(1),
             "dfkey1".getBytes()))).isNull();
-        db.remove(columnFamilyHandleList.get(1), "newcfkey1".getBytes());
+        db.delete(columnFamilyHandleList.get(1), "newcfkey1".getBytes());
         assertThat((db.get(columnFamilyHandleList.get(1),
             "newcfkey1".getBytes()))).isNull();
-        db.remove(columnFamilyHandleList.get(0), new WriteOptions(),
+        db.delete(columnFamilyHandleList.get(0), new WriteOptions(),
             "dfkey2".getBytes());
         assertThat(db.get(columnFamilyHandleList.get(0), new ReadOptions(),
             "dfkey2".getBytes())).isNull();
@@ -309,8 +309,8 @@ public class ColumnFamilyTest {
               "value".getBytes());
           writeBatch.put(columnFamilyHandleList.get(1), "newcfkey2".getBytes(),
               "value2".getBytes());
-          writeBatch.remove("xyz".getBytes());
-          writeBatch.remove(columnFamilyHandleList.get(1), "xyz".getBytes());
+          writeBatch.delete("xyz".getBytes());
+          writeBatch.delete(columnFamilyHandleList.get(1), "xyz".getBytes());
           db.write(writeOpt, writeBatch);
 
           assertThat(db.get(columnFamilyHandleList.get(1),
@@ -396,19 +396,19 @@ public class ColumnFamilyTest {
         final List<byte[]> keys = Arrays.asList(new byte[][]{
             "key".getBytes(), "newcfkey".getBytes()
         });
-        Map<byte[], byte[]> retValues = db.multiGet(columnFamilyHandleList,
-            keys);
+
+        List<byte[]> retValues = db.multiGetAsList(columnFamilyHandleList, keys);
         assertThat(retValues.size()).isEqualTo(2);
-        assertThat(new String(retValues.get(keys.get(0))))
+        assertThat(new String(retValues.get(0)))
             .isEqualTo("value");
-        assertThat(new String(retValues.get(keys.get(1))))
+        assertThat(new String(retValues.get(1)))
             .isEqualTo("value");
-        retValues = db.multiGet(new ReadOptions(), columnFamilyHandleList,
+        retValues = db.multiGetAsList(new ReadOptions(), columnFamilyHandleList,
             keys);
         assertThat(retValues.size()).isEqualTo(2);
-        assertThat(new String(retValues.get(keys.get(0))))
+        assertThat(new String(retValues.get(0)))
             .isEqualTo("value");
-        assertThat(new String(retValues.get(keys.get(1))))
+        assertThat(new String(retValues.get(1)))
             .isEqualTo("value");
       } finally {
         for (final ColumnFamilyHandle columnFamilyHandle :
@@ -590,7 +590,7 @@ public class ColumnFamilyTest {
              cfDescriptors, columnFamilyHandleList)) {
       try {
         db.dropColumnFamily(columnFamilyHandleList.get(1));
-        db.remove(columnFamilyHandleList.get(1), "key".getBytes());
+        db.delete(columnFamilyHandleList.get(1), "key".getBytes());
       } finally {
         for (final ColumnFamilyHandle columnFamilyHandle :
             columnFamilyHandleList) {
@@ -639,7 +639,7 @@ public class ColumnFamilyTest {
         keys.add("key".getBytes());
         keys.add("newcfkey".getBytes());
         final List<ColumnFamilyHandle> cfCustomList = new ArrayList<>();
-        db.multiGet(cfCustomList, keys);
+        db.multiGetAsList(cfCustomList, keys);
 
       } finally {
         for (final ColumnFamilyHandle columnFamilyHandle :