move

be/src/vec/common/schema_util.cpp

@@ -403,14 +403,32 @@ void inherit_column_attributes(TabletSchemaSPtr& schema) {
  // Add index meta if extracted column is missing index meta
  for (size_t i = 0; i < schema->num_columns(); ++i) {
  TabletColumn& col = schema->mutable_column(i);
+<<<<<<< HEAD
  if (!col.is_extracted_column() || !segment_v2::InvertedIndexColumnWriter::check_column_valid(col)) {
+=======
+ if (!col.is_extracted_column() ||
+ !segment_v2::InvertedIndexColumnWriter::check_column_valid(col)) {
+>>>>>>> ad3cd43f15 (move)
  continue;
  }
  if (schema->field_index(col.parent_unique_id()) == -1) {
  // parent column is missing, maybe dropped
  continue;
  }
+<<<<<<< HEAD
  inherit_column_attributes(schema->column_by_uid(col.parent_unique_id()), col, schema);
+=======
+ auto index_meta = schema->get_inverted_index(col);
+ // add index meta
+ TabletIndex index_info = it->second;
+ index_info.set_escaped_escaped_index_suffix_path(col.path_info_ptr()->get_path());
+ if (index_meta != nullptr) {
+ // already exist
+ schema->update_index(col, index_info);
+ } else {
+ schema->append_index(index_info);
+ }
+>>>>>>> ad3cd43f15 (move)
  }
 }