fix paths in modifications

ydb-platform · Oct 28, 2024 · 828600d · 828600d
1 parent ddfdc4a
commit 828600d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git a/ydb/core/tx/schemeshard/operations/metadata/update.cpp b/ydb/core/tx/schemeshard/operations/metadata/update.cpp
@@ -15,7 +15,7 @@ TConclusionStatus TMetadataUpdateCreate::DoInitializeImpl(const TUpdateInitializ
 
     Behaviour.reset(IMetadataUpdateBehaviour::TFactoryByPropertiesImpl::Construct(request.GetProperties().GetPropertiesImplCase()));
     if (!Behaviour) {
-        return TConclusionStatus::Fail("Updates are not supported for given object");
+        return TConclusionStatus::Fail("Metadata updates are not supported for given object");
     }
     const auto validator = Behaviour->MakeValidator(
         TPath::Resolve(modification->GetWorkingDir(), context.GetSSOperationContext()->SS), request.GetName(), *context.GetSSOperationContext());
@@ -50,7 +50,7 @@ TConclusionStatus TMetadataUpdateAlter::DoInitializeImpl(const TUpdateInitializa
 
     Behaviour.reset(IMetadataUpdateBehaviour::TFactoryByPropertiesImpl::Construct(request.GetProperties().GetPropertiesImplCase()));
     if (!Behaviour) {
-        return TConclusionStatus::Fail("Updates are not supported for given object");
+        return TConclusionStatus::Fail("Metadata updates are not supported for given object");
     }
     const auto validator = Behaviour->MakeValidator(
         TPath::Resolve(modification->GetWorkingDir(), context.GetSSOperationContext()->SS), request.GetName(), *context.GetSSOperationContext());
@@ -82,15 +82,15 @@ TConclusionStatus TMetadataUpdateDrop::DoInitializeImpl(const TUpdateInitializat
     const auto& modification = context.GetModification();
     const auto& request = modification->GetDrop();
     const auto& originalEntity = context.GetOriginalEntityAsVerified<TMetadataEntity>();
-    const TPath objectPath = TPath::Resolve(modification->GetWorkingDir(), context.GetSSOperationContext()->SS);
+    const TPath objectPath = TPath::Init(originalEntity.GetPathId(), context.GetSSOperationContext()->SS);
 
     if (!objectPath.IsResolved()) {
         return TConclusionStatus::Fail("Object not found at " + objectPath.PathString());
     }
 
     Behaviour.reset(IMetadataUpdateBehaviour::TFactoryByPath::Construct(objectPath->PathType));
     if (!Behaviour) {
-        return TConclusionStatus::Fail("Updates are not supported for given object");
+        return TConclusionStatus::Fail(TStringBuilder() << "Metadata updates are not supported for this object: " << objectPath->PathType);
     }
     const auto validator = Behaviour->MakeValidator(objectPath, request.GetName(), *context.GetSSOperationContext());
 

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_metadata_object.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_metadata_object.cpp
@@ -121,7 +121,7 @@ class TAlterMetadataObject : public TSubOperation {
     THolder<TProposeResponse> Propose(const TString& owner, TOperationContext& context) override {
         Y_UNUSED(owner);
 
-        const TString pathString = NMetadataObject::GetDestinationPath(Transaction);
+        const TString pathString = JoinPath({Transaction.GetWorkingDir(), Transaction.GetCreateMetadataObject().GetName()});
         LOG_N("TAlterMetadataObject Propose: opId# " << OperationId << ", path# " << pathString);
 
         auto result = MakeHolder<TProposeResponse>(NKikimrScheme::StatusAccepted,

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_common_metadata_object.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_common_metadata_object.cpp
@@ -70,9 +70,4 @@ void PersistOperation(const TOperationId& operationId, const TOperationContext&
     context.SS->PersistTxState(db, operationId);
 }
 
-TString GetDestinationPath(const NKikimrSchemeOp::TModifyScheme& transaction) {
-    return JoinPath({transaction.GetWorkingDir(), transaction.GetCreateMetadataObject().GetName()});
-}
-
-
 }   // namespace NKikimr::NSchemeShard::NMetadataObject
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_common_metadata_object.h b/ydb/core/tx/schemeshard/schemeshard__operation_common_metadata_object.h
@@ -25,6 +25,4 @@ void AdvanceTransactionStateToPropose(const TOperationId& operationId, const TOp
 void PersistOperation(const TOperationId& operationId, const TOperationContext& context, NIceDb::TNiceDb& db,
     const TPathElement::TPtr& objectPath, const TString& acl, const bool created);
 
-TString GetDestinationPath(const NKikimrSchemeOp::TModifyScheme& transaction);
-
 }   // namespace NKikimr::NSchemeShard::NMetadataObject
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_metadata_object.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_metadata_object.cpp
@@ -146,7 +146,7 @@ class TCreateMetadataObject : public TSubOperation {
     using TSubOperation::TSubOperation;
 
     THolder<TProposeResponse> Propose(const TString& owner, TOperationContext& context) override {
-        const TString pathString = NMetadataObject::GetDestinationPath(Transaction);
+        const TString pathString = JoinPath({Transaction.GetWorkingDir(), Transaction.GetCreateMetadataObject().GetName()});
         LOG_N("TCreateMetadataObject Propose: opId# " << OperationId << ", path# " << pathString);
 
         auto result = MakeHolder<TProposeResponse>(NKikimrScheme::StatusAccepted,

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_metadata_object.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_metadata_object.cpp
@@ -163,7 +163,7 @@ class TDropMetadataObject : public TSubOperation {
     THolder<TProposeResponse> Propose(const TString& owner, TOperationContext& context) override {
         Y_UNUSED(owner);
 
-        const TString pathString = NMetadataObject::GetDestinationPath(Transaction);
+        const TString pathString = JoinPath({Transaction.GetWorkingDir(), Transaction.GetDrop().GetName()});
         LOG_N("TDropMetadataObject Propose: opId# " << OperationId << ", path# " << pathString);
 
         auto result = MakeHolder<TProposeResponse>(NKikimrScheme::StatusAccepted,