Call PLy_spi_execute_fetch_result inside the try/catch block

petere · petere · commit 88dcdf900789 · 2011-01-25T00:43:25.000+02:00
This way errors from fetching tuples are correctly reported as errors
in the SPI call.  While at it, avoid palloc(0).

Jan Urbański
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
@@ -2978,6 +2978,7 @@ PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit)
 				rv;
 	PLyPlanObject *plan;
 	volatile MemoryContext oldcontext;
+	PyObject   *ret;
 
 	if (list != NULL)
 	{
@@ -3014,9 +3015,14 @@ PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit)
 	oldcontext = CurrentMemoryContext;
 	PG_TRY();
 	{
-		char	   *nulls = palloc(nargs * sizeof(char));
+		char	   *nulls;
 		volatile int j;
 
+		if (nargs > 0)
+			nulls = palloc(nargs * sizeof(char));
+		else
+			nulls = NULL;
+
 		for (j = 0; j < nargs; j++)
 		{
 			PyObject   *elem;
@@ -3055,8 +3061,10 @@ PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit)
 
 		rv = SPI_execute_plan(plan->plan, plan->values, nulls,
 							  PLy_curr_procedure->fn_readonly, limit);
+		ret = PLy_spi_execute_fetch_result(SPI_tuptable, SPI_processed, rv);
 
-		pfree(nulls);
+		if (nargs > 0)
+			pfree(nulls);
 	}
 	PG_CATCH();
 	{
@@ -3099,20 +3107,22 @@ PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit)
 		}
 	}
 
-	return PLy_spi_execute_fetch_result(SPI_tuptable, SPI_processed, rv);
+	return ret;
 }
 
 static PyObject *
 PLy_spi_execute_query(char *query, long limit)
 {
 	int			rv;
 	volatile MemoryContext oldcontext;
+	PyObject   *ret;
 
 	oldcontext = CurrentMemoryContext;
 	PG_TRY();
 	{
 		pg_verifymbstr(query, strlen(query), false);
 		rv = SPI_execute(query, PLy_curr_procedure->fn_readonly, limit);
+		ret = PLy_spi_execute_fetch_result(SPI_tuptable, SPI_processed, rv);
 	}
 	PG_CATCH();
 	{
@@ -3138,7 +3148,7 @@ PLy_spi_execute_query(char *query, long limit)
 		return NULL;
 	}
 
-	return PLy_spi_execute_fetch_result(SPI_tuptable, SPI_processed, rv);
+	return ret;
 }
 
 static PyObject *

Original file line number	Diff line number	Diff line change
`@@ -2978,6 +2978,7 @@ PLy_spi_execute_plan(PyObject ob, PyObject list, long limit)`
`2978`	`2978`	`rv;`
`2979`	`2979`	`PLyPlanObject *plan;`
`2980`	`2980`	`volatile MemoryContext oldcontext;`
	`2981`	`+ PyObject *ret;`
`2981`	`2982`
`2982`	`2983`	`if (list != NULL)`
`2983`	`2984`	`{`
`@@ -3014,9 +3015,14 @@ PLy_spi_execute_plan(PyObject ob, PyObject list, long limit)`
`3014`	`3015`	`oldcontext = CurrentMemoryContext;`
`3015`	`3016`	`PG_TRY();`
`3016`	`3017`	`{`
`3017`		`- char nulls = palloc(nargs sizeof(char));`
	`3018`	`+ char *nulls;`
`3018`	`3019`	`volatile int j;`
`3019`	`3020`
	`3021`	`+ if (nargs > 0)`
	`3022`	`+ nulls = palloc(nargs * sizeof(char));`
	`3023`	`+ else`
	`3024`	`+ nulls = NULL;`
	`3025`	`+`
`3020`	`3026`	`for (j = 0; j < nargs; j++)`
`3021`	`3027`	`{`
`3022`	`3028`	`PyObject *elem;`
`@@ -3055,8 +3061,10 @@ PLy_spi_execute_plan(PyObject ob, PyObject list, long limit)`
`3055`	`3061`
`3056`	`3062`	`rv = SPI_execute_plan(plan->plan, plan->values, nulls,`
`3057`	`3063`	`PLy_curr_procedure->fn_readonly, limit);`
	`3064`	`+ ret = PLy_spi_execute_fetch_result(SPI_tuptable, SPI_processed, rv);`
`3058`	`3065`
`3059`		`- pfree(nulls);`
	`3066`	`+ if (nargs > 0)`
	`3067`	`+ pfree(nulls);`
`3060`	`3068`	`}`
`3061`	`3069`	`PG_CATCH();`
`3062`	`3070`	`{`
`@@ -3099,20 +3107,22 @@ PLy_spi_execute_plan(PyObject ob, PyObject list, long limit)`
`3099`	`3107`	`}`
`3100`	`3108`	`}`
`3101`	`3109`
`3102`		`- return PLy_spi_execute_fetch_result(SPI_tuptable, SPI_processed, rv);`
	`3110`	`+ return ret;`
`3103`	`3111`	`}`
`3104`	`3112`
`3105`	`3113`	`static PyObject *`
`3106`	`3114`	`PLy_spi_execute_query(char *query, long limit)`
`3107`	`3115`	`{`
`3108`	`3116`	`int rv;`
`3109`	`3117`	`volatile MemoryContext oldcontext;`
	`3118`	`+ PyObject *ret;`
`3110`	`3119`
`3111`	`3120`	`oldcontext = CurrentMemoryContext;`
`3112`	`3121`	`PG_TRY();`
`3113`	`3122`	`{`
`3114`	`3123`	`pg_verifymbstr(query, strlen(query), false);`
`3115`	`3124`	`rv = SPI_execute(query, PLy_curr_procedure->fn_readonly, limit);`
	`3125`	`+ ret = PLy_spi_execute_fetch_result(SPI_tuptable, SPI_processed, rv);`
`3116`	`3126`	`}`
`3117`	`3127`	`PG_CATCH();`
`3118`	`3128`	`{`
`@@ -3138,7 +3148,7 @@ PLy_spi_execute_query(char *query, long limit)`
`3138`	`3148`	`return NULL;`
`3139`	`3149`	`}`
`3140`	`3150`
`3141`		`- return PLy_spi_execute_fetch_result(SPI_tuptable, SPI_processed, rv);`
	`3151`	`+ return ret;`
`3142`	`3152`	`}`
`3143`	`3153`
`3144`	`3154`	`static PyObject *`