Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bug](udaf) fix memory leak in the java udaf #32630

Merged
merged 2 commits into from
Mar 22, 2024
Merged

[bug](udaf) fix memory leak in the java udaf #32630

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8db8cce
update
zhangstar333 Mar 21, 2024
2cf8d10
update comment
zhangstar333 Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions be/src/vec/aggregate_functions/aggregate_function_java_udaf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,28 @@ struct AggregateJavaUdafData {
AggregateJavaUdafData() = default;
AggregateJavaUdafData(int64_t num_args) { argument_size = num_args; }

~AggregateJavaUdafData() {
~AggregateJavaUdafData() = default;

Status close_and_delete_object() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: method 'close_and_delete_object' can be made static [readability-convert-member-functions-to-static]

Suggested change
Status close_and_delete_object() {
static Status close_and_delete_object() {

JNIEnv* env = nullptr;
if (!JniUtil::GetJNIEnv(&env).ok()) {
Defer defer {[&]() {
if (env != nullptr) {
env->DeleteGlobalRef(executor_cl);
env->DeleteGlobalRef(executor_obj);
}
}};
Status st = JniUtil::GetJNIEnv(&env);
if (!st.ok()) {
LOG(WARNING) << "Failed to get JNIEnv";
return st;
}
env->CallNonvirtualVoidMethod(executor_obj, executor_cl, executor_close_id);
Status st = JniUtil::GetJniExceptionMsg(env);
st = JniUtil::GetJniExceptionMsg(env);
if (!st.ok()) {
LOG(WARNING) << "Failed to close JAVA UDAF: " << st.to_string();
return st;
}
env->DeleteGlobalRef(executor_cl);
env->DeleteGlobalRef(executor_obj);
return Status::OK();
}

Status init_udaf(const TFunction& fn, const std::string& local_location) {
Expand Down Expand Up @@ -268,8 +278,8 @@ class AggregateJavaUdaf final
}

void create(AggregateDataPtr __restrict place) const override {
new (place) Data(argument_types.size());
if (_first_created) {
new (place) Data(argument_types.size());
Status status = Status::OK();
SAFE_CREATE(RETURN_IF_STATUS_ERROR(status,
this->data(place).init_udaf(_fn, _local_location)),
Expand All @@ -279,16 +289,24 @@ class AggregateJavaUdaf final
});
_first_created = false;
_exec_place = place;
if (UNLIKELY(!status.ok())) {
throw doris::Exception(ErrorCode::INTERNAL_ERROR, status.to_string());
}
}
}

// To avoid multiple times JNI call, Here will destroy all data at once
void destroy(AggregateDataPtr __restrict place) const noexcept override {
if (place == _exec_place) {
static_cast<void>(this->data(_exec_place).destroy());
this->data(_exec_place).~Data();
Status status = Status::OK();
status = this->data(_exec_place).destroy();
status = this->data(_exec_place).close_and_delete_object();
_first_created = true;
if (UNLIKELY(!status.ok())) {
LOG(WARNING) << "Failed to destroy function: " << status.to_string();
}
}
this->data(place).~Data();
}

String get_name() const override { return _fn.name.function_name; }
Expand Down Expand Up @@ -372,7 +390,6 @@ class AggregateJavaUdaf final
// so it's can't call ~Data, only to change _destory_deserialize flag.
void deserialize(AggregateDataPtr __restrict place, BufferReadable& buf,
Arena*) const override {
new (place) Data(argument_types.size());
this->data(place).read(buf);
}

Expand Down
Loading