Merge ad9e774 into d099ee5

Author: kunga

ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp

@@ -30,7 +30,7 @@ ISubOperation::TPtr FinalizeIndexImplTable(TOperationContext& context, const TPa
     return CreateFinalizeBuildIndexImplTable(partId, transaction);
 }
 
-ISubOperation::TPtr DropIndexImplTable(const TPath& index, const TOperationId& nextId, const TOperationId& partId, const TString& name, const TPathId& pathId, bool& rejected) {
+ISubOperation::TPtr DropIndexImplTable(const TPath& index, const TOperationId& nextId, const TOperationId& partId, const TString& name, const TPathId& pathId, const NKikimrSchemeOp::TLockGuard& lockGuard, bool& rejected) {
     TPath implTable = index.Child(name);
     Y_ABORT_UNLESS(implTable->PathId == pathId);
     Y_ABORT_UNLESS(implTable.LeafName() == name);
@@ -48,6 +48,9 @@ ISubOperation::TPtr DropIndexImplTable(const TPath& index, const TOperationId& n
     }
     rejected = false;
     auto transaction = TransactionTemplate(index.PathString(), NKikimrSchemeOp::EOperationType::ESchemeOpDropTable);
+    if (implTable.IsLocked()) { // some impl tables may be not locked
+        *transaction.MutableLockGuard() = lockGuard;
+    }
     auto operation = transaction.MutableDrop();
     operation->SetName(name);
     return CreateDropTable(partId, transaction);
@@ -98,7 +101,7 @@ TVector<ISubOperation::TPtr> ApplyBuildIndex(TOperationId nextId, const TTxTrans
             const auto partId = NextPartId(nextId, result);
             if (NTableIndex::IsBuildImplTable(indexImplTableName)) {
                 bool rejected = false;
-                auto op = DropIndexImplTable(index, nextId, partId, indexImplTableName, indexChildItems.second, rejected);
+                auto op = DropIndexImplTable(index, nextId, partId, indexImplTableName, indexChildItems.second, tx.GetLockGuard(), rejected);
                 if (rejected) {
                     return {std::move(op)};
                 }
@@ -153,7 +156,7 @@ TVector<ISubOperation::TPtr> CancelBuildIndex(TOperationId nextId, const TTxTran
         for (auto& indexChildItems : index.Base()->GetChildren()) {
             const auto partId = NextPartId(nextId, result);
             bool rejected = false;
-            auto op = DropIndexImplTable(index, nextId, partId, indexChildItems.first, indexChildItems.second, rejected);
+            auto op = DropIndexImplTable(index, nextId, partId, indexChildItems.first, indexChildItems.second, tx.GetLockGuard(), rejected);
             if (rejected) {
                 return {std::move(op)};
             }

ydb/core/tx/schemeshard/schemeshard__operation_apply_build_index.cpp

@@ -95,6 +95,9 @@ class TCreateLock: public TSubOperation {
     THolder<TProposeResponse> Propose(const TString&, TOperationContext& context) override {
         const auto& workingDir = Transaction.GetWorkingDir();
         const auto& op = Transaction.GetLockConfig();
+        const auto lockTxId = Transaction.HasLockGuard() && Transaction.GetLockGuard().HasOwnerTxId()
+            ? TTxId(Transaction.GetLockGuard().GetOwnerTxId())
+            : OperationId.GetTxId();
 
         LOG_N("TCreateLock Propose"
             << ": opId# " << OperationId
@@ -158,17 +161,19 @@ class TCreateLock: public TSubOperation {
         const auto pathId = tablePath.Base()->PathId;
         result->SetPathId(pathId.LocalPathId);
 
-        if (tablePath.LockedBy() == OperationId.GetTxId()) {
-            result->SetError(NKikimrScheme::StatusAlreadyExists, TStringBuilder() << "path checks failed"
-                << ", path already locked by this operation"
-                << ", path: " << tablePath.PathString());
-            return result;
-        }
-
-        TString errStr;
-        if (!context.SS->CheckLocks(pathId, Transaction, errStr)) {
-            result->SetError(NKikimrScheme::StatusMultipleModifications, errStr);
-            return result;
+        if (auto lockedBy = tablePath.LockedBy(); lockedBy != InvalidTxId) {
+            if (lockedBy == lockTxId) {
+                result->SetError(NKikimrScheme::StatusAlreadyExists, TStringBuilder() << "path checks failed"
+                    << ", path already locked by this operation"
+                    << ", path: " << tablePath.PathString());
+                return result;
+            } else {
+                result->SetError(NKikimrScheme::StatusMultipleModifications, TStringBuilder() << "path checks failed"
+                    << ", path already locked by another operation"
+                    << ", path: " << tablePath.PathString()
+                    << ", locked by: " << lockedBy);
+                return result;
+            }
         }
 
         auto guard = context.DbGuard();
@@ -177,7 +182,7 @@ class TCreateLock: public TSubOperation {
         context.MemChanges.GrabNewTxState(context.SS, OperationId);
 
         context.DbChanges.PersistPath(pathId);
-        context.DbChanges.PersistLongLock(pathId, OperationId.GetTxId());
+        context.DbChanges.PersistLongLock(pathId, lockTxId);
         context.DbChanges.PersistTxState(OperationId);
 
         Y_ABORT_UNLESS(!context.SS->FindTx(OperationId));
@@ -194,7 +199,7 @@ class TCreateLock: public TSubOperation {
             context.OnComplete.Dependence(splitOpId.GetTxId(), OperationId.GetTxId());
         }
 
-        context.SS->LockedPaths[pathId] = OperationId.GetTxId();
+        context.SS->LockedPaths[pathId] = lockTxId;
         context.SS->TabletCounters->Simple()[COUNTER_LOCKS_COUNT].Add(1);
 
         context.OnComplete.ActivateTx(OperationId);

ydb/core/tx/schemeshard/schemeshard__operation_create_lock.cpp

@@ -164,7 +164,7 @@ class TDropLock: public TSubOperation {
         const auto pathId = dstPath.Base()->PathId;
         result->SetPathId(pathId.LocalPathId);
 
-        if (!dstPath.LockedBy()) {
+        if (!dstPath.IsLocked()) {
             result->SetError(TEvSchemeShard::EStatus::StatusAlreadyExists, TStringBuilder() << "path checks failed"
                 << ", path already unlocked"
                 << ", path: " << dstPath.PathString());