summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorivanmorozov <[email protected]>2022-12-23 20:14:47 +0300
committerivanmorozov <[email protected]>2022-12-23 20:14:47 +0300
commit7963bc738dbe95955aea313f22e5ee6cbc700482 (patch)
treeccc85b80743daf3059bc5ae9e4a89e6e532f2a80
parent0ac2c6be996fb394146ce7ad0d310fe4b6956138 (diff)
fix service disabled case
-rw-r--r--ydb/services/metadata/manager/abstract.cpp22
-rw-r--r--ydb/services/metadata/manager/abstract.h12
2 files changed, 25 insertions, 9 deletions
diff --git a/ydb/services/metadata/manager/abstract.cpp b/ydb/services/metadata/manager/abstract.cpp
index c2faf50d6c7..b4f788adce5 100644
--- a/ydb/services/metadata/manager/abstract.cpp
+++ b/ydb/services/metadata/manager/abstract.cpp
@@ -1,4 +1,5 @@
#include "abstract.h"
+#include <ydb/services/metadata/service.h>
namespace NKikimr::NMetadata::NModifications {
@@ -33,4 +34,25 @@ NKikimr::NMetadata::NModifications::TTableSchema& TTableSchema::AddColumn(const
return *this;
}
+NThreading::TFuture<NKikimr::NMetadata::NModifications::TObjectOperatorResult> IOperationsManager::DropObject(const NYql::TDropObjectSettings& settings, const ui32 nodeId, IClassBehaviour::TPtr manager, const TModificationContext& context) const {
+ if (!NMetadata::NProvider::TServiceOperator::IsEnabled()) {
+ return NThreading::MakeFuture<TObjectOperatorResult>("metadata provider service is disabled");
+ }
+ return DoDropObject(settings, nodeId, manager, context);
+}
+
+NThreading::TFuture<NKikimr::NMetadata::NModifications::TObjectOperatorResult> IOperationsManager::AlterObject(const NYql::TAlterObjectSettings& settings, const ui32 nodeId, IClassBehaviour::TPtr manager, const TModificationContext& context) const {
+ if (!NMetadata::NProvider::TServiceOperator::IsEnabled()) {
+ return NThreading::MakeFuture<TObjectOperatorResult>("metadata provider service is disabled");
+ }
+ return DoAlterObject(settings, nodeId, manager, context);
+}
+
+NThreading::TFuture<NKikimr::NMetadata::NModifications::TObjectOperatorResult> IOperationsManager::CreateObject(const NYql::TCreateObjectSettings& settings, const ui32 nodeId, IClassBehaviour::TPtr manager, const TModificationContext& context) const {
+ if (!NMetadata::NProvider::TServiceOperator::IsEnabled()) {
+ return NThreading::MakeFuture<TObjectOperatorResult>("metadata provider service is disabled");
+ }
+ return DoCreateObject(settings, nodeId, manager, context);
+}
+
}
diff --git a/ydb/services/metadata/manager/abstract.h b/ydb/services/metadata/manager/abstract.h
index c5130d9dcf5..5016eb1d84a 100644
--- a/ydb/services/metadata/manager/abstract.h
+++ b/ydb/services/metadata/manager/abstract.h
@@ -154,19 +154,13 @@ public:
virtual ~IOperationsManager() = default;
NThreading::TFuture<TObjectOperatorResult> CreateObject(const NYql::TCreateObjectSettings& settings, const ui32 nodeId,
- IClassBehaviour::TPtr manager, const TModificationContext& context) const {
- return DoCreateObject(settings, nodeId, manager, context);
- }
+ IClassBehaviour::TPtr manager, const TModificationContext& context) const;
NThreading::TFuture<TObjectOperatorResult> AlterObject(const NYql::TAlterObjectSettings& settings, const ui32 nodeId,
- IClassBehaviour::TPtr manager, const TModificationContext& context) const {
- return DoAlterObject(settings, nodeId, manager, context);
- }
+ IClassBehaviour::TPtr manager, const TModificationContext& context) const;
NThreading::TFuture<TObjectOperatorResult> DropObject(const NYql::TDropObjectSettings& settings, const ui32 nodeId,
- IClassBehaviour::TPtr manager, const TModificationContext& context) const {
- return DoDropObject(settings, nodeId, manager, context);
- }
+ IClassBehaviour::TPtr manager, const TModificationContext& context) const;
const TTableSchema& GetSchema() const {
Y_VERIFY(!!ActualSchema);