yiguolei commented on code in PR #54684:
URL: https://github.com/apache/doris/pull/54684#discussion_r2275260519
##########
be/src/olap/rowset/segment_v2/column_reader.cpp:
##########
@@ -780,100 +780,104 @@ Status ColumnReader::new_iterator(ColumnIterator**
iterator, const TabletColumn*
}
}
-Status ColumnReader::new_agg_state_iterator(ColumnIterator** iterator) {
- *iterator = new FileColumnIterator(this);
+Status ColumnReader::new_agg_state_iterator(ColumnIteratorUPtr* iterator) {
+ *iterator = std::make_unique<FileColumnIterator>(this);
return Status::OK();
}
-Status ColumnReader::new_array_iterator(ColumnIterator** iterator,
+Status ColumnReader::new_array_iterator(ColumnIteratorUPtr* iterator,
const TabletColumn* tablet_column) {
- ColumnIterator* item_iterator = nullptr;
+ ColumnIteratorUPtr item_iterator;
RETURN_IF_ERROR(_sub_readers[0]->new_iterator(
&item_iterator, tablet_column &&
tablet_column->get_subtype_count() > 0
? &tablet_column->get_sub_column(0)
: nullptr));
- ColumnIterator* offset_iterator = nullptr;
+ ColumnIteratorUPtr offset_iterator;
RETURN_IF_ERROR(_sub_readers[1]->new_iterator(&offset_iterator, nullptr));
- auto* ofcIter =
- new
OffsetFileColumnIterator(reinterpret_cast<FileColumnIterator*>(offset_iterator));
+ auto* file_iter =
static_cast<FileColumnIterator*>(offset_iterator.release());
+ OffsetFileColumnIteratorUPtr ofcIter =
std::make_unique<OffsetFileColumnIterator>(
+ std::unique_ptr<FileColumnIterator>(file_iter));
- ColumnIterator* null_iterator = nullptr;
+ ColumnIteratorUPtr null_iterator;
if (is_nullable()) {
RETURN_IF_ERROR(_sub_readers[2]->new_iterator(&null_iterator,
nullptr));
}
- *iterator = new ArrayFileColumnIterator(this, ofcIter, item_iterator,
null_iterator);
+ *iterator = std::make_unique<ArrayFileColumnIterator>(
+ this, std::move(ofcIter), std::move(item_iterator),
std::move(null_iterator));
return Status::OK();
}
-Status ColumnReader::new_map_iterator(ColumnIterator** iterator,
+Status ColumnReader::new_map_iterator(ColumnIteratorUPtr* iterator,
const TabletColumn* tablet_column) {
- ColumnIterator* key_iterator = nullptr;
+ ColumnIteratorUPtr key_iterator;
RETURN_IF_ERROR(_sub_readers[0]->new_iterator(
&key_iterator, tablet_column && tablet_column->get_subtype_count()
> 1
? &tablet_column->get_sub_column(0)
: nullptr));
- ColumnIterator* val_iterator = nullptr;
+ ColumnIteratorUPtr val_iterator;
RETURN_IF_ERROR(_sub_readers[1]->new_iterator(
&val_iterator, tablet_column && tablet_column->get_subtype_count()
> 1
? &tablet_column->get_sub_column(1)
: nullptr));
- ColumnIterator* offsets_iterator = nullptr;
+ ColumnIteratorUPtr offsets_iterator;
RETURN_IF_ERROR(_sub_readers[2]->new_iterator(&offsets_iterator, nullptr));
- auto* ofcIter =
- new
OffsetFileColumnIterator(reinterpret_cast<FileColumnIterator*>(offsets_iterator));
+ auto* file_iter =
static_cast<FileColumnIterator*>(offsets_iterator.release());
+ OffsetFileColumnIteratorUPtr ofcIter =
std::make_unique<OffsetFileColumnIterator>(
Review Comment:
这里也是
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
