Skip to content

Commit

Permalink
Updated snapshots to account for plan text changes for FilterSpecSet
Browse files Browse the repository at this point in the history
  • Loading branch information
@WilliamDee
WilliamDee committed Oct 12, 2024
1 parent 1f728fd commit 10cd7b3
Show file tree
Hide file tree
Showing 71 changed files with 2,105 additions and 1,849 deletions.
2 changes: 1 addition & 1 deletion tests_metricflow/snapshots/test_cyclic_join.py/DataflowPlan/test_cyclic_join__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='listings') -->
<!-- metric_spec = MetricSpec(element_name='listings', filter_spec_set=WhereFilterSpecSet()) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_0') -->
Expand Down
4 changes: 2 additions & 2 deletions ...napshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='bookings') -->
<!-- metric_spec = MetricSpec(element_name='bookings', filter_spec_set=WhereFilterSpecSet()) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_0') -->
Expand Down Expand Up @@ -83,7 +83,7 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_1') -->
<!-- metric_spec = MetricSpec(element_name='booking_value') -->
<!-- metric_spec = MetricSpec(element_name='booking_value', filter_spec_set=WhereFilterSpecSet()) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_1') -->
Expand Down
2 changes: 1 addition & 1 deletion ...der.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='revenue_all_time') -->
<!-- metric_spec = MetricSpec(element_name='revenue_all_time', filter_spec_set=WhereFilterSpecSet()) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_0') -->
Expand Down
2 changes: 1 addition & 1 deletion ....py/DataflowPlan/test_cumulative_metric_no_window_or_grain_without_metric_time__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='revenue_all_time') -->
<!-- metric_spec = MetricSpec(element_name='revenue_all_time', filter_spec_set=WhereFilterSpecSet()) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_0') -->
Expand Down
6 changes: 4 additions & 2 deletions ...low_plan_builder.py/DataflowPlan/test_cumulative_metric_with_non_default_grain__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<WindowReaggregationNode>
<!-- description = 'Re-aggregate Metrics via Window Functions' -->
<!-- node_id = NodeId(id_str='wr_0') -->
<!-- metric_spec = MetricSpec(element_name='trailing_2_months_revenue') -->
<!-- metric_spec = -->
<!-- MetricSpec(element_name='trailing_2_months_revenue', filter_spec_set=WhereFilterSpecSet()) -->
<!-- order_by_spec = -->
<!-- TimeDimensionSpec( -->
<!-- element_name='metric_time', -->
Expand All @@ -21,7 +22,8 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='trailing_2_months_revenue') -->
<!-- metric_spec = -->
<!-- MetricSpec(element_name='trailing_2_months_revenue', filter_spec_set=WhereFilterSpecSet()) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_0') -->
Expand Down
3 changes: 2 additions & 1 deletion .../test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='trailing_2_months_revenue') -->
<!-- metric_spec = -->
<!-- MetricSpec(element_name='trailing_2_months_revenue', filter_spec_set=WhereFilterSpecSet()) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_0') -->
Expand Down
17 changes: 14 additions & 3 deletions ..._builder.py/DataflowPlan/test_derived_cumulative_metric_with_non_default_grain__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_1') -->
<!-- metric_spec = MetricSpec(element_name='trailing_2_months_revenue_sub_10') -->
<!-- metric_spec = -->
<!-- MetricSpec(element_name='trailing_2_months_revenue_sub_10', filter_spec_set=WhereFilterSpecSet()) -->
<WindowReaggregationNode>
<!-- description = 'Re-aggregate Metrics via Window Functions' -->
<!-- node_id = NodeId(id_str='wr_0') -->
<!-- metric_spec = MetricSpec(element_name='trailing_2_months_revenue', alias='t2mr') -->
<!-- metric_spec = -->
<!-- MetricSpec( -->
<!-- element_name='trailing_2_months_revenue', -->
<!-- filter_spec_set=WhereFilterSpecSet(), -->
<!-- alias='t2mr', -->
<!-- ) -->
<!-- order_by_spec = -->
<!-- TimeDimensionSpec( -->
<!-- element_name='metric_time', -->
Expand All @@ -25,7 +31,12 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='trailing_2_months_revenue', alias='t2mr') -->
<!-- metric_spec = -->
<!-- MetricSpec( -->
<!-- element_name='trailing_2_months_revenue', -->
<!-- filter_spec_set=WhereFilterSpecSet(), -->
<!-- alias='t2mr', -->
<!-- ) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_0') -->
Expand Down
14 changes: 10 additions & 4 deletions ...test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_2') -->
<!-- metric_spec = MetricSpec(element_name='bookings_growth_since_start_of_month') -->
<!-- metric_spec = -->
<!-- MetricSpec(element_name='bookings_growth_since_start_of_month', filter_spec_set=WhereFilterSpecSet()) -->
<CombineAggregatedOutputsNode>
<!-- description = 'Combine Aggregated Outputs' -->
<!-- node_id = NodeId(id_str='cao_0') -->
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='bookings') -->
<!-- metric_spec = MetricSpec(element_name='bookings', filter_spec_set=WhereFilterSpecSet()) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_0') -->
Expand Down Expand Up @@ -42,8 +43,13 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_1') -->
<!-- metric_spec = -->
<!-- MetricSpec(element_name='bookings', alias='bookings_at_start_of_month', offset_to_grain=MONTH) -->
<!-- metric_spec = -->
<!-- MetricSpec( -->
<!-- element_name='bookings', -->
<!-- filter_spec_set=WhereFilterSpecSet(), -->
<!-- alias='bookings_at_start_of_month', -->
<!-- offset_to_grain=MONTH, -->
<!-- ) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_1') -->
Expand Down
3 changes: 2 additions & 1 deletion ...s/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_1') -->
<!-- metric_spec = MetricSpec(element_name='bookings_5_day_lag') -->
<!-- metric_spec = MetricSpec(element_name='bookings_5_day_lag', filter_spec_set=WhereFilterSpecSet()) -->
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = -->
<!-- MetricSpec( -->
<!-- element_name='bookings', -->
<!-- filter_spec_set=WhereFilterSpecSet(), -->
<!-- alias='bookings_5_days_ago', -->
<!-- offset_window=PydanticMetricTimeWindow(count=5, granularity=DAY), -->
<!-- ) -->
Expand Down
3 changes: 2 additions & 1 deletion ...aflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_1') -->
<!-- metric_spec = MetricSpec(element_name='bookings_5_day_lag') -->
<!-- metric_spec = MetricSpec(element_name='bookings_5_day_lag', filter_spec_set=WhereFilterSpecSet()) -->
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = -->
<!-- MetricSpec( -->
<!-- element_name='bookings', -->
<!-- filter_spec_set=WhereFilterSpecSet(), -->
<!-- alias='bookings_5_days_ago', -->
<!-- offset_window=PydanticMetricTimeWindow(count=5, granularity=DAY), -->
<!-- ) -->
Expand Down
4 changes: 3 additions & 1 deletion ...st_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_1') -->
<!-- metric_spec = MetricSpec(element_name='every_2_days_bookers_2_days_ago') -->
<!-- metric_spec = -->
<!-- MetricSpec(element_name='every_2_days_bookers_2_days_ago', filter_spec_set=WhereFilterSpecSet()) -->
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = -->
<!-- MetricSpec( -->
<!-- element_name='every_two_days_bookers', -->
<!-- filter_spec_set=WhereFilterSpecSet(), -->
<!-- alias='every_2_days_bookers_2_days_ago', -->
<!-- offset_window=PydanticMetricTimeWindow(count=2, granularity=DAY), -->
<!-- ) -->
Expand Down
3 changes: 2 additions & 1 deletion ...er.py/DataflowPlan/test_dont_join_to_time_spine_if_no_time_dimension_requested__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='bookings_fill_nulls_with_0') -->
<!-- metric_spec = -->
<!-- MetricSpec(element_name='bookings_fill_nulls_with_0', filter_spec_set=WhereFilterSpecSet()) -->
<AggregateMeasuresNode>
<!-- description = 'Aggregate Measures' -->
<!-- node_id = NodeId(id_str='am_0') -->
Expand Down
10 changes: 8 additions & 2 deletions ...t_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,19 @@
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_2') -->
<!-- metric_spec = MetricSpec(element_name='bookings_growth_2_weeks_fill_nulls_with_0') -->
<!-- metric_spec = -->
<!-- MetricSpec( -->
<!-- element_name='bookings_growth_2_weeks_fill_nulls_with_0', -->
<!-- filter_spec_set=WhereFilterSpecSet(), -->
<!-- ) -->
<CombineAggregatedOutputsNode>
<!-- description = 'Combine Aggregated Outputs' -->
<!-- node_id = NodeId(id_str='cao_0') -->
<ComputeMetricsNode>
<!-- description = 'Compute Metrics via Expressions' -->
<!-- node_id = NodeId(id_str='cm_0') -->
<!-- metric_spec = MetricSpec(element_name='bookings_fill_nulls_with_0') -->
<!-- metric_spec = -->
<!-- MetricSpec(element_name='bookings_fill_nulls_with_0', filter_spec_set=WhereFilterSpecSet()) -->
<JoinToTimeSpineNode>
<!-- description = 'Join to Time Spine Dataset' -->
<!-- node_id = NodeId(id_str='jts_0') -->
Expand Down Expand Up @@ -61,6 +66,7 @@
<!-- metric_spec = -->
<!-- MetricSpec( -->
<!-- element_name='bookings_fill_nulls_with_0', -->
<!-- filter_spec_set=WhereFilterSpecSet(), -->
<!-- alias='bookings_2_weeks_ago', -->
<!-- offset_window=PydanticMetricTimeWindow(count=14, granularity=DAY), -->
<!-- ) -->
Expand Down
Loading

0 comments on commit 10cd7b3

Please sign in to comment.