watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-12 16:45:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added rev_id column. Updated redis calls.

Browse source
This commit is contained in:
Mike Cao 2022-11-07 16:22:49 -08:00
parent a9112f39ec
commit 3485b6268b
18 changed files with 133 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

7
queries/analytics/event/getEventMetrics.js
View file

@ -1,6 +1,7 @@
import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import redis from 'lib/redis';
export async function getEventMetrics(...args) {
return runQuery({
@ -46,7 +47,8 @@ async function clickhouseQuery(
filters = {},
) {
const { rawQuery, getDateQuery, getBetweenDates, getFilterQuery } = clickhouse;
const params = [websiteId];
const website = await redis.get(`website:${websiteId}`);
const params = [websiteId, website?.revId || 0];
return rawQuery(
`select
@ -55,7 +57,8 @@ async function clickhouseQuery(
count(*) y
from event
where event_name != ''
and website_id= $1
and website_id = $1
anbd rev_id = $2
and ${getBetweenDates('created_at', start_at, end_at)}
${getFilterQuery('event', filters, params)}
group by x, t