From b2f1b8bc7d8b2578f8124ec42d5b935fbce7d165 Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Wed, 17 Jan 2024 13:17:43 +0300 Subject: [PATCH] Revert "Merge branch 'main' into many_phases_select" This reverts commit 1bcd1bfdd99873940e23f79a8784338d3fedc4e2, reversing changes made to 574f3ab8e552ae5bcea70ffaaefa7ffe9d6db262. --- ydb/core/tx/columnshard/engines/portions/portion_info.h | 4 +--- ydb/core/tx/columnshard/engines/scheme/abstract_scheme.cpp | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ydb/core/tx/columnshard/engines/portions/portion_info.h b/ydb/core/tx/columnshard/engines/portions/portion_info.h index 2ba089bb80d9..e87a34d05ce7 100644 --- a/ydb/core/tx/columnshard/engines/portions/portion_info.h +++ b/ydb/core/tx/columnshard/engines/portions/portion_info.h @@ -97,9 +97,7 @@ class TPortionInfo { TSerializationStats GetSerializationStat(const ISnapshotSchema& schema) const { TSerializationStats result; for (auto&& i : Records) { - if (schema.GetFieldByColumnIdOptional(i.ColumnId)) { - result.AddStat(i.GetSerializationStat(schema.GetFieldByColumnIdVerified(i.ColumnId)->name())); - } + result.AddStat(i.GetSerializationStat(schema.GetFieldByColumnIdVerified(i.ColumnId)->name())); } return result; } diff --git a/ydb/core/tx/columnshard/engines/scheme/abstract_scheme.cpp b/ydb/core/tx/columnshard/engines/scheme/abstract_scheme.cpp index a80496460e90..ff6260df140c 100644 --- a/ydb/core/tx/columnshard/engines/scheme/abstract_scheme.cpp +++ b/ydb/core/tx/columnshard/engines/scheme/abstract_scheme.cpp @@ -115,5 +115,3 @@ std::shared_ptr ISnapshotSchema::GetFieldByColumnIdVerified(const AFL_VERIFY(result)("event", "unknown_column")("column_id", columnId)("schema", DebugString()); return result; } - -}