Remove table related locks on RemoveSchema. KIKIMR-15040

REVIEW: 2609042

REVIEW: 2612259
x-ydb-stable-ref: d4536fd0281400884d657736a6145d6807cb4b9c

1 files changed, 11 insertions, 4 deletions

diff --git a/ydb/core/tx/datashard/datashard_locks.cpp b/ydb/core/tx/datashard/datashard_locks.cpp
index aa5fc3876b..ba5de5a9a6 100644
--- a/ydb/core/tx/datashard/datashard_locks.cpp
+++ b/ydb/core/tx/datashard/datashard_locks.cpp
@@ -115,7 +115,7 @@ TLockInfo::TPtr TLockLocker::AddShardLock(ui64 lockTxId, const THashSet<TPathId>
 
     ShardLocks.insert(lockTxId);
     for (const TPathId& tableId : lock->GetAffectedTables()) {
-        Tables[tableId]->RemoveLock(lock);
+        Tables.at(tableId)->RemoveLock(lock);
     }
     lock->AddShardLock(affectedTables);
     return lock;
@@ -187,7 +187,7 @@ void TLockLocker::RemoveBrokenRanges() {
 
             if (!lock->IsShardLock()) {
                 for (const TPathId& tableId : lock->GetAffectedTables()) {
-                    Tables[tableId]->RemoveLock(lock);
+                    Tables.at(tableId)->RemoveLock(lock);
                 }
             } else {
                 ShardLocks.erase(lockId);
@@ -214,7 +214,7 @@ void TLockLocker::RemoveBrokenRanges() {
 
             if (!lock->IsShardLock()) {
                 for (const TPathId& tableId : lock->GetAffectedTables()) {
-                    Tables[tableId]->RemoveLock(lock);
+                    Tables.at(tableId)->RemoveLock(lock);
                 }
             } else {
                 ShardLocks.erase(lockId);
@@ -249,7 +249,7 @@ void TLockLocker::RemoveOneLock(ui64 lockTxId) {
 
         if (!txLock->IsShardLock()) {
             for (const TPathId& tableId : txLock->GetAffectedTables()) {
-                Tables[tableId]->RemoveLock(txLock);
+                Tables.at(tableId)->RemoveLock(txLock);
             }
         } else {
             ShardLocks.erase(lockTxId);
@@ -296,6 +296,13 @@ void TLockLocker::UpdateSchema(const TPathId& tableId, const TUserTable& tableIn
 
 void TLockLocker::RemoveSchema(const TPathId& tableId) {
     Tables.erase(tableId);
+    Y_VERIFY(Tables.empty());
+    Locks.clear();
+    ShardLocks.clear();
+    BrokenLocks.clear();
+    CleanupPending.clear();
+    BrokenCandidates.clear();
+    CleanupCandidates.clear();
 }