Use correct mvcc mode when calculating tx version,

1 files changed, 6 insertions, 8 deletions

diff --git a/ydb/core/tx/datashard/datashard.cpp b/ydb/core/tx/datashard/datashard.cpp
index 392b587166..19d3bd1a3c 100644
--- a/ydb/core/tx/datashard/datashard.cpp
+++ b/ydb/core/tx/datashard/datashard.cpp
@@ -1537,17 +1537,15 @@ TReadWriteVersions TDataShard::GetReadWriteVersions(TOperation* op) const {
     if (!IsMvccEnabled())
         return {TRowVersion::Max(), SnapshotManager.GetMinWriteVersion()};
 
-    if (op && op->MvccReadWriteVersion) {
-        return *op->MvccReadWriteVersion;
-    }
-
-    auto mvccVersion = GetMvccTxVersion(EMvccTxMode::ReadWrite, op);
-
     if (op) {
-        op->MvccReadWriteVersion = mvccVersion;
+        if (!op->MvccReadWriteVersion) {
+            op->MvccReadWriteVersion = GetMvccTxVersion(op->IsReadOnly() ? EMvccTxMode::ReadOnly : EMvccTxMode::ReadWrite, op);
+        }
+
+        return *op->MvccReadWriteVersion;
     }
 
-    return mvccVersion;
+    return GetMvccTxVersion(EMvccTxMode::ReadWrite, nullptr);
 }
 
 TDataShard::TPromotePostExecuteEdges TDataShard::PromoteImmediatePostExecuteEdges(