Merge pull request cockroachdb#117496 from maryliag/backport23.1-116976

release-23.1: server: fix total latency time on sql stats call
pav-kv · Jan 8, 2024 · 5a4e1d0 · 5a4e1d0
2 parents 1391d7d + 8e1324d
commit 5a4e1d0
Show file tree

Hide file tree

Showing 2 changed files with 475 additions and 4 deletions.
diff --git a/pkg/server/combined_statement_stats.go b/pkg/server/combined_statement_stats.go
@@ -384,10 +384,9 @@ FROM %s %s`, table, whereClauseOldestDate), args...)
 
 	createActivityTableQuery := func(table string) string {
 		return fmt.Sprintf(`
-SELECT COALESCE(
-         execution_total_cluster_seconds,
-       0)
-FROM %s %s LIMIT 1`, table, whereClause)
+SELECT COALESCE(sum(total_latency), 0) from (SELECT aggregated_ts, 
+        max(execution_total_cluster_seconds) as total_latency
+FROM %s %s GROUP BY aggregated_ts) %s`, table, whereClause, testingKnobs.GetAOSTClause())
 	}
 
 	createStatsTableQuery := func(table string) string {