Merge bbee3d0 into 546620e

Author: zverevgeny

ydb/core/tx/columnshard/common/portion.h

@@ -17,10 +17,8 @@ class TSpecialColumns {
 public:
     static constexpr const char* SPEC_COL_PLAN_STEP = "_yql_plan_step";
     static constexpr const char* SPEC_COL_TX_ID = "_yql_tx_id";
-    static constexpr const char* SPEC_COL_DELETE_FLAG = "_yql_delete_flag";
     static const ui32 SPEC_COL_PLAN_STEP_INDEX = 0xffffff00;
     static const ui32 SPEC_COL_TX_ID_INDEX = SPEC_COL_PLAN_STEP_INDEX + 1;
-    static const ui32 SPEC_COL_DELETE_FLAG_INDEX = SPEC_COL_PLAN_STEP_INDEX + 2;
 };
 
 }

ydb/core/tx/columnshard/engines/scheme/abstract/index_info.h

@@ -9,13 +9,11 @@ class IIndexInfo {
 public:
     enum class ESpecialColumn: ui32 {
         PLAN_STEP = NOlap::NPortion::TSpecialColumns::SPEC_COL_PLAN_STEP_INDEX,
-        TX_ID = NOlap::NPortion::TSpecialColumns::SPEC_COL_TX_ID_INDEX,
-        DELETE_FLAG = NOlap::NPortion::TSpecialColumns::SPEC_COL_DELETE_FLAG_INDEX
+        TX_ID = NOlap::NPortion::TSpecialColumns::SPEC_COL_TX_ID_INDEX
     };
 
     static constexpr const char* SPEC_COL_PLAN_STEP = NOlap::NPortion::TSpecialColumns::SPEC_COL_PLAN_STEP;
     static constexpr const char* SPEC_COL_TX_ID = NOlap::NPortion::TSpecialColumns::SPEC_COL_TX_ID;
-    static constexpr const char* SPEC_COL_DELETE_FLAG = NOlap::NPortion::TSpecialColumns::SPEC_COL_DELETE_FLAG;
     static const TString STORE_INDEX_STATS_TABLE;
     static const TString STORE_INDEX_PORTION_STATS_TABLE;
     static const TString STORE_INDEX_GRANULE_STATS_TABLE;

ydb/core/tx/columnshard/engines/scheme/index_info.cpp

@@ -98,8 +98,6 @@ TString TIndexInfo::GetColumnName(ui32 id, bool required) const {
         return SPEC_COL_PLAN_STEP;
     } else if (ESpecialColumn(id) == ESpecialColumn::TX_ID) {
         return SPEC_COL_TX_ID;
-    } else if (ESpecialColumn(id) == ESpecialColumn::DELETE_FLAG) {
-        return SPEC_COL_DELETE_FLAG;
     } else {
         const auto ci = Columns.find(id);
 

ydb/core/tx/columnshard/normalizer/abstract/abstract.h

@@ -53,7 +53,6 @@ namespace NKikimr::NOlap {
     enum class ENormalizerSequentialId : ui32 {
         Granules = 1,
         Chunks,
-        DeleteUnsupportedSpecialColumns,
         PortionsCleaner,
         TablesCleaner,
         // PortionsMetadata

ydb/core/tx/columnshard/normalizer/special_columns/normalizer.cpp

@@ -56,7 +56,6 @@ PEERDIR(
     ydb/core/tx/columnshard/export
     ydb/core/tx/columnshard/resource_subscriber
     ydb/core/tx/columnshard/normalizer/granule
-    ydb/core/tx/columnshard/normalizer/special_columns
     ydb/core/tx/columnshard/normalizer/portion
     ydb/core/tx/columnshard/normalizer/tables
     ydb/core/tx/columnshard/blobs_action/storages_manager