From 3476a202b72fd280092afc76ef49664c2a969e0a Mon Sep 17 00:00:00 2001 From: jian he Date: Tue, 9 Dec 2025 14:36:39 +0800 Subject: [PATCH v18 18/23] refactor float_overflow_error,float_underflow_error,float_zero_divide_error discussion: https://postgr.es/m/CADkLM=fv1JfY4Ufa-jcwwNbjQixNViskQ8jZu3Tz_p656i_4hQ@mail.gmail.com --- contrib/btree_gist/btree_float4.c | 2 +- contrib/btree_gist/btree_float8.c | 4 +- src/backend/utils/adt/float.c | 104 +++++++++++++++--------------- src/include/utils/float.h | 34 +++++----- 4 files changed, 72 insertions(+), 72 deletions(-) diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c index d9c859835da..a7325a7bb29 100644 --- a/contrib/btree_gist/btree_float4.c +++ b/contrib/btree_gist/btree_float4.c @@ -101,7 +101,7 @@ float4_dist(PG_FUNCTION_ARGS) r = a - b; if (unlikely(isinf(r)) && !isinf(a) && !isinf(b)) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT4(fabsf(r)); } diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c index 567beede178..7c99b84de35 100644 --- a/contrib/btree_gist/btree_float8.c +++ b/contrib/btree_gist/btree_float8.c @@ -79,7 +79,7 @@ gbt_float8_dist(const void *a, const void *b, FmgrInfo *flinfo) r = arg1 - arg2; if (unlikely(isinf(r)) && !isinf(arg1) && !isinf(arg2)) - float_overflow_error(); + float_overflow_error(NULL); return fabs(r); } @@ -109,7 +109,7 @@ float8_dist(PG_FUNCTION_ARGS) r = a - b; if (unlikely(isinf(r)) && !isinf(a) && !isinf(b)) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(fabs(r)); } diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index 502398d29ec..5b71c40b00c 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -83,25 +83,25 @@ static void init_degree_constants(void); * This does mean that you don't get a useful error location indicator. */ pg_noinline void -float_overflow_error(void) +float_overflow_error(struct Node *escontext) { - ereport(ERROR, + errsave(escontext, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), errmsg("value out of range: overflow"))); } pg_noinline void -float_underflow_error(void) +float_underflow_error(struct Node *escontext) { - ereport(ERROR, + errsave(escontext, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), errmsg("value out of range: underflow"))); } pg_noinline void -float_zero_divide_error(void) +float_zero_divide_error(struct Node *escontext) { - ereport(ERROR, + errsave(escontext, (errcode(ERRCODE_DIVISION_BY_ZERO), errmsg("division by zero"))); } @@ -1460,9 +1460,9 @@ dsqrt(PG_FUNCTION_ARGS) result = sqrt(arg1); if (unlikely(isinf(result)) && !isinf(arg1)) - float_overflow_error(); + float_overflow_error(NULL); if (unlikely(result == 0.0) && arg1 != 0.0) - float_underflow_error(); + float_underflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -1479,9 +1479,9 @@ dcbrt(PG_FUNCTION_ARGS) result = cbrt(arg1); if (unlikely(isinf(result)) && !isinf(arg1)) - float_overflow_error(); + float_overflow_error(NULL); if (unlikely(result == 0.0) && arg1 != 0.0) - float_underflow_error(); + float_underflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -1617,24 +1617,24 @@ dpow(PG_FUNCTION_ARGS) if (absx == 1.0) result = 1.0; else if (arg2 >= 0.0 ? (absx > 1.0) : (absx < 1.0)) - float_overflow_error(); + float_overflow_error(NULL); else - float_underflow_error(); + float_underflow_error(NULL); } } else if (errno == ERANGE) { if (result != 0.0) - float_overflow_error(); + float_overflow_error(NULL); else - float_underflow_error(); + float_underflow_error(NULL); } else { if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); if (unlikely(result == 0.0) && arg1 != 0.0) - float_underflow_error(); + float_underflow_error(NULL); } } @@ -1674,14 +1674,14 @@ dexp(PG_FUNCTION_ARGS) if (unlikely(errno == ERANGE)) { if (result != 0.0) - float_overflow_error(); + float_overflow_error(NULL); else - float_underflow_error(); + float_underflow_error(NULL); } else if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); else if (unlikely(result == 0.0)) - float_underflow_error(); + float_underflow_error(NULL); } PG_RETURN_FLOAT8(result); @@ -1712,9 +1712,9 @@ dlog1(PG_FUNCTION_ARGS) result = log(arg1); if (unlikely(isinf(result)) && !isinf(arg1)) - float_overflow_error(); + float_overflow_error(NULL); if (unlikely(result == 0.0) && arg1 != 1.0) - float_underflow_error(); + float_underflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -1745,9 +1745,9 @@ dlog10(PG_FUNCTION_ARGS) result = log10(arg1); if (unlikely(isinf(result)) && !isinf(arg1)) - float_overflow_error(); + float_overflow_error(NULL); if (unlikely(result == 0.0) && arg1 != 1.0) - float_underflow_error(); + float_underflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -1778,7 +1778,7 @@ dacos(PG_FUNCTION_ARGS) result = acos(arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -1809,7 +1809,7 @@ dasin(PG_FUNCTION_ARGS) result = asin(arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -1835,7 +1835,7 @@ datan(PG_FUNCTION_ARGS) */ result = atan(arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -1861,7 +1861,7 @@ datan2(PG_FUNCTION_ARGS) */ result = atan2(arg1, arg2); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -1902,7 +1902,7 @@ dcos(PG_FUNCTION_ARGS) (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), errmsg("input is out of range"))); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -1957,7 +1957,7 @@ dsin(PG_FUNCTION_ARGS) (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), errmsg("input is out of range"))); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2137,7 +2137,7 @@ dacosd(PG_FUNCTION_ARGS) result = 90.0 + asind_q1(-arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2174,7 +2174,7 @@ dasind(PG_FUNCTION_ARGS) result = -asind_q1(-arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2206,7 +2206,7 @@ datand(PG_FUNCTION_ARGS) result = (atan_arg1 / atan_1_0) * 45.0; if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2242,7 +2242,7 @@ datan2d(PG_FUNCTION_ARGS) result = (atan2_arg1_arg2 / atan_1_0) * 45.0; if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2365,7 +2365,7 @@ dcosd(PG_FUNCTION_ARGS) result = sign * cosd_q1(arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2487,7 +2487,7 @@ dsind(PG_FUNCTION_ARGS) result = sign * sind_q1(arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2645,7 +2645,7 @@ dcosh(PG_FUNCTION_ARGS) result = get_float8_infinity(); if (unlikely(result == 0.0)) - float_underflow_error(); + float_underflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2665,7 +2665,7 @@ dtanh(PG_FUNCTION_ARGS) result = tanh(arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2765,7 +2765,7 @@ derf(PG_FUNCTION_ARGS) result = erf(arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2785,7 +2785,7 @@ derfc(PG_FUNCTION_ARGS) result = erfc(arg1); if (unlikely(isinf(result))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -2814,7 +2814,7 @@ dgamma(PG_FUNCTION_ARGS) /* Per POSIX, an input of -Inf causes a domain error */ if (arg1 < 0) { - float_overflow_error(); + float_overflow_error(NULL); result = get_float8_nan(); /* keep compiler quiet */ } else @@ -2836,12 +2836,12 @@ dgamma(PG_FUNCTION_ARGS) if (errno != 0 || isinf(result) || isnan(result)) { if (result != 0.0) - float_overflow_error(); + float_overflow_error(NULL); else - float_underflow_error(); + float_underflow_error(NULL); } else if (result == 0.0) - float_underflow_error(); + float_underflow_error(NULL); } PG_RETURN_FLOAT8(result); @@ -2873,7 +2873,7 @@ dlgamma(PG_FUNCTION_ARGS) * to report overflow, but it should never underflow. */ if (errno == ERANGE || (isinf(result) && !isinf(arg1))) - float_overflow_error(); + float_overflow_error(NULL); PG_RETURN_FLOAT8(result); } @@ -3013,7 +3013,7 @@ float8_combine(PG_FUNCTION_ARGS) tmp = Sx1 / N1 - Sx2 / N2; Sxx = Sxx1 + Sxx2 + N1 * N2 * tmp * tmp / N; if (unlikely(isinf(Sxx)) && !isinf(Sxx1) && !isinf(Sxx2)) - float_overflow_error(); + float_overflow_error(NULL); } /* @@ -3080,7 +3080,7 @@ float8_accum(PG_FUNCTION_ARGS) if (isinf(Sx) || isinf(Sxx)) { if (!isinf(transvalues[1]) && !isinf(newval)) - float_overflow_error(); + float_overflow_error(NULL); Sxx = get_float8_nan(); } @@ -3163,7 +3163,7 @@ float4_accum(PG_FUNCTION_ARGS) if (isinf(Sx) || isinf(Sxx)) { if (!isinf(transvalues[1]) && !isinf(newval)) - float_overflow_error(); + float_overflow_error(NULL); Sxx = get_float8_nan(); } @@ -3430,7 +3430,7 @@ float8_regr_accum(PG_FUNCTION_ARGS) (isinf(Sxy) && !isinf(transvalues[1]) && !isinf(newvalX) && !isinf(transvalues[3]) && !isinf(newvalY))) - float_overflow_error(); + float_overflow_error(NULL); if (isinf(Sxx)) Sxx = get_float8_nan(); @@ -3603,15 +3603,15 @@ float8_regr_combine(PG_FUNCTION_ARGS) tmp1 = Sx1 / N1 - Sx2 / N2; Sxx = Sxx1 + Sxx2 + N1 * N2 * tmp1 * tmp1 / N; if (unlikely(isinf(Sxx)) && !isinf(Sxx1) && !isinf(Sxx2)) - float_overflow_error(); + float_overflow_error(NULL); Sy = float8_pl(Sy1, Sy2); tmp2 = Sy1 / N1 - Sy2 / N2; Syy = Syy1 + Syy2 + N1 * N2 * tmp2 * tmp2 / N; if (unlikely(isinf(Syy)) && !isinf(Syy1) && !isinf(Syy2)) - float_overflow_error(); + float_overflow_error(NULL); Sxy = Sxy1 + Sxy2 + N1 * N2 * tmp1 * tmp2 / N; if (unlikely(isinf(Sxy)) && !isinf(Sxy1) && !isinf(Sxy2)) - float_overflow_error(); + float_overflow_error(NULL); if (float8_eq(Cx1, Cx2)) Cx = Cx1; else diff --git a/src/include/utils/float.h b/src/include/utils/float.h index b340678ca92..d2e989960a5 100644 --- a/src/include/utils/float.h +++ b/src/include/utils/float.h @@ -30,9 +30,9 @@ extern PGDLLIMPORT int extra_float_digits; /* * Utility functions in float.c */ -pg_noreturn extern void float_overflow_error(void); -pg_noreturn extern void float_underflow_error(void); -pg_noreturn extern void float_zero_divide_error(void); +extern void float_overflow_error(struct Node *escontext); +extern void float_underflow_error(struct Node *escontext); +extern void float_zero_divide_error(struct Node *escontext); extern int is_infinite(float8 val); extern float8 float8in_internal(char *num, char **endptr_p, const char *type_name, const char *orig_string, @@ -104,7 +104,7 @@ float4_pl(const float4 val1, const float4 val2) result = val1 + val2; if (unlikely(isinf(result)) && !isinf(val1) && !isinf(val2)) - float_overflow_error(); + float_overflow_error(NULL); return result; } @@ -116,7 +116,7 @@ float8_pl(const float8 val1, const float8 val2) result = val1 + val2; if (unlikely(isinf(result)) && !isinf(val1) && !isinf(val2)) - float_overflow_error(); + float_overflow_error(NULL); return result; } @@ -128,7 +128,7 @@ float4_mi(const float4 val1, const float4 val2) result = val1 - val2; if (unlikely(isinf(result)) && !isinf(val1) && !isinf(val2)) - float_overflow_error(); + float_overflow_error(NULL); return result; } @@ -140,7 +140,7 @@ float8_mi(const float8 val1, const float8 val2) result = val1 - val2; if (unlikely(isinf(result)) && !isinf(val1) && !isinf(val2)) - float_overflow_error(); + float_overflow_error(NULL); return result; } @@ -152,9 +152,9 @@ float4_mul(const float4 val1, const float4 val2) result = val1 * val2; if (unlikely(isinf(result)) && !isinf(val1) && !isinf(val2)) - float_overflow_error(); + float_overflow_error(NULL); if (unlikely(result == 0.0f) && val1 != 0.0f && val2 != 0.0f) - float_underflow_error(); + float_underflow_error(NULL); return result; } @@ -166,9 +166,9 @@ float8_mul(const float8 val1, const float8 val2) result = val1 * val2; if (unlikely(isinf(result)) && !isinf(val1) && !isinf(val2)) - float_overflow_error(); + float_overflow_error(NULL); if (unlikely(result == 0.0) && val1 != 0.0 && val2 != 0.0) - float_underflow_error(); + float_underflow_error(NULL); return result; } @@ -179,12 +179,12 @@ float4_div(const float4 val1, const float4 val2) float4 result; if (unlikely(val2 == 0.0f) && !isnan(val1)) - float_zero_divide_error(); + float_zero_divide_error(NULL); result = val1 / val2; if (unlikely(isinf(result)) && !isinf(val1)) - float_overflow_error(); + float_overflow_error(NULL); if (unlikely(result == 0.0f) && val1 != 0.0f && !isinf(val2)) - float_underflow_error(); + float_underflow_error(NULL); return result; } @@ -195,12 +195,12 @@ float8_div(const float8 val1, const float8 val2) float8 result; if (unlikely(val2 == 0.0) && !isnan(val1)) - float_zero_divide_error(); + float_zero_divide_error(NULL); result = val1 / val2; if (unlikely(isinf(result)) && !isinf(val1)) - float_overflow_error(); + float_overflow_error(NULL); if (unlikely(result == 0.0) && val1 != 0.0 && !isinf(val2)) - float_underflow_error(); + float_underflow_error(NULL); return result; } -- 2.34.1