Skip to content

Revert "Delete unsupported special column DELETE_FLAG (#7068)" #7172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Revert "Delete unsupported special column DELETE_FLAG (#7068)" #7172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ydb/core/tx/columnshard/common/portion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

}
4 changes: 1 addition & 3 deletions ydb/core/tx/columnshard/engines/scheme/abstract/index_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/tx/columnshard/engines/scheme/index_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion ydb/core/tx/columnshard/normalizer/abstract/abstract.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ namespace NKikimr::NOlap {
enum class ENormalizerSequentialId : ui32 {
Granules = 1,
Chunks,
DeleteUnsupportedSpecialColumns,
PortionsCleaner,
TablesCleaner,
// PortionsMetadata
Expand Down
131 changes: 0 additions & 131 deletions ydb/core/tx/columnshard/normalizer/special_columns/normalizer.cpp
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions ydb/core/tx/columnshard/normalizer/special_columns/normalizer.h
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions ydb/core/tx/columnshard/normalizer/special_columns/ya.make
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ydb/core/tx/columnshard/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading