Remove NewEngine flighting counter. ()

2 files changed, 4 insertions, 57 deletions

diff --git a/ydb/core/kqp/counters/kqp_counters.cpp b/ydb/core/kqp/counters/kqp_counters.cpp
index 12e329f918c..27459d7f741 100644
--- a/ydb/core/kqp/counters/kqp_counters.cpp
+++ b/ydb/core/kqp/counters/kqp_counters.cpp
@@ -743,7 +743,6 @@ TKqpCounters::TKqpCounters(const ::NMonitoring::TDynamicCounterPtr& counters, co
     CompileQueryCacheEvicted = YdbGroup->GetNamedCounter("name", "table.query.compilation.cache_evictions", true);
 
     CompileQueueSize = KqpGroup->GetCounter("Compilation/QueueSize", false);
-    ForceNewEngineCompileErrors = KqpGroup->GetCounter("Compilation/ForceNEErrors", true);
 
     /* Resource Manager */
     RmComputeActors = KqpGroup->GetCounter("RM/ComputeActors", false);
@@ -769,27 +768,12 @@ TKqpCounters::TKqpCounters(const ::NMonitoring::TDynamicCounterPtr& counters, co
     ScanQueryRateLimitLatency = KqpGroup->GetHistogram(
         "ScanQuery/RateLimitLatency", NMonitoring::ExponentialHistogram(20, 2, 1));
 
-
-    // NewEngine
-    NewEngineForcedQueryLatencies[NKikimrKqp::QUERY_ACTION_EXECUTE] = KqpGroup->GetHistogram(
-        "Query/ExecuteLatency_NEForced", NMonitoring::ExponentialHistogram(20, 2, 1));
-    NewEngineForcedQueryLatencies[NKikimrKqp::QUERY_ACTION_EXECUTE_PREPARED] = KqpGroup->GetHistogram(
-        "Query/ExecPreparedLatency_NEForced", NMonitoring::ExponentialHistogram(20, 2, 1));
-    NewEngineCompatibleQueryLatencies[NKikimrKqp::QUERY_ACTION_EXECUTE] = KqpGroup->GetHistogram(
-        "Query/ExecuteLatency_NECompatible", NMonitoring::ExponentialHistogram(20, 2, 1));
-    NewEngineCompatibleQueryLatencies[NKikimrKqp::QUERY_ACTION_EXECUTE_PREPARED] = KqpGroup->GetHistogram(
-        "Query/ExecPreparedLatency_NECompatible", NMonitoring::ExponentialHistogram(20, 2, 1));
-    NewEngineForcedComputeCpuTime = KqpGroup->GetCounter("Query/ComputeCpuTime_NEForced", true);
-    NewEngineCompatibleComputeCpuTime = KqpGroup->GetCounter("Query/ComputeCpuTime_NECompatible", true);
-    NewEngineForcedQueryCount = KqpGroup->GetCounter("Query/Count_NEForced", true);
-    NewEngineCompatibleQueryCount = KqpGroup->GetCounter("Query/Count_NECompatible", true);
-
     LiteralTxTotalTimeHistogram = KqpGroup->GetHistogram(
-        "NE/LiteralTxTotalTimeMs", NMonitoring::ExponentialHistogram(10, 2, 1));
+        "PhyTx/LiteralTxTotalTimeMs", NMonitoring::ExponentialHistogram(10, 2, 1));
     DataTxTotalTimeHistogram = KqpGroup->GetHistogram(
-        "NE/DataTxTotalTimeMs", NMonitoring::ExponentialHistogram(20, 2, 1));
+        "PhyTx/DataTxTotalTimeMs", NMonitoring::ExponentialHistogram(20, 2, 1));
     ScanTxTotalTimeHistogram = KqpGroup->GetHistogram(
-        "NE/ScanTxTotalTimeMs", NMonitoring::ExponentialHistogram(20, 2, 1));
+        "PhyTx/ScanTxTotalTimeMs", NMonitoring::ExponentialHistogram(20, 2, 1));
 }
 
 ::NMonitoring::TDynamicCounterPtr TKqpCounters::GetQueryReplayCounters() const {
@@ -1150,28 +1134,6 @@ void TKqpCounters::ReportRecompileRequestGet(TKqpDbCountersPtr dbCounters) {
     }
 }
 
