watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

split db files

Browse source
This commit is contained in:
Brian Cao 2022-08-25 22:04:32 -07:00
parent 46b4b98d40
commit bb50753704
36 changed files with 496 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

27
queries/analytics/session/createSession.js
View file

@ -1,13 +1,8 @@
import { CLICKHOUSE, RELATIONAL, KAFKA } from 'lib/constants';
import {
getDateFormatClickhouse,
prisma,
rawQueryClickhouse,
runAnalyticsQuery,
runQuery,
} from 'lib/db';
import { sendKafkaMessage, getDateFormatKafka } from 'lib/db/kafka';
import { getSessionByUuid } from 'queries';
import { CLICKHOUSE, KAFKA, RELATIONAL } from 'lib/constants';
import { prisma, runQuery } from 'lib/db/relational';
import clickhouse from 'lib/clickhouse';
import kafka from 'lib/db/kafka';
import { runAnalyticsQuery } from 'lib/db/db';
export async function createSession(...args) {
return runAnalyticsQuery({
@ -47,13 +42,11 @@ async function clickhouseQuery(
country ? country : null,
];
await rawQueryClickhouse(
await clickhouse.rawQuery(
`insert into umami.session (created_at, session_uuid, website_id, hostname, browser, os, device, screen, language, country)
values (${getDateFormatClickhouse(new Date())}, $1, $2, $3, $4, $5, $6, $7, $8, $9);`,
values (${clickhouse.getDateFormat(new Date())}, $1, $2, $3, $4, $5, $6, $7, $8, $9);`,
params,
);
return getSessionByUuid(session_uuid);
}
async function kafkaQuery(
@ -63,7 +56,7 @@ async function kafkaQuery(
const params = {
session_uuid: session_uuid,
website_id: website_id,
created_at: getDateFormatKafka(new Date()),
created_at: kafka.getDateFormat(new Date()),
hostname: hostname,
browser: browser,
os: os,
@ -73,7 +66,5 @@ async function kafkaQuery(
country: country ? country : null,
};
await sendKafkaMessage(params, 'session');
return getSessionByUuid(session_uuid);
await kafka.sendKafkaMessage(params, 'session');
}

8
queries/analytics/session/getSessionByUuid.js
View file

@ -1,5 +1,7 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import { rawQueryClickhouse, findUnique, prisma, runAnalyticsQuery, runQuery } from 'lib/db';
import { prisma, runQuery } from 'lib/db/relational';
import clickhouse from 'lib/clickhouse';
import { runAnalyticsQuery } from 'lib/db/db';
export async function getSessionByUuid(...args) {
return runAnalyticsQuery({
@ -21,7 +23,7 @@ async function relationalQuery(session_uuid) {
async function clickhouseQuery(session_uuid) {
const params = [session_uuid];
return rawQueryClickhouse(
return clickhouse.rawQuery(
`
select
session_uuid,
@ -38,5 +40,5 @@ async function clickhouseQuery(session_uuid) {
where session_uuid = $1
`,
params,
).then(data => findUnique(data));
);
}

16
queries/analytics/session/getSessionMetrics.js
View file

@ -1,11 +1,7 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import {
getBetweenDatesClickhouse,
parseFilters,
rawQuery,
rawQueryClickhouse,
runAnalyticsQuery,
} from 'lib/db';
import clickhouse from 'lib/clickhouse';
import { runAnalyticsQuery } from 'lib/db/db';
import { parseFilters, rawQuery } from 'lib/db/relational';
export async function getSessionMetrics(...args) {
return runAnalyticsQuery({
@ -45,7 +41,7 @@ async function relationalQuery(website_id, start_at, end_at, field, filters = {}
async function clickhouseQuery(website_id, start_at, end_at, field, filters = {}) {
const params = [website_id];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
const { pageviewQuery, sessionQuery, joinSession } = clickhouse.parseFilters(
'pageview',
null,
filters,
@ -53,7 +49,7 @@ async function clickhouseQuery(website_id, start_at, end_at, field, filters = {}
'session_uuid',
);
return rawQueryClickhouse(
return clickhouse.rawQuery(
`
select ${field} x, count(*) y
from session as x
@ -62,7 +58,7 @@ async function clickhouseQuery(website_id, start_at, end_at, field, filters = {}
from pageview
${joinSession}
where pageview.website_id=$1
and ${getBetweenDatesClickhouse('pageview.created_at', start_at, end_at)}
and ${clickhouse.getBetweenDates('pageview.created_at', start_at, end_at)}
${pageviewQuery}
${sessionQuery}
)

14
queries/analytics/session/getSessions.js
View file

@ -1,11 +1,7 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import {
getDateFormatClickhouse,
prisma,
rawQueryClickhouse,
runAnalyticsQuery,
runQuery,
} from 'lib/db';
import clickhouse from 'lib/clickhouse';
import { runAnalyticsQuery } from 'lib/db/db';
import { prisma, runQuery } from 'lib/db/relational';
export async function getSessions(...args) {
return runAnalyticsQuery({
@ -32,7 +28,7 @@ async function relationalQuery(websites, start_at) {
}
async function clickhouseQuery(websites, start_at) {
return rawQueryClickhouse(
return clickhouse.rawQuery(
`
select
session_id,
@ -48,7 +44,7 @@ async function clickhouseQuery(websites, start_at) {
country
from session
where website_id in (${websites.join[',']}
and created_at >= ${getDateFormatClickhouse(start_at)})
and created_at >= ${clickhouse.getDateFormat(start_at)})
`,
);
}