Merge bb7dac3 into 283d573

Author: ivanmorozov333

ydb/core/tx/columnshard/engines/defs.h

@@ -3,7 +3,6 @@
 #include <ydb/core/base/defs.h>
 #include <ydb/core/base/logoblob.h>
 #include <ydb/core/tx/ctor_logger.h>
-#include <ydb/core/tx/columnshard/common/snapshot.h>
 
 namespace NKikimr::NOlap {
 

ydb/core/tx/columnshard/engines/filter.h

@@ -3,6 +3,7 @@
 #include "defs.h"
 #include <ydb/core/formats/arrow/program.h>
 #include <ydb/core/formats/arrow/replace_key.h>
+#include <ydb/core/tx/columnshard/common/snapshot.h>
 
 namespace NKikimr::NOlap {
 

ydb/core/tx/columnshard/engines/insert_table/data.h

@@ -2,6 +2,7 @@
 #include "meta.h"
 #include <ydb/core/tx/columnshard/blob.h>
 #include <ydb/core/tx/columnshard/engines/defs.h>
+#include <ydb/core/tx/columnshard/common/snapshot.h>
 #include <ydb/core/protos/tx_columnshard.pb.h>
 
 namespace NKikimr::NOlap {

ydb/core/tx/columnshard/engines/scheme/abstract_scheme.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ydb/core/tx/columnshard/common/snapshot.h>
 #include <ydb/core/tx/columnshard/engines/defs.h>
 #include <ydb/core/tx/columnshard/engines/column_features.h>
 

ydb/core/tx/columnshard/engines/storage/optimizer/lbuckets/optimizer.h

@@ -744,7 +744,7 @@ class TPortionsBucket: public TMoveOnly {
                 return nullptr;
             }
         }
-        AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("stop_instant", stopInstant.value_or(TInstant::Zero()))("size", size)("next", NextBorder ? NextBorder->DebugString() : "")
+        AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("stop_instant", stopInstant)("size", size)("next", NextBorder ? NextBorder->DebugString() : "")
             ("count", portions.size())("info", Others.DebugString())("event", "start_optimization")("stop_point", stopPoint ? stopPoint->DebugString() : "");
         TSaverContext saverContext(storagesManager->GetOperator(IStoragesManager::DefaultStorageId), storagesManager);
         auto result = std::make_shared<NCompaction::TGeneralCompactColumnEngineChanges>(limits.GetSplitSettings(), granule, portions, saverContext);

ydb/core/tx/columnshard/tables_manager.cpp

@@ -270,7 +270,9 @@ void TTablesManager::AddSchemaVersion(const ui32 presetId, const NOlap::TSnapsho
 }
 
 void TTablesManager::AddTableVersion(const ui64 pathId, const NOlap::TSnapshot& version, const TTableInfo::TTableVersionInfo& versionInfo, NIceDb::TNiceDb& db) {
-    auto& table = Tables.at(pathId);
+    auto it = Tables.find(pathId);
+    AFL_VERIFY(it != Tables.end());
+    auto& table = it->second;
 
     if (versionInfo.HasSchemaPresetId()) {
         Y_ABORT_UNLESS(SchemaPresets.contains(versionInfo.GetSchemaPresetId()));