Skip to content

P
Postgres FD Implementation
Commit 42fbb6db authored by Tom Lane's avatar Tom Lane
Browse files
Options

Clean up various memory leaks within plpgsql, and re-enable the 

exec_eval_simple_expr shortcut, which was diked out in 7.1 because it
leaked too much space.  CVS tip now leaks no memory in Chris Ruprecht's
example, which formerly leaked to the tune of 500 MB.  (Much of this
is work that Jan already did; this commit just cleans up around the
edges.)
parent f59f3c88
Hide whitespace changes
Inline Side-by-side
Showing with 294 additions and 195 deletions
src/pl/plpgsql/src/pl_exec.c
View file @ 42fbb6db
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.46 2001/07/12 17:42:07 momjian Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.47 2001/08/02 21:31:23 tgl Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
...@@ -114,6 +114,10 @@ static int exec_stmt_dynexecute(PLpgSQL_execstate * estate, ...@@ -114,6 +114,10 @@ static int exec_stmt_dynexecute(PLpgSQL_execstate * estate,
static int exec_stmt_dynfors(PLpgSQL_execstate * estate, static int exec_stmt_dynfors(PLpgSQL_execstate * estate,
PLpgSQL_stmt_dynfors * stmt); PLpgSQL_stmt_dynfors * stmt);
static void plpgsql_estate_setup(PLpgSQL_execstate * estate,
PLpgSQL_function * func);
static void exec_eval_cleanup(PLpgSQL_execstate * estate);
static void exec_prepare_plan(PLpgSQL_execstate * estate, static void exec_prepare_plan(PLpgSQL_execstate * estate,
PLpgSQL_expr * expr); PLpgSQL_expr * expr);
static bool exec_simple_check_node(Node *node); static bool exec_simple_check_node(Node *node);
...@@ -271,16 +275,7 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo) ...@@ -271,16 +275,7 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo)
/* /*
* Setup the execution state * Setup the execution state
*/ */
estate.retval = 0; plpgsql_estate_setup(&estate, func);
estate.retisnull = false;
estate.rettype = InvalidOid;
estate.retistuple = func->fn_retistuple;
estate.retisset = func->fn_retset;
estate.exitlabel = NULL;
estate.found_varno = func->found_varno;
estate.ndatums = func->ndatums;
estate.datums = palloc(sizeof(PLpgSQL_datum *) * estate.ndatums);
/* /*
* Make local execution copies of all the datums * Make local execution copies of all the datums
...@@ -434,6 +429,9 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo) ...@@ -434,6 +429,9 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo)
} }
} }
/* Clean up any leftover temporary memory */
exec_eval_cleanup(&estate);
/* /*
* Restore the previous error info and elog() jump target * Restore the previous error info and elog() jump target
*/ */
...@@ -571,16 +569,7 @@ plpgsql_exec_trigger(PLpgSQL_function * func, ...@@ -571,16 +569,7 @@ plpgsql_exec_trigger(PLpgSQL_function * func,
/* /*
* Setup the execution state * Setup the execution state
*/ */
estate.retval = 0; plpgsql_estate_setup(&estate, func);
estate.retisnull = false;
estate.rettype = InvalidOid;
estate.retistuple = func->fn_retistuple;
estate.retisset = func->fn_retset;
estate.exitlabel = NULL;
estate.found_varno = func->found_varno;
estate.ndatums = func->ndatums;
estate.datums = palloc(sizeof(PLpgSQL_datum *) * estate.ndatums);
/* /*
* Make local execution copies of all the datums * Make local execution copies of all the datums
...@@ -616,10 +605,12 @@ plpgsql_exec_trigger(PLpgSQL_function * func, ...@@ -616,10 +605,12 @@ plpgsql_exec_trigger(PLpgSQL_function * func,
* variable * variable
*/ */
rec_new = (PLpgSQL_rec *) (estate.datums[func->new_varno]); rec_new = (PLpgSQL_rec *) (estate.datums[func->new_varno]);
rec_new->freetup = false;
rec_new->freetupdesc = false;
rec_old = (PLpgSQL_rec *) (estate.datums[func->old_varno]); rec_old = (PLpgSQL_rec *) (estate.datums[func->old_varno]);
rec_old->freetup = false;
rec_old->freetupdesc = false;
var = (PLpgSQL_var *) (estate.datums[func->tg_op_varno]); var = (PLpgSQL_var *) (estate.datums[func->tg_op_varno]);
var->isnull = false;
var->freeval = false;
if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event)) if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
{ {
...@@ -649,21 +640,25 @@ plpgsql_exec_trigger(PLpgSQL_function * func, ...@@ -649,21 +640,25 @@ plpgsql_exec_trigger(PLpgSQL_function * func,
{ {
rec_new->tup = NULL; rec_new->tup = NULL;
rec_new->tupdesc = NULL; rec_new->tupdesc = NULL;
rec_old->tup = NULL;
rec_old->tupdesc = NULL;
var->value = DirectFunctionCall1(textin, CStringGetDatum("UNKNOWN")); var->value = DirectFunctionCall1(textin, CStringGetDatum("UNKNOWN"));
} }
var->isnull = false;
var->freeval = true;
/* /*
* Fill all the other special tg_ variables * Fill all the other special tg_ variables
*/ */
var = (PLpgSQL_var *) (estate.datums[func->tg_name_varno]); var = (PLpgSQL_var *) (estate.datums[func->tg_name_varno]);
var->isnull = false; var->isnull = false;
var->freeval = false; var->freeval = true;
var->value = DirectFunctionCall1(namein, var->value = DirectFunctionCall1(namein,
CStringGetDatum(trigdata->tg_trigger->tgname)); CStringGetDatum(trigdata->tg_trigger->tgname));
var = (PLpgSQL_var *) (estate.datums[func->tg_when_varno]); var = (PLpgSQL_var *) (estate.datums[func->tg_when_varno]);
var->isnull = false; var->isnull = false;
var->freeval = false; var->freeval = true;
if (TRIGGER_FIRED_BEFORE(trigdata->tg_event)) if (TRIGGER_FIRED_BEFORE(trigdata->tg_event))
var->value = DirectFunctionCall1(textin, CStringGetDatum("BEFORE")); var->value = DirectFunctionCall1(textin, CStringGetDatum("BEFORE"));
else if (TRIGGER_FIRED_AFTER(trigdata->tg_event)) else if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
...@@ -673,7 +668,7 @@ plpgsql_exec_trigger(PLpgSQL_function * func, ...@@ -673,7 +668,7 @@ plpgsql_exec_trigger(PLpgSQL_function * func,
var = (PLpgSQL_var *) (estate.datums[func->tg_level_varno]); var = (PLpgSQL_var *) (estate.datums[func->tg_level_varno]);
var->isnull = false; var->isnull = false;
var->freeval = false; var->freeval = true;
if (TRIGGER_FIRED_FOR_ROW(trigdata->tg_event)) if (TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
var->value = DirectFunctionCall1(textin, CStringGetDatum("ROW")); var->value = DirectFunctionCall1(textin, CStringGetDatum("ROW"));
else if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) else if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
...@@ -684,17 +679,18 @@ plpgsql_exec_trigger(PLpgSQL_function * func, ...@@ -684,17 +679,18 @@ plpgsql_exec_trigger(PLpgSQL_function * func,
var = (PLpgSQL_var *) (estate.datums[func->tg_relid_varno]); var = (PLpgSQL_var *) (estate.datums[func->tg_relid_varno]);
var->isnull = false; var->isnull = false;
var->freeval = false; var->freeval = false;
var->value = (Datum) (trigdata->tg_relation->rd_id); var->value = ObjectIdGetDatum(trigdata->tg_relation->rd_id);
var = (PLpgSQL_var *) (estate.datums[func->tg_relname_varno]); var = (PLpgSQL_var *) (estate.datums[func->tg_relname_varno]);
var->isnull = false; var->isnull = false;
var->freeval = true;
var->value = DirectFunctionCall1(namein, var->value = DirectFunctionCall1(namein,
CStringGetDatum(RelationGetRelationName(trigdata->tg_relation))); CStringGetDatum(RelationGetRelationName(trigdata->tg_relation)));
var = (PLpgSQL_var *) (estate.datums[func->tg_nargs_varno]); var = (PLpgSQL_var *) (estate.datums[func->tg_nargs_varno]);
var->isnull = false; var->isnull = false;
var->freeval = false; var->freeval = false;
var->value = (Datum) (trigdata->tg_trigger->tgnargs); var->value = Int16GetDatum(trigdata->tg_trigger->tgnargs);
/* /*
* Put the actual call argument values into the special execution * Put the actual call argument values into the special execution
...@@ -784,9 +780,13 @@ plpgsql_exec_trigger(PLpgSQL_function * func, ...@@ -784,9 +780,13 @@ plpgsql_exec_trigger(PLpgSQL_function * func,
elog(ERROR, "returned tuple structure doesn't match table of trigger event"); elog(ERROR, "returned tuple structure doesn't match table of trigger event");
} }
/* Copy tuple to upper executor memory */
rettup = SPI_copytuple((HeapTuple) (estate.retval)); rettup = SPI_copytuple((HeapTuple) (estate.retval));
} }
/* Clean up any leftover temporary memory */
exec_eval_cleanup(&estate);
/* /*
* Restore the previous error info and elog() jump target * Restore the previous error info and elog() jump target
*/ */
...@@ -1085,9 +1085,6 @@ exec_stmt_assign(PLpgSQL_execstate * estate, PLpgSQL_stmt_assign * stmt) ...@@ -1085,9 +1085,6 @@ exec_stmt_assign(PLpgSQL_execstate * estate, PLpgSQL_stmt_assign * stmt)
*/ */
int rc; int rc;
SPI_tuptable = NULL;
SPI_processed = 0;
/* /*
* If not already done create a plan for this expression * If not already done create a plan for this expression
*/ */
...@@ -1098,7 +1095,7 @@ exec_stmt_assign(PLpgSQL_execstate * estate, PLpgSQL_stmt_assign * stmt) ...@@ -1098,7 +1095,7 @@ exec_stmt_assign(PLpgSQL_execstate * estate, PLpgSQL_stmt_assign * stmt)
if (rc != SPI_OK_SELECT) if (rc != SPI_OK_SELECT)
elog(ERROR, "query \"%s\" didn't return data", expr->query); elog(ERROR, "query \"%s\" didn't return data", expr->query);
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
} }
return PLPGSQL_RC_OK; return PLPGSQL_RC_OK;
...@@ -1132,13 +1129,15 @@ exec_stmt_getdiag(PLpgSQL_execstate * estate, PLpgSQL_stmt_getdiag * stmt) ...@@ -1132,13 +1129,15 @@ exec_stmt_getdiag(PLpgSQL_execstate * estate, PLpgSQL_stmt_getdiag * stmt)
{ {
case PLPGSQL_GETDIAG_ROW_COUNT: case PLPGSQL_GETDIAG_ROW_COUNT:
exec_assign_value(estate, var, UInt32GetDatum(SPI_processed), exec_assign_value(estate, var,
UInt32GetDatum(estate->eval_processed),
INT4OID, &isnull); INT4OID, &isnull);
break; break;
case PLPGSQL_GETDIAG_RESULT_OID: case PLPGSQL_GETDIAG_RESULT_OID:
exec_assign_value(estate, var, ObjectIdGetDatum(SPI_lastoid), exec_assign_value(estate, var,
ObjectIdGetDatum(estate->eval_lastoid),
OIDOID, &isnull); OIDOID, &isnull);
break; break;
...@@ -1166,9 +1165,9 @@ exec_stmt_if(PLpgSQL_execstate * estate, PLpgSQL_stmt_if * stmt) ...@@ -1166,9 +1165,9 @@ exec_stmt_if(PLpgSQL_execstate * estate, PLpgSQL_stmt_if * stmt)
bool isnull = false; bool isnull = false;
value = exec_eval_expr(estate, stmt->cond, &isnull, &valtype); value = exec_eval_expr(estate, stmt->cond, &isnull, &valtype);
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
if (value) if (!isnull && DatumGetBool(value))
{ {
if (stmt->true_body != NULL) if (stmt->true_body != NULL)
return exec_stmts(estate, stmt->true_body); return exec_stmts(estate, stmt->true_body);
...@@ -1241,8 +1240,8 @@ exec_stmt_while(PLpgSQL_execstate * estate, PLpgSQL_stmt_while * stmt) ...@@ -1241,8 +1240,8 @@ exec_stmt_while(PLpgSQL_execstate * estate, PLpgSQL_stmt_while * stmt)
for (;;) for (;;)
{ {
value = exec_eval_expr(estate, stmt->cond, &isnull, &valtype); value = exec_eval_expr(estate, stmt->cond, &isnull, &valtype);
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
if (!value) if (isnull || !DatumGetBool(value))
break; break;
rc = exec_stmts(estate, stmt->body); rc = exec_stmts(estate, stmt->body);
...@@ -1289,12 +1288,12 @@ exec_stmt_fori(PLpgSQL_execstate * estate, PLpgSQL_stmt_fori * stmt) ...@@ -1289,12 +1288,12 @@ exec_stmt_fori(PLpgSQL_execstate * estate, PLpgSQL_stmt_fori * stmt)
bool isnull = false; bool isnull = false;
int rc; int rc;
var = (PLpgSQL_var *) (estate->datums[stmt->var->varno]);
/* /*
* Get the value of the lower bound into the loop var * Get the value of the lower bound into the loop var
*/ */
value = exec_eval_expr(estate, stmt->lower, &isnull, &valtype); value = exec_eval_expr(estate, stmt->lower, &isnull, &valtype);
var = (PLpgSQL_var *) (estate->datums[stmt->var->varno]);
value = exec_cast_value(value, valtype, var->datatype->typoid, value = exec_cast_value(value, valtype, var->datatype->typoid,
&(var->datatype->typinput), &(var->datatype->typinput),
var->datatype->typelem, var->datatype->typelem,
...@@ -1303,7 +1302,7 @@ exec_stmt_fori(PLpgSQL_execstate * estate, PLpgSQL_stmt_fori * stmt) ...@@ -1303,7 +1302,7 @@ exec_stmt_fori(PLpgSQL_execstate * estate, PLpgSQL_stmt_fori * stmt)
elog(ERROR, "lower bound of FOR loop cannot be NULL"); elog(ERROR, "lower bound of FOR loop cannot be NULL");
var->value = value; var->value = value;
var->isnull = false; var->isnull = false;
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
/* /*
* Get the value of the upper bound * Get the value of the upper bound
...@@ -1315,7 +1314,7 @@ exec_stmt_fori(PLpgSQL_execstate * estate, PLpgSQL_stmt_fori * stmt) ...@@ -1315,7 +1314,7 @@ exec_stmt_fori(PLpgSQL_execstate * estate, PLpgSQL_stmt_fori * stmt)
var->datatype->atttypmod, &isnull); var->datatype->atttypmod, &isnull);
if (isnull) if (isnull)
elog(ERROR, "upper bound of FOR loop cannot be NULL"); elog(ERROR, "upper bound of FOR loop cannot be NULL");
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
/* /*
* Now do the loop * Now do the loop
...@@ -1423,8 +1422,10 @@ exec_stmt_fors(PLpgSQL_execstate * estate, PLpgSQL_stmt_fors * stmt) ...@@ -1423,8 +1422,10 @@ exec_stmt_fors(PLpgSQL_execstate * estate, PLpgSQL_stmt_fors * stmt)
* the initial 10 rows. * the initial 10 rows.
*/ */
exec_run_select(estate, stmt->query, 0, &portal); exec_run_select(estate, stmt->query, 0, &portal);
SPI_cursor_fetch(portal, true, 10); SPI_cursor_fetch(portal, true, 10);
n = SPI_processed; n = SPI_processed;
tuptab = SPI_tuptable;
/* /*
* If the query didn't return any row, set the target to NULL and * If the query didn't return any row, set the target to NULL and
...@@ -1447,12 +1448,8 @@ exec_stmt_fors(PLpgSQL_execstate * estate, PLpgSQL_stmt_fors * stmt) ...@@ -1447,12 +1448,8 @@ exec_stmt_fors(PLpgSQL_execstate * estate, PLpgSQL_stmt_fors * stmt)
*/ */
for (;;) for (;;)
{ {
tuptab = SPI_tuptable;
SPI_tuptable = NULL;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
/* /*
* Assign the tuple to the target * Assign the tuple to the target
*/ */
...@@ -1501,7 +1498,10 @@ exec_stmt_fors(PLpgSQL_execstate * estate, PLpgSQL_stmt_fors * stmt) ...@@ -1501,7 +1498,10 @@ exec_stmt_fors(PLpgSQL_execstate * estate, PLpgSQL_stmt_fors * stmt)
* Fetch the next 50 tuples * Fetch the next 50 tuples
*/ */
SPI_cursor_fetch(portal, true, 50); SPI_cursor_fetch(portal, true, 50);
if ((n = SPI_processed) == 0) n = SPI_processed;
tuptab = SPI_tuptable;
if (n == 0)
break; break;
} }
...@@ -1525,7 +1525,7 @@ exec_stmt_select(PLpgSQL_execstate * estate, PLpgSQL_stmt_select * stmt) ...@@ -1525,7 +1525,7 @@ exec_stmt_select(PLpgSQL_execstate * estate, PLpgSQL_stmt_select * stmt)
PLpgSQL_rec *rec = NULL; PLpgSQL_rec *rec = NULL;
PLpgSQL_row *row = NULL; PLpgSQL_row *row = NULL;
SPITupleTable *tuptab; SPITupleTable *tuptab;
int n; uint32 n;
/* /*
* Initialize the global found variable to false * Initialize the global found variable to false
...@@ -1537,21 +1537,16 @@ exec_stmt_select(PLpgSQL_execstate * estate, PLpgSQL_stmt_select * stmt) ...@@ -1537,21 +1537,16 @@ exec_stmt_select(PLpgSQL_execstate * estate, PLpgSQL_stmt_select * stmt)
*/ */
if (stmt->rec != NULL) if (stmt->rec != NULL)
rec = (PLpgSQL_rec *) (estate->datums[stmt->rec->recno]); rec = (PLpgSQL_rec *) (estate->datums[stmt->rec->recno]);
else if (stmt->row != NULL)
row = (PLpgSQL_row *) (estate->datums[stmt->row->rowno]);
else else
{ elog(ERROR, "unsupported target in exec_stmt_select()");
if (stmt->row != NULL)
row = (PLpgSQL_row *) (estate->datums[stmt->row->rowno]);
else
elog(ERROR, "unsupported target in exec_stmt_select()");
}
/* /*
* Run the query * Run the query
*/ */
exec_run_select(estate, stmt->query, 1, NULL); exec_run_select(estate, stmt->query, 1, NULL);
n = SPI_processed; n = estate->eval_processed;
tuptab = SPI_tuptable;
SPI_tuptable = NULL;
/* /*
* If the query didn't return any row, set the target to NULL and * If the query didn't return any row, set the target to NULL and
...@@ -1560,15 +1555,18 @@ exec_stmt_select(PLpgSQL_execstate * estate, PLpgSQL_stmt_select * stmt) ...@@ -1560,15 +1555,18 @@ exec_stmt_select(PLpgSQL_execstate * estate, PLpgSQL_stmt_select * stmt)
if (n == 0) if (n == 0)
{ {
exec_move_row(estate, rec, row, NULL, NULL); exec_move_row(estate, rec, row, NULL, NULL);
exec_eval_cleanup(estate);
return PLPGSQL_RC_OK; return PLPGSQL_RC_OK;
} }
/* /*
* Put the result into the target and set found to true * Put the result into the target and set found to true
*/ */
tuptab = estate->eval_tuptable;
exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc); exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc);
exec_set_found(estate, true); exec_set_found(estate, true);
SPI_freetuptable(tuptab);
exec_eval_cleanup(estate);
return PLPGSQL_RC_OK; return PLPGSQL_RC_OK;
} }
...@@ -1591,8 +1589,8 @@ exec_stmt_exit(PLpgSQL_execstate * estate, PLpgSQL_stmt_exit * stmt) ...@@ -1591,8 +1589,8 @@ exec_stmt_exit(PLpgSQL_execstate * estate, PLpgSQL_stmt_exit * stmt)
if (stmt->cond != NULL) if (stmt->cond != NULL)
{ {
value = exec_eval_expr(estate, stmt->cond, &isnull, &valtype); value = exec_eval_expr(estate, stmt->cond, &isnull, &valtype);
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
if (!value) if (isnull || !DatumGetBool(value))
return PLPGSQL_RC_OK; return PLPGSQL_RC_OK;
} }
...@@ -1611,29 +1609,38 @@ exec_stmt_return(PLpgSQL_execstate * estate, PLpgSQL_stmt_return * stmt) ...@@ -1611,29 +1609,38 @@ exec_stmt_return(PLpgSQL_execstate * estate, PLpgSQL_stmt_return * stmt)
{ {
if (estate->retistuple) if (estate->retistuple)
{ {
/* initialize for null result tuple */
estate->retval = (Datum) 0;
estate->rettupdesc = NULL;
estate->retisnull = true;
if (stmt->retrecno >= 0) if (stmt->retrecno >= 0)
{ {
PLpgSQL_rec *rec = (PLpgSQL_rec *) (estate->datums[stmt->retrecno]); PLpgSQL_rec *rec = (PLpgSQL_rec *) (estate->datums[stmt->retrecno]);
estate->retval = (Datum) (rec->tup); if (HeapTupleIsValid(rec->tup))
estate->rettupdesc = rec->tupdesc; {
estate->retisnull = !HeapTupleIsValid(rec->tup); estate->retval = (Datum) SPI_copytuple(rec->tup);
estate->rettupdesc = SPI_copytupledesc(rec->tupdesc);
estate->retisnull = false;
}
return PLPGSQL_RC_RETURN; return PLPGSQL_RC_RETURN;
} }
if (stmt->expr == NULL) if (stmt->expr != NULL)
{
estate->retval = (Datum) 0;
estate->rettupdesc = NULL;
estate->retisnull = true;
}
else
{ {
exec_run_select(estate, stmt->expr, 1, NULL); exec_run_select(estate, stmt->expr, 1, NULL);
estate->retval = (Datum) SPI_copytuple(SPI_tuptable->vals[0]); if (estate->eval_processed > 0)
estate->rettupdesc = SPI_tuptable->tupdesc; {
estate->retisnull = false; estate->retval = (Datum) SPI_copytuple(estate->eval_tuptable->vals[0]);
estate->rettupdesc = SPI_copytupledesc(estate->eval_tuptable->tupdesc);
estate->retisnull = false;
}
/*
* Okay to clean up here, since we already copied result tuple
* to upper executor.
*/
exec_eval_cleanup(estate);
} }
return PLPGSQL_RC_RETURN; return PLPGSQL_RC_RETURN;
} }
...@@ -1706,7 +1713,7 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt) ...@@ -1706,7 +1713,7 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt)
ObjectIdGetDatum(var->datatype->typoid), ObjectIdGetDatum(var->datatype->typoid),
0, 0, 0); 0, 0, 0);
if (!HeapTupleIsValid(typetup)) if (!HeapTupleIsValid(typetup))
elog(ERROR, "cache lookup for type %u failed (1)", elog(ERROR, "cache lookup for type %u failed",
var->datatype->typoid); var->datatype->typoid);
typeStruct = (Form_pg_type) GETSTRUCT(typetup); typeStruct = (Form_pg_type) GETSTRUCT(typetup);
...@@ -1750,7 +1757,7 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt) ...@@ -1750,7 +1757,7 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt)
(estate->datums[stmt->params[pidx]]); (estate->datums[stmt->params[pidx]]);
value = (int) exec_eval_expr(estate, trigarg->argnum, value = (int) exec_eval_expr(estate, trigarg->argnum,
&valisnull, &valtype); &valisnull, &valtype);
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
if (valisnull) if (valisnull)
extval = "<INDEX_IS_NULL>"; extval = "<INDEX_IS_NULL>";
else else
...@@ -1775,7 +1782,7 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt) ...@@ -1775,7 +1782,7 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt)
} }
/* /*
* Occurences of single ' are removed. double ' are reduced to * Occurrences of single ' are removed. double ' are reduced to
* single ones. * single ones.
*/ */
if (*cp == '\'') if (*cp == '\'')
...@@ -1806,6 +1813,58 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt) ...@@ -1806,6 +1813,58 @@ exec_stmt_raise(PLpgSQL_execstate * estate, PLpgSQL_stmt_raise * stmt)
} }
/* ----------
* Initialize an empty estate
* ----------
*/
static void
plpgsql_estate_setup(PLpgSQL_execstate * estate,
PLpgSQL_function * func)
{
estate->retval = (Datum) 0;
estate->retisnull = true;
estate->rettype = InvalidOid;
estate->retistuple = func->fn_retistuple;
estate->rettupdesc = NULL;
estate->retisset = func->fn_retset;
estate->exitlabel = NULL;
estate->trig_nargs = 0;
estate->trig_argv = NULL;
estate->found_varno = func->found_varno;
estate->ndatums = func->ndatums;
estate->datums = palloc(sizeof(PLpgSQL_datum *) * estate->ndatums);
/* caller is expected to fill the datums array */
estate->eval_tuptable = NULL;
estate->eval_processed = 0;
estate->eval_lastoid = InvalidOid;
estate->eval_econtext = NULL;
}
/* ----------
* Release temporary memory used by expression/subselect evaluation
*
* NB: the result of the evaluation is no longer valid after this is done,
* unless it is a pass-by-value datatype.
* ----------
*/
static void
exec_eval_cleanup(PLpgSQL_execstate * estate)
{
/* Clear result of a full SPI_exec */
if (estate->eval_tuptable != NULL)
SPI_freetuptable(estate->eval_tuptable);
estate->eval_tuptable = NULL;
/* Clear result of exec_eval_simple_expr */
if (estate->eval_econtext != NULL)
FreeExprContext(estate->eval_econtext);
estate->eval_econtext = NULL;
}
/* ---------- /* ----------
* Generate a prepared plan * Generate a prepared plan
* ---------- * ----------
...@@ -1823,9 +1882,12 @@ exec_prepare_plan(PLpgSQL_execstate * estate, ...@@ -1823,9 +1882,12 @@ exec_prepare_plan(PLpgSQL_execstate * estate,
Oid *argtypes; Oid *argtypes;
/* /*
* Setup the argtypes array * We need a temporary argtypes array to load with data.
* (The finished plan structure will contain a copy of it.)
*
* +1 is just to avoid palloc(0) error.
*/ */
argtypes = malloc(sizeof(Oid *) * (expr->nparams + 1)); argtypes = palloc(sizeof(Oid *) * (expr->nparams + 1));
for (i = 0; i < expr->nparams; i++) for (i = 0; i < expr->nparams; i++)
{ {
...@@ -1865,9 +1927,11 @@ exec_prepare_plan(PLpgSQL_execstate * estate, ...@@ -1865,9 +1927,11 @@ exec_prepare_plan(PLpgSQL_execstate * estate,
if (plan == NULL) if (plan == NULL)
elog(ERROR, "SPI_prepare() failed on \"%s\"", expr->query); elog(ERROR, "SPI_prepare() failed on \"%s\"", expr->query);
expr->plan = SPI_saveplan(plan); expr->plan = SPI_saveplan(plan);
expr->plan_argtypes = argtypes; expr->plan_argtypes = ((_SPI_plan *) expr->plan)->argtypes;
expr->plan_simple_expr = NULL; expr->plan_simple_expr = NULL;
exec_simple_check_plan(expr); exec_simple_check_plan(expr);
pfree(argtypes);
} }
...@@ -1943,7 +2007,7 @@ exec_stmt_execsql(PLpgSQL_execstate * estate, ...@@ -1943,7 +2007,7 @@ exec_stmt_execsql(PLpgSQL_execstate * estate,
trigarg = (PLpgSQL_trigarg *) (estate->datums[expr->params[i]]); trigarg = (PLpgSQL_trigarg *) (estate->datums[expr->params[i]]);
tgargno = (int) exec_eval_expr(estate, trigarg->argnum, tgargno = (int) exec_eval_expr(estate, trigarg->argnum,
&isnull, &tgargoid); &isnull, &tgargoid);
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
if (isnull || tgargno < 0 || tgargno >= estate->trig_nargs) if (isnull || tgargno < 0 || tgargno >= estate->trig_nargs)
{ {
values[i] = 0; values[i] = 0;
...@@ -1982,6 +2046,14 @@ exec_stmt_execsql(PLpgSQL_execstate * estate, ...@@ -1982,6 +2046,14 @@ exec_stmt_execsql(PLpgSQL_execstate * estate,
elog(ERROR, "error executing query \"%s\"", elog(ERROR, "error executing query \"%s\"",
expr->query); expr->query);
} }
/* Release any result tuples from SPI_execp (probably shouldn't be any) */
SPI_freetuptable(SPI_tuptable);
/* Save result info for GET DIAGNOSTICS */
estate->eval_processed = SPI_processed;
estate->eval_lastoid = SPI_lastoid;
pfree(values); pfree(values);
pfree(nulls); pfree(nulls);
...@@ -2022,7 +2094,7 @@ exec_stmt_dynexecute(PLpgSQL_execstate * estate, ...@@ -2022,7 +2094,7 @@ exec_stmt_dynexecute(PLpgSQL_execstate * estate,
ObjectIdGetDatum(restype), ObjectIdGetDatum(restype),
0, 0, 0); 0, 0, 0);
if (!HeapTupleIsValid(typetup)) if (!HeapTupleIsValid(typetup))
elog(ERROR, "cache lookup for type %u failed (1)", restype); elog(ERROR, "cache lookup for type %u failed", restype);
typeStruct = (Form_pg_type) GETSTRUCT(typetup); typeStruct = (Form_pg_type) GETSTRUCT(typetup);
fmgr_info(typeStruct->typoutput, &finfo_output); fmgr_info(typeStruct->typoutput, &finfo_output);
...@@ -2031,9 +2103,8 @@ exec_stmt_dynexecute(PLpgSQL_execstate * estate, ...@@ -2031,9 +2103,8 @@ exec_stmt_dynexecute(PLpgSQL_execstate * estate,
ObjectIdGetDatum(typeStruct->typelem), ObjectIdGetDatum(typeStruct->typelem),
Int32GetDatum(-1))); Int32GetDatum(-1)));
SPI_freetuptable(SPI_tuptable);
ReleaseSysCache(typetup); ReleaseSysCache(typetup);
exec_eval_cleanup(estate);
/* /*
* Call SPI_exec() without preparing a saved plan. The returncode can * Call SPI_exec() without preparing a saved plan. The returncode can
...@@ -2075,7 +2146,14 @@ exec_stmt_dynexecute(PLpgSQL_execstate * estate, ...@@ -2075,7 +2146,14 @@ exec_stmt_dynexecute(PLpgSQL_execstate * estate,
break; break;
} }
/* Release any result from SPI_exec, as well as the querystring */
SPI_freetuptable(SPI_tuptable);
pfree(querystr); pfree(querystr);
/* Save result info for GET DIAGNOSTICS */
estate->eval_processed = SPI_processed;
estate->eval_lastoid = SPI_lastoid;
return PLPGSQL_RC_OK; return PLPGSQL_RC_OK;
} }
...@@ -2139,7 +2217,7 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt) ...@@ -2139,7 +2217,7 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt)
ObjectIdGetDatum(restype), ObjectIdGetDatum(restype),
0, 0, 0); 0, 0, 0);
if (!HeapTupleIsValid(typetup)) if (!HeapTupleIsValid(typetup))
elog(ERROR, "cache lookup for type %u failed (1)", restype); elog(ERROR, "cache lookup for type %u failed", restype);
typeStruct = (Form_pg_type) GETSTRUCT(typetup); typeStruct = (Form_pg_type) GETSTRUCT(typetup);
fmgr_info(typeStruct->typoutput, &finfo_output); fmgr_info(typeStruct->typoutput, &finfo_output);
...@@ -2148,9 +2226,8 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt) ...@@ -2148,9 +2226,8 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt)
ObjectIdGetDatum(typeStruct->typelem), ObjectIdGetDatum(typeStruct->typelem),
Int32GetDatum(-1))); Int32GetDatum(-1)));
SPI_freetuptable(SPI_tuptable);
ReleaseSysCache(typetup); ReleaseSysCache(typetup);
exec_eval_cleanup(estate);
/* /*
* Prepare a plan and open an implicit cursor for the query * Prepare a plan and open an implicit cursor for the query
...@@ -2170,6 +2247,7 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt) ...@@ -2170,6 +2247,7 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt)
*/ */
SPI_cursor_fetch(portal, true, 10); SPI_cursor_fetch(portal, true, 10);
n = SPI_processed; n = SPI_processed;
tuptab = SPI_tuptable;
/* /*
* If the query didn't return any row, set the target to NULL and * If the query didn't return any row, set the target to NULL and
...@@ -2192,12 +2270,8 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt) ...@@ -2192,12 +2270,8 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt)
*/ */
for (;;) for (;;)
{ {
tuptab = SPI_tuptable;
SPI_tuptable = NULL;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
/* /*
* Assign the tuple to the target * Assign the tuple to the target
*/ */
...@@ -2246,7 +2320,10 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt) ...@@ -2246,7 +2320,10 @@ exec_stmt_dynfors(PLpgSQL_execstate * estate, PLpgSQL_stmt_dynfors * stmt)
* Fetch the next 50 tuples * Fetch the next 50 tuples
*/ */
SPI_cursor_fetch(portal, true, 50); SPI_cursor_fetch(portal, true, 50);
if ((n = SPI_processed) == 0) n = SPI_processed;
tuptab = SPI_tuptable;
if (n == 0)
break; break;
} }
...@@ -2346,7 +2423,7 @@ exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt) ...@@ -2346,7 +2423,7 @@ exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt)
ObjectIdGetDatum(restype), ObjectIdGetDatum(restype),
0, 0, 0); 0, 0, 0);
if (!HeapTupleIsValid(typetup)) if (!HeapTupleIsValid(typetup))
elog(ERROR, "cache lookup for type %u failed (1)", restype); elog(ERROR, "cache lookup for type %u failed", restype);
typeStruct = (Form_pg_type) GETSTRUCT(typetup); typeStruct = (Form_pg_type) GETSTRUCT(typetup);
fmgr_info(typeStruct->typoutput, &finfo_output); fmgr_info(typeStruct->typoutput, &finfo_output);
...@@ -2355,8 +2432,8 @@ exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt) ...@@ -2355,8 +2432,8 @@ exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt)
ObjectIdGetDatum(typeStruct->typelem), ObjectIdGetDatum(typeStruct->typelem),
Int32GetDatum(-1))); Int32GetDatum(-1)));
SPI_freetuptable(SPI_tuptable);
ReleaseSysCache(typetup); ReleaseSysCache(typetup);
exec_eval_cleanup(estate);
/* ---------- /* ----------
* Now we prepare a query plan for it and open a cursor * Now we prepare a query plan for it and open a cursor
...@@ -2459,7 +2536,7 @@ exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt) ...@@ -2459,7 +2536,7 @@ exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt)
trigarg = (PLpgSQL_trigarg *) (estate->datums[query->params[i]]); trigarg = (PLpgSQL_trigarg *) (estate->datums[query->params[i]]);
tgargno = (int) exec_eval_expr(estate, trigarg->argnum, tgargno = (int) exec_eval_expr(estate, trigarg->argnum,
&isnull, &tgargoid); &isnull, &tgargoid);
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
if (isnull || tgargno < 0 || tgargno >= estate->trig_nargs) if (isnull || tgargno < 0 || tgargno >= estate->trig_nargs)
{ {
values[i] = 0; values[i] = 0;
...@@ -2489,6 +2566,8 @@ exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt) ...@@ -2489,6 +2566,8 @@ exec_stmt_open(PLpgSQL_execstate * estate, PLpgSQL_stmt_open * stmt)
pfree(values); pfree(values);
pfree(nulls); pfree(nulls);
if (curname)
pfree(curname);
/* ---------- /* ----------
* Store the eventually assigned portal name in the cursor variable * Store the eventually assigned portal name in the cursor variable
...@@ -2515,6 +2594,7 @@ exec_stmt_fetch(PLpgSQL_execstate * estate, PLpgSQL_stmt_fetch * stmt) ...@@ -2515,6 +2594,7 @@ exec_stmt_fetch(PLpgSQL_execstate * estate, PLpgSQL_stmt_fetch * stmt)
PLpgSQL_var *curvar = NULL; PLpgSQL_var *curvar = NULL;
PLpgSQL_rec *rec = NULL; PLpgSQL_rec *rec = NULL;
PLpgSQL_row *row = NULL; PLpgSQL_row *row = NULL;
SPITupleTable *tuptab;
Portal portal; Portal portal;
char *curname; char *curname;
int n; int n;
...@@ -2559,6 +2639,7 @@ exec_stmt_fetch(PLpgSQL_execstate * estate, PLpgSQL_stmt_fetch * stmt) ...@@ -2559,6 +2639,7 @@ exec_stmt_fetch(PLpgSQL_execstate * estate, PLpgSQL_stmt_fetch * stmt)
*/ */
SPI_cursor_fetch(portal, true, 1); SPI_cursor_fetch(portal, true, 1);
n = SPI_processed; n = SPI_processed;
tuptab = SPI_tuptable;
/* ---------- /* ----------
* If the FETCH didn't return a row, set the target * If the FETCH didn't return a row, set the target
...@@ -2575,11 +2656,10 @@ exec_stmt_fetch(PLpgSQL_execstate * estate, PLpgSQL_stmt_fetch * stmt) ...@@ -2575,11 +2656,10 @@ exec_stmt_fetch(PLpgSQL_execstate * estate, PLpgSQL_stmt_fetch * stmt)
* Put the result into the target and set found to true * Put the result into the target and set found to true
* ---------- * ----------
*/ */
exec_move_row(estate, rec, row, SPI_tuptable->vals[0], exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc);
SPI_tuptable->tupdesc);
exec_set_found(estate, true); exec_set_found(estate, true);
SPI_freetuptable(SPI_tuptable); SPI_freetuptable(tuptab);
return PLPGSQL_RC_OK; return PLPGSQL_RC_OK;
} }
...@@ -2635,8 +2715,7 @@ exec_assign_expr(PLpgSQL_execstate * estate, PLpgSQL_datum * target, ...@@ -2635,8 +2715,7 @@ exec_assign_expr(PLpgSQL_execstate * estate, PLpgSQL_datum * target,
value = exec_eval_expr(estate, expr, &isnull, &valtype); value = exec_eval_expr(estate, expr, &isnull, &valtype);
exec_assign_value(estate, target, value, valtype, &isnull); exec_assign_value(estate, target, value, valtype, &isnull);
exec_eval_cleanup(estate);
SPI_freetuptable(SPI_tuptable);
} }
...@@ -2657,6 +2736,7 @@ exec_assign_value(PLpgSQL_execstate * estate, ...@@ -2657,6 +2736,7 @@ exec_assign_value(PLpgSQL_execstate * estate,
int natts; int natts;
Datum *values; Datum *values;
char *nulls; char *nulls;
void *mustfree;
Datum newvalue; Datum newvalue;
bool attisnull; bool attisnull;
Oid atttype; Oid atttype;
...@@ -2687,23 +2767,34 @@ exec_assign_value(PLpgSQL_execstate * estate, ...@@ -2687,23 +2767,34 @@ exec_assign_value(PLpgSQL_execstate * estate,
var->datatype->atttypmod, var->datatype->atttypmod,
isNull); isNull);
if (!var->datatype->typbyval && newvalue == value && !*isNull) if (*isNull && var->notnull)
elog(ERROR, "NULL assignment to variable '%s' declared NOT NULL", var->refname);
/*
* If type is by-reference, make sure we have a freshly palloc'd
* copy; the originally passed value may not live as long as the
* variable! But we don't need to re-copy if exec_cast_value
* performed a conversion; its output must already be palloc'd.
*/
if (!var->datatype->typbyval && !*isNull)
{ {
int len; if (newvalue == value)
if (var->datatype->typlen < 0) {
len = VARSIZE(newvalue); int len;
if (var->datatype->typlen < 0)
len = VARSIZE(newvalue);
else
len = var->datatype->typlen;
var->value = (Datum) palloc(len);
memcpy((void *)(var->value), (void *)newvalue, len);
}
else else
len = var->datatype->typlen; var->value = newvalue;
var->value = (Datum)palloc(len);
memcpy((void *)(var->value), (void *)newvalue, len);
var->freeval = true; var->freeval = true;
} }
else else
var->value = newvalue; var->value = newvalue;
if (*isNull && var->notnull)
elog(ERROR, "NULL assignment to variable '%s' declared NOT NULL", var->refname);
var->isnull = *isNull; var->isnull = *isNull;
break; break;
...@@ -2734,62 +2825,64 @@ exec_assign_value(PLpgSQL_execstate * estate, ...@@ -2734,62 +2825,64 @@ exec_assign_value(PLpgSQL_execstate * estate,
natts = rec->tupdesc->natts; natts = rec->tupdesc->natts;
/* /*
* We loop over the attributes of the rec's current tuple and * Set up values/datums arrays for heap_formtuple. For all the
* collect the values in a Datum array along with the nulls * attributes except the one we want to replace, use the value
* information. * that's in the old tuple.
*/ */
values = palloc(sizeof(Datum) * natts); values = palloc(sizeof(Datum) * natts);
nulls = palloc(natts + 1); nulls = palloc(natts);
for (i = 0; i < natts; i++) for (i = 0; i < natts; i++)
{ {
if (i == fno)
/*
* If this isn't the field we assign to, just use the
* value that's already in the tuple.
*/
if (i != fno)
{
values[i] = SPI_getbinval(rec->tup, rec->tupdesc,
i + 1, &attisnull);
if (attisnull)
nulls[i] = 'n';
else
nulls[i] = ' ';
continue; continue;
} values[i] = SPI_getbinval(rec->tup, rec->tupdesc,
i + 1, &attisnull);
/*
* This is the field to change. Get its type and cast the
* value we insert to that type.
*/
atttype = SPI_gettypeid(rec->tupdesc, i + 1);
atttypmod = rec->tupdesc->attrs[i]->atttypmod;
typetup = SearchSysCache(TYPEOID,
ObjectIdGetDatum(atttype),
0, 0, 0);
if (!HeapTupleIsValid(typetup))
elog(ERROR, "cache lookup for type %u failed", atttype);
typeStruct = (Form_pg_type) GETSTRUCT(typetup);
fmgr_info(typeStruct->typinput, &finfo_input);
attisnull = *isNull;
values[i] = exec_cast_value(value, valtype,
atttype, &finfo_input,
typeStruct->typelem,
atttypmod, &attisnull);
if (attisnull) if (attisnull)
nulls[i] = 'n'; nulls[i] = 'n';
else else
nulls[i] = ' '; nulls[i] = ' ';
ReleaseSysCache(typetup);
} }
/*
* Now insert the new value, being careful to cast it to the
* right type.
*/
atttype = SPI_gettypeid(rec->tupdesc, fno + 1);
atttypmod = rec->tupdesc->attrs[fno]->atttypmod;
typetup = SearchSysCache(TYPEOID,
ObjectIdGetDatum(atttype),
0, 0, 0);
if (!HeapTupleIsValid(typetup))
elog(ERROR, "cache lookup for type %u failed", atttype);
typeStruct = (Form_pg_type) GETSTRUCT(typetup);
fmgr_info(typeStruct->typinput, &finfo_input);
attisnull = *isNull;
values[fno] = exec_cast_value(value, valtype,
atttype, &finfo_input,
typeStruct->typelem,
atttypmod, &attisnull);
if (attisnull)
nulls[fno] = 'n';
else
nulls[fno] = ' ';
/*
* Avoid leaking the result of exec_cast_value, if it performed
* a conversion to a pass-by-ref type.
*/
if (!typeStruct->typbyval && !attisnull && values[fno] != value)
mustfree = DatumGetPointer(values[fno]);
else
mustfree = NULL;
ReleaseSysCache(typetup);
/* /*
* Now call heap_formtuple() to create a new tuple that * Now call heap_formtuple() to create a new tuple that
* replaces the old one in the record. * replaces the old one in the record.
*/ */
nulls[i] = '\0';
newtup = heap_formtuple(rec->tupdesc, values, nulls); newtup = heap_formtuple(rec->tupdesc, values, nulls);
if (rec->freetup) if (rec->freetup)
...@@ -2800,6 +2893,8 @@ exec_assign_value(PLpgSQL_execstate * estate, ...@@ -2800,6 +2893,8 @@ exec_assign_value(PLpgSQL_execstate * estate,
pfree(values); pfree(values);
pfree(nulls); pfree(nulls);
if (mustfree)
pfree(mustfree);
break; break;
...@@ -2813,6 +2908,8 @@ exec_assign_value(PLpgSQL_execstate * estate, ...@@ -2813,6 +2908,8 @@ exec_assign_value(PLpgSQL_execstate * estate,
/* ---------- /* ----------
* exec_eval_expr Evaluate an expression and return * exec_eval_expr Evaluate an expression and return
* the result Datum. * the result Datum.
*
* NOTE: caller must do exec_eval_cleanup when done with the Datum.
* ---------- * ----------
*/ */
static Datum static Datum
...@@ -2823,9 +2920,6 @@ exec_eval_expr(PLpgSQL_execstate * estate, ...@@ -2823,9 +2920,6 @@ exec_eval_expr(PLpgSQL_execstate * estate,
{ {
int rc; int rc;
SPI_tuptable = NULL;
SPI_processed = 0;
/* /*
* If not already done create a plan for this expression * If not already done create a plan for this expression
*/ */
...@@ -2846,7 +2940,7 @@ exec_eval_expr(PLpgSQL_execstate * estate, ...@@ -2846,7 +2940,7 @@ exec_eval_expr(PLpgSQL_execstate * estate,
/* /*
* If there are no rows selected, the result is NULL. * If there are no rows selected, the result is NULL.
*/ */
if (SPI_processed == 0) if (estate->eval_processed == 0)
{ {
*isNull = true; *isNull = true;
return (Datum) 0; return (Datum) 0;
...@@ -2855,17 +2949,18 @@ exec_eval_expr(PLpgSQL_execstate * estate, ...@@ -2855,17 +2949,18 @@ exec_eval_expr(PLpgSQL_execstate * estate,
/* /*
* Check that the expression returned one single Datum * Check that the expression returned one single Datum
*/ */
if (SPI_processed > 1) if (estate->eval_processed > 1)
elog(ERROR, "query \"%s\" returned more than one row", expr->query); elog(ERROR, "query \"%s\" returned more than one row", expr->query);
if (SPI_tuptable->tupdesc->natts != 1) if (estate->eval_tuptable->tupdesc->natts != 1)
elog(ERROR, "query \"%s\" returned %d columns", expr->query, elog(ERROR, "query \"%s\" returned %d columns", expr->query,
SPI_tuptable->tupdesc->natts); estate->eval_tuptable->tupdesc->natts);
/* /*
* Return the result and its type * Return the result and its type
*/ */
*rettype = SPI_gettypeid(SPI_tuptable->tupdesc, 1); *rettype = SPI_gettypeid(estate->eval_tuptable->tupdesc, 1);
return SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, isNull); return SPI_getbinval(estate->eval_tuptable->vals[0],
estate->eval_tuptable->tupdesc, 1, isNull);
} }
...@@ -2939,7 +3034,7 @@ exec_run_select(PLpgSQL_execstate * estate, ...@@ -2939,7 +3034,7 @@ exec_run_select(PLpgSQL_execstate * estate,
trigarg = (PLpgSQL_trigarg *) (estate->datums[expr->params[i]]); trigarg = (PLpgSQL_trigarg *) (estate->datums[expr->params[i]]);
tgargno = (int) exec_eval_expr(estate, trigarg->argnum, tgargno = (int) exec_eval_expr(estate, trigarg->argnum,
&isnull, &tgargoid); &isnull, &tgargoid);
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
if (isnull || tgargno < 0 || tgargno >= estate->trig_nargs) if (isnull || tgargno < 0 || tgargno >= estate->trig_nargs)
{ {
values[i] = 0; values[i] = 0;
...@@ -2960,7 +3055,7 @@ exec_run_select(PLpgSQL_execstate * estate, ...@@ -2960,7 +3055,7 @@ exec_run_select(PLpgSQL_execstate * estate,
nulls[i] = '\0'; nulls[i] = '\0';
/* /*
* Execute the query * If a portal was requested, put the query into the portal
*/ */
if (portalP != NULL) if (portalP != NULL)
{ {
...@@ -2972,9 +3067,20 @@ exec_run_select(PLpgSQL_execstate * estate, ...@@ -2972,9 +3067,20 @@ exec_run_select(PLpgSQL_execstate * estate,
pfree(nulls); pfree(nulls);
return SPI_OK_CURSOR; return SPI_OK_CURSOR;
} }
/*
* Execute the query
*/
rc = SPI_execp(expr->plan, values, nulls, maxtuples); rc = SPI_execp(expr->plan, values, nulls, maxtuples);
if (rc != SPI_OK_SELECT) if (rc != SPI_OK_SELECT)
elog(ERROR, "query \"%s\" isn't a SELECT", expr->query); elog(ERROR, "query \"%s\" isn't a SELECT", expr->query);
/* Save query results for eventual cleanup */
Assert(estate->eval_tuptable == NULL);
estate->eval_tuptable = SPI_tuptable;
estate->eval_processed = SPI_processed;
estate->eval_lastoid = SPI_lastoid;
pfree(values); pfree(values);
pfree(nulls); pfree(nulls);
...@@ -2993,6 +3099,7 @@ exec_eval_simple_expr(PLpgSQL_execstate * estate, ...@@ -2993,6 +3099,7 @@ exec_eval_simple_expr(PLpgSQL_execstate * estate,
bool *isNull, bool *isNull,
Oid *rettype) Oid *rettype)
{ {
_SPI_plan *spi_plan = (_SPI_plan *) expr->plan;
Datum retval; Datum retval;
PLpgSQL_var *var; PLpgSQL_var *var;
PLpgSQL_rec *rec; PLpgSQL_rec *rec;
...@@ -3009,16 +3116,19 @@ exec_eval_simple_expr(PLpgSQL_execstate * estate, ...@@ -3009,16 +3116,19 @@ exec_eval_simple_expr(PLpgSQL_execstate * estate,
/* /*
* Create a simple expression context to hold the arguments. * Create a simple expression context to hold the arguments.
* *
* NOTE: we pass TopMemoryContext as the query-lifetime context for * NOTE: we pass the SPI plan's context as the query-lifetime context for
* function cache nodes and suchlike allocations. This is necessary * function cache nodes and suchlike allocations. This is appropriate
* because that's where the expression tree itself is (it'll never be * because that's where the expression tree itself is, and the function
* freed in this backend, and the function cache nodes must live as * cache nodes must live as long as it does.
* long as it does). The memory allocation for plpgsql's plan trees */
* really needs to be redesigned... econtext = MakeExprContext(NULL, spi_plan->plancxt);
*/
econtext = MakeExprContext(NULL, TopMemoryContext); /*
paramLI = (ParamListInfo) palloc((expr->nparams + 1) * * Param list can live in econtext's temporary memory context.
sizeof(ParamListInfoData)); */
paramLI = (ParamListInfo)
MemoryContextAlloc(econtext->ecxt_per_tuple_memory,
(expr->nparams + 1) * sizeof(ParamListInfoData));
econtext->ecxt_param_list_info = paramLI; econtext->ecxt_param_list_info = paramLI;
/* /*
...@@ -3059,7 +3169,7 @@ exec_eval_simple_expr(PLpgSQL_execstate * estate, ...@@ -3059,7 +3169,7 @@ exec_eval_simple_expr(PLpgSQL_execstate * estate,
trigarg = (PLpgSQL_trigarg *) (estate->datums[expr->params[i]]); trigarg = (PLpgSQL_trigarg *) (estate->datums[expr->params[i]]);
tgargno = (int) exec_eval_expr(estate, trigarg->argnum, tgargno = (int) exec_eval_expr(estate, trigarg->argnum,
&isnull, &tgargoid); &isnull, &tgargoid);
SPI_freetuptable(SPI_tuptable); exec_eval_cleanup(estate);
if (isnull || tgargno < 0 || tgargno >= estate->trig_nargs) if (isnull || tgargno < 0 || tgargno >= estate->trig_nargs)
{ {
paramLI->value = 0; paramLI->value = 0;
...@@ -3094,19 +3204,11 @@ exec_eval_simple_expr(PLpgSQL_execstate * estate, ...@@ -3094,19 +3204,11 @@ exec_eval_simple_expr(PLpgSQL_execstate * estate,
SPI_pop(); SPI_pop();
/* /*
* Copy the result out of the expression-evaluation memory context, so * Note: if pass-by-reference, the result is in the econtext's temporary
* that we can free the expression context. * memory context. It will be freed when exec_eval_cleanup is done.
*/ */
if (!*isNull) Assert(estate->eval_econtext == NULL);
{ estate->eval_econtext = econtext;
int16 typeLength;
bool byValue;
get_typlenbyval(*rettype, &typeLength, &byValue);
retval = datumCopy(retval, byValue, typeLength);
}
FreeExprContext(econtext);
/* /*
* That's it. * That's it.
...@@ -3224,7 +3326,6 @@ exec_cast_value(Datum value, Oid valtype, ...@@ -3224,7 +3326,6 @@ exec_cast_value(Datum value, Oid valtype,
{ {
if (!*isnull) if (!*isnull)
{ {
/* /*
* If the type of the queries return value isn't that of the * If the type of the queries return value isn't that of the
* variable, convert it. * variable, convert it.
...@@ -3329,12 +3430,6 @@ exec_simple_check_plan(PLpgSQL_expr * expr) ...@@ -3329,12 +3430,6 @@ exec_simple_check_plan(PLpgSQL_expr * expr)
TargetEntry *tle; TargetEntry *tle;
expr->plan_simple_expr = NULL; expr->plan_simple_expr = NULL;
/*
* Disabled for now until we can execute simple expressions
* without collecting all the memory allocations until procedure
* returns. 05/17/2001 Jan
*/
return;
/* /*
* 1. We can only evaluate queries that resulted in one single * 1. We can only evaluate queries that resulted in one single
...@@ -3402,5 +3497,3 @@ exec_set_found(PLpgSQL_execstate * estate, bool state) ...@@ -3402,5 +3497,3 @@ exec_set_found(PLpgSQL_execstate * estate, bool state)
var->value = (Datum) state; var->value = (Datum) state;
var->isnull = false; var->isnull = false;
} }
src/pl/plpgsql/src/plpgsql.h
View file @ 42fbb6db
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.16 2001/07/12 17:42:08 momjian Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.17 2001/08/02 21:31:23 tgl Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
...@@ -502,6 +502,12 @@ typedef struct ...@@ -502,6 +502,12 @@ typedef struct
int found_varno; int found_varno;
int ndatums; int ndatums;
PLpgSQL_datum **datums; PLpgSQL_datum **datums;
/* temporary state for results from evaluation of query or expr */
SPITupleTable *eval_tuptable;
uint32 eval_processed;
Oid eval_lastoid;
ExprContext *eval_econtext;
} PLpgSQL_execstate; } PLpgSQL_execstate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment