Fix SessionActor fail in FlowControl UT KIKIMR-14935

ref:6647bec23b624a72fe8b51274241f54aaf27d67f

1 files changed, 8 insertions, 3 deletions

diff --git a/ydb/core/kqp/kqp_session_actor.cpp b/ydb/core/kqp/kqp_session_actor.cpp
index 663e9877ad7..16a678d06de 100644
--- a/ydb/core/kqp/kqp_session_actor.cpp
+++ b/ydb/core/kqp/kqp_session_actor.cpp
@@ -314,11 +314,11 @@ public:
         LOG_D(requestInfo << "Received request,"
             << " selfId : " << SelfId()
             << " proxyRequestId: " << proxyRequestId
-            << " query: " << (queryRequest.HasQuery() ? queryRequest.GetQuery().Quote() : "")
             << " prepared: " << queryRequest.HasPreparedQuery()
             << " tx_control: " << queryRequest.HasTxControl()
             << " action: " << action
             << " type: " << (queryRequest.HasType() ? queryRequest.GetType() : NKikimrKqp::QUERY_TYPE_UNDEFINED)
+            << " text: " << (queryRequest.HasQuery() ? queryRequest.GetQuery() : "")
         );
 
         QueryState->Sender = ev->Sender;
@@ -1086,7 +1086,12 @@ public:
 
     void HandleExecute(TEvKqpExecuter::TEvStreamData::TPtr& ev) {
         YQL_ENSURE(QueryState && QueryState->RequestActorId);
-        LOG_D("TEvStreamData: " << ev->Get()->Record.DebugString());
+        TlsActivationContext->Send(ev->Forward(QueryState->RequestActorId));
+    }
+
+    void HandleExecute(TEvKqpExecuter::TEvExecuterProgress::TPtr& ev) {
+        YQL_ENSURE(QueryState);
+        // note: RequestActorId may be TActorId{};
         TlsActivationContext->Send(ev->Forward(QueryState->RequestActorId));
     }
 
@@ -1821,7 +1826,7 @@ public:
                 hFunc(TEvKqpExecuter::TEvStreamData, HandleExecute);
                 hFunc(TEvKqpExecuter::TEvStreamDataAck, HandleExecute);
 
-                hFunc(TEvKqpExecuter::TEvExecuterProgress, HandleNoop);
+                hFunc(TEvKqpExecuter::TEvExecuterProgress, HandleExecute);
                 hFunc(NYql::NDq::TEvDq::TEvAbortExecution, HandleExecute);
                 hFunc(TEvKqpSnapshot::TEvCreateSnapshotResponse, HandleExecute);