Skip to content

ref(query-builder): Cleanup query_framework code #54586

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

Merged
merged 2 commits into from
Aug 15, 2023
Merged

ref(query-builder): Cleanup query_framework code #54586

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3dc523
ref(query-builder): Cleanup query_framework code
wmak Aug 10, 2023
4a08493
Merge branch 'master' into wmak/ref/cleanup-query-framework-code
wmak Aug 15, 2023
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
116 changes: 35 additions & 81 deletions src/sentry/search/events/builder/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ def get_snql_query(self) -> Request:
tenant_ids=self.tenant_ids,
)

def _create_query_framework(self) -> Tuple[str, Dict[str, QueryFramework]]:
def _get_base_query_framework(self) -> Dict[str, QueryFramework]:
prefix = "generic_" if self.dataset is Dataset.PerformanceMetrics else ""
query_framework: Dict[str, QueryFramework] = {
"distribution": QueryFramework(
Expand Down Expand Up @@ -748,85 +748,44 @@ def _create_query_framework(self) -> Tuple[str, Dict[str, QueryFramework]]:
entity=Entity(f"{prefix}metrics_distributions", sample=self.sample_rate),
),
}
return query_framework

def _create_query_framework(self) -> Tuple[str, Dict[str, QueryFramework]]:
query_framework = self._get_base_query_framework()
primary = None
# Metrics layer can't have aliases in the functions for some reason
metrics_layer_without_aliases = [
function.exp if isinstance(function, AliasedExpression) else function
for function in self.metrics_layer_functions
]
percentiles_without_aliases = [
function.exp if isinstance(function, AliasedExpression) else function
for function in self.percentiles
]
# if orderby spans more than one table, the query isn't possible with metrics
for orderby in self.orderby:
if orderby.exp in self.sets:
query_framework["set"].orderby.append(orderby)
if primary not in [None, "set"]:
raise IncompatibleMetricsQuery("Can't order across tables")
primary = "set"
elif orderby.exp in self.counters:
query_framework["counter"].orderby.append(orderby)
if primary not in [None, "counter"]:
raise IncompatibleMetricsQuery("Can't order across tables")
primary = "counter"
elif orderby.exp in self.distributions:
query_framework["distribution"].orderby.append(orderby)
if primary not in [None, "distribution"]:
raise IncompatibleMetricsQuery("Can't order across tables")
primary = "distribution"
elif orderby.exp in metrics_layer_without_aliases:
query_framework["metrics_layer"].orderby.append(orderby)
if primary not in [None, "metrics_layer"]:
raise IncompatibleMetricsQuery("Can't order across tables")
primary = "metrics_layer"
elif orderby.exp in percentiles_without_aliases:
query_framework["percentiles"].orderby.append(orderby)
if primary not in [None, "percentiles"]:
raise IncompatibleMetricsQuery("Can't order across tables")
primary = "percentiles"
for entity, framework in query_framework.items():
# Metrics layer can't have aliases in the functions for some reason
if self.use_metrics_layer:
framework_functions = [
function.exp if isinstance(function, AliasedExpression) else function
for function in framework.functions
]
else:
framework_functions = framework.functions
if orderby.exp in framework_functions:
framework.orderby.append(orderby)
if primary not in [None, entity]:
raise IncompatibleMetricsQuery("Can't order across tables")
primary = entity
break
else:
# An orderby that isn't on a function add it to all of them
for framework in query_framework.values():
framework.orderby.append(orderby)

having_entity: Optional[str] = None
for condition in self.flattened_having:
if condition.lhs in self.sets:
if having_entity is None:
having_entity = "set"
elif having_entity != "set":
raise IncompatibleMetricsQuery(
"Can only have aggregate conditions on one entity"
)
elif condition.lhs in self.counters:
if having_entity is None:
having_entity = "counter"
elif having_entity != "counter":
raise IncompatibleMetricsQuery(
"Can only have aggregate conditions on one entity"
)
elif condition.lhs in self.distributions:
if having_entity is None:
having_entity = "distribution"
elif having_entity != "distribution":
raise IncompatibleMetricsQuery(
"Can only have aggregate conditions on one entity"
)
elif condition.lhs in self.metrics_layer_functions:
if having_entity is None:
having_entity = "metrics_layer"
elif having_entity != "metrics_layer":
raise IncompatibleMetricsQuery(
"Can only have aggregate conditions on one entity"
)
elif condition.lhs in self.percentiles:
if having_entity is None:
having_entity = "percentiles"
elif having_entity != "percentiles":
raise IncompatibleMetricsQuery(
"Can only have aggregate conditions on one entity"
)
for entity, framework in query_framework.items():
if condition.lhs in framework.functions:
if having_entity is None:
having_entity = entity
elif having_entity != entity:
raise IncompatibleMetricsQuery(
"Can only have aggregate conditions on one entity"
)
break

if primary is not None and having_entity is not None and having_entity != primary:
raise IncompatibleMetricsQuery(
Expand All @@ -837,18 +796,13 @@ def _create_query_framework(self) -> Tuple[str, Dict[str, QueryFramework]]:
if primary is None:
if having_entity is not None:
primary = having_entity
elif len(self.counters) > 0:
primary = "counter"
elif len(self.sets) > 0:
primary = "set"
elif len(self.distributions) > 0:
primary = "distribution"
elif len(self.metrics_layer_functions) > 0:
primary = "metrics_layer"
elif len(self.percentiles) > 0:
primary = "percentiles"
else:
raise IncompatibleMetricsQuery("Need at least one function")
for entity, framework in query_framework.items():
if len(framework.functions) > 0:
primary = entity
break
else:
raise IncompatibleMetricsQuery("Need at least one function")

query_framework[primary].having = self.having

Expand Down