Commit3680cd0

Nikita Glukhov

committed

Optimize numeric conversions in jsonb_plpython

1 parentceb3a38 commit3680cd0Copy full SHA for 3680cd0

File tree

+49

-2

lines changed

+49

-2

lines changed

Lines changed: 27 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,13 @@ PLyObject_FromJsonbValue(JsonbValue *jsonbValue)`
`126`	`126`	`{`
`127`	`127`	`Datumnum;`
`128`	`128`	`char*str;`
	`129`	`+int64intval;`
	`130`	`+`
	`131`	`+if (numeric_to_exact_int64(jsonbValue->val.numeric,&intval))`
	`132`	`+#ifndefHAVE_LONG_INT_64`
	`133`	`+if ((long)intval==intval)`
	`134`	`+#endif`
	`135`	`+returnPyInt_FromLong((long)intval);`
`129`	`136`
`130`	`137`	`num=NumericGetDatum(jsonbValue->val.numeric);`
`131`	`138`	`str=DatumGetCString(DirectFunctionCall1(numeric_out,num));`
`@@ -409,7 +416,26 @@ static JsonbValue *`
`409`	`416`	`PLyNumber_ToJsonbValue(PyObjectobj,JsonbValuejbvNum)`
`410`	`417`	`{`
`411`	`418`	`Numericnum;`
`412`		`-char*str=PLyObject_AsString(obj);`
	`419`	`+char*str;`
	`420`	`+`
	`421`	`+jbvNum->type=jbvNumeric;`
	`422`	`+`
	`423`	`+if (PyInt_Check(obj))`
	`424`	`+{`
	`425`	`+longval=PyInt_AsLong(obj);`
	`426`	`+`
	`427`	`+if (val!=-1\|\| !PyErr_Occurred())`
	`428`	`+{`
	`429`	`+jbvNum->val.numeric=`
	`430`	`+DatumGetNumeric(DirectFunctionCall1(int8_numeric,`
	`431`	`+Int64GetDatum((int64)val)));`
	`432`	`+returnjbvNum;`
	`433`	`+}`
	`434`	`+`
	`435`	`+PyErr_Clear();`
	`436`	`+}`
	`437`	`+`
	`438`	`+str=PLyObject_AsString(obj);`
`413`	`439`
`414`	`440`	`PG_TRY();`
`415`	`441`	`{`
`@@ -441,7 +467,6 @@ PLyNumber_ToJsonbValue(PyObject obj, JsonbValue jbvNum)`
`441`	`467`	`(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),`
`442`	`468`	`(errmsg("cannot convert NaN to jsonb"))));`
`443`	`469`
`444`		`-jbvNum->type=jbvNumeric;`
`445`	`470`	`jbvNum->val.numeric=num;`
`446`	`471`
`447`	`472`	`returnjbvNum;`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3349,6 +3349,27 @@ numeric_float4(PG_FUNCTION_ARGS)`
`3349`	`3349`	`PG_RETURN_DATUM(result);`
`3350`	`3350`	`}`
`3351`	`3351`
	`3352`	`+/*`
	`3353`	`+ * numeric_get_int64() -`
	`3354`	`+ *`
	`3355`	`+ *Try to convert numeric to int64 if it is an exact integer (i.e. it does`
	`3356`	`+ *not have digits after the decimal point). Return true if okay.`
	`3357`	`+ */`
	`3358`	`+bool`
	`3359`	`+numeric_to_exact_int64(Numericnum,int64*result)`
	`3360`	`+{`
	`3361`	`+NumericVarvar;`
	`3362`	`+`
	`3363`	`+if (NUMERIC_IS_NAN(num))`
	`3364`	`+return false;`
	`3365`	`+`
	`3366`	`+if (NUMERIC_DSCALE(num)!=0)`
	`3367`	`+return false;/* digits after the decimal point are not allowed */`
	`3368`	`+`
	`3369`	`+init_var_from_num(num,&var);`
	`3370`	`+`
	`3371`	`+returnnumericvar_to_int64(&var,result);`
	`3372`	`+}`
`3352`	`3373`
`3353`	`3374`	`/* ----------------------------------------------------------------------`
`3354`	`3375`	`*`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,6 @@ extern bool numeric_is_nan(Numeric num);`
`60`	`60`	`int32numeric_maximum_size(int32typmod);`
`61`	`61`	`externchar*numeric_out_sci(Numericnum,intscale);`
`62`	`62`	`externchar*numeric_normalize(Numericnum);`
	`63`	`+externboolnumeric_to_exact_int64(Numericvalue,int64*out);`
`63`	`64`
`64`	`65`	`#endif/* _PG_NUMERIC_H_ */`

Comments

(0)