Fix review issues

Author: UgnineSirdis

ydb/core/kqp/session_actor/kqp_query_state.cpp

@@ -306,20 +306,41 @@ bool TKqpQueryState::HasErrors(const NSchemeCache::TSchemeCacheNavigate& respons
     return true;
 }
 
-bool TKqpQueryState::HasImpliedAutostartTransactions() const {
-    if (!HasTxControl()
-        && (RequestEv->GetAction() == NKikimrKqp::QUERY_ACTION_EXECUTE
-            || RequestEv->GetAction() == NKikimrKqp::QUERY_ACTION_EXECUTE_PREPARED)
-        && (RequestEv->GetType() == NKikimrKqp::QUERY_TYPE_SQL_GENERIC_QUERY
-            || RequestEv->GetType() == NKikimrKqp::QUERY_TYPE_SQL_GENERIC_SCRIPT
-            || RequestEv->GetType() == NKikimrKqp::QUERY_TYPE_SQL_GENERIC_CONCURRENT_QUERY))
+bool TKqpQueryState::HasImpliedTx() const {
+    if (HasTxControl()) {
+        return false;
+    }
+
+    const NKikimrKqp::EQueryAction action = RequestEv->GetAction();
+    if (action != NKikimrKqp::QUERY_ACTION_EXECUTE &&
+        action != NKikimrKqp::QUERY_ACTION_EXECUTE_PREPARED)
     {
-        for (const auto& transactionPtr : PreparedQuery->GetTransactions()) {
-            if (transactionPtr->GetType() == NKqpProto::TKqpPhyTx::TYPE_GENERIC) { // data transaction
-                return true;
-            }
+        return false;
+    }
+
+    const NKikimrKqp::EQueryType queryType = RequestEv->GetType();
+    if (queryType != NKikimrKqp::QUERY_TYPE_SQL_GENERIC_QUERY &&
+        queryType != NKikimrKqp::QUERY_TYPE_SQL_GENERIC_SCRIPT &&
+        queryType != NKikimrKqp::QUERY_TYPE_SQL_GENERIC_CONCURRENT_QUERY)
+    {
+        return false;
+    }
+
+    for (const auto& transactionPtr : PreparedQuery->GetTransactions()) {
+        switch (transactionPtr->GetType()) {
+        case NKqpProto::TKqpPhyTx::TYPE_GENERIC: // data transaction
+            return true;
+        case NKqpProto::TKqpPhyTx::TYPE_UNSPECIFIED:
+        case NKqpProto::TKqpPhyTx::TYPE_COMPUTE:
+        case NKqpProto::TKqpPhyTx::TYPE_DATA: // data transaction, but not in QueryService API
+        case NKqpProto::TKqpPhyTx::TYPE_SCAN:
+        case NKqpProto::TKqpPhyTx::TYPE_SCHEME:
+        case NKqpProto::TKqpPhyTx_EType_TKqpPhyTx_EType_INT_MIN_SENTINEL_DO_NOT_USE_:
+        case NKqpProto::TKqpPhyTx_EType_TKqpPhyTx_EType_INT_MAX_SENTINEL_DO_NOT_USE_:
+            break;
         }
     }
+
     return false;
 }
 

ydb/core/kqp/session_actor/kqp_query_state.h

@@ -362,7 +362,7 @@ class TKqpQueryState : public TNonCopyable {
         return RequestEv->HasTxControl();
     }
 
-    bool HasImpliedAutostartTransactions() const;
+    bool HasImpliedTx() const; // (only for QueryService API) user has not specified TxControl in the request. In this case we behave like Begin/Commit was specified.
 
     const ::Ydb::Table::TransactionControl& GetTxControl() const {
         return RequestEv->GetTxControl();

ydb/core/kqp/session_actor/kqp_session_actor.cpp

@@ -636,7 +636,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
         Counters->ReportBeginTransaction(Settings.DbCounters, Transactions.EvictedTx, Transactions.Size(), Transactions.ToBeAbortedSize());
     }
 
-    static const Ydb::Table::TransactionControl& GetAutoTransactionControl() {
+    static const Ydb::Table::TransactionControl& GetImpliedTxControl() {
         auto create = []() -> Ydb::Table::TransactionControl {
             Ydb::Table::TransactionControl control;
             control.mutable_begin_tx()->mutable_serializable_read_write();
@@ -648,9 +648,9 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
     }
 
     bool PrepareQueryTransaction() {
-        bool autoTransaction = false;
-        if (QueryState->HasTxControl() || (autoTransaction = QueryState->HasImpliedAutostartTransactions())) {
-            const auto& txControl = autoTransaction ? GetAutoTransactionControl() : QueryState->GetTxControl();
+        const bool hasTxControl = QueryState->HasTxControl();
+        if (hasTxControl || QueryState->HasImpliedTx()) {
+            const auto& txControl = hasTxControl ? QueryState->GetTxControl() : GetImpliedTxControl();
 
             QueryState->Commit = txControl.commit_tx();
             switch (txControl.tx_selector_case()) {