sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-06 00:02:36 -04:00
Code Issues Projects Releases Wiki Activity

The following patch cleans up the deferred trigger mechanism. There is

Browse Source 
an unneeded memory context and some variables that are not used anymore.
It's pretty trivial and the regression tests pass fine.  There's no
change in functionality, only deletion of unused code.  I left an empty
function because maybe I'll need it for nested transactions.

Alvaro Herrera
This commit is contained in:
Bruce Momjian 2003-03-31 20:47:51 +00:00
parent 7cd30e1590
commit 50be3e5efe
1 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/backend/commands/trigger.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.146 2003/03/27 14:33:11 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.147 2003/03/31 20:47:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -15,6 +15,7 @@
#include "access/genam.h" #include "access/genam.h"
#include "access/heapam.h" #include "access/heapam.h"
#include "access/xact.h"
#include "catalog/catalog.h" #include "catalog/catalog.h"
#include "catalog/catname.h" #include "catalog/catname.h"
#include "catalog/dependency.h" #include "catalog/dependency.h"
@ -1601,14 +1602,12 @@ ltrmark:;
*/ */
/* ---------- /*
* Internal data to the deferred trigger mechanism is held * Internal data to the deferred trigger mechanism is held over
* during entire session in a global context created at startup and * statements/commands in a context which is created at transaction
* over statements/commands in a separate context which * start and destroyed at transaction end.
* is created at transaction start and destroyed at transaction end.
* ----------
*/ */
static MemoryContext deftrig_gcxt = NULL;
static MemoryContext deftrig_cxt = NULL; static MemoryContext deftrig_cxt = NULL;
/* ---------- /* ----------
@ -1616,8 +1615,6 @@ static MemoryContext deftrig_cxt = NULL;
* state IMMEDIATE or DEFERRED. * state IMMEDIATE or DEFERRED.
* ---------- * ----------
*/ */
static List *deftrig_dfl_trigstates = NIL;
static bool deftrig_all_isset = false; static bool deftrig_all_isset = false;
static bool deftrig_all_isdeferred = false; static bool deftrig_all_isdeferred = false;
static List *deftrig_trigstates; static List *deftrig_trigstates;
@ -2017,11 +2014,8 @@ deferredTriggerInvokeEvents(bool immediate_only)
void void
DeferredTriggerInit(void) DeferredTriggerInit(void)
{ {
deftrig_gcxt = AllocSetContextCreate(TopMemoryContext, /* Nothing to do */
"DeferredTriggerSession", ;
ALLOCSET_DEFAULT_MINSIZE,
ALLOCSET_DEFAULT_INITSIZE,
ALLOCSET_DEFAULT_MAXSIZE);
} }
@ -2035,26 +2029,18 @@ DeferredTriggerInit(void)
void void
DeferredTriggerBeginXact(void) DeferredTriggerBeginXact(void)
{ {
MemoryContext oldcxt;
List *l;
DeferredTriggerStatus dflstat;
DeferredTriggerStatus stat;
if (deftrig_cxt != NULL) if (deftrig_cxt != NULL)
elog(ERROR, elog(ERROR,
"DeferredTriggerBeginXact() called while inside transaction"); "DeferredTriggerBeginXact() called while inside transaction");
/* /*
* Create the per transaction memory context and copy all states from * Create the per transaction memory context
* the per session context to here.
*/ */
deftrig_cxt = AllocSetContextCreate(TopTransactionContext, deftrig_cxt = AllocSetContextCreate(TopTransactionContext,
"DeferredTriggerXact", "DeferredTriggerXact",
ALLOCSET_DEFAULT_MINSIZE, ALLOCSET_DEFAULT_MINSIZE,
ALLOCSET_DEFAULT_INITSIZE, ALLOCSET_DEFAULT_INITSIZE,
ALLOCSET_DEFAULT_MAXSIZE); ALLOCSET_DEFAULT_MAXSIZE);
oldcxt = MemoryContextSwitchTo(deftrig_cxt);
deftrig_all_isset = false; deftrig_all_isset = false;
/* /*
@ -2063,19 +2049,6 @@ DeferredTriggerBeginXact(void)
deftrig_all_isdeferred = false; deftrig_all_isdeferred = false;
deftrig_trigstates = NIL; deftrig_trigstates = NIL;
foreach(l, deftrig_dfl_trigstates)
{
dflstat = (DeferredTriggerStatus) lfirst(l);
stat = (DeferredTriggerStatus)
palloc(sizeof(DeferredTriggerStatusData));
stat->dts_tgoid = dflstat->dts_tgoid;
stat->dts_tgisdeferred = dflstat->dts_tgisdeferred;
deftrig_trigstates = lappend(deftrig_trigstates, stat);
}
MemoryContextSwitchTo(oldcxt);
deftrig_events = NULL; deftrig_events = NULL;
deftrig_event_tail = NULL; deftrig_event_tail = NULL;