-void TKqpCounters::ReportNewEngineForcedQueryStats(NKikimrKqp::EQueryAction action, TDuration duration,
-    ui64 computeCpuTime)
-{
-    NewEngineForcedComputeCpuTime->Add(computeCpuTime);
-    NewEngineForcedQueryCount->Inc();
-
-    if (auto counter = NewEngineForcedQueryLatencies.FindPtr(action)) {
-        (*counter)->Collect(duration.MilliSeconds());
-    }
-}
-
-void TKqpCounters::ReportNewEngineCompatibleQueryStats(NKikimrKqp::EQueryAction action, TDuration duration,
-    ui64 computeCpuTime)
-{
-    NewEngineCompatibleComputeCpuTime->Add(computeCpuTime);
-    NewEngineCompatibleQueryCount->Inc();
-
-    if (auto counter = NewEngineCompatibleQueryLatencies.FindPtr(action)) {
-        (*counter)->Collect(duration.MilliSeconds());
-    }
-}
-
 const ::NMonitoring::TDynamicCounters::TCounterPtr TKqpCounters::RecompileRequestGet() const {
     return TKqpCountersBase::CompileRequestsRecompile;
 }
diff --git a/ydb/core/kqp/counters/kqp_counters.h b/ydb/core/kqp/counters/kqp_counters.h
index 0a8b1bbeb1c..286b0b76dae 100644
--- a/ydb/core/kqp/counters/kqp_counters.h
+++ b/ydb/core/kqp/counters/kqp_counters.h
@@ -289,12 +289,6 @@ public:
     void ReportSqlVersion(TKqpDbCountersPtr dbCounters, ui16 sqlVersion);
     void ReportTransaction(TKqpDbCountersPtr dbCounters, const TKqpTransactionInfo& txInfo);
 
-    // NewEngine
-    void ReportNewEngineForcedQueryStats(NKikimrKqp::EQueryAction action,
-        TDuration duration, ui64 computeCpuTime);
-    void ReportNewEngineCompatibleQueryStats(NKikimrKqp::EQueryAction action,
-        TDuration duration, ui64 computeCpuTime);
-
     void ReportWorkerCreated(TKqpDbCountersPtr dbCounters);
     void ReportWorkerFinished(TKqpDbCountersPtr dbCounters, TDuration lifeSpan);
     void ReportWorkerCleanupLatency(TKqpDbCountersPtr dbCounters, TDuration cleanupTime);
@@ -346,7 +340,6 @@ public:
     ::NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheBytes;
     ::NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheEvicted;
     ::NMonitoring::TDynamicCounters::TCounterPtr CompileQueueSize;
-    ::NMonitoring::TDynamicCounters::TCounterPtr ForceNewEngineCompileErrors;
 
     // Resource Manager
     ::NMonitoring::TDynamicCounters::TCounterPtr RmComputeActors;
@@ -371,15 +364,7 @@ public:
     ::NMonitoring::TDynamicCounters::TCounterPtr ScanQueryShardResolve;
     NMonitoring::THistogramPtr ScanQueryRateLimitLatency;
 
-    // NewEngine vs OldEngine
-    THashMap<NKikimrKqp::EQueryAction, NMonitoring::THistogramPtr> NewEngineForcedQueryLatencies;
-    THashMap<NKikimrKqp::EQueryAction, NMonitoring::THistogramPtr> NewEngineCompatibleQueryLatencies;
-    ::NMonitoring::TDynamicCounters::TCounterPtr NewEngineForcedComputeCpuTime;
-    ::NMonitoring::TDynamicCounters::TCounterPtr NewEngineForcedQueryCount;
-    ::NMonitoring::TDynamicCounters::TCounterPtr NewEngineCompatibleComputeCpuTime;
-    ::NMonitoring::TDynamicCounters::TCounterPtr NewEngineCompatibleQueryCount;
-
-    // NewEngine tx duration
+    // Physical tx duration
     NMonitoring::THistogramPtr LiteralTxTotalTimeHistogram;
     NMonitoring::THistogramPtr DataTxTotalTimeHistogram;
     NMonitoring::THistogramPtr ScanTxTotalTimeHistogram;