YQ-4237 added progress stats period into execute script request (#17314)

Author: GrigoriyPA

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

@@ -120,6 +120,7 @@ struct TEvKqp {
         mutable NKikimrKqp::TEvQueryRequest Record;
         TDuration ForgetAfter;
         TDuration ResultsTtl;
+        TDuration ProgressStatsPeriod;
     };
 
     struct TEvScriptResponse : public TEventLocal<TEvScriptResponse, TKqpEvents::EvScriptResponse> {

ydb/core/kqp/proxy_service/kqp_proxy_service.cpp

@@ -244,9 +244,10 @@ class TKqpProxyService : public TActorBootstrapped<TKqpProxyService> {
         ui32 logConfigKind = (ui32)NKikimrConsole::TConfigItem::LogConfigItem;
         ui32 featureFlagsKind = (ui32)NKikimrConsole::TConfigItem::FeatureFlagsItem;
         ui32 workloadManagerKind = (ui32)NKikimrConsole::TConfigItem::WorkloadManagerConfigItem;
+        ui32 queryServiceConfigKind = (ui32)NKikimrConsole::TConfigItem::QueryServiceConfigItem;
         Send(NConsole::MakeConfigsDispatcherID(SelfId().NodeId()),
             new NConsole::TEvConfigsDispatcher::TEvSetConfigSubscriptionRequest(
-                {tableServiceConfigKind, logConfigKind, featureFlagsKind, workloadManagerKind}),
+                {tableServiceConfigKind, logConfigKind, featureFlagsKind, workloadManagerKind, queryServiceConfigKind}),
             IEventHandle::FlagTrackDelivery);
 
         WhiteBoardService = NNodeWhiteboard::MakeNodeWhiteboardServiceId(SelfId().NodeId());
@@ -524,6 +525,10 @@ class TKqpProxyService : public TActorBootstrapped<TKqpProxyService> {
         WorkloadManagerConfig.Swap(event.MutableConfig()->MutableWorkloadManagerConfig());
         ResourcePoolsCache.UpdateConfig(FeatureFlags, WorkloadManagerConfig, ActorContext());
 
+        if (event.GetConfig().HasQueryServiceConfig()) {
+            QueryServiceConfig.Swap(event.MutableConfig()->MutableQueryServiceConfig());
+        }
+
         auto responseEv = MakeHolder<NConsole::TEvConsole::TEvConfigNotificationResponse>(event);
         Send(ev->Sender, responseEv.Release(), IEventHandle::FlagTrackDelivery, ev->Cookie);
         PublishResourceUsage();

ydb/core/kqp/proxy_service/kqp_script_executions.cpp

@@ -340,8 +340,19 @@ struct TCreateScriptExecutionActor : public TActorBootstrapped<TCreateScriptExec
             resultsTtl = Min(operationTtl, resultsTtl);
         }
 
+        const auto& eventProto = Event->Get()->Record;
+        const TKqpRunScriptActorSettings settings = {
+            .Database = eventProto.GetRequest().GetDatabase(),
+            .ExecutionId = ExecutionId,
+            .LeaseGeneration = 1,
+            .LeaseDuration = LeaseDuration,
+            .ResultsTtl = resultsTtl,
+            .ProgressStatsPeriod = Event->Get()->ProgressStatsPeriod,
+            .Counters = Counters,
+        };
+
         // Start request
-        RunScriptActorId = Register(CreateRunScriptActor(ExecutionId, Event->Get()->Record, Event->Get()->Record.GetRequest().GetDatabase(), 1, LeaseDuration, resultsTtl, QueryServiceConfig, Counters));
+        RunScriptActorId = Register(CreateRunScriptActor(eventProto, settings, QueryServiceConfig));
         Register(new TCreateScriptOperationQuery(ExecutionId, RunScriptActorId, Event->Get()->Record, operationTtl, resultsTtl, LeaseDuration, MaxRunTime));
     }
 

ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp

@@ -87,15 +87,16 @@ class TRunScriptActor : public NActors::TActorBootstrapped<TRunScriptActor> {
     };
 
 public:
-    TRunScriptActor(const TString& executionId, const NKikimrKqp::TEvQueryRequest& request, const TString& database, ui64 leaseGeneration, TDuration leaseDuration, TDuration resultsTtl, NKikimrConfig::TQueryServiceConfig&& queryServiceConfig, TIntrusivePtr<TKqpCounters> counters)
-        : ExecutionId(executionId)
+    TRunScriptActor(const NKikimrKqp::TEvQueryRequest& request, const TKqpRunScriptActorSettings& settings, NKikimrConfig::TQueryServiceConfig&& queryServiceConfig)
+        : ExecutionId(settings.ExecutionId)
         , Request(request)
-        , Database(database)
-        , LeaseGeneration(leaseGeneration)
-        , LeaseDuration(leaseDuration)
-        , ResultsTtl(resultsTtl)
-        , QueryServiceConfig(queryServiceConfig)
-        , Counters(counters)
+        , Database(settings.Database)
+        , LeaseGeneration(settings.LeaseGeneration)
+        , LeaseDuration(settings.LeaseDuration)
+        , ResultsTtl(settings.ResultsTtl)
+        , ProgressStatsPeriod(settings.ProgressStatsPeriod)
+        , QueryServiceConfig(std::move(queryServiceConfig))
+        , Counters(settings.Counters)
     {
         UserRequestContext = MakeIntrusive<TUserRequestContext>(Request.GetTraceId(), Database, "", ExecutionId, Request.GetTraceId());
     }
@@ -174,7 +175,7 @@ class TRunScriptActor : public NActors::TActorBootstrapped<TRunScriptActor> {
         ev->Record.MutableRequest()->SetSessionId(SessionId);
         ev->SetUserRequestContext(UserRequestContext);
         if (ev->Record.GetRequest().GetCollectStats() >= Ydb::Table::QueryStatsCollection::STATS_COLLECTION_FULL) {
-            ev->SetProgressStatsPeriod(TDuration::MilliSeconds(QueryServiceConfig.GetProgressStatsPeriodMs()));
+            ev->SetProgressStatsPeriod(ProgressStatsPeriod ? ProgressStatsPeriod : TDuration::MilliSeconds(QueryServiceConfig.GetProgressStatsPeriodMs()));
         }
 
         NActors::ActorIdToProto(SelfId(), ev->Record.MutableRequestActorId());
@@ -680,6 +681,7 @@ class TRunScriptActor : public NActors::TActorBootstrapped<TRunScriptActor> {
     const ui64 LeaseGeneration;
     const TDuration LeaseDuration;
     const TDuration ResultsTtl;
+    const TDuration ProgressStatsPeriod;
     const NKikimrConfig::TQueryServiceConfig QueryServiceConfig;
     TIntrusivePtr<TKqpCounters> Counters;
     TString SessionId;
@@ -713,8 +715,8 @@ class TRunScriptActor : public NActors::TActorBootstrapped<TRunScriptActor> {
 
 } // namespace
 
-NActors::IActor* CreateRunScriptActor(const TString& executionId, const NKikimrKqp::TEvQueryRequest& request, const TString& database, ui64 leaseGeneration, TDuration leaseDuration, TDuration resultsTtl, NKikimrConfig::TQueryServiceConfig queryServiceConfig, TIntrusivePtr<TKqpCounters> counters) {
-    return new TRunScriptActor(executionId, request, database, leaseGeneration, leaseDuration, resultsTtl, std::move(queryServiceConfig), counters);
+NActors::IActor* CreateRunScriptActor(const NKikimrKqp::TEvQueryRequest& request, const TKqpRunScriptActorSettings& settings, NKikimrConfig::TQueryServiceConfig queryServiceConfig) {
+    return new TRunScriptActor(request, settings, std::move(queryServiceConfig));
 }
 
 } // namespace NKikimr::NKqp

ydb/core/kqp/run_script_actor/kqp_run_script_actor.h

@@ -13,9 +13,16 @@ namespace NKikimrConfig {
 
 namespace NKikimr::NKqp {
 
-struct TEvKqpRunScriptActor {
+struct TKqpRunScriptActorSettings {
+    TString Database;
+    TString ExecutionId;
+    ui64 LeaseGeneration = 0;
+    TDuration LeaseDuration;
+    TDuration ResultsTtl;
+    TDuration ProgressStatsPeriod;
+    TIntrusivePtr<TKqpCounters> Counters;
 };
 
-NActors::IActor* CreateRunScriptActor(const TString& executionId, const NKikimrKqp::TEvQueryRequest& request, const TString& database, ui64 leaseGeneration, TDuration leaseDuration, TDuration resultsTtl, NKikimrConfig::TQueryServiceConfig queryServiceConfig, TIntrusivePtr<TKqpCounters> counters);
+NActors::IActor* CreateRunScriptActor(const NKikimrKqp::TEvQueryRequest& request, const TKqpRunScriptActorSettings& settings, NKikimrConfig::TQueryServiceConfig queryServiceConfig);
 
 } // namespace NKikimr::NKqp