Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Join on all keys in multi series chart #294

Merged
merged 2 commits into from
Feb 3, 2024
Merged

Join on all keys in multi series chart #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a9b921
Join on all keys in multi series chart
MikeShi42 Feb 2, 2024
36ecdbd
Merge branch 'main' into mikeshi/multi-seriesjoin-on-all-keys
kodiakhq[bot] Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions packages/api/src/clickhouse/__tests__/clickhouse.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,11 +850,39 @@ Array [
"series_0.data": 0.05128205128205128,
"ts_bucket": 1641341100,
},
Object {
"group": Array [
"test1",
],
"series_0.data": 0,
"ts_bucket": 1641341400,
},
Object {
"group": Array [
"test2",
],
"series_0.data": 0,
"ts_bucket": 1641341400,
},
Object {
"group": Array [],
"series_0.data": null,
"ts_bucket": 1641341400,
},
Object {
"group": Array [
"test1",
],
"series_0.data": 0,
"ts_bucket": 1641341700,
},
Object {
"group": Array [
"test2",
],
"series_0.data": 0,
"ts_bucket": 1641341700,
},
Object {
"group": Array [],
"series_0.data": null,
Expand Down
36 changes: 22 additions & 14 deletions packages/api/src/clickhouse/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@ const buildEventSeriesQuery = async ({
granularity != null
? `toUnixTimestamp(toStartOfInterval(timestamp, INTERVAL ${granularity})) as ts_bucket`
: "'0' as ts_bucket",
hasGroupBy ? `[${groupByColumnNames.join(',')}] as group` : `[] as group`, // FIXME: should we fallback to use aggFn as group
hasGroupBy ? `[${groupByColumnNames.join(',')}] as group` : `[] as group`,
`${label} as label`,
].join(',');

Expand Down Expand Up @@ -1531,9 +1531,15 @@ export const queryMultiSeriesChart = async ({
.map((q, i) => `series_${i} AS (${q.query})`)
.join(',\n');

// Only join on group bys if all queries have group bys
// TODO: This will not work for an array of group by fields
const allQueiesHaveGroupBy = queries.every(q => q.hasGroupBy);
// Build a subquery of the join key (ts + group) for all series to join on
// fixes the case where some series have more data points than others
// (due to missing groups or missing metrics)
const joinKeysSubquery = queries
.map((q, i) => {
const series = `series_${i}`;
return `SELECT ${series}.ts_bucket, ${series}.group FROM ${series}`;
})
.join(' UNION DISTINCT\n');

let seriesIndexWithSorting = -1;
let sortOrder: 'asc' | 'desc' = 'desc';
Expand All @@ -1546,13 +1552,14 @@ export const queryMultiSeriesChart = async ({
}
}

let leftJoin = '';
// Join every series after the first one
for (let i = 1; i < queries.length; i++) {
leftJoin += `LEFT JOIN series_${i} ON series_${i}.ts_bucket=series_0.ts_bucket${
allQueiesHaveGroupBy ? ` AND series_${i}.group = series_0.group` : ''
}\n`;
}
const leftJoin = queries
.map((_, i) => {
return (
`LEFT JOIN series_${i} ON series_${i}.ts_bucket=join_keys.ts_bucket ` +
`AND series_${i}.group = join_keys.group`
);
})
.join('\n');

const select =
seriesReturnType === 'column'
Expand All @@ -1573,9 +1580,9 @@ export const queryMultiSeriesChart = async ({
,raw_groups AS (
SELECT
?,
series_0.ts_bucket as ts_bucket,
series_0.group as group
FROM series_0 AS series_0
join_keys.ts_bucket as ts_bucket,
join_keys.group as group
FROM (?) as join_keys
?
WHERE ?
), groups AS (
Expand All @@ -1594,6 +1601,7 @@ export const queryMultiSeriesChart = async ({
[
SqlString.raw(seriesCTEs),
SqlString.raw(select),
SqlString.raw(joinKeysSubquery),
SqlString.raw(leftJoin),
SqlString.raw(postGroupWhereClause),
// Setting rank_order_by_value
Expand Down
Loading