Add numeric transform for plpython

Nikita Glukhov · Nikita Glukhov · commit a734d83d4075 · 2019-01-15T02:15:18.000+03:00
diff --git a/contrib/jsonb_plpython/Makefile b/contrib/jsonb_plpython/Makefile
@@ -1,7 +1,7 @@
 # contrib/jsonb_plpython/Makefile
 
 MODULE_big = jsonb_plpython$(python_majorversion)
-OBJS = jsonb_plpython.o jsonb_lazy.o $(WIN32RES)
+OBJS = jsonb_plpython.o jsonb_lazy.o numeric_plpython.o $(WIN32RES)
 PGFILEDESC = "jsonb_plpython - transform between jsonb and plpythonu"
 
 PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -DPLPYTHON_LIBNAME='"plpython$(python_majorversion)"'
diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -5,6 +5,7 @@
 #include "plpy_main.h"
 #include "plpy_typeio.h"
 #include "jsonb_plpython.h"
+#include "numeric_plpython.h"
 #include "utils/jsonb.h"
 #include "utils/fmgrprotos.h"
 #include "utils/numeric.h"
@@ -13,8 +14,11 @@ PG_MODULE_MAGIC;
 
 void		_PG_init(void);
 
-typedef void (*PLy_elog_impl_t) (int elevel, const char *fmt,...);
-static PLy_elog_impl_t PLy_elog_impl_p;
+PLyObject_AsString_t PLyObject_AsString_p;
+PLy_elog_impl_t PLy_elog_impl_p;
+#if PY_MAJOR_VERSION >= 3
+PLyUnicode_FromStringAndSize_t PLyUnicode_FromStringAndSize_p;
+#endif
 
 PLy_get_global_memory_context_t PLy_get_global_memory_context_p;
 PLyObject_AsString_t PLyObject_AsString_p;
@@ -37,12 +41,6 @@ static JsonbValue *PLyObject_ToJsonbValue(PyObject *obj,
 		PLyJsonb_FromJsonbContainer(jbc, len)
 #endif
 
-#if PY_MAJOR_VERSION >= 3
-typedef PyObject *(*PLyUnicode_FromStringAndSize_t)
-			(const char *s, Py_ssize_t size);
-static PLyUnicode_FromStringAndSize_t PLyUnicode_FromStringAndSize_p;
-#endif
-
 /*
  * Module initialize function: fetch function pointers for cross-module calls.
  */
@@ -134,6 +132,7 @@ PLyObject_FromJsonbValue(JsonbValue *jsonbValue)
 #endif
 						return PyInt_FromLong((long) intval);
 
+				return PLyObject_FromNumeric(jsonbValue->val.numeric);
 				num = NumericGetDatum(jsonbValue->val.numeric);
 				str = DatumGetCString(DirectFunctionCall1(numeric_out, num));
 
@@ -415,60 +414,19 @@ PLySequence_ToJsonbValue(PyObject *obj, JsonbParseState **jsonb_state)
 static JsonbValue *
 PLyNumber_ToJsonbValue(PyObject *obj, JsonbValue *jbvNum)
 {
-	Numeric		num;
-	char	   *str;
-
 	jbvNum->type = jbvNumeric;
-
-	if (PyInt_Check(obj))
-	{
-		long		val = PyInt_AsLong(obj);
-
-		if (val != -1 || !PyErr_Occurred())
-		{
-			jbvNum->val.numeric =
-				DatumGetNumeric(DirectFunctionCall1(int8_numeric,
-													Int64GetDatum((int64) val)));
-			return jbvNum;
-		}
-
-		PyErr_Clear();
-	}
-
-	str = PLyObject_AsString(obj);
-
-	PG_TRY();
-	{
-		Datum		numd;
-
-		numd = DirectFunctionCall3(numeric_in,
-								   CStringGetDatum(str),
-								   ObjectIdGetDatum(InvalidOid),
-								   Int32GetDatum(-1));
-		num = DatumGetNumeric(numd);
-	}
-	PG_CATCH();
-	{
-		ereport(ERROR,
-				(errcode(ERRCODE_DATATYPE_MISMATCH),
-				 (errmsg("could not convert value \"%s\" to jsonb", str))));
-	}
-	PG_END_TRY();
-
-	pfree(str);
+	jbvNum->val.numeric = PLyNumber_ToNumeric(obj);
 
 	/*
 	 * jsonb doesn't allow NaN (per JSON specification), so we have to prevent
 	 * it here explicitly.  (Infinity is also not allowed in jsonb, but
 	 * numeric_in above already catches that.)
 	 */
-	if (numeric_is_nan(num))
+	if (numeric_is_nan(jbvNum->val.numeric))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 (errmsg("cannot convert NaN to jsonb"))));
 
-	jbvNum->val.numeric = num;
-
 	return jbvNum;
 }
 
diff --git a/contrib/jsonb_plpython/jsonb_plpython.h b/contrib/jsonb_plpython/jsonb_plpython.h
@@ -1,6 +1,7 @@
 #include "postgres.h"
 #include "plpython.h"
 #include "utils/jsonb.h"
+#include "plpy_typeio.h"
 
 /* Python wrapper for jsonb container */
 typedef struct PLyJsonb
@@ -33,6 +34,19 @@ extern void PLyKey_ToJsonbValue(PyObject *key, JsonbValue *jbv);
 extern PyObject *PLyObject_FromJsonbContainer(JsonbContainer *jsonb);
 extern PyObject *PLyObject_FromJsonbValue(JsonbValue *jsonbValue);
 
+/* for PLyObject_AsString in plpy_typeio.c */
+typedef char *(*PLyObject_AsString_t) (PyObject *plrv);
+extern PLyObject_AsString_t PLyObject_AsString_p;
+
+typedef void (*PLy_elog_impl_t) (int elevel, const char *fmt,...);
+extern PLy_elog_impl_t PLy_elog_impl_p;
+
+#if PY_MAJOR_VERSION >= 3
+typedef PyObject *(*PLyUnicode_FromStringAndSize_t)
+			(const char *s, Py_ssize_t size);
+extern PLyUnicode_FromStringAndSize_t PLyUnicode_FromStringAndSize_p;
+#endif
+
 typedef MemoryContext (*PLy_get_global_memory_context_t) (void);
 extern PLy_get_global_memory_context_t PLy_get_global_memory_context_p;
 
diff --git a/contrib/jsonb_plpython/jsonb_plpythonu--1.0.sql b/contrib/jsonb_plpython/jsonb_plpythonu--1.0.sql
@@ -17,3 +17,16 @@ CREATE TRANSFORM FOR jsonb LANGUAGE plpythonu (
 );
 
 COMMENT ON TRANSFORM FOR jsonb LANGUAGE plpythonu IS 'transform between jsonb and Python';
+
+CREATE FUNCTION numeric_to_plpython(val internal) RETURNS internal
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME';
+
+CREATE FUNCTION plpython_to_numeric(val internal) RETURNS numeric
+LANGUAGE C STRICT IMMUTABLE
+AS 'MODULE_PATHNAME';
+
+CREATE TRANSFORM FOR numeric LANGUAGE plpythonu (
+	FROM SQL WITH FUNCTION numeric_to_plpython(internal),
+	TO SQL WITH FUNCTION plpython_to_numeric(internal)
+);
diff --git a/contrib/jsonb_plpython/numeric_plpython.c b/contrib/jsonb_plpython/numeric_plpython.c
diff --git a/contrib/jsonb_plpython/numeric_plpython.h b/contrib/jsonb_plpython/numeric_plpython.h
