From 8e7f6cd4545d349ea6a4fde1bc709b1c4312ee03 Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Wed, 27 Nov 2019 19:57:08 +0200 Subject: [PATCH] SQLStore: Rewrite system statistics query to count users once (#20711) Fix system statistics query to count only once users that are part of several organisations. Fixes #20681 (cherry picked from commit 02d7d00560693cc907133ac68fa8ac407c2611f6) --- pkg/services/sqlstore/stats.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/sqlstore/stats.go b/pkg/services/sqlstore/stats.go index 71c8bf626b0..dde3f0a6df5 100644 --- a/pkg/services/sqlstore/stats.go +++ b/pkg/services/sqlstore/stats.go @@ -95,12 +95,12 @@ func GetSystemStats(query *m.GetSystemStatsQuery) error { func roleCounterSQL(role, alias string) string { return ` ( - SELECT COUNT(*) + SELECT COUNT(DISTINCT u.id) FROM ` + dialect.Quote("user") + ` as u, org_user WHERE ( org_user.user_id=u.id AND org_user.role='` + role + `' ) ) as ` + alias + `, ( - SELECT COUNT(*) + SELECT COUNT(DISTINCT u.id) 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