@@ -86,6 +86,14 @@ Status OlapScanner::prepare(
8686 LOG (WARNING ) << ss.str ();
8787 return Status::InternalError (ss.str ());
8888 }
89+ _tablet_schema = _tablet->tablet_schema ();
90+ if (!_parent->_olap_scan_node .columns_desc .empty () &&
91+ _parent->_olap_scan_node .columns_desc [0 ].col_unique_id >= 0 ) {
92+ _tablet_schema.clear_columns ();
93+ for (const auto & column_desc : _parent->_olap_scan_node .columns_desc ) {
94+ _tablet_schema.append_column (TabletColumn (column_desc));
95+ }
96+ }
8997 {
9098 std::shared_lock rdlock (_tablet->get_header_lock ());
9199 const RowsetSharedPtr rowset = _tablet->rowset_with_max_version ();
@@ -168,6 +176,7 @@ Status OlapScanner::_init_tablet_reader_params(
168176 RETURN_IF_ERROR (_init_return_columns (!_tablet_reader_params.direct_mode ));
169177
170178 _tablet_reader_params.tablet = _tablet;
179+ _tablet_reader_params.tablet_schema = &_tablet_schema;
171180 _tablet_reader_params.reader_type = READER_QUERY ;
172181 _tablet_reader_params.aggregation = _aggregation;
173182 _tablet_reader_params.version = Version (0 , _version);
@@ -208,7 +217,7 @@ Status OlapScanner::_init_tablet_reader_params(
208217 _tablet_reader_params.return_columns .push_back (i);
209218 }
210219 for (auto index : _return_columns) {
211- if (_tablet-> tablet_schema () .column (index).is_key ()) {
220+ if (_tablet_schema .column (index).is_key ()) {
212221 continue ;
213222 } else {
214223 _tablet_reader_params.return_columns .push_back (index);
@@ -217,13 +226,12 @@ Status OlapScanner::_init_tablet_reader_params(
217226 }
218227
219228 // use _tablet_reader_params.return_columns, because reader use this to merge sort
220- Status res =
221- _read_row_cursor.init (_tablet->tablet_schema (), _tablet_reader_params.return_columns );
229+ Status res = _read_row_cursor.init (_tablet_schema, _tablet_reader_params.return_columns );
222230 if (!res.ok ()) {
223231 LOG (WARNING ) << " fail to init row cursor.res = " << res;
224232 return Status::InternalError (" failed to initialize storage read row cursor" );
225233 }
226- _read_row_cursor.allocate_memory_for_string_type (_tablet-> tablet_schema () );
234+ _read_row_cursor.allocate_memory_for_string_type (_tablet_schema );
227235
228236 // If a agg node is this scan node direct parent
229237 // we will not call agg object finalize method in scan node,
@@ -242,15 +250,16 @@ Status OlapScanner::_init_return_columns(bool need_seq_col) {
242250 if (!slot->is_materialized ()) {
243251 continue ;
244252 }
245- int32_t index = _tablet->field_index (slot->col_name ());
253+ int32_t index = slot->col_unique_id () >= 0 ? slot->col_unique_id ()
254+ : _tablet_schema.field_index (slot->col_name ());
246255 if (index < 0 ) {
247256 std::stringstream ss;
248257 ss << " field name is invalid. field=" << slot->col_name ();
249258 LOG (WARNING ) << ss.str ();
250259 return Status::InternalError (ss.str ());
251260 }
252261 _return_columns.push_back (index);
253- if (slot->is_nullable () && !_tablet-> tablet_schema () .column (index).is_nullable ())
262+ if (slot->is_nullable () && !_tablet_schema .column (index).is_nullable ())
254263 _tablet_columns_convert_to_null_set.emplace (index);
255264 _query_slots.push_back (slot);
256265 }
@@ -259,13 +268,13 @@ Status OlapScanner::_init_return_columns(bool need_seq_col) {
259268 if (_tablet->tablet_schema ().has_sequence_col () && need_seq_col) {
260269 bool has_replace_col = false ;
261270 for (auto col : _return_columns) {
262- if (_tablet-> tablet_schema () .column (col).aggregation () ==
271+ if (_tablet_schema .column (col).aggregation () ==
263272 FieldAggregationMethod::OLAP_FIELD_AGGREGATION_REPLACE ) {
264273 has_replace_col = true ;
265274 break ;
266275 }
267276 }
268- if (auto sequence_col_idx = _tablet-> tablet_schema () .sequence_col_idx ();
277+ if (auto sequence_col_idx = _tablet_schema .sequence_col_idx ();
269278 has_replace_col && std::find (_return_columns.begin (), _return_columns.end (),
270279 sequence_col_idx) == _return_columns.end ()) {
271280 _return_columns.push_back (sequence_col_idx);
0 commit comments