Simplify nodes that join to time spine #1535
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for your pull request! We could not find a changelog entry for this change. For details on how to document a change, see the contributing guide. |
courtneyholcomb
commented
Nov 20, 2024
| @@ -645,15 +643,17 @@ def _build_derived_metric_output_node( | |||
|
|
|||
| # For ratio / derived metrics with time offset, apply offset & where constraint after metric computation. | |||
| if metric_spec.has_time_offset: | |||
| queried_agg_time_dimension_specs = queried_linkable_specs.included_agg_time_dimension_specs_for_metric( | |||
| required_agg_time_dimension_specs = queried_linkable_specs.included_agg_time_dimension_specs_for_metric( | |||
There was a problem hiding this comment.
should revert this
courtneyholcomb
commented
Nov 20, 2024
| ), "Joining to time spine requires querying with metric_time or the appropriate agg_time_dimension." | ||
| output_node = JoinToTimeSpineNode.create( | ||
| parent_node=output_node, | ||
| requested_agg_time_dimension_specs=queried_agg_time_dimension_specs, | ||
| requested_agg_time_dimension_specs=[ | ||
| spec.with_base_grain() for spec in required_agg_time_dimension_specs |
courtneyholcomb
commented
Nov 20, 2024
| @@ -1625,7 +1625,11 @@ def _build_aggregated_measure_from_measure_source_node( | |||
| # in join rendering | |||
| unaggregated_measure_node = JoinToTimeSpineNode.create( | |||
| parent_node=unaggregated_measure_node, | |||
| requested_agg_time_dimension_specs=queried_agg_time_dimension_specs, | |||
| requested_agg_time_dimension_specs=[ | |||
courtneyholcomb
commented
Nov 20, 2024
| @@ -1592,10 +1592,14 @@ def _build_aggregated_measure_from_measure_source_node( | |||
| queried_agg_time_dimension_specs = queried_linkable_specs.included_agg_time_dimension_specs_for_measure( | |||
| measure_reference=measure_spec.reference, semantic_model_lookup=self._semantic_model_lookup | |||
| ) | |||
| required_agg_time_dimension_specs = required_linkable_specs.included_agg_time_dimension_specs_for_measure( | |||
courtneyholcomb
commented
Nov 20, 2024
|
|
||
| # If a cumulative metric is queried with metric_time / agg_time_dimension, join over time range. | ||
| # Otherwise, the measure will be aggregated over all time. | ||
| unaggregated_measure_node: DataflowPlanNode = measure_recipe.source_node | ||
| # TODO: can we use required here, too? |
courtneyholcomb
commented
Nov 20, 2024
| @@ -1697,7 +1701,7 @@ def _build_aggregated_measure_from_measure_source_node( | |||
| # like JoinToCustomGranularityNode, WhereConstraintNode, etc. | |||
| output_node: DataflowPlanNode = JoinToTimeSpineNode.create( | |||
| parent_node=aggregate_measures_node, | |||
| requested_agg_time_dimension_specs=queried_agg_time_dimension_specs, | |||
| requested_agg_time_dimension_specs=required_agg_time_dimension_specs, | |||
courtneyholcomb
force-pushed
the
court/simplify
branch
2 times, most recently
from
705fe01 to
00fb89e
Compare
Clean up. This was causing me some confusion because we recently introduced the concept of default grain for metrics, which is defined in the YAML spec, but this code was not referring to that.
There should be no functional changes in this commit, only cleanup and readability improvements. Mostly involves moving complex logic to helper functions.
courtneyholcomb
force-pushed
the
court/simplify
branch
from
00fb89e to
8dae910
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.