From f7ba3b1af2eeb01ea953b430b08de9be3c15e7c0 Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Thu, 15 Aug 2024 19:00:50 +0300 Subject: [PATCH 1/4] dont use background init for portion kind --- ydb/core/tx/columnshard/engines/changes/with_appended.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/ydb/core/tx/columnshard/engines/changes/with_appended.cpp b/ydb/core/tx/columnshard/engines/changes/with_appended.cpp index 0acdf919fa41..e24fa9e8988c 100644 --- a/ydb/core/tx/columnshard/engines/changes/with_appended.cpp +++ b/ydb/core/tx/columnshard/engines/changes/with_appended.cpp @@ -89,7 +89,6 @@ void TChangesWithAppend::DoWriteIndexOnComplete(NColumnShard::TColumnShard* self void TChangesWithAppend::DoCompile(TFinalizationContext& context) { for (auto&& i : AppendedPortions) { i.GetPortionConstructor().SetPortionId(context.NextPortionId()); - i.GetPortionConstructor().MutableMeta().UpdateRecordsMeta(TPortionMeta::EProduced::INSERTED); } for (auto& [_, portionInfo] : PortionsToRemove) { portionInfo.SetRemoveSnapshot(context.GetSnapshot()); From 13429069323c2f0af73487d1c93c2ef437edfef1 Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Thu, 15 Aug 2024 19:24:26 +0300 Subject: [PATCH 2/4] initialize kind explicitly --- ydb/core/tx/columnshard/engines/changes/general_compaction.cpp | 3 +++ ydb/core/tx/columnshard/engines/changes/indexation.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp b/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp index dc021696d433..88c239612b1b 100644 --- a/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp +++ b/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp @@ -141,6 +141,9 @@ void TGeneralCompactColumnEngineChanges::BuildAppendedPortionsByChunks( shardingActualVersion = shardingActual->GetSnapshotVersion(); } AppendedPortions = merger.Execute(stats, CheckPoints, resultFiltered, GranuleMeta->GetPathId(), shardingActualVersion); + for (auto&& p : AppendedPortions) { + i.GetPortionConstructor().GetMeta().UpdateRecordsMeta(NPortion::EProduced::SPLIT_COMPACTED); + } } TConclusionStatus TGeneralCompactColumnEngineChanges::DoConstructBlobs(TConstructionContext& context) noexcept { diff --git a/ydb/core/tx/columnshard/engines/changes/indexation.cpp b/ydb/core/tx/columnshard/engines/changes/indexation.cpp index 1e0ffca320b0..c68c30e8c542 100644 --- a/ydb/core/tx/columnshard/engines/changes/indexation.cpp +++ b/ydb/core/tx/columnshard/engines/changes/indexation.cpp @@ -266,6 +266,7 @@ TConclusionStatus TInsertColumnEngineChanges::DoConstructBlobs(TConstructionCont merger.SetOptimizationWritingPackMode(true); auto localAppended = merger.Execute(stats, itGranule->second, filteredSnapshot, pathId, shardingVersion); for (auto&& i : localAppended) { + i.GetPortionConstructor().GetMeta().UpdateRecordsMeta(NPortion::EProduced::INSERTED); AppendedPortions.emplace_back(std::move(i)); } } From 57e1328b3ef6a5beb919f396eb13e5565d5b2a73 Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Thu, 15 Aug 2024 19:25:54 +0300 Subject: [PATCH 3/4] fix build --- ydb/core/tx/columnshard/engines/changes/general_compaction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp b/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp index 88c239612b1b..25b32556a8e7 100644 --- a/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp +++ b/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp @@ -142,7 +142,7 @@ void TGeneralCompactColumnEngineChanges::BuildAppendedPortionsByChunks( } AppendedPortions = merger.Execute(stats, CheckPoints, resultFiltered, GranuleMeta->GetPathId(), shardingActualVersion); for (auto&& p : AppendedPortions) { - i.GetPortionConstructor().GetMeta().UpdateRecordsMeta(NPortion::EProduced::SPLIT_COMPACTED); + p.GetPortionConstructor().GetMeta().UpdateRecordsMeta(NPortion::EProduced::SPLIT_COMPACTED); } } From 461262f34d535fbcc4d39495c32d5d1325d537fc Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Thu, 15 Aug 2024 19:27:21 +0300 Subject: [PATCH 4/4] fix --- ydb/core/tx/columnshard/engines/changes/general_compaction.cpp | 2 +- ydb/core/tx/columnshard/engines/changes/indexation.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp b/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp index 25b32556a8e7..ea7b6ddc2eb4 100644 --- a/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp +++ b/ydb/core/tx/columnshard/engines/changes/general_compaction.cpp @@ -142,7 +142,7 @@ void TGeneralCompactColumnEngineChanges::BuildAppendedPortionsByChunks( } AppendedPortions = merger.Execute(stats, CheckPoints, resultFiltered, GranuleMeta->GetPathId(), shardingActualVersion); for (auto&& p : AppendedPortions) { - p.GetPortionConstructor().GetMeta().UpdateRecordsMeta(NPortion::EProduced::SPLIT_COMPACTED); + p.GetPortionConstructor().MutableMeta().UpdateRecordsMeta(NPortion::EProduced::SPLIT_COMPACTED); } } diff --git a/ydb/core/tx/columnshard/engines/changes/indexation.cpp b/ydb/core/tx/columnshard/engines/changes/indexation.cpp index c68c30e8c542..3c37b6b51e7c 100644 --- a/ydb/core/tx/columnshard/engines/changes/indexation.cpp +++ b/ydb/core/tx/columnshard/engines/changes/indexation.cpp @@ -266,7 +266,7 @@ TConclusionStatus TInsertColumnEngineChanges::DoConstructBlobs(TConstructionCont merger.SetOptimizationWritingPackMode(true); auto localAppended = merger.Execute(stats, itGranule->second, filteredSnapshot, pathId, shardingVersion); for (auto&& i : localAppended) { - i.GetPortionConstructor().GetMeta().UpdateRecordsMeta(NPortion::EProduced::INSERTED); + i.GetPortionConstructor().MutableMeta().UpdateRecordsMeta(NPortion::EProduced::INSERTED); AppendedPortions.emplace_back(std::move(i)); } }