query optimizations on session property filters
This commit is contained in:
1 parent
5fc02b6aef
commit
a113f5be79
4 files changed
+68
-7
No files matched your search
+18
-3
@@ -253,6 +253,10 @@ function getPropertyFilterQuery(
|
||||
const table = propertyType === 'event' ? 'event_data' : 'session_data final';
|
||||
const column = propertyType === 'event' ? 'event_id' : 'session_id';
|
||||
const outerColumn = propertyType === 'event' ? 'event_id' : 'website_event.session_id';
|
||||
const dateFilter =
|
||||
propertyType === 'event'
|
||||
? `and created_at between {startDate:DateTime64} and {endDate:DateTime64}`
|
||||
: '';
|
||||
|
||||
filters.forEach(({ propertyName, dataType, operator, value }, i) => {
|
||||
const keyParam = `pf_key_${i}`;
|
||||
@@ -333,15 +337,26 @@ function getPropertyFilterQuery(
|
||||
}
|
||||
}
|
||||
|
||||
parts.push(`and ${outerColumn} in (
|
||||
select ${column}
|
||||
if (propertyType === 'session') {
|
||||
parts.push(`and tuple(website_event.website_id, website_event.session_id) in (
|
||||
select website_id, session_id
|
||||
from ${table}
|
||||
where website_id = {websiteId:UUID}
|
||||
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
and data_key = {${keyParam}:String}
|
||||
and data_type = ${dataType}
|
||||
and ${condition}
|
||||
)`);
|
||||
} else {
|
||||
parts.push(`and ${outerColumn} in (
|
||||
select ${column}
|
||||
from ${table}
|
||||
where website_id = {websiteId:UUID}
|
||||
${dateFilter}
|
||||
and data_key = {${keyParam}:String}
|
||||
and data_type = ${dataType}
|
||||
and ${condition}
|
||||
)`);
|
||||
}
|
||||
});
|
||||
|
||||
return { sql: parts.join('\n'), params };
|
||||
|
||||
+18
-4
@@ -289,6 +289,8 @@ function getPropertyFilterQuery(
|
||||
const column = propertyType === 'event' ? 'website_event_id' : 'session_id';
|
||||
const outerColumn =
|
||||
propertyType === 'event' ? 'website_event.event_id' : 'website_event.session_id';
|
||||
const dateFilter =
|
||||
propertyType === 'event' ? `and created_at between {{startDate}} and {{endDate}}` : '';
|
||||
|
||||
filters.forEach(({ propertyName, dataType, operator, value }, i) => {
|
||||
const keyParam = `pf_key_${i}`;
|
||||
@@ -372,15 +374,27 @@ function getPropertyFilterQuery(
|
||||
}
|
||||
}
|
||||
|
||||
parts.push(`and ${outerColumn} in (
|
||||
select ${column}
|
||||
if (propertyType === 'session') {
|
||||
parts.push(`and exists (
|
||||
select 1
|
||||
from ${table}
|
||||
where website_id = {{websiteId::uuid}}
|
||||
and created_at between {{startDate}} and {{endDate}}
|
||||
where website_id = website_event.website_id
|
||||
and session_id = website_event.session_id
|
||||
and data_key = {{${keyParam}}}
|
||||
and data_type = ${dataType}
|
||||
and ${condition}
|
||||
)`);
|
||||
} else {
|
||||
parts.push(`and ${outerColumn} in (
|
||||
select ${column}
|
||||
from ${table}
|
||||
where website_id = {{websiteId::uuid}}
|
||||
${dateFilter}
|
||||
and data_key = {{${keyParam}}}
|
||||
and data_type = ${dataType}
|
||||
and ${condition}
|
||||
)`);
|
||||
}
|
||||
});
|
||||
|
||||
return { sql: parts.join('\n'), params };
|
||||
|
||||
Reference in new issue
Block a user