database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

New memmgr logic in xact.c failed if AbortTransaction() is called when

Browse Source 
there is no open transaction.
This commit is contained in:
Tom Lane
2000-07-02 02:28:38 +00:00
parent e225260440
commit 57eeb0d315
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/backend/access/transam/xact.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.68 2000/06/28 03:31:05 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.69 2000/07/02 02:28:38 tgl Exp $
* *
* NOTES * NOTES
* Transaction aborts can now occur two ways: * Transaction aborts can now occur two ways:
@ -749,6 +749,7 @@ AtCommit_Memory()
* Release all transaction-local memory. * Release all transaction-local memory.
* ---------------- * ----------------
*/ */
Assert(TopTransactionContext != NULL);
MemoryContextDelete(TopTransactionContext); MemoryContextDelete(TopTransactionContext);
TopTransactionContext = NULL; TopTransactionContext = NULL;
TransactionCommandContext = NULL; TransactionCommandContext = NULL;
@ -825,17 +826,26 @@ AtAbort_Memory()
{ {
/* ---------------- /* ----------------
* Make sure we are in a valid context (not a child of * Make sure we are in a valid context (not a child of
* TransactionCommandContext...) * TransactionCommandContext...). Note that it is possible
* for this code to be called when we aren't in a transaction
* at all; go directly to TopMemoryContext in that case.
* ---------------- * ----------------
*/ */
MemoryContextSwitchTo(TransactionCommandContext); if (TransactionCommandContext != NULL)
{
MemoryContextSwitchTo(TransactionCommandContext);
/* ---------------- /* ----------------
* We do not want to destroy transaction contexts yet, * We do not want to destroy transaction contexts yet,
* but it should be OK to delete any command-local memory. * but it should be OK to delete any command-local memory.
* ---------------- * ----------------
*/ */
MemoryContextResetAndDeleteChildren(TransactionCommandContext); MemoryContextResetAndDeleteChildren(TransactionCommandContext);
}
else
{
MemoryContextSwitchTo(TopMemoryContext);
}
} }
@ -863,7 +873,8 @@ AtCleanup_Memory()
* Release all transaction-local memory. * Release all transaction-local memory.
* ---------------- * ----------------
*/ */
MemoryContextDelete(TopTransactionContext); if (TopTransactionContext != NULL)
MemoryContextDelete(TopTransactionContext);
TopTransactionContext = NULL; TopTransactionContext = NULL;
TransactionCommandContext = NULL; TransactionCommandContext = NULL;
} }