From fdd211758ec635ce6291f9690f38397cd8169874 Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Thu, 19 Sep 2019 14:15:26 +0300 Subject: [PATCH] SQL: Rewrite statistics query (#19178) * Rewrite statistics query (cherry picked from commit 56f5106717d6b9a25b002f0febbe5c5b4a528039) --- pkg/services/sqlstore/stats.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkg/services/sqlstore/stats.go b/pkg/services/sqlstore/stats.go index 1e4537a0e16..71c8bf626b0 100644 --- a/pkg/services/sqlstore/stats.go +++ b/pkg/services/sqlstore/stats.go @@ -96,22 +96,13 @@ func roleCounterSQL(role, alias string) string { return ` ( SELECT COUNT(*) - FROM ` + dialect.Quote("user") + ` as u - WHERE - (SELECT COUNT(*) - FROM org_user - WHERE org_user.user_id=u.id - AND org_user.role='` + role + `')>0 + FROM ` + dialect.Quote("user") + ` as u, org_user + WHERE ( org_user.user_id=u.id AND org_user.role='` + role + `' ) ) as ` + alias + `, ( SELECT COUNT(*) - FROM ` + dialect.Quote("user") + ` as u - WHERE - (SELECT COUNT(*) - FROM org_user - WHERE org_user.user_id=u.id - AND org_user.role='` + role + `')>0 - AND u.last_seen_at>? + FROM ` + dialect.Quote("user") + ` as u, org_user + WHERE u.last_seen_at>? AND ( org_user.user_id=u.id AND org_user.role='` + role + `' ) ) as active_` + alias }