Improve type conversion of SPI_processed in Python

petere · petere · commit 918e02a221db · 2018-01-20T08:02:01.000-05:00
The previous code converted SPI_processed to a Python float if it didn't fit into a Python int. But Python longs have unlimited precision, so use that instead in all cases. As in eee50a8, we use the Python LongLong API unconditionally for simplicity. Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
@@ -444,9 +444,7 @@ PLy_cursor_fetch(PyObject *self, PyObject *args)
 		ret->status = PyInt_FromLong(SPI_OK_FETCH);
 
 		Py_DECREF(ret->nrows);
-		ret->nrows = (SPI_processed > (uint64) LONG_MAX) ?
-			PyFloat_FromDouble((double) SPI_processed) :
-			PyInt_FromLong((long) SPI_processed);
+		ret->nrows = PyLong_FromUnsignedLongLong(SPI_processed);
 
 		if (SPI_processed != 0)
 		{
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
@@ -371,19 +371,15 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
 	if (status > 0 && tuptable == NULL)
 	{
 		Py_DECREF(result->nrows);
-		result->nrows = (rows > (uint64) LONG_MAX) ?
-			PyFloat_FromDouble((double) rows) :
-			PyInt_FromLong((long) rows);
+		result->nrows = PyLong_FromUnsignedLongLong(rows);
 	}
 	else if (status > 0 && tuptable != NULL)
 	{
 		PLyDatumToOb ininfo;
 		MemoryContext cxt;
 
 		Py_DECREF(result->nrows);
-		result->nrows = (rows > (uint64) LONG_MAX) ?
-			PyFloat_FromDouble((double) rows) :
-			PyInt_FromLong((long) rows);
+		result->nrows = PyLong_FromUnsignedLongLong(rows);
 
 		cxt = AllocSetContextCreate(CurrentMemoryContext,
 									"PL/Python temp context",

Original file line number	Diff line number	Diff line change
`@@ -444,9 +444,7 @@ PLy_cursor_fetch(PyObject self, PyObject args)`
`444`	`444`	`ret->status = PyInt_FromLong(SPI_OK_FETCH);`
`445`	`445`
`446`	`446`	`Py_DECREF(ret->nrows);`
`447`		`- ret->nrows = (SPI_processed > (uint64) LONG_MAX) ?`
`448`		`- PyFloat_FromDouble((double) SPI_processed) :`
`449`		`- PyInt_FromLong((long) SPI_processed);`
	`447`	`+ ret->nrows = PyLong_FromUnsignedLongLong(SPI_processed);`
`450`	`448`
`451`	`449`	`if (SPI_processed != 0)`
`452`	`450`	`{`