diff options
| author | Robert Haas <rhaas@postgresql.org> | 2010-08-13 15:42:21 +0000 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2010-08-13 15:42:21 +0000 |
| commit | 95ef7cd40da69feff0ab1f2e4964949e6fb15383 (patch) | |
| tree | 1cc05253d361a65f3703dffd2e01feb18237ee61 | |
| parent | e4155c8483084e2a8d5779002e3b07854c85baf8 (diff) | |
| download | postgresql-95ef7cd40da69feff0ab1f2e4964949e6fb15383.tar.gz postgresql-95ef7cd40da69feff0ab1f2e4964949e6fb15383.zip | |
Make RecordTransactionCommit() respect wal_level.
Since the only purpose of WAL-loggin SharedInvalidationMessages is to support
Hot Standby operation, they needn't be included when wal_level < hot_standby.
Back-patch to 9.0.
Review by Heikki Linnakanagas and Fujii Masao.
| -rw-r--r-- | src/backend/access/transam/xact.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 37764891d7f..0491d2c8d91 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.296 2010/08/12 23:24:53 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.297 2010/08/13 15:42:21 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -915,15 +915,16 @@ RecordTransactionCommit(void) bool haveNonTemp; int nchildren; TransactionId *children; - int nmsgs; + int nmsgs = 0; SharedInvalidationMessage *invalMessages = NULL; - bool RelcacheInitFileInval; + bool RelcacheInitFileInval = false; /* Get data needed for commit record */ nrels = smgrGetPendingDeletes(true, &rels, &haveNonTemp); nchildren = xactGetCommittedChildren(&children); - nmsgs = xactGetCommittedInvalidationMessages(&invalMessages, - &RelcacheInitFileInval); + if (XLogStandbyInfoActive()) + nmsgs = xactGetCommittedInvalidationMessages(&invalMessages, + &RelcacheInitFileInval); /* * If we haven't been assigned an XID yet, we neither can, nor do we want |