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.

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

fix(sf|quadbin): QUADBIN_FROMLONGLAT not clamping latitudes and return some quadbin functions return NULL when NULL parameters #456

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions clouds/snowflake/modules/sql/quadbin/QUADBIN_FROMLONGLAT.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----------------------------
-- Copyright (C) 2022 CARTO
----------------------------
--------------------------------
-- Copyright (C) 2022-2023 CARTO
--------------------------------

CREATE OR REPLACE SECURE FUNCTION @@SF_SCHEMA@@.QUADBIN_FROMLONGLAT
(longitude FLOAT, latitude FLOAT, resolution INT)
Expand All @@ -16,13 +16,13 @@ AS $$
SELECT
resolution AS z,
ACOS(-1) AS PI,
GREATEST(-85.05, LEAST(85.05, latitude)) AS latitude
GREATEST(-85.05, LEAST(85.05, latitude)) AS params_latitude
),
__zxy AS (
SELECT
z,
bitand( CAST(FLOOR(BITSHIFTLEFT(1, z) * ((longitude / 360.0) + 0.5)) AS INT), (BITSHIFTLEFT(1, z) - 1)) AS x,
bitand( CAST(FLOOR(BITSHIFTLEFT(1, z) * (0.5 - (LN(TAN(PI/4.0 + latitude/2.0 * PI/180.0)) / (2*PI)))) AS INT),
BITAND( CAST(FLOOR(BITSHIFTLEFT(1, z) * ((longitude / 360.0) + 0.5)) AS INT), (BITSHIFTLEFT(1, z) - 1)) AS x,
BITAND( CAST(FLOOR(BITSHIFTLEFT(1, z) * (0.5 - (LN(TAN(PI/4.0 + params_latitude/2.0 * PI/180.0)) / (2*PI)))) AS INT),
(BITSHIFTLEFT(1, z) - 1)) AS y
FROM __params
)
Expand Down
11 changes: 7 additions & 4 deletions clouds/snowflake/modules/sql/quadbin/QUADBIN_FROMQUADKEY.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----------------------------
-- Copyright (C) 2022 CARTO
----------------------------
--------------------------------
-- Copyright (C) 2022-2023 CARTO
--------------------------------

CREATE OR REPLACE FUNCTION @@SF_SCHEMA@@._QUADBIN_FROMQUADKEY
(quadkey STRING)
Expand All @@ -22,5 +22,8 @@ CREATE OR REPLACE FUNCTION @@SF_SCHEMA@@.QUADBIN_FROMQUADKEY
RETURNS BIGINT
IMMUTABLE
AS $$
SELECT CAST(@@SF_SCHEMA@@._QUADBIN_FROMQUADKEY(QUADKEY) AS BIGINT)
IFF(quadkey IS NULL,
NULL,
CAST(@@SF_SCHEMA@@._QUADBIN_FROMQUADKEY(QUADKEY) AS BIGINT)
)
$$;
13 changes: 8 additions & 5 deletions clouds/snowflake/modules/sql/quadbin/QUADBIN_FROMZXY.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----------------------------
-- Copyright (C) 2022 CARTO
----------------------------
--------------------------------
-- Copyright (C) 2022-2023 CARTO
--------------------------------

CREATE OR REPLACE FUNCTION @@SF_SCHEMA@@._QUADBIN_FROMZXY
(z DOUBLE, x DOUBLE, y DOUBLE)
Expand All @@ -25,7 +25,10 @@ CREATE OR REPLACE SECURE FUNCTION @@SF_SCHEMA@@.QUADBIN_FROMZXY
RETURNS BIGINT
IMMUTABLE
AS $$
@@SF_SCHEMA@@._QUADBIN_STRING_TOINT(
@@SF_SCHEMA@@._QUADBIN_FROMZXY(Z, X, Y)
IFF(z IS NULL OR x IS NULL OR y IS NULL,
NULL,
@@SF_SCHEMA@@._QUADBIN_STRING_TOINT(
@@SF_SCHEMA@@._QUADBIN_FROMZXY(Z, X, Y)
)
)
$$;
11 changes: 7 additions & 4 deletions clouds/snowflake/modules/sql/quadbin/QUADBIN_KRING.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----------------------------
-- Copyright (C) 2022 CARTO
----------------------------
--------------------------------
-- Copyright (C) 2022-2023 CARTO
--------------------------------

-- The function returns a STRING for two main issues related with Snowflake limitations
-- 1. Snowflake has a native support of BigInt numbers, however, if the UDF
Expand All @@ -14,5 +14,8 @@ CREATE OR REPLACE SECURE FUNCTION @@SF_SCHEMA@@.QUADBIN_KRING
RETURNS ARRAY
IMMUTABLE
AS $$
TO_ARRAY(PARSE_JSON(@@SF_SCHEMA@@._QUADBIN_KRING(TO_VARCHAR(ORIGIN, 'xxxxxxxxxxxxxxxx'), SIZE, false)))
IFF(origin IS NULL OR size IS NULL,
NULL,
TO_ARRAY(PARSE_JSON(@@SF_SCHEMA@@._QUADBIN_KRING(TO_VARCHAR(ORIGIN, 'xxxxxxxxxxxxxxxx'), SIZE, false)))
)
$$;
11 changes: 7 additions & 4 deletions clouds/snowflake/modules/sql/quadbin/QUADBIN_KRING_DISTANCES.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----------------------------
-- Copyright (C) 2022 CARTO
----------------------------
--------------------------------
-- Copyright (C) 2022-2023 CARTO
--------------------------------

-- The function returns a STRING for two main issues related with Snowflake limitations
-- 1. Snowflake has a native support of BigInt numbers, however, if the UDF
Expand All @@ -14,5 +14,8 @@ CREATE OR REPLACE SECURE FUNCTION @@SF_SCHEMA@@.QUADBIN_KRING_DISTANCES
RETURNS ARRAY
IMMUTABLE
AS $$
TO_ARRAY(PARSE_JSON(@@SF_SCHEMA@@._QUADBIN_KRING(TO_VARCHAR(ORIGIN, 'xxxxxxxxxxxxxxxx'), SIZE, true)))
IFF(origin IS NULL OR size IS NULL,
NULL,
TO_ARRAY(PARSE_JSON(@@SF_SCHEMA@@._QUADBIN_KRING(TO_VARCHAR(ORIGIN, 'xxxxxxxxxxxxxxxx'), SIZE, true)))
)
$$;
33 changes: 18 additions & 15 deletions clouds/snowflake/modules/sql/quadbin/QUADBIN_SIBLING.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----------------------------
-- Copyright (C) 2022 CARTO
----------------------------
--------------------------------
-- Copyright (C) 2022-2023 CARTO
--------------------------------

-- FIXME: slow

Expand All @@ -9,16 +9,19 @@ CREATE OR REPLACE SECURE FUNCTION @@SF_SCHEMA@@.QUADBIN_SIBLING
RETURNS INT
IMMUTABLE
AS $$
CASE direction
WHEN 'left' THEN
@@SF_SCHEMA@@._QUADBIN_SIBLING(quadbin, -1, 0)
WHEN 'right' THEN
@@SF_SCHEMA@@._QUADBIN_SIBLING(quadbin, 1, 0)
WHEN 'up' THEN
@@SF_SCHEMA@@._QUADBIN_SIBLING(quadbin, 0, -1)
WHEN 'down' THEN
@@SF_SCHEMA@@._QUADBIN_SIBLING(quadbin, 0, 1)
ELSE
NULL
END
IFF(quadbin IS NULL OR direction IS NULL,
NULL,
CASE direction
WHEN 'left' THEN
@@SF_SCHEMA@@._QUADBIN_SIBLING(quadbin, -1, 0)
WHEN 'right' THEN
@@SF_SCHEMA@@._QUADBIN_SIBLING(quadbin, 1, 0)
WHEN 'up' THEN
@@SF_SCHEMA@@._QUADBIN_SIBLING(quadbin, 0, -1)
WHEN 'down' THEN
@@SF_SCHEMA@@._QUADBIN_SIBLING(quadbin, 0, 1)
ELSE
NULL
END
)
$$;
37 changes: 21 additions & 16 deletions clouds/snowflake/modules/sql/quadbin/QUADBIN_TOPARENT.sql
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
----------------------------
-- Copyright (C) 2022 CARTO
----------------------------
--------------------------------
-- Copyright (C) 2022-2023 CARTO
--------------------------------

CREATE OR REPLACE SECURE FUNCTION @@SF_SCHEMA@@.QUADBIN_TOPARENT
(quadbin BIGINT, resolution INT)
RETURNS BIGINT
IMMUTABLE
AS $$
SELECT bitor(
bitor(
bitand(
quadbin,
bitnot(
bitshiftleft(31, 52)
)
IFF(quadbin IS NULL OR resolution IS NULL OR resolution < 0 OR resolution > 26,
NULL,
(
SELECT bitor(
bitor(
bitand(
quadbin,
bitnot(
bitshiftleft(31, 52)
)
),
bitshiftleft(resolution, 52)
),
bitshiftleft(resolution, 52)
),
bitshiftright(
4503599627370495,
resolution * 2
bitshiftright(
4503599627370495,
resolution * 2
)
)
)
)
)
$$;
11 changes: 7 additions & 4 deletions clouds/snowflake/modules/sql/quadbin/QUADBIN_TOQUADKEY.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----------------------------
-- Copyright (C) 2022 CARTO
----------------------------
--------------------------------
-- Copyright (C) 2022-2023 CARTO
--------------------------------

CREATE OR REPLACE FUNCTION @@SF_SCHEMA@@._QUADBIN_TOQUADKEY
(quadbin STRING)
Expand All @@ -20,5 +20,8 @@ CREATE OR REPLACE FUNCTION @@SF_SCHEMA@@.QUADBIN_TOQUADKEY
RETURNS STRING
IMMUTABLE
AS $$
SELECT @@SF_SCHEMA@@._QUADBIN_TOQUADKEY(CAST(QUADBIN AS STRING))
IFF(quadbin IS NULL,
NULL,
@@SF_SCHEMA@@._QUADBIN_TOQUADKEY(CAST(QUADBIN AS STRING))
)
$$;
11 changes: 7 additions & 4 deletions clouds/snowflake/modules/sql/quadbin/QUADBIN_TOZXY.sql
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
----------------------------
-- Copyright (C) 2022 CARTO
----------------------------
--------------------------------
-- Copyright (C) 2022-2023 CARTO
--------------------------------


CREATE OR REPLACE SECURE FUNCTION @@SF_SCHEMA@@.QUADBIN_TOZXY
(quadbin BIGINT)
RETURNS OBJECT
IMMUTABLE
AS $$
@@SF_SCHEMA@@._QUADBIN_TOZXY(TO_VARCHAR(QUADBIN, 'xxxxxxxxxxxxxxxx'))
IFF(quadbin IS NULL,
NULL,
@@SF_SCHEMA@@._QUADBIN_TOZXY(TO_VARCHAR(QUADBIN, 'xxxxxxxxxxxxxxxx'))
)
$$;