Revert "Merge branch 'main' into many_phases_select"

This reverts commit 1bcd1bf, reversing changes made to 574f3ab.
ivanmorozov333 · Jan 17, 2024 · b2f1b8b · b2f1b8b
1 parent b40c765
commit b2f1b8b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -115,5 +115,3 @@ std::shared_ptr<arrow::Field> ISnapshotSchema::GetFieldByColumnIdVerified(const
     AFL_VERIFY(result)("event", "unknown_column")("column_id", columnId)("schema", DebugString());
     return result;
 }
-
-}
-Original file line number
+Diff line change
@@ Expand Up @@
         AFL_VERIFY(result)("event", "unknown_column")("column_id", columnId)("schema", DebugString());
         return result;
     }
-    }