yiguolei commented on code in PR #66472:
URL: https://github.com/apache/doris/pull/66472#discussion_r3764328372


##########
be/src/storage/schema_change/schema_change.cpp:
##########
@@ -1068,33 +1034,35 @@ Status SchemaChangeJob::_do_process_alter_tablet(const 
TAlterTabletReqV2& reques
                 if (!rs_meta->has_delete_predicate() || 
rs_meta->start_version() > end_version) {
                     continue;
                 }
-                
_base_tablet_schema->merge_dropped_columns(*rs_meta->tablet_schema());
                 del_preds.push_back(rs_meta);
             }
-            res = delete_handler.init(_base_tablet_schema, del_preds, 
end_version);
+            std::vector<TabletColumn> dropped_columns;
+            res = delete_handler.init(del_preds, end_version, read_schema, 
dropped_columns);
             if (!res) {
                 LOG(WARNING) << "init delete handler failed. base_tablet="
                              << _base_tablet->tablet_id() << ", end_version=" 
<< end_version;
                 break;
             }
+            for (auto& column : dropped_columns) {
+                
read_schema->append_column(std::make_shared<TabletColumn>(std::move(column)));
+            }
 
             reader_context.reader_type = ReaderType::READER_ALTER_TABLE;
             reader_context.tablet_schema = _base_tablet_schema;
             reader_context.need_ordered_result = true;
             reader_context.delete_handler = &delete_handler;
-            reader_context.return_columns = &return_columns;
-            reader_context.sequence_id_idx = 
reader_context.tablet_schema->sequence_col_idx();
+            reader_context.read_schema = read_schema;
             reader_context.is_unique = _base_tablet->keys_type() == 
UNIQUE_KEYS;
             reader_context.batch_size = ALTER_TABLE_BATCH_SIZE;
             reader_context.delete_bitmap = 
_base_tablet->tablet_meta()->delete_bitmap_ptr();
             reader_context.version = Version(0, end_version);
             if (!_base_tablet_schema->cluster_key_uids().empty()) {
                 for (const auto& uid : 
_base_tablet_schema->cluster_key_uids()) {
-                    
cluster_key_idxes.emplace_back(_base_tablet_schema->field_index(uid));
+                    
cluster_key_idxes.emplace_back(read_schema->ordinal_by_uid(uid));
                 }
                 reader_context.read_orderby_key_columns = &cluster_key_idxes;
                 reader_context.is_unique = false;
-                reader_context.sequence_id_idx = -1;
+                reader_context.use_sequence_column_for_merge_order = false;

Review Comment:
   为啥schema change 这里就always 是false?



-- 
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]

Reply via email to