From 2f17fa0d53c66682bcca2eb6aca2be259f9b8298 Mon Sep 17 00:00:00 2001 From: Courtney Holcomb Date: Wed, 20 Nov 2024 15:13:06 -0800 Subject: [PATCH] Remove use_custom_agg_time_dimension property from JoinToTimeSpineNode It is no longer used. --- metricflow/dataflow/builder/dataflow_plan_builder.py | 3 --- metricflow/dataflow/nodes/join_to_time_spine.py | 7 ------- .../plan_conversion/test_dataflow_to_sql_plan.py | 3 --- .../test_derived_metric_offset_to_grain__dfp_0.xml | 1 - .../test_derived_metric_offset_window__dfp_0.xml | 1 - .../test_derived_metric_offset_with_granularity__dfp_0.xml | 1 - .../test_derived_offset_cumulative_metric__dfp_0.xml | 1 - .../test_join_to_time_spine_derived_metric__dfp_0.xml | 3 --- .../test_join_to_time_spine_with_filters__dfp_0.xml | 1 - .../test_join_to_time_spine_with_metric_time__dfp_0.xml | 1 - ...test_nested_derived_metric_with_outer_offset__dfp_0.xml | 2 -- ...ilter_and_query_have_different_granularities__dfp_0.xml | 1 - ...ilter_and_query_have_different_granularities__dfp_0.xml | 1 - ...join_to_time_spine_node_with_offset_to_grain__plan0.xml | 1 - ...t_join_to_time_spine_node_with_offset_window__plan0.xml | 1 - .../test_join_to_time_spine_node_without_offset__plan0.xml | 1 - ...l_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml | 3 --- ..._nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml | 3 --- ...metric_with_post_agg_join_predicate_pushdown__dfp_0.xml | 3 --- ...etric_with_post_agg_join_predicate_pushdown__dfpo_0.xml | 3 --- .../test_offset_metric_predicate_pushdown__dfp_0.xml | 1 - .../test_offset_metric_predicate_pushdown__dfpo_0.xml | 1 - 22 files changed, 43 deletions(-) diff --git a/metricflow/dataflow/builder/dataflow_plan_builder.py b/metricflow/dataflow/builder/dataflow_plan_builder.py index 296c332a4a..7cfb9a239a 100644 --- a/metricflow/dataflow/builder/dataflow_plan_builder.py +++ b/metricflow/dataflow/builder/dataflow_plan_builder.py @@ -649,7 +649,6 @@ def _build_derived_metric_output_node( output_node = JoinToTimeSpineNode.create( parent_node=output_node, requested_agg_time_dimension_specs=queried_agg_time_dimension_specs, - use_custom_agg_time_dimension=not queried_linkable_specs.contains_metric_time, time_range_constraint=predicate_pushdown_state.time_range_constraint, offset_window=metric_spec.offset_window, offset_to_grain=metric_spec.offset_to_grain, @@ -1630,7 +1629,6 @@ def _build_aggregated_measure_from_measure_source_node( unaggregated_measure_node = JoinToTimeSpineNode.create( parent_node=unaggregated_measure_node, requested_agg_time_dimension_specs=base_agg_time_dimension_specs, - use_custom_agg_time_dimension=not queried_linkable_specs.contains_metric_time, time_range_constraint=predicate_pushdown_state.time_range_constraint, offset_window=before_aggregation_time_spine_join_description.offset_window, offset_to_grain=before_aggregation_time_spine_join_description.offset_to_grain, @@ -1705,7 +1703,6 @@ def _build_aggregated_measure_from_measure_source_node( output_node: DataflowPlanNode = JoinToTimeSpineNode.create( parent_node=aggregate_measures_node, requested_agg_time_dimension_specs=queried_agg_time_dimension_specs, - use_custom_agg_time_dimension=not queried_linkable_specs.contains_metric_time, join_type=after_aggregation_time_spine_join_description.join_type, time_range_constraint=predicate_pushdown_state.time_range_constraint, offset_window=after_aggregation_time_spine_join_description.offset_window, diff --git a/metricflow/dataflow/nodes/join_to_time_spine.py b/metricflow/dataflow/nodes/join_to_time_spine.py index a17b2e4283..fd86503813 100644 --- a/metricflow/dataflow/nodes/join_to_time_spine.py +++ b/metricflow/dataflow/nodes/join_to_time_spine.py @@ -24,7 +24,6 @@ class JoinToTimeSpineNode(DataflowPlanNode, ABC): Attributes: requested_agg_time_dimension_specs: Time dimensions requested in the query. - use_custom_agg_time_dimension: Indicates if agg_time_dimension should be used in join. If false, uses metric_time. join_type: Join type to use when joining to time spine. time_range_constraint: Time range to constrain the time spine to. offset_window: Time window to offset the parent dataset by when joining to time spine. @@ -32,7 +31,6 @@ class JoinToTimeSpineNode(DataflowPlanNode, ABC): """ requested_agg_time_dimension_specs: Sequence[TimeDimensionSpec] - use_custom_agg_time_dimension: bool join_type: SqlJoinType time_range_constraint: Optional[TimeRangeConstraint] offset_window: Optional[MetricTimeWindow] @@ -54,7 +52,6 @@ def __post_init__(self) -> None: # noqa: D105 def create( # noqa: D102 parent_node: DataflowPlanNode, requested_agg_time_dimension_specs: Sequence[TimeDimensionSpec], - use_custom_agg_time_dimension: bool, join_type: SqlJoinType, time_range_constraint: Optional[TimeRangeConstraint] = None, offset_window: Optional[MetricTimeWindow] = None, @@ -64,7 +61,6 @@ def create( # noqa: D102 return JoinToTimeSpineNode( parent_nodes=(parent_node,), requested_agg_time_dimension_specs=tuple(requested_agg_time_dimension_specs), - use_custom_agg_time_dimension=use_custom_agg_time_dimension, join_type=join_type, time_range_constraint=time_range_constraint, offset_window=offset_window, @@ -87,7 +83,6 @@ def description(self) -> str: # noqa: D102 def displayed_properties(self) -> Sequence[DisplayedProperty]: # noqa: D102 props = tuple(super().displayed_properties) + ( DisplayedProperty("requested_agg_time_dimension_specs", self.requested_agg_time_dimension_specs), - DisplayedProperty("use_custom_agg_time_dimension", self.use_custom_agg_time_dimension), DisplayedProperty("join_type", self.join_type), ) if self.offset_window: @@ -115,7 +110,6 @@ def functionally_identical(self, other_node: DataflowPlanNode) -> bool: # noqa: and other_node.offset_window == self.offset_window and other_node.offset_to_grain == self.offset_to_grain and other_node.requested_agg_time_dimension_specs == self.requested_agg_time_dimension_specs - and other_node.use_custom_agg_time_dimension == self.use_custom_agg_time_dimension and other_node.join_type == self.join_type and other_node.time_spine_filters == self.time_spine_filters ) @@ -125,7 +119,6 @@ def with_new_parents(self, new_parent_nodes: Sequence[DataflowPlanNode]) -> Join return JoinToTimeSpineNode.create( parent_node=new_parent_nodes[0], requested_agg_time_dimension_specs=self.requested_agg_time_dimension_specs, - use_custom_agg_time_dimension=self.use_custom_agg_time_dimension, time_range_constraint=self.time_range_constraint, offset_window=self.offset_window, offset_to_grain=self.offset_to_grain, diff --git a/tests_metricflow/plan_conversion/test_dataflow_to_sql_plan.py b/tests_metricflow/plan_conversion/test_dataflow_to_sql_plan.py index 23b3e43144..e25afe72da 100644 --- a/tests_metricflow/plan_conversion/test_dataflow_to_sql_plan.py +++ b/tests_metricflow/plan_conversion/test_dataflow_to_sql_plan.py @@ -607,7 +607,6 @@ def test_join_to_time_spine_node_without_offset( join_to_time_spine_node = JoinToTimeSpineNode.create( parent_node=compute_metrics_node, requested_agg_time_dimension_specs=[MTD_SPEC_DAY], - use_custom_agg_time_dimension=False, time_range_constraint=TimeRangeConstraint( start_time=as_datetime("2020-01-01"), end_time=as_datetime("2021-01-01") ), @@ -681,7 +680,6 @@ def test_join_to_time_spine_node_with_offset_window( join_to_time_spine_node = JoinToTimeSpineNode.create( parent_node=compute_metrics_node, requested_agg_time_dimension_specs=[MTD_SPEC_DAY], - use_custom_agg_time_dimension=False, time_range_constraint=TimeRangeConstraint( start_time=as_datetime("2020-01-01"), end_time=as_datetime("2021-01-01") ), @@ -756,7 +754,6 @@ def test_join_to_time_spine_node_with_offset_to_grain( join_to_time_spine_node = JoinToTimeSpineNode.create( parent_node=compute_metrics_node, requested_agg_time_dimension_specs=[MTD_SPEC_DAY], - use_custom_agg_time_dimension=False, time_range_constraint=TimeRangeConstraint( start_time=as_datetime("2020-01-01"), end_time=as_datetime("2021-01-01") ), diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml index b2f69c23da..f8197f144b 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml @@ -78,7 +78,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml index 89893e30bb..dbe84cd5db 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml @@ -44,7 +44,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml index e359957f56..88e7bab66e 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml @@ -42,7 +42,6 @@ test_filename: test_dataflow_plan_builder.py - diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml index a24de25d6d..55d4a16786 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml @@ -43,7 +43,6 @@ test_filename: test_dataflow_plan_builder.py - diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml index 4acddea8cb..ab0c43a9dd 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml @@ -31,7 +31,6 @@ test_filename: test_dataflow_plan_builder.py - @@ -80,7 +79,6 @@ test_filename: test_dataflow_plan_builder.py - @@ -105,7 +103,6 @@ test_filename: test_dataflow_plan_builder.py - diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml index 67b73c422f..29dcfc8ad3 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_filters__dfp_0.xml @@ -71,7 +71,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml index 99ecbc8466..474bca4b1e 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_with_metric_time__dfp_0.xml @@ -20,7 +20,6 @@ test_filename: test_dataflow_plan_builder.py - diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml index f82e0ccbd5..c4c72c23ed 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml @@ -19,7 +19,6 @@ test_filename: test_dataflow_plan_builder.py - @@ -63,7 +62,6 @@ test_filename: test_dataflow_plan_builder.py - diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_to_grain_metric_filter_and_query_have_different_granularities__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_to_grain_metric_filter_and_query_have_different_granularities__dfp_0.xml index 69377fe729..85ac6913de 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_to_grain_metric_filter_and_query_have_different_granularities__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_to_grain_metric_filter_and_query_have_different_granularities__dfp_0.xml @@ -170,7 +170,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml index 37a544adde..5734f04cda 100644 --- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml +++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml @@ -175,7 +175,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml index 694abd4f7a..b623f35249 100644 --- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml +++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml @@ -17,7 +17,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml index 2fb63b6c0f..56015eb0eb 100644 --- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml +++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml @@ -17,7 +17,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml index 76da467914..49be0d8387 100644 --- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml +++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml @@ -17,7 +17,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml index a6b9017bcc..3155d70d46 100644 --- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml +++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml @@ -128,7 +128,6 @@ docstring: - @@ -297,7 +296,6 @@ docstring: - @@ -382,7 +380,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml index 1a7bf440d1..b18699c1ef 100644 --- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml +++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml @@ -128,7 +128,6 @@ docstring: - @@ -296,7 +295,6 @@ docstring: - @@ -381,7 +379,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml index 349319f1f4..00cb1d56f1 100644 --- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml +++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml @@ -177,7 +177,6 @@ docstring: - @@ -397,7 +396,6 @@ docstring: - @@ -488,7 +486,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml index 594a2144f0..4a805d22fc 100644 --- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml +++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml @@ -177,7 +177,6 @@ docstring: - @@ -397,7 +396,6 @@ docstring: - @@ -488,7 +486,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml index 08bfdf7469..9f0b5af2d3 100644 --- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml +++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml @@ -357,7 +357,6 @@ docstring: - diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml index 8a861b78d7..3d4c78b8dc 100644 --- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml +++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml @@ -357,7 +357,6 @@ docstring: -