diff options
| -rw-r--r-- | src/backend/utils/adt/float.c | 24 | ||||
| -rw-r--r-- | src/test/regress/expected/float8-exp-three-digits-win32.out | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/float8-small-is-zero.out | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/float8-small-is-zero_1.out | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/float8.out | 6 | ||||
| -rw-r--r-- | src/test/regress/sql/float8.sql | 1 |
6 files changed, 46 insertions, 3 deletions
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index 9f4afaa08b9..45a62f26161 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -1462,6 +1462,25 @@ dpow(PG_FUNCTION_ARGS) float8 result; /* + * The POSIX spec says that NaN ^ 0 = 1, and 1 ^ NaN = 1, while all other + * cases with NaN inputs yield NaN (with no error). Many older platforms + * get one or more of these cases wrong, so deal with them via explicit + * logic rather than trusting pow(3). + */ + if (isnan(arg1)) + { + if (isnan(arg2) || arg2 != 0.0) + PG_RETURN_FLOAT8(get_float8_nan()); + PG_RETURN_FLOAT8(1.0); + } + if (isnan(arg2)) + { + if (arg1 != 1.0) + PG_RETURN_FLOAT8(get_float8_nan()); + PG_RETURN_FLOAT8(1.0); + } + + /* * The SQL spec requires that we emit a particular SQLSTATE error code for * certain error conditions. Specifically, we don't return a * divide-by-zero error code for 0 ^ -1. @@ -1482,12 +1501,11 @@ dpow(PG_FUNCTION_ARGS) * and result == NaN for negative arg1 and very large arg2 (they must be * using something different from our floor() test to decide it's * invalid). Other platforms (HPPA) return errno == ERANGE and a large - * (HUGE_VAL) but finite result to signal overflow. Also, some versions - * of MSVC return errno == EDOM and result == NaN for NaN inputs. + * (HUGE_VAL) but finite result to signal overflow. */ errno = 0; result = pow(arg1, arg2); - if (errno == EDOM && isnan(result) && !isnan(arg1) && !isnan(arg2)) + if (errno == EDOM && isnan(result)) { if ((fabs(arg1) > 1 && arg2 >= 0) || (fabs(arg1) < 1 && arg2 < 0)) /* The sign of Inf is not significant in this case. */ diff --git a/src/test/regress/expected/float8-exp-three-digits-win32.out b/src/test/regress/expected/float8-exp-three-digits-win32.out index 3fe50b4bf00..3896cdec721 100644 --- a/src/test/regress/expected/float8-exp-three-digits-win32.out +++ b/src/test/regress/expected/float8-exp-three-digits-win32.out @@ -358,6 +358,12 @@ SELECT power(float8 'NaN', float8 'NaN'); NaN (1 row) +SELECT power(float8 '-1', float8 'NaN'); + power +------- + NaN +(1 row) + SELECT power(float8 '1', float8 'NaN'); power ------- diff --git a/src/test/regress/expected/float8-small-is-zero.out b/src/test/regress/expected/float8-small-is-zero.out index 46adbe1c4ba..f8e09390f51 100644 --- a/src/test/regress/expected/float8-small-is-zero.out +++ b/src/test/regress/expected/float8-small-is-zero.out @@ -362,6 +362,12 @@ SELECT power(float8 'NaN', float8 'NaN'); NaN (1 row) +SELECT power(float8 '-1', float8 'NaN'); + power +------- + NaN +(1 row) + SELECT power(float8 '1', float8 'NaN'); power ------- diff --git a/src/test/regress/expected/float8-small-is-zero_1.out b/src/test/regress/expected/float8-small-is-zero_1.out index f215eede103..ebfec4cdb68 100644 --- a/src/test/regress/expected/float8-small-is-zero_1.out +++ b/src/test/regress/expected/float8-small-is-zero_1.out @@ -362,6 +362,12 @@ SELECT power(float8 'NaN', float8 'NaN'); NaN (1 row) +SELECT power(float8 '-1', float8 'NaN'); + power +------- + NaN +(1 row) + SELECT power(float8 '1', float8 'NaN'); power ------- diff --git a/src/test/regress/expected/float8.out b/src/test/regress/expected/float8.out index 7159e78d4a7..b05831d45c9 100644 --- a/src/test/regress/expected/float8.out +++ b/src/test/regress/expected/float8.out @@ -358,6 +358,12 @@ SELECT power(float8 'NaN', float8 'NaN'); NaN (1 row) +SELECT power(float8 '-1', float8 'NaN'); + power +------- + NaN +(1 row) + SELECT power(float8 '1', float8 'NaN'); power ------- diff --git a/src/test/regress/sql/float8.sql b/src/test/regress/sql/float8.sql index 5510fe9d345..eeebddd4b78 100644 --- a/src/test/regress/sql/float8.sql +++ b/src/test/regress/sql/float8.sql @@ -111,6 +111,7 @@ SELECT power(float8 '144', float8 '0.5'); SELECT power(float8 'NaN', float8 '0.5'); SELECT power(float8 '144', float8 'NaN'); SELECT power(float8 'NaN', float8 'NaN'); +SELECT power(float8 '-1', float8 'NaN'); SELECT power(float8 '1', float8 'NaN'); SELECT power(float8 'NaN', float8 '0'); |