Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Updated data query limits.

Mike Caoffa954ee02e7
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 474417b93..70f8d31d7 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -189,7 +189,7 @@ async function rawQuery<T = unknown>(
format: 'JSONEachRow',
});
- return resultSet.json() as T;
+ return (await resultSet.json()) as T;
}
async function insert(table: string, values: any[]) {
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 1fbb3cd4f..85b1bea7e 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -1,3 +1,4 @@
+import debug from 'debug';
import { Prisma } from '@prisma/client';
import prisma from '@umami/prisma-client';
import moment from 'moment-timezone';
@@ -8,6 +9,8 @@ import { maxDate } from './date';
import { QueryFilters, QueryOptions, PageParams } from './types';
import { filtersToArray } from './params';
+const log = debug('umami:prisma');
+
const MYSQL_DATE_FORMATS = {
minute: '%Y-%m-%d %H:%i:00',
hour: '%Y-%m-%d %H:00:00',
@@ -210,6 +213,11 @@ async function parseFilters(
}
async function rawQuery(sql: string, data: object): Promise<any> {
+ if (process.env.LOG_QUERY) {
+ log('QUERY:\n', sql);
+ log('PARAMETERS:\n', data);
+ }
+
const db = getDatabaseType();
const params = [];
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
index e055bfccc..7ccd7a286 100644
--- a/src/queries/analytics/events/getEventDataValues.ts
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -35,7 +35,7 @@ async function relationalQuery(
${filterQuery}
group by string_value
order by 2 desc
- limit 500
+ limit 100
`,
params,
);
@@ -63,7 +63,7 @@ async function clickhouseQuery(
${filterQuery}
group by event_name, value
order by 2 desc
- limit 500;
+ limit 100
`,
params,
).then(result => {
diff --git a/src/queries/analytics/sessions/getSessionDataValues.ts b/src/queries/analytics/sessions/getSessionDataValues.ts
index fd67e7a99..74524204a 100644
--- a/src/queries/analytics/sessions/getSessionDataValues.ts
+++ b/src/queries/analytics/sessions/getSessionDataValues.ts
@@ -31,7 +31,7 @@ async function relationalQuery(
${filterQuery}
group by string_value
order by 2 desc
- limit 500
+ limit 100
`,
params,
);
@@ -58,7 +58,7 @@ async function clickhouseQuery(
${filterQuery}
group by value
order by 2 desc
- limit 500;
+ limit 100
`,
params,
).then(result => {