database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix core dump on vcase_expr::close (#9875)

Browse Source
This commit is contained in:
Pxl
2022-05-31 15:45:39 +08:00
committed by GitHub
parent 0cba6b7d95
commit fa50b63cee
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
be/src/vec/exprs/vcase_expr.cpp
View File

@ -68,19 +68,15 @@ Status VCaseExpr::open(RuntimeState* state, VExprContext* context,
FunctionContext::FunctionStateScope scope) {
RETURN_IF_ERROR(VExpr::open(state, context, scope));
RETURN_IF_ERROR(VExpr::init_function_context(context, scope, _function));
CaseState* case_state = new CaseState {_data_type};
context->fn_context(_fn_context_index)
->set_function_state(FunctionContext::FRAGMENT_LOCAL, case_state);
context->fn_context(_fn_context_index)->set_function_state(scope, case_state);
return Status::OK();
}
void VCaseExpr::close(RuntimeState* state, VExprContext* context,
FunctionContext::FunctionStateScope scope) {
CaseState* case_state = reinterpret_cast<CaseState*>(
context->fn_context(_fn_context_index)
->get_function_state(FunctionContext::FRAGMENT_LOCAL));
delete case_state;
VExpr::close_function_context(context, scope, _function);
VExpr::close(state, context, scope);
}

8
be/src/vec/exprs/vexpr.cpp
View File

@ -190,7 +190,7 @@ Status VExpr::create_expr_tree(doris::ObjectPool* pool, const doris::TExpr& texp
}
int node_idx = 0;
VExpr* e = nullptr;
Status status = create_tree_from_thrift(pool, texpr.nodes, NULL, &node_idx, &e, ctx);
Status status = create_tree_from_thrift(pool, texpr.nodes, nullptr, &node_idx, &e, ctx);
if (status.ok() && node_idx + 1 != texpr.nodes.size()) {
status = Status::InternalError(
"Expression tree only partially reconstructed. Not all thrift nodes were used.");
@ -237,7 +237,7 @@ Status VExpr::open(const std::vector<VExprContext*>& ctxs, RuntimeState* state)
Status VExpr::clone_if_not_exists(const std::vector<VExprContext*>& ctxs, RuntimeState* state,
std::vector<VExprContext*>* new_ctxs) {
DCHECK(new_ctxs != NULL);
DCHECK(new_ctxs != nullptr);
if (!new_ctxs->empty()) {
// 'ctxs' was already cloned into '*new_ctxs', nothing to do.
DCHECK_EQ(new_ctxs->size(), ctxs.size());
@ -326,7 +326,7 @@ void VExpr::register_function_context(doris::RuntimeState* state, VExprContext*
Status VExpr::init_function_context(VExprContext* context,
FunctionContext::FunctionStateScope scope,
const FunctionBasePtr& function) {
const FunctionBasePtr& function) const {
FunctionContext* fn_ctx = context->fn_context(_fn_context_index);
if (scope == FunctionContext::FRAGMENT_LOCAL) {
std::vector<ColumnPtrWrapper*> constant_cols;
@ -344,7 +344,7 @@ Status VExpr::init_function_context(VExprContext* context,
}
void VExpr::close_function_context(VExprContext* context, FunctionContext::FunctionStateScope scope,
const FunctionBasePtr& function) {
const FunctionBasePtr& function) const {
if (_fn_context_index != -1) {
FunctionContext* fn_ctx = context->fn_context(_fn_context_index);
function->close(fn_ctx, FunctionContext::THREAD_LOCAL);

6
be/src/vec/exprs/vexpr.h
View File

@ -116,7 +116,7 @@ public:
static std::string debug_string(const std::vector<VExpr*>& exprs);
static std::string debug_string(const std::vector<VExprContext*>& ctxs);
bool is_and_expr() { return _fn.name.function_name == "and"; }
bool is_and_expr() const { return _fn.name.function_name == "and"; }
const TFunction& fn() const { return _fn; }
@ -148,12 +148,12 @@ protected:
/// 2. Call function's prepare() to initialize function state, fragment-local or
/// thread-local according the input `FunctionStateScope` argument.
Status init_function_context(VExprContext* context, FunctionContext::FunctionStateScope scope,
const FunctionBasePtr& function);
const FunctionBasePtr& function) const;
/// Helper function to close function context, fragment-local or thread-local according
/// the input `FunctionStateScope` argument. Called in `close` phase of VExpr.
void close_function_context(VExprContext* context, FunctionContext::FunctionStateScope scope,
const FunctionBasePtr& function);
const FunctionBasePtr& function) const;
TExprNodeType::type _node_type;
TypeDescriptor _type;

12
be/src/vec/functions/function_case.h
View File

@ -222,7 +222,8 @@ public:
}
template <typename ColumnType>
void update_result_auto_simd(MutableColumnPtr& result_column_ptr, uint8* __restrict then_idx,
void update_result_auto_simd(MutableColumnPtr& result_column_ptr,
const uint8* __restrict then_idx,
CaseWhenColumnHolder& column_holder) {
size_t rows_count = column_holder.rows_count;
result_column_ptr->resize(rows_count);
@ -332,6 +333,15 @@ public:
return execute_get_type(case_state->result_type, block, arguments, result,
input_rows_count);
}
Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) override {
if (scope == FunctionContext::THREAD_LOCAL) {
auto* state = reinterpret_cast<CaseState*>(
context->get_function_state(FunctionContext::THREAD_LOCAL));
delete state;
}
return Status::OK();
}
};
} // namespace doris::vectorized