PL/Python: Simplify PLyLong_FromInt64

petere · petere · commit eee50a8d4c38 · 2018-01-19T17:22:38.000-05:00
We don't actually need two code paths, one for 32 bits and one for 64 bits. Since the existing code already assumed that "long long" is available, we can just use PyLong_FromLongLong() for 64 bits as well. In Python 2.5 and later, PyLong_FromLong() and PyLong_FromLongLong() use the same code, so there will be no difference for 64-bit platforms. In Python 2.4, the code is different, but performance testing showed no noticeable difference in PL/Python, and that Python version is ancient anyway. Discussion: https://www.postgresql.org/message-id/0a02203c-e157-55b2-464e-6087066a1849@2ndquadrant.com
diff --git a/src/pl/plpython/plpy_typeio.c b/src/pl/plpython/plpy_typeio.c
@@ -618,11 +618,7 @@ PLyInt_FromInt32(PLyDatumToOb *arg, Datum d)
 static PyObject *
 PLyLong_FromInt64(PLyDatumToOb *arg, Datum d)
 {
-	/* on 32 bit platforms "long" may be too small */
-	if (sizeof(int64) > sizeof(long))
-		return PyLong_FromLongLong(DatumGetInt64(d));
-	else
-		return PyLong_FromLong(DatumGetInt64(d));
+	return PyLong_FromLongLong(DatumGetInt64(d));
 }
 
 static PyObject *

Original file line number	Diff line number	Diff line change
`@@ -618,11 +618,7 @@ PLyInt_FromInt32(PLyDatumToOb *arg, Datum d)`
`618`	`618`	`static PyObject *`
`619`	`619`	`PLyLong_FromInt64(PLyDatumToOb *arg, Datum d)`
`620`	`620`	`{`
`621`		`- /* on 32 bit platforms "long" may be too small */`
`622`		`- if (sizeof(int64) > sizeof(long))`
`623`		`- return PyLong_FromLongLong(DatumGetInt64(d));`
`624`		`- else`
`625`		`- return PyLong_FromLong(DatumGetInt64(d));`
	`621`	`+ return PyLong_FromLongLong(DatumGetInt64(d));`
`626`	`622`	`}`
`627`	`623`
`628`	`624`	`static PyObject *`