drop some dead code (#6957)

Author: gridnevvvit

ydb/core/kqp/common/events/events.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "process_response.h"
 #include "query.h"
 
 #include <ydb/core/kqp/common/simple/kqp_event_ids.h>
@@ -21,8 +20,6 @@ namespace NKikimr::NKqp {
 struct TEvKqp {
     using TEvQueryRequestRemote = NPrivateEvents::TEvQueryRequestRemote;
 
-    using TEvProcessResponse = NPrivateEvents::TEvProcessResponse;
-
     using TEvQueryRequest = NPrivateEvents::TEvQueryRequest;
 
     struct TEvCloseSessionRequest : public TEventPB<TEvCloseSessionRequest,

ydb/core/kqp/common/events/process_response.cpp

@@ -1,7 +1,6 @@
 LIBRARY()
 
 SRCS(
-    process_response.cpp
     events.cpp
     query.cpp
     script_executions.cpp

ydb/core/kqp/common/events/process_response.h

@@ -884,7 +884,6 @@ class IKikimrGateway : public TThrRefBase {
     struct TQueryResult : public TGenericResult {
         TString SessionId;
         TVector<NKikimrMiniKQL::TResult*> Results;
-        TMaybe<NKikimrKqp::TQueryProfile> Profile; // TODO: Deprecate.
         NKqpProto::TKqpStatsQuery QueryStats;
         std::unique_ptr<NKikimrKqp::TPreparedQuery> PreparingQuery;
         std::shared_ptr<const NKikimrKqp::TPreparedQuery> PreparedQuery;

ydb/core/kqp/common/events/ya.make

@@ -1331,7 +1331,6 @@ class TKqpProxyService : public TActorBootstrapped<TKqpProxyService> {
             hFunc(TEvKqp::TEvCloseSessionRequest, Handle);
             hFunc(TEvKqp::TEvQueryResponse, ForwardEvent);
             hFunc(TEvKqpExecuter::TEvExecuterProgress, ForwardProgress);
-            hFunc(TEvKqp::TEvProcessResponse, Handle);
             hFunc(TEvKqp::TEvCreateSessionRequest, Handle);
             hFunc(TEvKqp::TEvPingSessionRequest, Handle);
             hFunc(TEvKqp::TEvCancelQueryRequest, Handle);
@@ -1360,16 +1359,6 @@ class TKqpProxyService : public TActorBootstrapped<TKqpProxyService> {
     }
 
 private:
-    void LogResponse(const TKqpRequestInfo& requestInfo,
-        const NKikimrKqp::TEvProcessResponse& event, TKqpDbCountersPtr dbCounters)
-    {
-        auto status = event.GetYdbStatus();
-        if (status != Ydb::StatusIds::SUCCESS) {
-            KQP_PROXY_LOG_W(requestInfo << event.GetError());
-        }
-
-        Counters->ReportResponseStatus(dbCounters, event.ByteSize(), status);
-    }
 
     void LogResponse(const TKqpRequestInfo&,
         const NKikimrKqp::TEvCreateSessionResponse& event, TKqpDbCountersPtr dbCounters)
@@ -1384,11 +1373,6 @@ class TKqpProxyService : public TActorBootstrapped<TKqpProxyService> {
         Counters->ReportResponseStatus(dbCounters, event.ByteSize(), event.GetStatus());
     }
 
-
-    void Handle(TEvKqp::TEvProcessResponse::TPtr&ev) {
-        ReplyProcessError(ev->Get()->Record.GetYdbStatus(), ev->Get()->Record.GetError(), ev->Cookie);
-    }
-
     bool ReplyProcessError(Ydb::StatusIds::StatusCode ydbStatus, const TString& message, ui64 requestId)
     {
         auto issue = NKikimr::MakeIssue(NKikimrIssues::TIssuesIds::DEFAULT_ERROR, message);

ydb/core/kqp/provider/yql_kikimr_gateway.h

@@ -44,6 +44,12 @@ namespace {
 
 using TQueryResult = IKqpHost::TQueryResult;
 
+enum EReplyFlags : ui32 {
+    QUERY_REPLY_FLAG_RESULTS = 1,
+    QUERY_REPLY_FLAG_PLAN = 2,
+    QUERY_REPLY_FLAG_AST = 4,
+};
+
 struct TKqpQueryState {
     TActorId Sender;
     ui64 ProxyRequestId = 0;
@@ -194,10 +200,10 @@ class TKqpWorkerActor : public TActorBootstrapped<TKqpWorkerActor> {
         QueryState->ProxyRequestId = proxyRequestId;
         QueryState->KeepSession = Settings.LongSession || queryRequest->GetKeepSession();
         QueryState->StartTime = now;
-        QueryState->ReplyFlags = queryRequest->Record.GetRequest().GetReplyFlags();
+        QueryState->ReplyFlags = EReplyFlags::QUERY_REPLY_FLAG_RESULTS;
 
         if (GetStatsMode(QueryState->RequestEv.get(), EKikimrStatsMode::None) > EKikimrStatsMode::Basic) {
-            QueryState->ReplyFlags |= NKikimrKqp::QUERY_REPLY_FLAG_AST;
+            QueryState->ReplyFlags |= EReplyFlags::QUERY_REPLY_FLAG_AST;
         }
 
         NCpuTime::TCpuTimer timer;
@@ -477,7 +483,7 @@ class TKqpWorkerActor : public TActorBootstrapped<TKqpWorkerActor> {
 
             case NKikimrKqp::QUERY_ACTION_EXPLAIN: {
                 // Force reply flags
-                QueryState->ReplyFlags |= NKikimrKqp::QUERY_REPLY_FLAG_PLAN | NKikimrKqp::QUERY_REPLY_FLAG_AST;
+                QueryState->ReplyFlags |= EReplyFlags::QUERY_REPLY_FLAG_PLAN | EReplyFlags::QUERY_REPLY_FLAG_AST;
                 if (!ExplainQuery(ctx, QueryState->RequestEv->GetQuery(), queryType)) {
                     onBadRequest(QueryState->Error);
                     return;
@@ -936,9 +942,9 @@ class TKqpWorkerActor : public TActorBootstrapped<TKqpWorkerActor> {
         bool replyAst = true;
 
         // TODO: Handle in KQP to avoid generation of redundant data
-        replyResults = replyResults && (QueryState->ReplyFlags & NKikimrKqp::QUERY_REPLY_FLAG_RESULTS);
-        replyPlan = replyPlan && (QueryState->ReplyFlags & NKikimrKqp::QUERY_REPLY_FLAG_PLAN);
-        replyAst = replyAst && (QueryState->ReplyFlags & NKikimrKqp::QUERY_REPLY_FLAG_AST);
+        replyResults = replyResults && (QueryState->ReplyFlags & EReplyFlags::QUERY_REPLY_FLAG_RESULTS);
+        replyPlan = replyPlan && (QueryState->ReplyFlags & EReplyFlags::QUERY_REPLY_FLAG_PLAN);
+        replyAst = replyAst && (QueryState->ReplyFlags & EReplyFlags::QUERY_REPLY_FLAG_AST);
 
         auto ydbStatus = GetYdbStatus(queryResult);
         auto issues = queryResult.Issues();

ydb/core/kqp/proxy_service/kqp_proxy_service.cpp

@@ -66,12 +66,6 @@ enum EIsolationLevel {
     ISOLATION_LEVEL_READ_STALE = 4;
 };
 
-enum EQueryReplyFlags {
-    QUERY_REPLY_FLAG_RESULTS = 1;
-    QUERY_REPLY_FLAG_PLAN = 2;
-    QUERY_REPLY_FLAG_AST = 4;
-};
-
 message TTopicOperationsRequest {
     optional string Consumer = 1;
     repeated Ydb.Topic.UpdateOffsetsInTransactionRequest.TopicOffsets Topics = 2;
@@ -99,7 +93,8 @@ message TQueryRequest {
     optional EQueryAction Action = 9;
     reserved 10; // (deprecated) Profile
     optional bytes PreparedQuery = 11;
-    optional uint32 ReplyFlags = 12 [default = 1];
+    // optional uint32 ReplyFlags = 12 [default = 1];
+    reserved 12;
     optional Ydb.Table.TransactionControl TxControl = 13;
     optional string Database = 14;
     optional Ydb.Table.QueryCachePolicy QueryCachePolicy = 15;
@@ -211,35 +206,6 @@ message TEvQueryRequest {
     optional NActorsProto.TActorId CancelationActor = 9;
 }
 
-message TMkqlProfile {
-    optional string Query = 1;
-    optional NKikimrQueryStats.TTxStats TxStats = 2;
-};
-
-message TTransformProfile {
-    optional string Name = 1;
-    optional uint64 TransformDurationUs = 2;
-    optional uint64 WaitDurationUs = 3;
-    optional int32 NewExprNodes = 4;
-    optional int32 NewTypeNodes = 5;
-    optional uint32 Repeats = 6;
-    optional uint32 Restarts = 7;
-
-    repeated TTransformProfile Stages = 100;
-}
-
-message TKqlProfile {
-    optional string Query = 1;
-    repeated TMkqlProfile MkqlProfiles = 2;
-    optional EIsolationLevel EffectiveIsolationLevel = 3;
-    optional TTransformProfile TransformStats = 4;
-}
-
-message TQueryProfile {
-    repeated TKqlProfile KqlProfiles = 1;
-    optional TTransformProfile TransformStats = 2;
-};
-
 message TParameterBinding {
     optional string Name = 1;
     optional uint32 MkqlIndex = 2;
@@ -331,13 +297,6 @@ message TEvCloseSessionResponse {
     optional TCloseSessionResponse Response = 3;
 }
 
-message TEvProcessResponse {
-    reserved 1; // (deprecated) KqpStatus
-    optional bytes Error = 2;
-    optional Ydb.StatusIds.StatusCode YdbStatus = 3;
-    optional bool WorkerIsClosing = 4 [default = false];
-}
-
 message TSessionInfo {
     optional string SessionId = 1;
     /// optional ui32 NodeId = 2;
@@ -587,7 +546,7 @@ message TEvStartKqpTasksRequest {
     optional NActorsProto.TActorId ExecuterActorId = 4;
     optional TKqpSnapshot Snapshot = 5;
     optional bool StartAllOrFail = 6 [default = true];
-    optional uint64 OutputChunkMaxSize = 7 [default = 0]; // 0 - use some default value 
+    optional uint64 OutputChunkMaxSize = 7 [default = 0]; // 0 - use some default value
     optional string SerializedGUCSettings = 8;
 }