diff --git a/utils/local-engine/Common/CHUtil.cpp b/utils/local-engine/Common/CHUtil.cpp index de1d38fe1ec2..9575236a9c4c 100644 --- a/utils/local-engine/Common/CHUtil.cpp +++ b/utils/local-engine/Common/CHUtil.cpp @@ -637,6 +637,8 @@ void BackendInitializerUtil::init(const std::string & plan) void BackendFinalizerUtil::finalizeGlobally() { + local_engine::BroadCastJoinBuilder::clean(); + auto & global_context = SerializedPlanParser::global_context; auto & shared_context = SerializedPlanParser::shared_context; auto * logger = BackendInitializerUtil::logger; @@ -648,11 +650,8 @@ void BackendFinalizerUtil::finalizeGlobally() } } -void BackendFinalizerUtil::finalizeSessionall() +void BackendFinalizerUtil::finalizeSessionally() { - /// TODO: figure out why BroadCastJoinBuilder::clean would cause core issue - /// Currently remove it as a workaround - // local_engine::BroadCastJoinBuilder::clean(); } } diff --git a/utils/local-engine/Common/CHUtil.h b/utils/local-engine/Common/CHUtil.h index a9fd59f0d413..665afade3e4b 100644 --- a/utils/local-engine/Common/CHUtil.h +++ b/utils/local-engine/Common/CHUtil.h @@ -132,7 +132,7 @@ class BackendFinalizerUtil static void finalizeGlobally(); /// Release session level resources like StorageJoinBuilder. Invoked every time executor/driver shutdown. - static void finalizeSessionall(); + static void finalizeSessionally(); }; } diff --git a/utils/local-engine/local_engine_jni.cpp b/utils/local-engine/local_engine_jni.cpp index 2383d6e08ff7..0a5b47d5233d 100644 --- a/utils/local-engine/local_engine_jni.cpp +++ b/utils/local-engine/local_engine_jni.cpp @@ -168,7 +168,7 @@ void Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeInitNa void Java_io_glutenproject_vectorized_ExpressionEvaluatorJniWrapper_nativeFinalizeNative(JNIEnv * env) { LOCAL_ENGINE_JNI_METHOD_START - local_engine::BackendFinalizerUtil::finalizeSessionall(); + local_engine::BackendFinalizerUtil::finalizeSessionally(); LOCAL_ENGINE_JNI_METHOD_END(env, ) }