Mercurial > lbo > hg > analyrics
changeset 65:2715ed801bb1
Fix trailing whitespace
| author | Lewin Bormann <lbo@spheniscida.de> |
|---|---|
| date | Mon, 25 Jul 2022 15:33:42 -0700 |
| parents | 3bcab50dcca5 |
| children | 26c69030419d |
| files | TODO src/logsdb.rs |
| diffstat | 2 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/TODO Mon Jul 25 09:21:26 2022 -0700 +++ b/TODO Mon Jul 25 15:33:42 2022 -0700 @@ -1,1 +1,3 @@ -* Configurable duration on index page +* General settings page + * Domain management +* Debug recent-sessions query: scaling behavior with requesttags?
--- a/src/logsdb.rs Mon Jul 25 09:21:26 2022 -0700 +++ b/src/logsdb.rs Mon Jul 25 15:33:42 2022 -0700 @@ -385,24 +385,24 @@ // Check later if this query possibly has bad scaling behavior due to no restrictions on // requesttags query. let result = sqlx::query(r#" -SELECT Sessions.start AS start, - Sessions.last-Sessions.start AS duration, - COUNT(RequestLog.id) AS count, - RequestLog.Refer AS refer, - Sessions.origin_country AS origin_country, - Sessions.origin_city AS origin_city, +SELECT Sessions.start AS start, + Sessions.last-Sessions.start AS duration, + COUNT(RequestLog.id) AS count, + RequestLog.Refer AS refer, + Sessions.origin_country AS origin_country, + Sessions.origin_city AS origin_city, RequestLog.ua AS ua, tagstring AS alltags -FROM RequestLog -JOIN Sessions ON (RequestLog.session = Sessions.id) -LEFT JOIN +FROM RequestLog +JOIN Sessions ON (RequestLog.session = Sessions.id) +LEFT JOIN (SELECT requestid, GROUP_CONCAT(IIF(value, PRINTF("%s=%s", IIF(key, key, ""), value), key)) AS tagstring FROM RequestTags GROUP BY requestid) AS AccumTags - ON (RequestLog.id = AccumTags.requestid) + ON (RequestLog.id = AccumTags.requestid) WHERE atime+? >= ? AND atime+? <= ? AND Sessions.is_bot <= ? -GROUP BY Sessions.id +GROUP BY Sessions.id ORDER BY Sessions.start DESC, RequestLog.atime DESC LIMIT 10;"#) .bind(tz_offset)