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.

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

chore: add timings measure for breakdown values query #17974

Merged
merged 1 commit into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 20 additions & 11 deletions posthog/hogql_queries/insights/trends/breakdown.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from typing import Dict, List, Tuple
from posthog.hogql import ast
from posthog.hogql.timings import HogQLTimings
from posthog.hogql_queries.insights.trends.breakdown_values import BreakdownValues
from posthog.hogql_queries.insights.trends.utils import get_properties_chain, series_event_name
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
Expand All @@ -13,14 +14,21 @@ class Breakdown:
team: Team
series: EventsNode | ActionsNode
query_date_range: QueryDateRange
timings: HogQLTimings

def __init__(
self, team: Team, query: TrendsQuery, series: EventsNode | ActionsNode, query_date_range: QueryDateRange
self,
team: Team,
query: TrendsQuery,
series: EventsNode | ActionsNode,
query_date_range: QueryDateRange,
timings: HogQLTimings,
):
self.team = team
self.query = query
self.series = series
self.query_date_range = query_date_range
self.timings = timings

@cached_property
def enabled(self) -> bool:
Expand Down Expand Up @@ -65,16 +73,17 @@ def _breakdown_values_ast(self) -> ast.Array:

@cached_property
def _get_breakdown_values(self) -> ast.Array:
breakdown = BreakdownValues(
team=self.team,
event_name=series_event_name(self.series),
breakdown_field=self.query.breakdown.breakdown,
breakdown_type=self.query.breakdown.breakdown_type,
query_date_range=self.query_date_range,
histogram_bin_count=self.query.breakdown.breakdown_histogram_bin_count,
group_type_index=self.query.breakdown.breakdown_group_type_index,
)
return breakdown.get_breakdown_values()
with self.timings.measure("breakdown_values_query"):
breakdown = BreakdownValues(
team=self.team,
event_name=series_event_name(self.series),
breakdown_field=self.query.breakdown.breakdown,
breakdown_type=self.query.breakdown.breakdown_type,
query_date_range=self.query_date_range,
histogram_bin_count=self.query.breakdown.breakdown_histogram_bin_count,
group_type_index=self.query.breakdown.breakdown_group_type_index,
)
return breakdown.get_breakdown_values()

def _get_breakdown_histogram_buckets(self) -> List[Tuple[float, float]]:
buckets = []
Expand Down
10 changes: 9 additions & 1 deletion posthog/hogql_queries/insights/trends/query_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from posthog.hogql import ast
from posthog.hogql.parser import parse_expr, parse_select
from posthog.hogql.property import property_to_expr
from posthog.hogql.timings import HogQLTimings
from posthog.hogql_queries.insights.trends.breakdown import Breakdown
from posthog.hogql_queries.insights.trends.utils import series_event_name
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
Expand All @@ -15,14 +16,21 @@ class TrendsQueryBuilder:
team: Team
query_date_range: QueryDateRange
series: EventsNode | ActionsNode
timings: HogQLTimings

def __init__(
self, trends_query: TrendsQuery, team: Team, query_date_range: QueryDateRange, series: EventsNode | ActionsNode
self,
trends_query: TrendsQuery,
team: Team,
query_date_range: QueryDateRange,
series: EventsNode | ActionsNode,
timings: HogQLTimings,
):
self.query = trends_query
self.team = team
self.query_date_range = query_date_range
self.series = series
self.timings = timings

def build_query(self) -> ast.SelectUnionQuery:
date_subqueries = self._get_date_subqueries()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def to_query(self) -> List[ast.SelectQuery]:
else:
query_date_range = self.query_previous_date_range

query_builder = TrendsQueryBuilder(self.query, self.team, query_date_range, series.series)
query_builder = TrendsQueryBuilder(self.query, self.team, query_date_range, series.series, self.timings)
queries.append(query_builder.build_query())

return queries
Expand Down
Loading