update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/rocksdb/java/rocksjni/table_filter_jnicallback.cc b/ceph/src/rocksdb/java/rocksjni/table_filter_jnicallback.cc
index 680c014459d7b572e4a868eb243b1e576626e371..d1699548d0e557a92dda624a61f07a17b987ee7c 100644 (file)
--- a/ceph/src/rocksdb/java/rocksjni/table_filter_jnicallback.cc
+++ b/ceph/src/rocksdb/java/rocksjni/table_filter_jnicallback.cc
@@ -4,12 +4,12 @@
 //  (found in the LICENSE.Apache file in the root directory).
 //
 // This file implements the callback "bridge" between Java and C++ for
-// rocksdb::TableFilter.
+// ROCKSDB_NAMESPACE::TableFilter.
 
 #include "rocksjni/table_filter_jnicallback.h"
 #include "rocksjni/portal.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 TableFilterJniCallback::TableFilterJniCallback(
     JNIEnv* env, jobject jtable_filter)
     : JniCallback(env, jtable_filter) {
@@ -26,37 +26,41 @@ TableFilterJniCallback::TableFilterJniCallback(
   on each call to the function itself as
   it may be called from multiple threads
   */
-  m_table_filter_function = [this](const rocksdb::TableProperties& table_properties) {
-    jboolean attached_thread = JNI_FALSE;
-    JNIEnv* thread_env = getJniEnv(&attached_thread);
-    assert(thread_env != nullptr);
-
-    // create a Java TableProperties object
-    jobject jtable_properties = TablePropertiesJni::fromCppTableProperties(thread_env, table_properties);
-    if (jtable_properties == nullptr) {
-      // exception thrown from fromCppTableProperties
-      thread_env->ExceptionDescribe();  // print out exception to stderr
-      releaseJniEnv(attached_thread);
-      return false;
-    }
-
-    jboolean result = thread_env->CallBooleanMethod(m_jcallback_obj, m_jfilter_methodid, jtable_properties);
-    if (thread_env->ExceptionCheck()) {
-      // exception thrown from CallBooleanMethod
-      thread_env->DeleteLocalRef(jtable_properties);
-      thread_env->ExceptionDescribe();  // print out exception to stderr
-      releaseJniEnv(attached_thread);
-      return false;
-    }
-
-    // ok... cleanup and then return
-    releaseJniEnv(attached_thread);
-    return static_cast<bool>(result);
-  };
+  m_table_filter_function =
+      [this](const ROCKSDB_NAMESPACE::TableProperties& table_properties) {
+        jboolean attached_thread = JNI_FALSE;
+        JNIEnv* thread_env = getJniEnv(&attached_thread);
+        assert(thread_env != nullptr);
+
+        // create a Java TableProperties object
+        jobject jtable_properties = TablePropertiesJni::fromCppTableProperties(
+            thread_env, table_properties);
+        if (jtable_properties == nullptr) {
+          // exception thrown from fromCppTableProperties
+          thread_env->ExceptionDescribe();  // print out exception to stderr
+          releaseJniEnv(attached_thread);
+          return false;
+        }
+
+        jboolean result = thread_env->CallBooleanMethod(
+            m_jcallback_obj, m_jfilter_methodid, jtable_properties);
+        if (thread_env->ExceptionCheck()) {
+          // exception thrown from CallBooleanMethod
+          thread_env->DeleteLocalRef(jtable_properties);
+          thread_env->ExceptionDescribe();  // print out exception to stderr
+          releaseJniEnv(attached_thread);
+          return false;
+        }
+
+        // ok... cleanup and then return
+        releaseJniEnv(attached_thread);
+        return static_cast<bool>(result);
+      };
 }
 
-std::function<bool(const rocksdb::TableProperties&)> TableFilterJniCallback::GetTableFilterFunction() {
+std::function<bool(const ROCKSDB_NAMESPACE::TableProperties&)>
+TableFilterJniCallback::GetTableFilterFunction() {
   return m_table_filter_function;
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE