git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c

index d125738b4c8c2145538df0f771d8e93a9911b4bc..7bb7804dabb52d67032701d5d04f137ce0d01156 100644 (file)

--- a/src/backend/access/transam/xact.c

+++ b/src/backend/access/transam/xact.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.293 2010年07月06日 19:18:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.294 2010年07月23日 00:43:00 rhaas Exp $

*

*-------------------------------------------------------------------------

*/

/*

* Ensure parent(s) have XIDs, so that a child always has an XID later

- * than its parent.

+ * than its parent. Musn't recurse here, or we might get a stack overflow

+ * if we're at the bottom of a huge stack of subtransactions none of which

+ * have XIDs yet.

*/

if (isSubXact && !TransactionIdIsValid(s->parent->transactionId))

- AssignTransactionId(s->parent);

+ {

+ TransactionState p = s->parent;

+ TransactionState *parents;

+ size_t parentOffset = 0;

+

+ parents = palloc(sizeof(TransactionState) * s->nestingLevel);

+ while (p != NULL && !TransactionIdIsValid(p->transactionId))

+ {

+ parents[parentOffset++] = p;

+ p = p->parent;

+ }

+

+ /*

+ * This is technically a recursive call, but the recursion will

+ * never be more than one layer deep.

+ */

+ while (parentOffset != 0)

+ AssignTransactionId(parents[--parentOffset]);

+

+ pfree(parents);

+ }

/*

* Generate a new Xid and record it in PG_PROC and pg_subtrans.