rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Expose internal function for converting int64 to numeric 

Existing callers had to take complicated detours via
DirectFunctionCall1().  This simplifies a lot of code.

Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/flat/42b73d2d-da12-ba9f-570a-420e0cce19d9@phystech.edu
This commit is contained in:
Peter Eisentraut 2020-09-09 20:16:28 +02:00
parent a273dcc6fd
commit 0aa8f76408
8 changed files with 50 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/btree_gist/btree_numeric.c
View File

@ -195,7 +195,7 @@ gbt_numeric_penalty(PG_FUNCTION_ARGS)
} }
else else
{ {
Numeric nul = DatumGetNumeric(DirectFunctionCall1(int4_numeric, Int32GetDatum(0))); Numeric nul = int64_to_numeric(0);
*result = 0.0; *result = 0.0;

4
contrib/jsonb_plperl/jsonb_plperl.c
View File

@ -216,9 +216,7 @@ SV_to_JsonbValue(SV *in, JsonbParseState **jsonb_state, bool is_elem)
IV ival = SvIV(in); IV ival = SvIV(in);
out.type = jbvNumeric; out.type = jbvNumeric;
out.val.numeric = out.val.numeric = int64_to_numeric(ival);
DatumGetNumeric(DirectFunctionCall1(int8_numeric,
Int64GetDatum((int64) ival)));
} }
else if (SvNOK(in)) else if (SvNOK(in))
{ {

7
src/backend/utils/adt/cash.c
View File

@ -1042,7 +1042,7 @@ cash_numeric(PG_FUNCTION_ARGS)
fpoint = 2; fpoint = 2;
/* convert the integral money value to numeric */ /* convert the integral money value to numeric */
result = DirectFunctionCall1(int8_numeric, Int64GetDatum(money)); result = NumericGetDatum(int64_to_numeric(money));
/* scale appropriately, if needed */ /* scale appropriately, if needed */
if (fpoint > 0) if (fpoint > 0)
@ -1056,8 +1056,7 @@ cash_numeric(PG_FUNCTION_ARGS)
scale = 1; scale = 1;
for (i = 0; i < fpoint; i++) for (i = 0; i < fpoint; i++)
scale *= 10; scale *= 10;
numeric_scale = DirectFunctionCall1(int8_numeric, numeric_scale = NumericGetDatum(int64_to_numeric(scale));
Int64GetDatum(scale));
/* /*
* Given integral inputs approaching INT64_MAX, select_div_scale() * Given integral inputs approaching INT64_MAX, select_div_scale()
@ -1107,7 +1106,7 @@ numeric_cash(PG_FUNCTION_ARGS)
scale *= 10; scale *= 10;
/* multiply the input amount by scale factor */ /* multiply the input amount by scale factor */
numeric_scale = DirectFunctionCall1(int8_numeric, Int64GetDatum(scale)); numeric_scale = NumericGetDatum(int64_to_numeric(scale));
amount = DirectFunctionCall2(numeric_mul, amount, numeric_scale); amount = DirectFunctionCall2(numeric_mul, amount, numeric_scale);
/* note that numeric_int8 will round to nearest integer for us */ /* note that numeric_int8 will round to nearest integer for us */

21
src/backend/utils/adt/dbsize.c
View File

@ -579,14 +579,6 @@ numeric_to_cstring(Numeric n)
return DatumGetCString(DirectFunctionCall1(numeric_out, d)); return DatumGetCString(DirectFunctionCall1(numeric_out, d));
} }
static Numeric
int64_to_numeric(int64 v)
{
Datum d = Int64GetDatum(v);
return DatumGetNumeric(DirectFunctionCall1(int8_numeric, d));
}
static bool static bool
numeric_is_less(Numeric a, Numeric b) numeric_is_less(Numeric a, Numeric b)
{ {
@ -615,9 +607,9 @@ numeric_half_rounded(Numeric n)
Datum two; Datum two;
Datum result; Datum result;
zero = DirectFunctionCall1(int8_numeric, Int64GetDatum(0)); zero = NumericGetDatum(int64_to_numeric(0));
one = DirectFunctionCall1(int8_numeric, Int64GetDatum(1)); one = NumericGetDatum(int64_to_numeric(1));
two = DirectFunctionCall1(int8_numeric, Int64GetDatum(2)); two = NumericGetDatum(int64_to_numeric(2));
if (DatumGetBool(DirectFunctionCall2(numeric_ge, d, zero))) if (DatumGetBool(DirectFunctionCall2(numeric_ge, d, zero)))
d = DirectFunctionCall2(numeric_add, d, one); d = DirectFunctionCall2(numeric_add, d, one);
@ -632,12 +624,10 @@ static Numeric
numeric_shift_right(Numeric n, unsigned count) numeric_shift_right(Numeric n, unsigned count)
{ {
Datum d = NumericGetDatum(n); Datum d = NumericGetDatum(n);
Datum divisor_int64;
Datum divisor_numeric; Datum divisor_numeric;
Datum result; Datum result;
divisor_int64 = Int64GetDatum((int64) (1 << count)); divisor_numeric = NumericGetDatum(int64_to_numeric(1 << count));
divisor_numeric = DirectFunctionCall1(int8_numeric, divisor_int64);
result = DirectFunctionCall2(numeric_div_trunc, d, divisor_numeric); result = DirectFunctionCall2(numeric_div_trunc, d, divisor_numeric);
return DatumGetNumeric(result); return DatumGetNumeric(result);
} }
@ -832,8 +822,7 @@ pg_size_bytes(PG_FUNCTION_ARGS)
{ {
Numeric mul_num; Numeric mul_num;
mul_num = DatumGetNumeric(DirectFunctionCall1(int8_numeric, mul_num = int64_to_numeric(multiplier);
Int64GetDatum(multiplier)));
num = DatumGetNumeric(DirectFunctionCall2(numeric_mul, num = DatumGetNumeric(DirectFunctionCall2(numeric_mul,
NumericGetDatum(mul_num), NumericGetDatum(mul_num),

19
src/backend/utils/adt/formatting.c
View File

@ -6070,10 +6070,8 @@ numeric_to_number(PG_FUNCTION_ARGS)
if (IS_MULTI(&Num)) if (IS_MULTI(&Num))
{ {
Numeric x; Numeric x;
Numeric a = DatumGetNumeric(DirectFunctionCall1(int4_numeric, Numeric a = int64_to_numeric(10);
Int32GetDatum(10))); Numeric b = int64_to_numeric(-Num.multi);
Numeric b = DatumGetNumeric(DirectFunctionCall1(int4_numeric,
Int32GetDatum(-Num.multi)));
x = DatumGetNumeric(DirectFunctionCall2(numeric_power, x = DatumGetNumeric(DirectFunctionCall2(numeric_power,
NumericGetDatum(a), NumericGetDatum(a),
@ -6162,10 +6160,8 @@ numeric_to_char(PG_FUNCTION_ARGS)
if (IS_MULTI(&Num)) if (IS_MULTI(&Num))
{ {
Numeric a = DatumGetNumeric(DirectFunctionCall1(int4_numeric, Numeric a = int64_to_numeric(10);
Int32GetDatum(10))); Numeric b = int64_to_numeric(Num.multi);
Numeric b = DatumGetNumeric(DirectFunctionCall1(int4_numeric,
Int32GetDatum(Num.multi)));
x = DatumGetNumeric(DirectFunctionCall2(numeric_power, x = DatumGetNumeric(DirectFunctionCall2(numeric_power,
NumericGetDatum(a), NumericGetDatum(a),
@ -6339,11 +6335,8 @@ int8_to_char(PG_FUNCTION_ARGS)
else if (IS_EEEE(&Num)) else if (IS_EEEE(&Num))
{ {
/* to avoid loss of precision, must go via numeric not float8 */ /* to avoid loss of precision, must go via numeric not float8 */
Numeric val; orgnum = numeric_out_sci(int64_to_numeric(value),
Num.post);
val = DatumGetNumeric(DirectFunctionCall1(int8_numeric,
Int64GetDatum(value)));
orgnum = numeric_out_sci(val, Num.post);
/* /*
* numeric_out_sci() does not emit a sign for positive numbers. We * numeric_out_sci() does not emit a sign for positive numbers. We

11
src/backend/utils/adt/jsonpath_exec.c
View File

@ -842,9 +842,7 @@ executeItemOptUnwrapTarget(JsonPathExecContext *cxt, JsonPathItem *jsp,
lastjbv = hasNext ? &tmpjbv : palloc(sizeof(*lastjbv)); lastjbv = hasNext ? &tmpjbv : palloc(sizeof(*lastjbv));
lastjbv->type = jbvNumeric; lastjbv->type = jbvNumeric;
lastjbv->val.numeric = lastjbv->val.numeric = int64_to_numeric(last);
DatumGetNumeric(DirectFunctionCall1(int4_numeric,
Int32GetDatum(last)));
res = executeNextItem(cxt, jsp, &elem, res = executeNextItem(cxt, jsp, &elem,
lastjbv, found, hasNext); lastjbv, found, hasNext);
@ -1012,9 +1010,7 @@ executeItemOptUnwrapTarget(JsonPathExecContext *cxt, JsonPathItem *jsp,
jb = palloc(sizeof(*jb)); jb = palloc(sizeof(*jb));
jb->type = jbvNumeric; jb->type = jbvNumeric;
jb->val.numeric = jb->val.numeric = int64_to_numeric(size);
DatumGetNumeric(DirectFunctionCall1(int4_numeric,
Int32GetDatum(size)));
res = executeNextItem(cxt, jsp, NULL, jb, found, false); res = executeNextItem(cxt, jsp, NULL, jb, found, false);
} }
@ -1979,8 +1975,7 @@ executeKeyValueMethod(JsonPathExecContext *cxt, JsonPathItem *jsp,
id += (int64) cxt->baseObject.id * INT64CONST(10000000000); id += (int64) cxt->baseObject.id * INT64CONST(10000000000);
idval.type = jbvNumeric; idval.type = jbvNumeric;
idval.val.numeric = DatumGetNumeric(DirectFunctionCall1(int8_numeric, idval.val.numeric = int64_to_numeric(id);
Int64GetDatum(id)));
it = JsonbIteratorInit(jbc); it = JsonbIteratorInit(jbc);

116
src/backend/utils/adt/numeric.c
View File

@ -4073,23 +4073,29 @@ numeric_trim_scale(PG_FUNCTION_ARGS)
* ---------------------------------------------------------------------- * ----------------------------------------------------------------------
*/ */
Numeric
Datum int64_to_numeric(int64 val)
int4_numeric(PG_FUNCTION_ARGS)
{ {
int32 val = PG_GETARG_INT32(0);
Numeric res; Numeric res;
NumericVar result; NumericVar result;
init_var(&result); init_var(&result);
int64_to_numericvar((int64) val, &result); int64_to_numericvar(val, &result);
res = make_result(&result); res = make_result(&result);
free_var(&result); free_var(&result);
PG_RETURN_NUMERIC(res); return res;
}
Datum
int4_numeric(PG_FUNCTION_ARGS)
{
int32 val = PG_GETARG_INT32(0);
PG_RETURN_NUMERIC(int64_to_numeric(val));
} }
int32 int32
@ -4174,18 +4180,8 @@ Datum
int8_numeric(PG_FUNCTION_ARGS) int8_numeric(PG_FUNCTION_ARGS)
{ {
int64 val = PG_GETARG_INT64(0); int64 val = PG_GETARG_INT64(0);
Numeric res;
NumericVar result;
init_var(&result); PG_RETURN_NUMERIC(int64_to_numeric(val));
int64_to_numericvar(val, &result);
res = make_result(&result);
free_var(&result);
PG_RETURN_NUMERIC(res);
} }
@ -4224,18 +4220,8 @@ Datum
int2_numeric(PG_FUNCTION_ARGS) int2_numeric(PG_FUNCTION_ARGS)
{ {
int16 val = PG_GETARG_INT16(0); int16 val = PG_GETARG_INT16(0);
Numeric res;
NumericVar result;
init_var(&result); PG_RETURN_NUMERIC(int64_to_numeric(val));
int64_to_numericvar((int64) val, &result);
res = make_result(&result);
free_var(&result);
PG_RETURN_NUMERIC(res);
} }
@ -5290,11 +5276,7 @@ int2_accum(PG_FUNCTION_ARGS)
#ifdef HAVE_INT128 #ifdef HAVE_INT128
do_int128_accum(state, (int128) PG_GETARG_INT16(1)); do_int128_accum(state, (int128) PG_GETARG_INT16(1));
#else #else
Numeric newval; do_numeric_accum(state, int64_to_numeric(PG_GETARG_INT16(1)));
newval = DatumGetNumeric(DirectFunctionCall1(int2_numeric,
PG_GETARG_DATUM(1)));
do_numeric_accum(state, newval);
#endif #endif
} }
@ -5317,11 +5299,7 @@ int4_accum(PG_FUNCTION_ARGS)
#ifdef HAVE_INT128 #ifdef HAVE_INT128
do_int128_accum(state, (int128) PG_GETARG_INT32(1)); do_int128_accum(state, (int128) PG_GETARG_INT32(1));
#else #else
Numeric newval; do_numeric_accum(state, int64_to_numeric(PG_GETARG_INT32(1)));
newval = DatumGetNumeric(DirectFunctionCall1(int4_numeric,
PG_GETARG_DATUM(1)));
do_numeric_accum(state, newval);
#endif #endif
} }
@ -5340,13 +5318,7 @@ int8_accum(PG_FUNCTION_ARGS)
state = makeNumericAggState(fcinfo, true); state = makeNumericAggState(fcinfo, true);
if (!PG_ARGISNULL(1)) if (!PG_ARGISNULL(1))
{ do_numeric_accum(state, int64_to_numeric(PG_GETARG_INT64(1)));
Numeric newval;
newval = DatumGetNumeric(DirectFunctionCall1(int8_numeric,
PG_GETARG_DATUM(1)));
do_numeric_accum(state, newval);
}
PG_RETURN_POINTER(state); PG_RETURN_POINTER(state);
} }
@ -5570,11 +5542,7 @@ int8_avg_accum(PG_FUNCTION_ARGS)
#ifdef HAVE_INT128 #ifdef HAVE_INT128
do_int128_accum(state, (int128) PG_GETARG_INT64(1)); do_int128_accum(state, (int128) PG_GETARG_INT64(1));
#else #else
Numeric newval; do_numeric_accum(state, int64_to_numeric(PG_GETARG_INT64(1)));
newval = DatumGetNumeric(DirectFunctionCall1(int8_numeric,
PG_GETARG_DATUM(1)));
do_numeric_accum(state, newval);
#endif #endif
} }
@ -5767,13 +5735,8 @@ int2_accum_inv(PG_FUNCTION_ARGS)
#ifdef HAVE_INT128 #ifdef HAVE_INT128
do_int128_discard(state, (int128) PG_GETARG_INT16(1)); do_int128_discard(state, (int128) PG_GETARG_INT16(1));
#else #else
Numeric newval;
newval = DatumGetNumeric(DirectFunctionCall1(int2_numeric,
PG_GETARG_DATUM(1)));
/* Should never fail, all inputs have dscale 0 */ /* Should never fail, all inputs have dscale 0 */
if (!do_numeric_discard(state, newval)) if (!do_numeric_discard(state, int64_to_numeric(PG_GETARG_INT16(1))))
elog(ERROR, "do_numeric_discard failed unexpectedly"); elog(ERROR, "do_numeric_discard failed unexpectedly");
#endif #endif
} }
@ -5797,13 +5760,8 @@ int4_accum_inv(PG_FUNCTION_ARGS)
#ifdef HAVE_INT128 #ifdef HAVE_INT128
do_int128_discard(state, (int128) PG_GETARG_INT32(1)); do_int128_discard(state, (int128) PG_GETARG_INT32(1));
#else #else
Numeric newval;
newval = DatumGetNumeric(DirectFunctionCall1(int4_numeric,
PG_GETARG_DATUM(1)));
/* Should never fail, all inputs have dscale 0 */ /* Should never fail, all inputs have dscale 0 */
if (!do_numeric_discard(state, newval)) if (!do_numeric_discard(state, int64_to_numeric(PG_GETARG_INT32(1))))
elog(ERROR, "do_numeric_discard failed unexpectedly"); elog(ERROR, "do_numeric_discard failed unexpectedly");
#endif #endif
} }
@ -5824,13 +5782,8 @@ int8_accum_inv(PG_FUNCTION_ARGS)
if (!PG_ARGISNULL(1)) if (!PG_ARGISNULL(1))
{ {
Numeric newval;
newval = DatumGetNumeric(DirectFunctionCall1(int8_numeric,
PG_GETARG_DATUM(1)));
/* Should never fail, all inputs have dscale 0 */ /* Should never fail, all inputs have dscale 0 */
if (!do_numeric_discard(state, newval)) if (!do_numeric_discard(state, int64_to_numeric(PG_GETARG_INT64(1))))
elog(ERROR, "do_numeric_discard failed unexpectedly"); elog(ERROR, "do_numeric_discard failed unexpectedly");
} }
@ -5853,13 +5806,8 @@ int8_avg_accum_inv(PG_FUNCTION_ARGS)
#ifdef HAVE_INT128 #ifdef HAVE_INT128
do_int128_discard(state, (int128) PG_GETARG_INT64(1)); do_int128_discard(state, (int128) PG_GETARG_INT64(1));
#else #else
Numeric newval;
newval = DatumGetNumeric(DirectFunctionCall1(int8_numeric,
PG_GETARG_DATUM(1)));
/* Should never fail, all inputs have dscale 0 */ /* Should never fail, all inputs have dscale 0 */
if (!do_numeric_discard(state, newval)) if (!do_numeric_discard(state, int64_to_numeric(PG_GETARG_INT64(1))))
elog(ERROR, "do_numeric_discard failed unexpectedly"); elog(ERROR, "do_numeric_discard failed unexpectedly");
#endif #endif
} }
@ -5914,8 +5862,7 @@ numeric_poly_avg(PG_FUNCTION_ARGS)
int128_to_numericvar(state->sumX, &result); int128_to_numericvar(state->sumX, &result);
countd = DirectFunctionCall1(int8_numeric, countd = NumericGetDatum(int64_to_numeric(state->N));
Int64GetDatumFast(state->N));
sumd = NumericGetDatum(make_result(&result)); sumd = NumericGetDatum(make_result(&result));
free_var(&result); free_var(&result);
@ -5951,7 +5898,7 @@ numeric_avg(PG_FUNCTION_ARGS)
if (state->nInfcount > 0) if (state->nInfcount > 0)
PG_RETURN_NUMERIC(make_result(&const_ninf)); PG_RETURN_NUMERIC(make_result(&const_ninf));
N_datum = DirectFunctionCall1(int8_numeric, Int64GetDatum(state->N)); N_datum = NumericGetDatum(int64_to_numeric(state->N));
init_var(&sumX_var); init_var(&sumX_var);
accum_sum_final(&state->sumX, &sumX_var); accum_sum_final(&state->sumX, &sumX_var);
@ -6411,7 +6358,6 @@ Datum
int8_sum(PG_FUNCTION_ARGS) int8_sum(PG_FUNCTION_ARGS)
{ {
Numeric oldsum; Numeric oldsum;
Datum newval;
if (PG_ARGISNULL(0)) if (PG_ARGISNULL(0))
{ {
@ -6419,8 +6365,7 @@ int8_sum(PG_FUNCTION_ARGS)
if (PG_ARGISNULL(1)) if (PG_ARGISNULL(1))
PG_RETURN_NULL(); /* still no non-null */ PG_RETURN_NULL(); /* still no non-null */
/* This is the first non-null input. */ /* This is the first non-null input. */
newval = DirectFunctionCall1(int8_numeric, PG_GETARG_DATUM(1)); PG_RETURN_NUMERIC(int64_to_numeric(PG_GETARG_INT64(1)));
PG_RETURN_DATUM(newval);
} }
/* /*
@ -6436,10 +6381,9 @@ int8_sum(PG_FUNCTION_ARGS)
PG_RETURN_NUMERIC(oldsum); PG_RETURN_NUMERIC(oldsum);
/* OK to do the addition. */ /* OK to do the addition. */
newval = DirectFunctionCall1(int8_numeric, PG_GETARG_DATUM(1));
PG_RETURN_DATUM(DirectFunctionCall2(numeric_add, PG_RETURN_DATUM(DirectFunctionCall2(numeric_add,
NumericGetDatum(oldsum), newval)); NumericGetDatum(oldsum),
NumericGetDatum(int64_to_numeric(PG_GETARG_INT64(1)))));
} }
@ -6618,10 +6562,8 @@ int8_avg(PG_FUNCTION_ARGS)
if (transdata->count == 0) if (transdata->count == 0)
PG_RETURN_NULL(); PG_RETURN_NULL();
countd = DirectFunctionCall1(int8_numeric, countd = NumericGetDatum(int64_to_numeric(transdata->count));
Int64GetDatumFast(transdata->count)); sumd = NumericGetDatum(int64_to_numeric(transdata->sum));
sumd = DirectFunctionCall1(int8_numeric,
Int64GetDatumFast(transdata->sum));
PG_RETURN_DATUM(DirectFunctionCall2(numeric_div, sumd, countd)); PG_RETURN_DATUM(DirectFunctionCall2(numeric_div, sumd, countd));
} }

2
src/include/utils/numeric.h
View File

@ -62,6 +62,8 @@ int32 numeric_maximum_size(int32 typmod);
extern char *numeric_out_sci(Numeric num, int scale); extern char *numeric_out_sci(Numeric num, int scale);
extern char *numeric_normalize(Numeric num); extern char *numeric_normalize(Numeric num);
extern Numeric int64_to_numeric(int64 val);
extern Numeric numeric_add_opt_error(Numeric num1, Numeric num2, extern Numeric numeric_add_opt_error(Numeric num1, Numeric num2,
bool *have_error); bool *have_error);
extern Numeric numeric_sub_opt_error(Numeric num1, Numeric num2, extern Numeric numeric_sub_opt_error(Numeric num1, Numeric num2,