Skip to content

Commit 88115ff

Browse files
authored
[feature-wip](array-type) ArrayFileColumnIterator bug fix (apache#9114)
1 parent cdd1b6d commit 88115ff

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎be/src/olap/rowset/segment_v2/column_reader.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,8 @@ Status ArrayFileColumnIterator::next_batch(size_t* n, ColumnBlockView* dst, bool
417417
array_batch->get_offset_by_length(dst->current_offset(), *n);
418418

419419
// 2. read null
420-
if (dst->is_nullable()) {
420+
if (_array_reader->is_nullable()) {
421+
DCHECK(dst->is_nullable());
421422
auto null_batch = array_batch->get_null_as_batch();
422423
ColumnBlock null_block(&null_batch, nullptr);
423424
ColumnBlockView null_view(&null_block, dst->current_offset());

‎be/src/olap/rowset/segment_v2/column_reader.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ class ArrayFileColumnIterator final : public ColumnIterator {
351351
ordinal_t start_offset_in_this_page =
352352
_length_iterator->get_current_page()->first_array_item_ordinal;
353353
ColumnBlock ordinal_block(_length_batch.get(), nullptr);
354-
ordinal_t size_to_read = ord - start_offset_in_this_page;
354+
ordinal_t size_to_read = ord - _length_iterator->get_current_ordinal();
355355
bool has_null = false;
356356
ordinal_t item_ordinal = start_offset_in_this_page;
357357
while (size_to_read > 0) {

‎be/src/olap/rowset/segment_v2/segment_iterator.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,13 @@ void SegmentIterator::_init_lazy_materialization() {
463463
}
464464
_opts.delete_condition_predicates->get_all_column_ids(predicate_columns);
465465

466+
// ARRAY column do not support lazy materialization read
467+
for (auto cid : _schema.column_ids()) {
468+
if (_schema.column(cid)->type() == OLAP_FIELD_TYPE_ARRAY) {
469+
predicate_columns.insert(cid);
470+
}
471+
}
472+
466473
// when all return columns have predicates, disable lazy materialization to avoid its overhead
467474
if (_schema.column_ids().size() > predicate_columns.size()) {
468475
_lazy_materialization_read = true;

0 commit comments

Comments
 (0)