Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

remove useless optimizations

Bill Yangbd0d86e57777
diff --git a/server/src/api/analytics/getMetric.ts b/server/src/api/analytics/getMetric.ts
index d0a013fc0..fbc2bbc7e 100644
--- a/server/src/api/analytics/getMetric.ts
+++ b/server/src/api/analytics/getMetric.ts
@@ -352,7 +352,6 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: boole
// Default case for other parameters
const sqlParam = getSqlParam(parameter);
- const hasFilter = filterStatement.trim().length > 0;
if (isCountQuery) {
return `
@@ -367,41 +366,6 @@ const getQuery = (request: FastifyRequest<GetMetricRequest>, isCountQuery: boole
`;
}
- if (!hasFilter) {
- // Single scan: compute pageviews_in_session inline via countIf per session.
- // Safe because with no filter, the scan covers all events in the session anyway.
- return `
- WITH SessionData AS (
- SELECT
- argMin(${sqlParam}, timestamp) as value,
- session_id,
- countIf(type = 'pageview') as pageviews_in_session
- FROM events
- WHERE
- site_id = {siteId:Int32}
- AND ${sqlParam} IS NOT NULL
- AND ${sqlParam} <> ''
- ${timeStatement}
- GROUP BY session_id
- )
- SELECT
- value,
- COUNT(DISTINCT session_id) as count,
- round((COUNT(DISTINCT session_id) / sum(COUNT(DISTINCT session_id)) OVER ()) * 100, 2) as percentage,
- COUNT() as pageviews,
- round((COUNT() / sum(COUNT()) OVER ()) * 100, 2) as pageviews_percentage,
- round((countIf(DISTINCT session_id, pageviews_in_session = 1) / nullIf(COUNT(DISTINCT session_id), 0)) * 100, 2) as bounce_rate
- FROM SessionData
- GROUP BY value
- ORDER BY count desc
- ${limitStatement}
- ${offsetStatement};
- `;
- }
-
- // With filters: two-scan approach preserves correct bounce rate.
- // SessionPageCounts counts total pageviews per session (unfiltered) so bounce rate
- // reflects the true session behaviour, not just filtered events.
return `
WITH SessionPageCounts AS (
SELECT
diff --git a/server/src/api/analytics/getOverview.ts b/server/src/api/analytics/getOverview.ts
index 0ad3c67fa..033bc3fac 100644
--- a/server/src/api/analytics/getOverview.ts
+++ b/server/src/api/analytics/getOverview.ts
@@ -16,37 +16,7 @@ type GetOverviewResponse = {
const getQuery = (params: FilterParams, siteId: number) => {
const timeStatement = getTimeStatement(params);
const filterStatement = getFilterStatement(params.filters, siteId, timeStatement);
- const hasFilter = filterStatement.trim().length > 0;
- if (!hasFilter) {
- // Single scan: no filter means AllSessionPageviews === FilteredSessions
- return `
- WITH SessionMetrics AS (
- SELECT
- session_id,
- anyLast(user_id) AS user_id,
- MIN(timestamp) AS start_time,
- MAX(timestamp) AS end_time,
- countIf(type = 'pageview') AS total_pageviews_in_session
- FROM events
- WHERE
- site_id = {siteId:Int32}
- ${timeStatement}
- GROUP BY session_id
- )
- SELECT
- COUNT() AS sessions,
- AVG(total_pageviews_in_session) AS pages_per_session,
- sumIf(1, total_pageviews_in_session = 1) / COUNT() * 100 AS bounce_rate,
- AVG(end_time - start_time) AS session_duration,
- SUM(total_pageviews_in_session) AS pageviews,
- COUNT(DISTINCT user_id) AS users
- FROM SessionMetrics`;
- }
-
- // Two scans (down from three):
- // 1. AllSessionPageviews — unfiltered, for accurate bounce rate / pages_per_session
- // 2. FilteredSessionsWithStats — filtered, provides session timing + pageviews + users
return `
WITH
AllSessionPageviews AS (
diff --git a/server/src/api/analytics/getOverviewBucketed.ts b/server/src/api/analytics/getOverviewBucketed.ts
index 148f5eff7..a4ea7e5cc 100644
--- a/server/src/api/analytics/getOverviewBucketed.ts
+++ b/server/src/api/analytics/getOverviewBucketed.ts
@@ -70,8 +70,6 @@ const getQuery = (params: FilterParams<{ bucket: TimeBucket }>, siteId: number)
const { start_date, end_date, time_zone, bucket = "hour", filters, past_minutes_start, past_minutes_end } = params;
const timeStatement = getTimeStatement(params);
const filterStatement = getFilterStatement(filters, siteId, timeStatement);
- const hasFilter = filterStatement.trim().length > 0;
-
const pastMinutesRange =
past_minutes_start !== undefined && past_minutes_end !== undefined
? { start: Number(past_minutes_start), end: Number(past_minutes_end) }
@@ -81,61 +79,6 @@ const getQuery = (params: FilterParams<{ bucket: TimeBucket }>, siteId: number)
const fillClause = isAllTime ? "" : getTimeStatementFill(params, bucket);
const tzEscaped = SqlString.escape(time_zone);
- if (!hasFilter) {
- // No filter: merge AllSessionPageviews + FilteredSessions into one session scan.
- // A second scan handles pageviews/users bucketed by event timestamp for accuracy.
- return `
-WITH SessionMetrics AS (
- SELECT
- session_id,
- anyLast(user_id) AS user_id,
- MIN(timestamp) AS start_time,
- MAX(timestamp) AS end_time,
- countIf(type = 'pageview') AS total_pageviews_in_session
- FROM events
- WHERE
- site_id = {siteId:Int32}
- ${timeStatement}
- GROUP BY session_id
-),
-SessionBucketed AS (
- SELECT
- toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(start_time, ${tzEscaped}))) AS time,
- COUNT() AS sessions,
- AVG(total_pageviews_in_session) AS pages_per_session,
- sumIf(1, total_pageviews_in_session = 1) / COUNT() AS bounce_rate,
- AVG(end_time - start_time) AS session_duration,
- COUNT(DISTINCT user_id) AS users
- FROM SessionMetrics
- GROUP BY time
- ORDER BY time ${fillClause}
-),
-EventBucketed AS (
- SELECT
- toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(timestamp, ${tzEscaped}))) AS time,
- countIf(type = 'pageview') AS pageviews
- FROM events
- WHERE
- site_id = {siteId:Int32}
- ${timeStatement}
- GROUP BY time
- ORDER BY time ${fillClause}
-)
-SELECT
- s.time AS time,
- s.sessions,
- s.pages_per_session,
- s.bounce_rate * 100 AS bounce_rate,
- s.session_duration,
- e.pageviews,
- s.users
-FROM SessionBucketed s
-FULL JOIN EventBucketed e USING time
-ORDER BY time`;
- }
-
- // With filters: keep original 3-CTE structure (semantics for bounce rate require
- // unfiltered pageview counts per session from AllSessionPageviews).
return `
WITH
AllSessionPageviews AS (
diff --git a/server/src/api/analytics/sessions/getSessions.ts b/server/src/api/analytics/sessions/getSessions.ts
index 2891f93ab..bdf06a2f5 100644
--- a/server/src/api/analytics/sessions/getSessions.ts
+++ b/server/src/api/analytics/sessions/getSessions.ts
@@ -2,7 +2,7 @@ import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
import { enrichWithTraits, getTimeStatement, processResults } from "../utils/utils.js";
import { FilterParams } from "@rybbit/shared";
-import { getFilterStatement, getEventLevelFilterStatement } from "../utils/getFilterStatement.js";
+import { getFilterStatement } from "../utils/getFilterStatement.js";
export type GetSessionsResponse = {
session_id: string;
@@ -103,11 +103,6 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:
fieldMappings: SESSION_FIELD_MAPPINGS,
});
- // Inner filter: only raw event-level columns (country, browser, device_type, etc.)
- // Applied inside the CTE before GROUP BY to reduce rows aggregated.
- // The outer filterStatement still enforces full correctness.
- const innerFilterStatement = getEventLevelFilterStatement(filters, Number(site), timeStatement);
-
const query = `
WITH AggregatedSessions AS (
SELECT
@@ -156,7 +151,6 @@ export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res:
${userId ? ` AND (events.user_id = {user_id:String} OR events.identified_user_id = {user_id:String})` : ""}
${sessionId ? ` AND events.session_id = {session_id:String}` : ""}
${timeStatement}
- ${innerFilterStatement}
GROUP BY
session_id
ORDER BY session_end DESC
diff --git a/server/src/api/analytics/utils/getFilterStatement.ts b/server/src/api/analytics/utils/getFilterStatement.ts
index 55e964be8..8c84b3017 100644
--- a/server/src/api/analytics/utils/getFilterStatement.ts
+++ b/server/src/api/analytics/utils/getFilterStatement.ts
@@ -12,30 +12,8 @@ export interface FilterStatementOptions {
// e.g., { "url_parameters['utm_source']": "utm_source" }
fieldMappings?: Record<string, string>;
- // When set, only generate conditions for the listed parameters (all others are skipped)
- includeOnly?: FilterParameter[];
}
-// Raw event-level columns that have consistent values across all events in a session.
-// Safe to push into a CTE WHERE clause before GROUP BY session_id.
-export const INNER_SAFE_PARAMS: FilterParameter[] = [
- "country",
- "region",
- "city",
- "language",
- "device_type",
- "browser",
- "browser_version",
- "operating_system",
- "operating_system_version",
- "hostname",
- "referrer",
- "channel",
- "dimensions",
- "lat",
- "lon",
-];
-
const DEFAULT_SESSION_LEVEL_PARAMS: FilterParameter[] = ["event_name"];
const filterTypeToOperator = (type: FilterType) => {
@@ -117,7 +95,6 @@ export function getFilterStatement(
}
const sessionLevelParams = options?.sessionLevelParams ?? DEFAULT_SESSION_LEVEL_PARAMS;
- const includeOnly = options?.includeOnly;
const siteIdFilter = siteId ? `site_id = ${siteId}` : "";
// Strip leading "AND " from timeStatement since we'll be constructing WHERE clauses
const timeFilter = timeStatement ? timeStatement.replace(/^AND\s+/i, "").trim() : "";
@@ -144,17 +121,9 @@ export function getFilterStatement(
)`;
};
- const activeFilters = includeOnly
- ? filtersArray.filter(f => includeOnly.includes(f.parameter))
- : filtersArray;
-
- if (activeFilters.length === 0) {
- return "";
- }
-
let result =
"AND " +
- activeFilters
+ filtersArray
.map(filter => {
const x = filter.type === "contains" || filter.type === "not_contains" ? "%" : "";
const isNumericParam = filter.parameter === "lat" || filter.parameter === "lon";
@@ -345,15 +314,3 @@ export function getFilterStatement(
return result;
}
-// Returns a WHERE fragment containing only raw event-level column filters.
-// Safe to push inside a CTE WHERE clause before GROUP BY session_id, because
-// these columns have consistent values across all events in a session.
-export function getEventLevelFilterStatement(
- filters: string,
- siteId?: number,
- timeStatement?: string
-): string {
- return getFilterStatement(filters, siteId, timeStatement, {
- includeOnly: INNER_SAFE_PARAMS,
- });
-}