Skip to content

[FIX](complextype)fix shrink in topN for complex type #26609

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

Merged
yiguolei merged 1 commit into from
Nov 9, 2023
+24 −11
Merged

[FIX](complextype)fix shrink in topN for complex type #26609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 22 additions & 11 deletions be/src/exec/rowid_fetcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,24 @@ Status RowIDFetcher::_merge_rpc_results(const PMultiGetRequest& request,
return Status::OK();
}

bool _has_char_type(const TypeDescriptor& desc) {
switch (desc.type) {
case TYPE_CHAR:
return true;
case TYPE_ARRAY:
case TYPE_MAP:
case TYPE_STRUCT:
Copy link
Copy Markdown
Contributor

@xiaokang xiaokang Nov 8, 2023

Choose a reason for hiding this comment

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

can we make it more general to just check children

Copy link
Copy Markdown
Contributor

@yiguolei yiguolei Nov 9, 2023

Choose a reason for hiding this comment

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

could not. It has to check the child recursively.....

for (int idx = 0; idx < desc.children.size(); ++idx) {
if (_has_char_type(desc.children[idx])) {
return true;
}
}
return false;
default:
return false;
}
}

Status RowIDFetcher::fetch(const vectorized::ColumnPtr& column_row_ids,
vectorized::Block* res_block) {
CHECK(!_stubs.empty());
Expand Down Expand Up @@ -238,17 +256,10 @@ Status RowIDFetcher::fetch(const vectorized::ColumnPtr& column_row_ids,
std::vector<size_t> char_type_idx;
for (size_t i = 0; i < _fetch_option.desc->slots().size(); i++) {
const auto& column_desc = _fetch_option.desc->slots()[i];
const TypeDescriptor* type_desc = &column_desc->type();
do {
if (type_desc->type == TYPE_CHAR) {
char_type_idx.emplace_back(i);
break;
} else if (type_desc->type != TYPE_ARRAY) {
break;
}
// for Array<Char> or Array<Array<Char>>
type_desc = &type_desc->children[0];
} while (true);
const TypeDescriptor& type_desc = column_desc->type();
if (_has_char_type(type_desc)) {
char_type_idx.push_back(i);
}
}
res_block->shrink_char_type_column_suffix_zero(char_type_idx);
VLOG_DEBUG << "dump block:" << res_block->dump_data(0, 10);
Expand Down
1 change: 1 addition & 0 deletions ...est/suites/datatype_p0/nested_types/query/test_nestedtypes_csv_insert_into_with_s3.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ suite("test_nestedtypes_csv_insert_into_with_s3", "p0") {
sql 'use regression_test_datatype_p0_nested_types'
sql 'set enable_nereids_planner=false'
sql 'set max_allowed_packet=4194304'
sql 'set topn_opt_limit_threshold=10000'
sql """ADMIN SET FRONTEND CONFIG ('disable_nested_complex_type' = 'false')"""

String ak = getS3AK()
Expand Down
1 change: 1 addition & 0 deletions ...st/suites/datatype_p0/nested_types/query/test_nestedtypes_json_insert_into_with_s3.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ suite("test_nestedtypes_json_insert_into_with_s3", "p0") {
sql 'use regression_test_datatype_p0_nested_types'
sql 'set enable_nereids_planner=false'
sql 'set max_allowed_packet=4194304'
sql 'set topn_opt_limit_threshold=10000'
sql """ADMIN SET FRONTEND CONFIG ('disable_nested_complex_type' = 'false')"""

String ak = getS3AK()
Expand Down