Skip to content

Commit

Permalink
fix iterator
Browse files Browse the repository at this point in the history
  • Loading branch information
amorynan committed Jan 20, 2025
1 parent fca5c63 commit bf0089e
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions be/src/olap/rowset/segment_v2/column_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,9 @@ Status ColumnReader::new_array_iterator(ColumnIterator** iterator,
const TabletColumn* tablet_column) {
ColumnIterator* item_iterator = nullptr;
RETURN_IF_ERROR(_sub_readers[0]->new_iterator(
&item_iterator, tablet_column ? &tablet_column->get_sub_column(0) : nullptr));
&item_iterator, tablet_column && tablet_column->get_subtype_count() > 0
? &tablet_column->get_sub_column(0)
: nullptr));

ColumnIterator* offset_iterator = nullptr;
RETURN_IF_ERROR(_sub_readers[1]->new_iterator(&offset_iterator, nullptr));
Expand All @@ -777,10 +779,14 @@ Status ColumnReader::new_map_iterator(ColumnIterator** iterator,
const TabletColumn* tablet_column) {
ColumnIterator* key_iterator = nullptr;
RETURN_IF_ERROR(_sub_readers[0]->new_iterator(
&key_iterator, tablet_column ? &tablet_column->get_sub_column(0) : nullptr));
&key_iterator, tablet_column && tablet_column->get_subtype_count() > 1
? &tablet_column->get_sub_column(0)
: nullptr));
ColumnIterator* val_iterator = nullptr;
RETURN_IF_ERROR(_sub_readers[1]->new_iterator(
&val_iterator, tablet_column ? &tablet_column->get_sub_column(1) : nullptr));
&val_iterator, tablet_column && tablet_column->get_subtype_count() > 1
? &tablet_column->get_sub_column(1)
: nullptr));
ColumnIterator* offsets_iterator = nullptr;
RETURN_IF_ERROR(_sub_readers[2]->new_iterator(&offsets_iterator, nullptr));
auto* ofcIter =
Expand Down

0 comments on commit bf0089e

Please sign in to comment.