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

[enhancement](VSlotRef) enhance column_id check in execute function during runtime (#11862)

Browse Source 
The column id check in VSlotRef::execute function before is too strict for fuzzy test to continuously produce random query. Temporarily loosen the check logic.
Moreover, there exists some careless call to VExpr::get_const_col, it might return a nullptr but not every function call checks if it's valid. It's an underlying problem.
This commit is contained in:
AlexYue
2022-08-18 09:12:26 +08:00
committed by GitHub
parent 582be130dd
commit 8b10a1a3f7
11 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
be/src/vec/exprs/table_function/vexplode.cpp
View File

@ -17,6 +17,7 @@
#include "vec/exprs/table_function/vexplode.h"
#include "common/status.h"
#include "vec/exprs/vexpr.h"
namespace doris::vectorized {
@ -31,7 +32,8 @@ Status VExplodeTableFunction::process_init(vectorized::Block* block) {
<< _vexpr_context->root()->children().size();
int value_column_idx = -1;
_vexpr_context->root()->children()[0]->execute(_vexpr_context, block, &value_column_idx);
RETURN_IF_ERROR(_vexpr_context->root()->children()[0]->execute(_vexpr_context, block,
&value_column_idx));
_array_column =
block->get_by_position(value_column_idx).column->convert_to_full_column_if_const();

4
be/src/vec/exprs/table_function/vexplode_bitmap.cpp
View File

@ -17,6 +17,7 @@
#include "vec/exprs/table_function/vexplode_bitmap.h"
#include "common/status.h"
#include "util/bitmap_value.h"
#include "vec/exprs/vexpr.h"
@ -32,7 +33,8 @@ Status VExplodeBitmapTableFunction::process_init(vectorized::Block* block) {
<< _vexpr_context->root()->children().size();
int value_column_idx = -1;
_vexpr_context->root()->children()[0]->execute(_vexpr_context, block, &value_column_idx);
RETURN_IF_ERROR(_vexpr_context->root()->children()[0]->execute(_vexpr_context, block,
&value_column_idx));
_value_column = block->get_by_position(value_column_idx).column;
return Status::OK();

3
be/src/vec/exprs/table_function/vexplode_json_array.cpp
View File

@ -32,7 +32,8 @@ Status VExplodeJsonArrayTableFunction::process_init(vectorized::Block* block) {
<< _vexpr_context->root()->children().size();
int text_column_idx = -1;
_vexpr_context->root()->children()[0]->execute(_vexpr_context, block, &text_column_idx);
RETURN_IF_ERROR(_vexpr_context->root()->children()[0]->execute(_vexpr_context, block,
&text_column_idx));
_text_column = block->get_by_position(text_column_idx).column;
return Status::OK();

4
be/src/vec/exprs/table_function/vexplode_numbers.cpp
View File

@ -17,6 +17,7 @@
#include "vec/exprs/table_function/vexplode_numbers.h"
#include "common/status.h"
#include "vec/exprs/vexpr.h"
namespace doris::vectorized {
@ -31,7 +32,8 @@ Status VExplodeNumbersTableFunction::process_init(vectorized::Block* block) {
<< _vexpr_context->root()->children().size();
int value_column_idx = -1;
_vexpr_context->root()->children()[0]->execute(_vexpr_context, block, &value_column_idx);
RETURN_IF_ERROR(_vexpr_context->root()->children()[0]->execute(_vexpr_context, block,
&value_column_idx));
_value_column = block->get_by_position(value_column_idx).column;
return Status::OK();

6
be/src/vec/exprs/table_function/vexplode_split.cpp
View File

@ -40,8 +40,10 @@ Status VExplodeSplitTableFunction::process_init(vectorized::Block* block) {
int text_column_idx = -1;
int delimiter_column_idx = -1;
_vexpr_context->root()->children()[0]->execute(_vexpr_context, block, &text_column_idx);
_vexpr_context->root()->children()[1]->execute(_vexpr_context, block, &delimiter_column_idx);
RETURN_IF_ERROR(_vexpr_context->root()->children()[0]->execute(_vexpr_context, block,
&text_column_idx));
RETURN_IF_ERROR(_vexpr_context->root()->children()[1]->execute(_vexpr_context, block,
&delimiter_column_idx));
_text_column = block->get_by_position(text_column_idx).column;
_delimiter_column = block->get_by_position(delimiter_column_idx).column;