update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rocksdb/java/rocksjni/transaction_log.cc b/ceph/src/rocksdb/java/rocksjni/transaction_log.cc
index 8186a846bd5c35d52cf670254828799c0dbd7a51..aa57211eb6d8ba8ae09eab39154060683ba0be56 100644 (file)
--- a/ceph/src/rocksdb/java/rocksjni/transaction_log.cc
+++ b/ceph/src/rocksdb/java/rocksjni/transaction_log.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::Iterator methods from Java side.
+// calling c++ ROCKSDB_NAMESPACE::Iterator methods from Java side.
 
 #include <jni.h>
 #include <stdio.h>
@@ -22,7 +22,7 @@
 void Java_org_rocksdb_TransactionLogIterator_disposeInternal(JNIEnv* /*env*/,
                                                              jobject /*jobj*/,
                                                              jlong handle) {
-  delete reinterpret_cast<rocksdb::TransactionLogIterator*>(handle);
+  delete reinterpret_cast<ROCKSDB_NAMESPACE::TransactionLogIterator*>(handle);
 }
 
 /*
@@ -33,7 +33,8 @@ void Java_org_rocksdb_TransactionLogIterator_disposeInternal(JNIEnv* /*env*/,
 jboolean Java_org_rocksdb_TransactionLogIterator_isValid(JNIEnv* /*env*/,
                                                          jobject /*jobj*/,
                                                          jlong handle) {
-  return reinterpret_cast<rocksdb::TransactionLogIterator*>(handle)->Valid();
+  return reinterpret_cast<ROCKSDB_NAMESPACE::TransactionLogIterator*>(handle)
+      ->Valid();
 }
 
 /*
@@ -44,7 +45,7 @@ jboolean Java_org_rocksdb_TransactionLogIterator_isValid(JNIEnv* /*env*/,
 void Java_org_rocksdb_TransactionLogIterator_next(JNIEnv* /*env*/,
                                                   jobject /*jobj*/,
                                                   jlong handle) {
-  reinterpret_cast<rocksdb::TransactionLogIterator*>(handle)->Next();
+  reinterpret_cast<ROCKSDB_NAMESPACE::TransactionLogIterator*>(handle)->Next();
 }
 
 /*
@@ -55,10 +56,11 @@ void Java_org_rocksdb_TransactionLogIterator_next(JNIEnv* /*env*/,
 void Java_org_rocksdb_TransactionLogIterator_status(JNIEnv* env,
                                                     jobject /*jobj*/,
                                                     jlong handle) {
-  rocksdb::Status s =
-      reinterpret_cast<rocksdb::TransactionLogIterator*>(handle)->status();
+  ROCKSDB_NAMESPACE::Status s =
+      reinterpret_cast<ROCKSDB_NAMESPACE::TransactionLogIterator*>(handle)
+          ->status();
   if (!s.ok()) {
-    rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
+    ROCKSDB_NAMESPACE::RocksDBExceptionJni::ThrowNew(env, s);
   }
 }
 
@@ -70,7 +72,8 @@ void Java_org_rocksdb_TransactionLogIterator_status(JNIEnv* env,
 jobject Java_org_rocksdb_TransactionLogIterator_getBatch(JNIEnv* env,
                                                          jobject /*jobj*/,
                                                          jlong handle) {
-  rocksdb::BatchResult batch_result =
-      reinterpret_cast<rocksdb::TransactionLogIterator*>(handle)->GetBatch();
-  return rocksdb::BatchResultJni::construct(env, batch_result);
+  ROCKSDB_NAMESPACE::BatchResult batch_result =
+      reinterpret_cast<ROCKSDB_NAMESPACE::TransactionLogIterator*>(handle)
+          ->GetBatch();
+  return ROCKSDB_NAMESPACE::BatchResultJni::construct(env, batch_result);
 }