git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix numeric width_bucket() to allow its first argument to be infinite.

Thu, 8 Oct 2020 16:37:59 +0000 (12:37 -0400)

While the calculation is not well-defined if the bounds arguments are
infinite, there is a perfectly sane outcome if the test operand is
infinite: it's just like any other value that's before the first bucket
or after the last one. width_bucket_float8() got this right, but
I was too hasty about the case when adding infinities to numerics
(commit a57d312a7), so that width_bucket_numeric() just rejected it.
Fix that, and sync the relevant error message strings.

No back-patch needed, since infinities-in-numeric haven't shipped yet.

Discussion: https://postgr.es/m/2465409.1602170063@sss.pgh.pa.us

src/backend/utils/adt/numeric.c patch | blob | blame | history

src/test/regress/expected/numeric.out patch | blob | blame | history

src/test/regress/sql/numeric.sql patch | blob | blame | history

diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c

index 27d65557dfa9ebd199dc5c71cc681f165d3e9e03..a4692d8cfc059f9c21c4a89b536788e20b7c3b35 100644 (file)

--- a/src/backend/utils/adt/numeric.c

+++ b/src/backend/utils/adt/numeric.c

@@ -1724,10 +1724,11 @@ width_bucket_numeric(PG_FUNCTION_ARGS)

ereport(ERROR,

(errcode(ERRCODE_INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION),

errmsg("operand, lower bound, and upper bound cannot be NaN")));

- else

+ /* We allow "operand" to be infinite; cmp_numerics will cope */

+ if (NUMERIC_IS_INF(bound1) || NUMERIC_IS_INF(bound2))

ereport(ERROR,

(errcode(ERRCODE_INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION),

- errmsg("operand, lower bound, and upper bound cannot be infinity")));

+ errmsg("lower and upper bounds must be finite")));

}

init_var(&result_var);

diff --git a/src/test/regress/expected/numeric.out b/src/test/regress/expected/numeric.out

index 823f3fbccf517ca5b2332b5e2ea068c07f410430..70d6cfe4232c6c4245a1e9e2469e567ce8003ec1 100644 (file)

--- a/src/test/regress/expected/numeric.out

+++ b/src/test/regress/expected/numeric.out

@@ -1316,10 +1316,8 @@ SELECT width_bucket('NaN', 3.0, 4.0, 888);

ERROR: operand, lower bound, and upper bound cannot be NaN

SELECT width_bucket(0::float8, 'NaN', 4.0::float8, 888);

ERROR: operand, lower bound, and upper bound cannot be NaN

-SELECT width_bucket('inf', 3.0, 4.0, 888);

-ERROR: operand, lower bound, and upper bound cannot be infinity

SELECT width_bucket(2.0, 3.0, '-inf', 888);

-ERROR: operand, lower bound, and upper bound cannot be infinity

+ERROR: lower and upper bounds must be finite

SELECT width_bucket(0::float8, '-inf', 4.0::float8, 888);

ERROR: lower and upper bounds must be finite

-- normal operation

@@ -1362,8 +1360,19 @@ SELECT

10.0000000000001 | 6 | 6 | 0 | 0 | 5 | 5 | 21 | 21 | 8 | 8

(19 rows)

--- for float8 only, check positive and negative infinity: we require

+-- Check positive and negative infinity: we require

-- finite bucket bounds, but allow an infinite operand

+SELECT width_bucket(0.0::numeric, 'Infinity'::numeric, 5, 10); -- error

+ERROR: lower and upper bounds must be finite

+SELECT width_bucket(0.0::numeric, 5, '-Infinity'::numeric, 20); -- error

+ERROR: lower and upper bounds must be finite

+SELECT width_bucket('Infinity'::numeric, 1, 10, 10),

+ width_bucket('-Infinity'::numeric, 1, 10, 10);

+ width_bucket | width_bucket

+--------------+--------------

+ 11 | 0

+(1 row)

SELECT width_bucket(0.0::float8, 'Infinity'::float8, 5, 10); -- error

ERROR: lower and upper bounds must be finite

SELECT width_bucket(0.0::float8, 5, '-Infinity'::float8, 20); -- error

diff --git a/src/test/regress/sql/numeric.sql b/src/test/regress/sql/numeric.sql

index 5eac895e86e17000a3a2d20887c6c966709937b7..520e23a9f554c09fb7a6323da5c4b3f12f36aad7 100644 (file)

--- a/src/test/regress/sql/numeric.sql

+++ b/src/test/regress/sql/numeric.sql

@@ -831,7 +831,6 @@ SELECT width_bucket(5.0::float8, 3.0::float8, 4.0::float8, -5);

SELECT width_bucket(3.5::float8, 3.0::float8, 3.0::float8, 888);

SELECT width_bucket('NaN', 3.0, 4.0, 888);

SELECT width_bucket(0::float8, 'NaN', 4.0::float8, 888);

-SELECT width_bucket('inf', 3.0, 4.0, 888);

SELECT width_bucket(2.0, 3.0, '-inf', 888);

SELECT width_bucket(0::float8, '-inf', 4.0::float8, 888);

@@ -876,8 +875,12 @@ SELECT

width_bucket(operand_f8, -25, 25, 10) AS wb_5f

FROM width_bucket_test;

--- for float8 only, check positive and negative infinity: we require

+-- Check positive and negative infinity: we require

-- finite bucket bounds, but allow an infinite operand

+SELECT width_bucket(0.0::numeric, 'Infinity'::numeric, 5, 10); -- error

+SELECT width_bucket(0.0::numeric, 5, '-Infinity'::numeric, 20); -- error

+SELECT width_bucket('Infinity'::numeric, 1, 10, 10),

+ width_bucket('-Infinity'::numeric, 1, 10, 10);

SELECT width_bucket(0.0::float8, 'Infinity'::float8, 5, 10); -- error

SELECT width_bucket(0.0::float8, 5, '-Infinity'::float8, 20); -- error

SELECT width_bucket('Infinity'::float8, 1, 10, 10),

This is the main PostgreSQL git repository.

RSS Atom