SparkRowInfoJNI class ref

apache · Feb 21, 2025 · 12c9ff6 · 12c9ff6
1 parent 7f69516
commit 12c9ff6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/cpp-ch/local-engine/Parser/CHColumnToSparkRow.cpp b/cpp-ch/local-engine/Parser/CHColumnToSparkRow.cpp
@@ -29,6 +29,7 @@
 #include <DataTypes/ObjectUtils.h>
 #include <jni/jni_common.h>
 #include <Common/Exception.h>
+#include <Resource/JVMClassReference.h>
 
 namespace DB
 {
@@ -948,17 +949,7 @@ void FixedLengthDataWriter::unsafeWrite(const char * __restrict src, char * __re
 
 namespace SparkRowInfoJNI
 {
-static jclass spark_row_info_class;
-static jmethodID spark_row_info_constructor;
-void init(JNIEnv * env)
-{
-    spark_row_info_class = CreateGlobalClassReference(env, "Lorg/apache/gluten/row/SparkRowInfo;");
-    spark_row_info_constructor = GetMethodID(env, spark_row_info_class, "<init>", "([J[JJJJ)V");
-}
-void destroy(JNIEnv * env)
-{
-    env->DeleteGlobalRef(spark_row_info_class);
-}
+
 jobject create(JNIEnv * env, const SparkRowInfo & spark_row_info)
 {
     auto * offsets_arr = env->NewLongArray(spark_row_info.getNumRows());
@@ -971,8 +962,9 @@ jobject create(JNIEnv * env, const SparkRowInfo & spark_row_info)
     int64_t column_number = spark_row_info.getNumCols();
     int64_t total_size = spark_row_info.getTotalBytes();
 
+    auto & spark_row_info_class_ref = JVM_CLASS_REFERENCE(spark_row_info_class);
     return env->NewObject(
-        spark_row_info_class, spark_row_info_constructor, offsets_arr, lengths_arr, address, column_number, total_size);
+        spark_row_info_class_ref(), spark_row_info_class_ref["<init>"], offsets_arr, lengths_arr, address, column_number, total_size);
 }
 }
 

diff --git a/cpp-ch/local-engine/Parser/CHColumnToSparkRow.h b/cpp-ch/local-engine/Parser/CHColumnToSparkRow.h
@@ -203,8 +203,6 @@ class FixedLengthDataWriter
 
 namespace SparkRowInfoJNI
 {
-void init(JNIEnv *);
-void destroy(JNIEnv *);
 jobject create(JNIEnv * env, const SparkRowInfo & spark_row_info);
 }
 

diff --git a/cpp-ch/local-engine/Resource/JVMClassReference.cpp b/cpp-ch/local-engine/Resource/JVMClassReference.cpp
@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 #include "JVMClassReference.h"
-#include <iostream>
 #include <Common/ErrorCodes.h>
 #include <Common/Exception.h>
-#include <Common/logger_useful.h>
 
 namespace DB::ErrorCodes
 {
@@ -151,4 +149,6 @@ REGISTER_JVM_CLASS_REFERENCE(cache_manager_result_class, "Lorg/apache/gluten/exe
 
 // Used in SparkMergeTreeWriterJNI
 REGISTER_JVM_CLASS_REFERENCE(merge_tree_committer_helper, "Lorg/apache/spark/sql/execution/datasources/v1/clickhouse/MergeTreeCommiterHelper;", "setCurrentTaskWriteInfo", "(Ljava/lang/String;Ljava/lang/String;)V")
+
+REGISTER_JVM_CLASS_REFERENCE(spark_row_info_class, "Lorg/apache/gluten/row/SparkRowInfo;", "<init>", "([J[JJJJ)V")
 }
diff --git a/cpp-ch/local-engine/local_engine_jni.cpp b/cpp-ch/local-engine/local_engine_jni.cpp
@@ -61,8 +61,6 @@
 #include <Resource/ResourceManager.h>
 #include <Resource/JVMClassReference.h>
 
-#include <iostream>
-
 #ifdef __cplusplus
 namespace DB
 {
@@ -104,10 +102,6 @@ JNIEXPORT jint JNI_OnLoad(JavaVM * vm, void * /*reserved*/)
         return JNI_ERR;
 
     local_engine::JNIEnvResourceManager::instance().initialize(env);
-    std::cout << "xxx \n" << local_engine::JNIEnvResourceManager::instance().dumpInitializeDependencyDAG() << std::endl;
-
-    local_engine::SparkRowInfoJNI::init(env);
-
     local_engine::JNIUtils::vm = vm;
     return JNI_VERSION_1_8;
 }
@@ -121,8 +115,6 @@ JNIEXPORT void JNI_OnUnload(JavaVM * vm, void * /*reserved*/)
     vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_8);
 
     local_engine::JNIEnvResourceManager::instance().destroy(env);
-
-    local_engine::SparkRowInfoJNI::destroy(env);
 }
 
 JNIEXPORT void Java_org_apache_gluten_vectorized_ExpressionEvaluatorJniWrapper_nativeInitNative(JNIEnv * env, jclass, jbyteArray conf_plan)