update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rocksdb/java/rocksjni/thread_status.cc b/ceph/src/rocksdb/java/rocksjni/thread_status.cc
index f70d515a5be22973d6eed335750d9ffc99d3c017..a5811ec177f6a049c08a6ca91f36c33c21b2ebb0 100644 (file)
--- a/ceph/src/rocksdb/java/rocksjni/thread_status.cc
+++ b/ceph/src/rocksdb/java/rocksjni/thread_status.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::ThreadStatus methods from Java side.
+// calling c++ ROCKSDB_NAMESPACE::ThreadStatus methods from Java side.
 
 #include <jni.h>
 
@@ -19,9 +19,9 @@
  */
 jstring Java_org_rocksdb_ThreadStatus_getThreadTypeName(
     JNIEnv* env, jclass, jbyte jthread_type_value) {
-  auto name = rocksdb::ThreadStatus::GetThreadTypeName(
-      rocksdb::ThreadTypeJni::toCppThreadType(jthread_type_value));
-  return rocksdb::JniUtil::toJavaString(env, &name, true);
+  auto name = ROCKSDB_NAMESPACE::ThreadStatus::GetThreadTypeName(
+      ROCKSDB_NAMESPACE::ThreadTypeJni::toCppThreadType(jthread_type_value));
+  return ROCKSDB_NAMESPACE::JniUtil::toJavaString(env, &name, true);
 }
 
 /*
@@ -31,9 +31,10 @@ jstring Java_org_rocksdb_ThreadStatus_getThreadTypeName(
  */
 jstring Java_org_rocksdb_ThreadStatus_getOperationName(
     JNIEnv* env, jclass, jbyte joperation_type_value) {
-  auto name = rocksdb::ThreadStatus::GetOperationName(
-      rocksdb::OperationTypeJni::toCppOperationType(joperation_type_value));
-  return rocksdb::JniUtil::toJavaString(env, &name, true);
+  auto name = ROCKSDB_NAMESPACE::ThreadStatus::GetOperationName(
+      ROCKSDB_NAMESPACE::OperationTypeJni::toCppOperationType(
+          joperation_type_value));
+  return ROCKSDB_NAMESPACE::JniUtil::toJavaString(env, &name, true);
 }
 
 /*
@@ -43,9 +44,9 @@ jstring Java_org_rocksdb_ThreadStatus_getOperationName(
  */
 jstring Java_org_rocksdb_ThreadStatus_microsToStringNative(
     JNIEnv* env, jclass, jlong jmicros) {
-  auto str =
-      rocksdb::ThreadStatus::MicrosToString(static_cast<uint64_t>(jmicros));
-  return rocksdb::JniUtil::toJavaString(env, &str, true);
+  auto str = ROCKSDB_NAMESPACE::ThreadStatus::MicrosToString(
+      static_cast<uint64_t>(jmicros));
+  return ROCKSDB_NAMESPACE::JniUtil::toJavaString(env, &str, true);
 }
 
 /*
@@ -55,9 +56,10 @@ jstring Java_org_rocksdb_ThreadStatus_microsToStringNative(
  */
 jstring Java_org_rocksdb_ThreadStatus_getOperationStageName(
     JNIEnv* env, jclass, jbyte joperation_stage_value) {
-  auto name = rocksdb::ThreadStatus::GetOperationStageName(
-      rocksdb::OperationStageJni::toCppOperationStage(joperation_stage_value));
-  return rocksdb::JniUtil::toJavaString(env, &name, true);
+  auto name = ROCKSDB_NAMESPACE::ThreadStatus::GetOperationStageName(
+      ROCKSDB_NAMESPACE::OperationStageJni::toCppOperationStage(
+          joperation_stage_value));
+  return ROCKSDB_NAMESPACE::JniUtil::toJavaString(env, &name, true);
 }
 
 /*
@@ -67,10 +69,11 @@ jstring Java_org_rocksdb_ThreadStatus_getOperationStageName(
  */
 jstring Java_org_rocksdb_ThreadStatus_getOperationPropertyName(
     JNIEnv* env, jclass, jbyte joperation_type_value, jint jindex) {
-  auto name = rocksdb::ThreadStatus::GetOperationPropertyName(
-      rocksdb::OperationTypeJni::toCppOperationType(joperation_type_value),
+  auto name = ROCKSDB_NAMESPACE::ThreadStatus::GetOperationPropertyName(
+      ROCKSDB_NAMESPACE::OperationTypeJni::toCppOperationType(
+          joperation_type_value),
       static_cast<int>(jindex));
-  return rocksdb::JniUtil::toJavaString(env, &name, true);
+  return ROCKSDB_NAMESPACE::JniUtil::toJavaString(env, &name, true);
 }
 
 /*
@@ -96,10 +99,11 @@ jobject Java_org_rocksdb_ThreadStatus_interpretOperationProperties(
   env->ReleaseLongArrayElements(joperation_properties, jop, JNI_ABORT);
 
   // call the function
-  auto result = rocksdb::ThreadStatus::InterpretOperationProperties(
-      rocksdb::OperationTypeJni::toCppOperationType(joperation_type_value),
+  auto result = ROCKSDB_NAMESPACE::ThreadStatus::InterpretOperationProperties(
+      ROCKSDB_NAMESPACE::OperationTypeJni::toCppOperationType(
+          joperation_type_value),
       op_properties.get());
-  jobject jresult = rocksdb::HashMapJni::fromCppMap(env, &result);
+  jobject jresult = ROCKSDB_NAMESPACE::HashMapJni::fromCppMap(env, &result);
   if (env->ExceptionCheck()) {
     // exception occurred
     return nullptr;
@@ -115,7 +119,7 @@ jobject Java_org_rocksdb_ThreadStatus_interpretOperationProperties(
  */
 jstring Java_org_rocksdb_ThreadStatus_getStateName(
   JNIEnv* env, jclass, jbyte jstate_type_value) {
-  auto name = rocksdb::ThreadStatus::GetStateName(
-      rocksdb::StateTypeJni::toCppStateType(jstate_type_value));
-  return rocksdb::JniUtil::toJavaString(env, &name, true);
-}
\ No newline at end of file
+  auto name = ROCKSDB_NAMESPACE::ThreadStatus::GetStateName(
+      ROCKSDB_NAMESPACE::StateTypeJni::toCppStateType(jstate_type_value));
+  return ROCKSDB_NAMESPACE::JniUtil::toJavaString(env, &name, true);
+}