mirror of
https://github.com/postgres/postgres.git
synced 2025-05-05 09:19:17 +03:00
Ensure that the result of evaluating a function during constant-expression
simplification gets detoasted before it is incorporated into a Const node. Otherwise, if an immutable function were to return a TOAST pointer (an unlikely case, but it can be made to happen), we would end up with a plan that depends on the continued existence of the out-of-line toast datum.
This commit is contained in:
parent
a948f7c62c
commit
ef3ff3eee4
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.223.2.3 2007/05/01 18:54:01 tgl Exp $
|
* $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.223.2.4 2007/10/11 21:28:05 tgl Exp $
|
||||||
*
|
*
|
||||||
* HISTORY
|
* HISTORY
|
||||||
* AUTHOR DATE MAJOR EVENT
|
* AUTHOR DATE MAJOR EVENT
|
||||||
@ -3040,9 +3040,20 @@ evaluate_expr(Expr *expr, Oid result_type)
|
|||||||
/* Get back to outer memory context */
|
/* Get back to outer memory context */
|
||||||
MemoryContextSwitchTo(oldcontext);
|
MemoryContextSwitchTo(oldcontext);
|
||||||
|
|
||||||
/* Must copy result out of sub-context used by expression eval */
|
/*
|
||||||
|
* Must copy result out of sub-context used by expression eval.
|
||||||
|
*
|
||||||
|
* Also, if it's varlena, forcibly detoast it. This protects us against
|
||||||
|
* storing TOAST pointers into plans that might outlive the referenced
|
||||||
|
* data.
|
||||||
|
*/
|
||||||
if (!const_is_null)
|
if (!const_is_null)
|
||||||
const_val = datumCopy(const_val, resultTypByVal, resultTypLen);
|
{
|
||||||
|
if (resultTypLen == -1)
|
||||||
|
const_val = PointerGetDatum(PG_DETOAST_DATUM_COPY(const_val));
|
||||||
|
else
|
||||||
|
const_val = datumCopy(const_val, resultTypByVal, resultTypLen);
|
||||||
|
}
|
||||||
|
|
||||||
/* Release all the junk we just created */
|
/* Release all the junk we just created */
|
||||||
FreeExecutorState(estate);
|
FreeExecutorState(estate);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user