correct libraries for use in future (ydb-platform#1628)

ivanmorozov333 · Apr 16, 2024 · b39c9b2 · b39c9b2
1 parent 15d6396
commit b39c9b2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/ydb/core/tx/tiering/rule/object.h b/ydb/core/tx/tiering/rule/object.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <ydb/core/protos/flat_scheme_op.pb.h>
-#include <ydb/core/tx/columnshard/engines/column_engine.h>
+#include <ydb/core/tx/columnshard/engines/scheme/tier_info.h>
+
 #include <ydb/services/metadata/abstract/decoder.h>
 #include <ydb/services/metadata/service.h>
 #include <ydb/services/metadata/manager/object.h>

diff --git a/ydb/core/tx/tiering/rule/ya.make b/ydb/core/tx/tiering/rule/ya.make
@@ -14,6 +14,7 @@ PEERDIR(
     ydb/services/metadata/abstract
     ydb/services/metadata/common
     ydb/services/metadata/initializer
+    ydb/services/metadata/manager
     ydb/services/bg_tasks/abstract
     ydb/core/tx/schemeshard
 )

diff --git a/ydb/library/conclusion/result.h b/ydb/library/conclusion/result.h
@@ -50,12 +50,26 @@ class TConclusion {
         return *result;
     }
 
+    TResult& MutableResult() {
+        auto result = std::get_if<TResult>(&Result);
+        Y_ABORT_UNLESS(result, "incorrect object for result request");
+        return *result;
+    }
+
     TResult&& DetachResult() {
         auto result = std::get_if<TResult>(&Result);
         Y_ABORT_UNLESS(result, "incorrect object for result request");
         return std::move(*result);
     }
 
+    const TResult* operator->() const {
+        return &GetResult();
+    }
+
+    TResult* operator->() {
+        return &MutableResult();
+    }
+
     const TResult& operator*() const {
         return GetResult();
     }

diff --git a/ydb/services/bg_tasks/abstract/interface.h b/ydb/services/bg_tasks/abstract/interface.h
@@ -164,10 +164,12 @@ class TCommonInterfaceContainer {
     }
 
     const IInterface* operator->() const {
+        AFL_VERIFY(Object);
         return Object.get();
     }
 
     IInterface* operator->() {
+        AFL_VERIFY(Object);
         return Object.get();
     }