allow to specify delete sign col in flexible partial update

apache · Aug 22, 2024 · bd91d77 · bd91d77
1 parent ace9799
commit bd91d77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp b/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp
@@ -779,15 +779,6 @@ Status VerticalSegmentWriter::_append_block_with_flexible_partial_content(
                                                     _mow_context->rowset_ids);
     }
 
-    // all hidden columns will not be marked in skip bitmap
-    // row_store_col will be filled in _serialize_block_to_row_column
-    full_block.replace_by_position(
-            _tablet_schema->version_col_idx(),
-            data.block->get_by_position(_tablet_schema->version_col_idx()).column);
-    full_block.replace_by_position(
-            _tablet_schema->skip_bitmap_col_idx(),
-            data.block->get_by_position(_tablet_schema->skip_bitmap_col_idx()).column);
-
     // read to fill full_block
     RETURN_IF_ERROR(read_plan.fill_non_sort_key_columns(
             _opts.rowset_ctx, _rsid_to_rowset, *_tablet_schema, full_block,

diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/Load.java b/fe/fe-core/src/main/java/org/apache/doris/load/Load.java
@@ -337,6 +337,12 @@ private static void initColumns(Table tbl, List<ImportColumnDesc> columnExprs,
                 copiedColumnExprs.add(columnDesc);
             }
             if (hasSkipBitmapColumn && isFlexiblePartialUpdate) {
+                Preconditions.checkArgument(!specifyFileFieldNames);
+                Preconditions.checkArgument(hiddenColumns == null);
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("add hidden column {} to stream load task", Column.DELETE_SIGN);
+                }
+                copiedColumnExprs.add(new ImportColumnDesc(Column.DELETE_SIGN));
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("add hidden column {} to stream load task", Column.SKIP_BITMAP_COL);
                 }