Skip to content

[fix](orc-reader) Fix orc lazy materialization should not be bundled with pushdown. #51292

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

Closed
kaka11chen wants to merge 1 commit into from
Closed

[fix](orc-reader) Fix orc lazy materialization should not be bundled with pushdown. #51292

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
2 changes: 1 addition & 1 deletion be/src/apache-orc
Open in desktop
Submodule apache-orc updated 3 files
+7 −7 c++/src/Reader.cc
+3 −2 c++/src/StripeStream.cc
+5 −3 c++/src/StripeStream.hh
22 changes: 19 additions & 3 deletions be/src/vec/exec/format/orc/vorc_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,8 @@ bool static build_search_argument(std::vector<OrcPredicate>& predicates, int ind

bool OrcReader::_init_search_argument(
const std::unordered_map<std::string, ColumnValueRangeType>* colname_to_value_range) {
if ((!_enable_filter_by_min_max) || colname_to_value_range->empty()) {
if ((!_enable_filter_by_min_max) || _colname_to_value_range == nullptr ||
colname_to_value_range->empty()) {
return false;
}
std::vector<OrcPredicate> predicates;
Expand Down Expand Up @@ -797,12 +798,25 @@ Status OrcReader::set_fill_columns(
visit_slot(conjunct->root().get());
}

if (_is_acid) {
_lazy_read_ctx.predicate_orc_columns.insert(
_lazy_read_ctx.predicate_orc_columns.end(),
TransactionalHive::READ_ROW_COLUMN_NAMES.begin(),
TransactionalHive::READ_ROW_COLUMN_NAMES.end());
}

for (auto& read_col : _read_cols_lower_case) {
_lazy_read_ctx.all_read_columns.emplace_back(read_col);
if (predicate_columns.size() > 0) {
auto iter = predicate_columns.find(read_col);
if (iter == predicate_columns.end()) {
_lazy_read_ctx.lazy_read_columns.emplace_back(read_col);
if (!_is_acid ||
std::find(TransactionalHive::READ_ROW_COLUMN_NAMES_LOWER_CASE.begin(),
TransactionalHive::READ_ROW_COLUMN_NAMES_LOWER_CASE.end(),
read_col) ==
TransactionalHive::READ_ROW_COLUMN_NAMES_LOWER_CASE.end()) {
_lazy_read_ctx.lazy_read_columns.emplace_back(read_col);
}
} else {
_lazy_read_ctx.predicate_columns.first.emplace_back(iter->first);
_lazy_read_ctx.predicate_columns.second.emplace_back(iter->second.second);
Expand Down Expand Up @@ -859,8 +873,10 @@ Status OrcReader::set_fill_columns(
_lazy_read_ctx.can_lazy_read = true;
}

if (_colname_to_value_range == nullptr || !_init_search_argument(_colname_to_value_range)) {
if (_lazy_read_ctx.conjuncts.empty()) {
_lazy_read_ctx.can_lazy_read = false;
} else {
_init_search_argument(_colname_to_value_range);
}
try {
_row_reader_options.range(_range_start_offset, _range_size);
Expand Down
Loading