update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / java / rocksjni / checkpoint.cc

diff --git a/ceph/src/rocksdb/java/rocksjni/checkpoint.cc b/ceph/src/rocksdb/java/rocksjni/checkpoint.cc
index f67f01629624de67b94d43e4cc787edb00933b8b..b04846e877a19eb7fe04efacc332d40502b3007f 100644 (file)
--- a/ceph/src/rocksdb/java/rocksjni/checkpoint.cc
+++ b/ceph/src/rocksdb/java/rocksjni/checkpoint.cc
@@ -4,7 +4,7 @@
 //  (found in the LICENSE.Apache file in the root directory).
 //
 // This file implements the "bridge" between Java and C++ and enables
-// calling c++ rocksdb::Checkpoint methods from Java side.
+// calling c++ ROCKSDB_NAMESPACE::Checkpoint methods from Java side.
 
 #include <jni.h>
 #include <stdio.h>
@@ -23,9 +23,9 @@
 jlong Java_org_rocksdb_Checkpoint_newCheckpoint(JNIEnv* /*env*/,
                                                 jclass /*jclazz*/,
                                                 jlong jdb_handle) {
-  auto* db = reinterpret_cast<rocksdb::DB*>(jdb_handle);
-  rocksdb::Checkpoint* checkpoint;
-  rocksdb::Checkpoint::Create(db, &checkpoint);
+  auto* db = reinterpret_cast<ROCKSDB_NAMESPACE::DB*>(jdb_handle);
+  ROCKSDB_NAMESPACE::Checkpoint* checkpoint;
+  ROCKSDB_NAMESPACE::Checkpoint::Create(db, &checkpoint);
   return reinterpret_cast<jlong>(checkpoint);
 }
 
@@ -37,7 +37,7 @@ jlong Java_org_rocksdb_Checkpoint_newCheckpoint(JNIEnv* /*env*/,
 void Java_org_rocksdb_Checkpoint_disposeInternal(JNIEnv* /*env*/,
                                                  jobject /*jobj*/,
                                                  jlong jhandle) {
-  auto* checkpoint = reinterpret_cast<rocksdb::Checkpoint*>(jhandle);
+  auto* checkpoint = reinterpret_cast<ROCKSDB_NAMESPACE::Checkpoint*>(jhandle);
   assert(checkpoint != nullptr);
   delete checkpoint;
 }
@@ -56,12 +56,13 @@ void Java_org_rocksdb_Checkpoint_createCheckpoint(JNIEnv* env, jobject /*jobj*/,
     return;
   }
 
-  auto* checkpoint = reinterpret_cast<rocksdb::Checkpoint*>(jcheckpoint_handle);
-  rocksdb::Status s = checkpoint->CreateCheckpoint(checkpoint_path);
+  auto* checkpoint =
+      reinterpret_cast<ROCKSDB_NAMESPACE::Checkpoint*>(jcheckpoint_handle);
+  ROCKSDB_NAMESPACE::Status s = checkpoint->CreateCheckpoint(checkpoint_path);
 
   env->ReleaseStringUTFChars(jcheckpoint_path, checkpoint_path);
 
   if (!s.ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::RocksDBExceptionJni::ThrowNew(env, s);
   }
 }