kangpinghuang commented on a change in pull request #516: Modify compaction code to be adapted to Rowset interface URL: https://github.com/apache/incubator-doris/pull/516#discussion_r246373244
########## File path: be/src/olap/merger.cpp ########## @@ -35,24 +35,24 @@ using std::vector; namespace doris { -Merger::Merger(TabletSharedPtr tablet, SegmentGroup* segment_group, ReaderType type) : +Merger::Merger(TabletSharedPtr tablet, RowsetBuilder* builder, ReaderType type) : _tablet(tablet), - _segment_group(segment_group), + _builder(builder), _reader_type(type), _row_count(0) {} -OLAPStatus Merger::merge(const vector<ColumnData*>& olap_data_arr, - uint64_t* merged_rows, uint64_t* filted_rows) { +OLAPStatus Merger::merge(const vector<RowsetReaderSharedPtr>& rs_readers, + const Version& version, uint64_t* merged_rows, uint64_t* filted_rows) { // Create and initiate reader for scanning and multi-merging specified // OLAPDatas. Reader reader; ReaderParams reader_params; reader_params.tablet = _tablet; reader_params.reader_type = _reader_type; - reader_params.olap_data_arr = olap_data_arr; + reader_params.olap_data_arr = rs_readers; Review comment: change the olap_data_arr name ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@doris.apache.org For additional commands, e-mail: dev-h...@doris.apache.org