fix

ydb-platform · Dec 22, 2024 · 2a982f1 · 2a982f1
1 parent 95b4cfe
commit 2a982f1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/ydb/core/kqp/common/kqp_tx.cpp b/ydb/core/kqp/common/kqp_tx.cpp
@@ -222,9 +222,10 @@ bool NeedSnapshot(const TKqpTransactionContext& txCtx, const NYql::TKikimrConfig
             // Don't need snapshot for WriteOnly transaction.
             return false;
         } else if (hasEffects) {
-            // Has reads & writes => need snapshot
+            // ReadWrite transaction => need snapshot
             return true;
         }
+        // ReadOnly transaction here
     } else {
         YQL_ENSURE(txCtx.EffectiveIsolationLevel == NKikimrKqp::ISOLATION_LEVEL_SERIALIZABLE);
 

diff --git a/ydb/core/kqp/common/kqp_tx.h b/ydb/core/kqp/common/kqp_tx.h
@@ -279,7 +279,9 @@ class TKqpTransactionContext : public NYql::TKikimrTransactionContextBase  {
         if (NeedUncommittedChangesFlush || HasOlapTable) {
             return !DeferredEffects.Empty();
         }
-        if (EffectiveIsolationLevel == NKikimrKqp::ISOLATION_LEVEL_SNAPSHOT_RW && !tx) {
+        if (EffectiveIsolationLevel == NKikimrKqp::ISOLATION_LEVEL_SNAPSHOT_RW && !tx && HasTableRead) {
+            // RW transaction
+            YQL_ENSURE(HasTableWrite);
             return !DeferredEffects.Empty();
         }
 
@@ -351,6 +353,7 @@ class TKqpTransactionContext : public NYql::TKikimrTransactionContextBase  {
     bool HasOlapTable = false;
     bool HasOltpTable = false;
     bool HasTableWrite = false;
+    bool HasTableRead = false;
 
     bool NeedUncommittedChangesFlush = false;
     THashSet<NKikimr::TTableId> ModifiedTablesSinceLastFlush;

diff --git a/ydb/core/kqp/session_actor/kqp_query_state.h b/ydb/core/kqp/session_actor/kqp_query_state.h
@@ -355,8 +355,9 @@ class TKqpQueryState : public TNonCopyable {
         }
 
         if (TxCtx->EffectiveIsolationLevel == NKikimrKqp::ISOLATION_LEVEL_SNAPSHOT_RW) {
-            // Snapshot isolation can use only uncommitted data.
-            return false;
+            // ReadWrite snapshot isolation transaction with can only use uncommitted data.
+            // WriteOnly snapshot isolation transaction is executed like serializable transaction.
+            return !TxCtx->HasTableRead;
         }
 
         if (TxCtx->NeedUncommittedChangesFlush || AppData()->FeatureFlags.GetEnableForceImmediateEffectsExecution()) {

diff --git a/ydb/core/kqp/session_actor/kqp_session_actor.cpp b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
@@ -899,9 +899,12 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
         const NKqpProto::TKqpPhyQuery& phyQuery = QueryState->PreparedQuery->GetPhysicalQuery();
         const bool hasOlapWrite = ::NKikimr::NKqp::HasOlapTableWriteInTx(phyQuery);
         const bool hasOltpWrite = ::NKikimr::NKqp::HasOltpTableWriteInTx(phyQuery);
-        QueryState->TxCtx->HasOlapTable |= hasOlapWrite || ::NKikimr::NKqp::HasOlapTableReadInTx(phyQuery);
-        QueryState->TxCtx->HasOltpTable |= hasOltpWrite || ::NKikimr::NKqp::HasOltpTableReadInTx(phyQuery);
+        const bool hasOlapRead = ::NKikimr::NKqp::HasOlapTableReadInTx(phyQuery);
+        const bool hasOltpRead = ::NKikimr::NKqp::HasOltpTableReadInTx(phyQuery);
+        QueryState->TxCtx->HasOlapTable |= hasOlapWrite || hasOlapRead;
+        QueryState->TxCtx->HasOltpTable |= hasOltpWrite || hasOltpRead;
         QueryState->TxCtx->HasTableWrite |= hasOlapWrite || hasOltpWrite;
+        QueryState->TxCtx->HasTableRead |= hasOlapRead || hasOltpRead;
         if (QueryState->TxCtx->HasOlapTable && QueryState->TxCtx->HasOltpTable && QueryState->TxCtx->HasTableWrite
                 && !Settings.TableService.GetEnableHtapTx() && !QueryState->IsSplitted()) {
             ReplyQueryError(Ydb::StatusIds::PRECONDITION_FAILED,
@@ -1136,15 +1139,11 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
             return;
         }
 
-        Cerr << "TEST:: ExecuteOrDefer" << Endl;
         if (QueryState->TxCtx->ShouldExecuteDeferredEffects(tx)) {
-            Cerr << "TEST:: EXEC DEF" << Endl;
             ExecuteDeferredEffectsImmediately(tx);
         } else if (auto commit = QueryState->ShouldCommitWithCurrentTx(tx); commit || tx) {
-            Cerr << "TEST:: COMMIT SHOULD = " << commit << Endl;
             ExecutePhyTx(tx, commit);
         } else {
-            Cerr << "TEST:: SKIP" << Endl;
             ReplySuccess();
         }
     }