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.

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

Update SqlWindowFunction enum #1266

Merged
merged 2 commits into from
Jun 12, 2024
Merged

Update SqlWindowFunction enum #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5cb489
Update SqlWindowFunction enum
courtneyholcomb Jun 12, 2024
95db3fa
Update SQL snapshots
courtneyholcomb Jun 12, 2024
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
5 changes: 3 additions & 2 deletions metricflow/sql/sql_exprs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,8 +944,9 @@ class SqlWindowFunction(Enum):
Values are the SQL string to be used in rendering.
"""

FIRST_VALUE = "first_value"
ROW_NUMBER = "row_number"
FIRST_VALUE = "FIRST_VALUE"
LAST_VALUE = "LAST_VALUE"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to include this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which part? The uppercasing?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the last_value enum

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes! Sorry forgot to include in the PR description! Will also be used for non-default granularities with cumulative metrics. We could use FIRST_VALUE and order desc, but I decided this was more readable because it aligns with the YAML argument names (which are first/last).

AVERAGE = "AVG"


@dataclass(frozen=True)
Expand Down
8 changes: 4 additions & 4 deletions ...st_conversion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,31 +130,31 @@ FROM (
FROM (
-- Dedupe the fanout with mf_internal_uuid in the conversion data set
SELECT DISTINCT
first_value(subq_7.visits) OVER (
FIRST_VALUE(subq_7.visits) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visits
, first_value(subq_7.ds__day) OVER (
, FIRST_VALUE(subq_7.ds__day) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS ds__day
, first_value(subq_7.metric_time__day) OVER (
, FIRST_VALUE(subq_7.metric_time__day) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS metric_time__day
, first_value(subq_7.user) OVER (
, FIRST_VALUE(subq_7.user) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
Expand Down
8 changes: 4 additions & 4 deletions ...ion_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric__plan0_optimized.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,31 @@ FROM (
FROM (
-- Dedupe the fanout with mf_internal_uuid in the conversion data set
SELECT DISTINCT
first_value(subq_23.visits) OVER (
FIRST_VALUE(subq_23.visits) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visits
, first_value(subq_23.ds__day) OVER (
, FIRST_VALUE(subq_23.ds__day) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS ds__day
, first_value(subq_23.metric_time__day) OVER (
, FIRST_VALUE(subq_23.metric_time__day) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS metric_time__day
, first_value(subq_23.user) OVER (
, FIRST_VALUE(subq_23.user) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
Expand Down
10 changes: 5 additions & 5 deletions ...dering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,39 +139,39 @@ FROM (
FROM (
-- Dedupe the fanout with mf_internal_uuid in the conversion data set
SELECT DISTINCT
first_value(subq_7.visits) OVER (
FIRST_VALUE(subq_7.visits) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visits
, first_value(subq_7.visit__referrer_id) OVER (
, FIRST_VALUE(subq_7.visit__referrer_id) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visit__referrer_id
, first_value(subq_7.ds__day) OVER (
, FIRST_VALUE(subq_7.ds__day) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS ds__day
, first_value(subq_7.metric_time__day) OVER (
, FIRST_VALUE(subq_7.metric_time__day) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS metric_time__day
, first_value(subq_7.user) OVER (
, FIRST_VALUE(subq_7.user) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
Expand Down
10 changes: 5 additions & 5 deletions ...SqlQueryPlan/BigQuery/test_conversion_metric_with_categorical_filter__plan0_optimized.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,39 +43,39 @@ FROM (
FROM (
-- Dedupe the fanout with mf_internal_uuid in the conversion data set
SELECT DISTINCT
first_value(subq_23.visits) OVER (
FIRST_VALUE(subq_23.visits) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visits
, first_value(subq_23.visit__referrer_id) OVER (
, FIRST_VALUE(subq_23.visit__referrer_id) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visit__referrer_id
, first_value(subq_23.ds__day) OVER (
, FIRST_VALUE(subq_23.ds__day) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS ds__day
, first_value(subq_23.metric_time__day) OVER (
, FIRST_VALUE(subq_23.metric_time__day) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS metric_time__day
, first_value(subq_23.user) OVER (
, FIRST_VALUE(subq_23.user) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
Expand Down
8 changes: 4 additions & 4 deletions ...rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,31 +176,31 @@ FROM (
FROM (
-- Dedupe the fanout with mf_internal_uuid in the conversion data set
SELECT DISTINCT
first_value(subq_13.visits) OVER (
FIRST_VALUE(subq_13.visits) OVER (
PARTITION BY
subq_16.user
, subq_16.ds__day
, subq_16.mf_internal_uuid
ORDER BY subq_13.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visits
, first_value(subq_13.visit__referrer_id) OVER (
, FIRST_VALUE(subq_13.visit__referrer_id) OVER (
PARTITION BY
subq_16.user
, subq_16.ds__day
, subq_16.mf_internal_uuid
ORDER BY subq_13.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visit__referrer_id
, first_value(subq_13.ds__day) OVER (
, FIRST_VALUE(subq_13.ds__day) OVER (
PARTITION BY
subq_16.user
, subq_16.ds__day
, subq_16.mf_internal_uuid
ORDER BY subq_13.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS ds__day
, first_value(subq_13.user) OVER (
, FIRST_VALUE(subq_13.user) OVER (
PARTITION BY
subq_16.user
, subq_16.ds__day
Expand Down
8 changes: 4 additions & 4 deletions ...py/SqlQueryPlan/BigQuery/test_conversion_metric_with_time_constraint__plan0_optimized.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,31 @@ FROM (
FROM (
-- Dedupe the fanout with mf_internal_uuid in the conversion data set
SELECT DISTINCT
first_value(subq_31.visits) OVER (
FIRST_VALUE(subq_31.visits) OVER (
PARTITION BY
subq_34.user
, subq_34.ds__day
, subq_34.mf_internal_uuid
ORDER BY subq_31.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visits
, first_value(subq_31.visit__referrer_id) OVER (
, FIRST_VALUE(subq_31.visit__referrer_id) OVER (
PARTITION BY
subq_34.user
, subq_34.ds__day
, subq_34.mf_internal_uuid
ORDER BY subq_31.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visit__referrer_id
, first_value(subq_31.ds__day) OVER (
, FIRST_VALUE(subq_31.ds__day) OVER (
PARTITION BY
subq_34.user
, subq_34.ds__day
, subq_34.mf_internal_uuid
ORDER BY subq_31.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS ds__day
, first_value(subq_31.user) OVER (
, FIRST_VALUE(subq_31.user) OVER (
PARTITION BY
subq_34.user
, subq_34.ds__day
Expand Down
8 changes: 4 additions & 4 deletions ...n_metric_rendering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,31 +130,31 @@ FROM (
FROM (
-- Dedupe the fanout with mf_internal_uuid in the conversion data set
SELECT DISTINCT
first_value(subq_7.visits) OVER (
FIRST_VALUE(subq_7.visits) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visits
, first_value(subq_7.ds__day) OVER (
, FIRST_VALUE(subq_7.ds__day) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS ds__day
, first_value(subq_7.metric_time__day) OVER (
, FIRST_VALUE(subq_7.metric_time__day) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
, subq_10.mf_internal_uuid
ORDER BY subq_7.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS metric_time__day
, first_value(subq_7.user) OVER (
, FIRST_VALUE(subq_7.user) OVER (
PARTITION BY
subq_10.user
, subq_10.ds__day
Expand Down
8 changes: 4 additions & 4 deletions ...endering.py/SqlQueryPlan/BigQuery/test_conversion_metric_with_window__plan0_optimized.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,31 @@ FROM (
FROM (
-- Dedupe the fanout with mf_internal_uuid in the conversion data set
SELECT DISTINCT
first_value(subq_23.visits) OVER (
FIRST_VALUE(subq_23.visits) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visits
, first_value(subq_23.ds__day) OVER (
, FIRST_VALUE(subq_23.ds__day) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS ds__day
, first_value(subq_23.metric_time__day) OVER (
, FIRST_VALUE(subq_23.metric_time__day) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
, subq_26.mf_internal_uuid
ORDER BY subq_23.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS metric_time__day
, first_value(subq_23.user) OVER (
, FIRST_VALUE(subq_23.user) OVER (
PARTITION BY
subq_26.user
, subq_26.ds__day
Expand Down
10 changes: 5 additions & 5 deletions ...y/SqlQueryPlan/BigQuery/test_conversion_metric_with_window_and_time_constraint__plan0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,39 +185,39 @@ FROM (
FROM (
-- Dedupe the fanout with mf_internal_uuid in the conversion data set
SELECT DISTINCT
first_value(subq_13.visits) OVER (
FIRST_VALUE(subq_13.visits) OVER (
PARTITION BY
subq_16.user
, subq_16.ds__day
, subq_16.mf_internal_uuid
ORDER BY subq_13.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visits
, first_value(subq_13.visit__referrer_id) OVER (
, FIRST_VALUE(subq_13.visit__referrer_id) OVER (
PARTITION BY
subq_16.user
, subq_16.ds__day
, subq_16.mf_internal_uuid
ORDER BY subq_13.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS visit__referrer_id
, first_value(subq_13.ds__day) OVER (
, FIRST_VALUE(subq_13.ds__day) OVER (
PARTITION BY
subq_16.user
, subq_16.ds__day
, subq_16.mf_internal_uuid
ORDER BY subq_13.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS ds__day
, first_value(subq_13.metric_time__day) OVER (
, FIRST_VALUE(subq_13.metric_time__day) OVER (
PARTITION BY
subq_16.user
, subq_16.ds__day
, subq_16.mf_internal_uuid
ORDER BY subq_13.ds__day DESC
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) AS metric_time__day
, first_value(subq_13.user) OVER (
, FIRST_VALUE(subq_13.user) OVER (
PARTITION BY
subq_16.user
, subq_16.ds__day
Expand Down
Loading
Loading