Merge efbca4c into dbf7e40

Author: Hor911

ydb/library/yql/providers/dq/counters/counters.h

@@ -61,6 +61,10 @@ struct TCounters {
         Counters[name] = TEntry(value);
     }
 
+    void SetTimeCounter(const TString& name, i64 value) const {
+        SetCounter(name, value * 1000); // ms => us
+    }
+
     THashMap<i64, ui64>& GetHistogram(const TString& name) {
         return Histograms[name];
     }

ydb/library/yql/providers/dq/runtime/task_command_executor.cpp

@@ -127,13 +127,11 @@ class TTaskCommandExecutor {
                         "TaskRunner",
                         labels,
                         name);
-                    auto& old = CurrentJobStats[counterName];
                     if (name.EndsWith("Time")) {
-                        QueryStat.AddTimeCounter(counterName, value - old);
+                        QueryStat.SetTimeCounter(counterName, value);
                     } else {
-                        QueryStat.AddCounter(counterName, value - old);
+                        QueryStat.SetCounter(counterName, value);
                     }
-                    old = value;
                 }
             });
         }
@@ -766,7 +764,6 @@ class TTaskCommandExecutor {
     std::unique_ptr<NKikimr::NMiniKQL::TScopedAlloc> Alloc;
     NKikimr::NMiniKQL::TComputationNodeFactory ComputationFactory;
     TTaskTransformFactory TaskTransformFactory;
-    THashMap<TString, i64> CurrentJobStats;
     NKikimr::NMiniKQL::IStatsRegistry* JobStats;
     bool TerminateOnError;
     TIntrusivePtr<NDq::IDqTaskRunner> Runner;