Merge 0f778c0 into 5424e5a

Author: ivanmorozov333

ydb/core/tx/columnshard/blobs_action/transaction/tx_write.cpp

@@ -151,9 +151,11 @@ void TTxWrite::Complete(const TActorContext& ctx) {
         if (!writeMeta.HasLongTxId()) {
             auto op = Self->GetOperationsManager().GetOperationVerified((TOperationWriteId)writeMeta.GetWriteId());
             if (op->GetBehaviour() == EOperationBehaviour::WriteWithLock || op->GetBehaviour() == EOperationBehaviour::NoTxWrite) {
-                auto evWrite = std::make_shared<NOlap::NTxInteractions::TEvWriteWriter>(writeMeta.GetTableId(),
-                    buffer.GetAggregations()[i]->GetRecordBatch(), Self->GetIndexOptional()->GetVersionedIndex().GetPrimaryKey());
-                Self->GetOperationsManager().AddEventForLock(*Self, op->GetLockId(), evWrite);
+                if (op->GetBehaviour() != EOperationBehaviour::NoTxWrite || Self->GetOperationsManager().HasReadLocks(writeMeta.GetTableId())) {
+                    auto evWrite = std::make_shared<NOlap::NTxInteractions::TEvWriteWriter>(writeMeta.GetTableId(),
+                        buffer.GetAggregations()[i]->GetRecordBatch(), Self->GetIndexOptional()->GetVersionedIndex().GetPrimaryKey());
+                    Self->GetOperationsManager().AddEventForLock(*Self, op->GetLockId(), evWrite);
+                }
             }
             if (op->GetBehaviour() == EOperationBehaviour::NoTxWrite) {
                 Self->OperationsManager->AddTemporaryTxLink(op->GetLockId());

ydb/core/tx/columnshard/operations/manager.h

@@ -208,6 +208,10 @@ class TOperationsManager {
         }
     }
 
+    bool HasReadLocks(const ui64 pathId) const {
+        return InteractionsContext.HasReadIntervals(pathId);
+    }
+
     TOperationsManager();
 
 private:

ydb/core/tx/columnshard/transactions/locks/interaction.h

@@ -400,6 +400,10 @@ class TInteractionsContext {
     THashMap<ui64, TReadIntervals> ReadIntervalsByPathId;
 
 public:
+    bool HasReadIntervals(const ui64 pathId) const {
+        return ReadIntervalsByPathId.contains(pathId);
+    }
+
     NJson::TJsonValue DebugJson() const {
         NJson::TJsonValue result = NJson::JSON_MAP;
         for (auto&& i : ReadIntervalsByPathId) {