fix error processing

4 files changed, 7 insertions, 3 deletions

diff --git a/ydb/core/tx/columnshard/engines/predicate/container.cpp b/ydb/core/tx/columnshard/engines/predicate/container.cpp
index f69b0796875..047540984a7 100644
--- a/ydb/core/tx/columnshard/engines/predicate/container.cpp
+++ b/ydb/core/tx/columnshard/engines/predicate/container.cpp
@@ -1,4 +1,5 @@
 #include "container.h"
+#include <ydb/core/tx/columnshard/engines/index_info.h>
 #include <library/cpp/actors/core/log.h>
 
 namespace NKikimr::NOlap {
diff --git a/ydb/core/tx/columnshard/engines/predicate/container.h b/ydb/core/tx/columnshard/engines/predicate/container.h
index 4dee27271f0..a568a9f9cd9 100644
--- a/ydb/core/tx/columnshard/engines/predicate/container.h
+++ b/ydb/core/tx/columnshard/engines/predicate/container.h
@@ -1,13 +1,14 @@
 #pragma once
 #include "predicate.h"
 #include <ydb/core/formats/arrow/arrow_filter.h>
-#include <ydb/core/tx/columnshard/engines/index_info.h>
 #include <ydb/library/accessor/accessor.h>
 #include <contrib/libs/apache/arrow/cpp/src/arrow/record_batch.h>
 #include <optional>
 
 namespace NKikimr::NOlap {
 
+struct TIndexInfo;
+
 class TPredicateContainer {
 private:
     std::shared_ptr<NOlap::TPredicate> Object;
diff --git a/ydb/core/tx/columnshard/engines/reader/order_control/pk_with_limit.cpp b/ydb/core/tx/columnshard/engines/reader/order_control/pk_with_limit.cpp
index e183f7b53e2..36576669e8c 100644
--- a/ydb/core/tx/columnshard/engines/reader/order_control/pk_with_limit.cpp
+++ b/ydb/core/tx/columnshard/engines/reader/order_control/pk_with_limit.cpp
@@ -114,7 +114,7 @@ std::vector<TGranule*> TPKSortingWithLimit::DoDetachReadyGranules(THashMap<ui64,
 }
 
 TPKSortingWithLimit::TPKSortingWithLimit(TReadMetadata::TConstPtr readMetadata)
-    :TBase(readMetadata)
+    : TBase(readMetadata)
     , MergeStream(readMetadata->GetIndexInfo(readMetadata->GetSnapshot()).GetReplaceKey(), readMetadata->IsDescSorted())
 {
     CurrentItemsLimit = ReadMetadata->Limit;
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp
index 0d5e14b13c8..14d0ef01fd2 100644
--- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp
@@ -58,7 +58,9 @@ TOlapStoreInfo::TPtr ParseParams(const TOlapStoreInfo::TPtr& storeInfo,
         if (!schemaUpdate.Parse(alterProto.GetAlterSchema(), errors)) {
             return nullptr;
         }
-        alterData->UpdatePreset(presetName, schemaUpdate, errors);
+        if (!alterData->UpdatePreset(presetName, schemaUpdate, errors)) {
+            return nullptr;
+        }
     }
     return alterData;
 }