diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/cluster.c | 8 | ||||
| -rw-r--r-- | src/backend/commands/copy.c | 6 | ||||
| -rw-r--r-- | src/backend/commands/tablecmds.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 0f0ebd3ebc0..913ba1681c5 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.192 2010/01/06 11:25:39 itagaki Exp $ + * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.193 2010/01/15 09:19:01 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -816,10 +816,10 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, isnull = (bool *) palloc(natts * sizeof(bool)); /* - * We need to log the copied data in WAL iff WAL archiving is enabled AND - * it's not a temp rel. + * We need to log the copied data in WAL iff WAL archiving/streaming + * is enabled AND it's not a temp rel. */ - use_wal = XLogArchivingActive() && !NewHeap->rd_istemp; + use_wal = XLogIsNeeded() && !NewHeap->rd_istemp; /* use_wal off requires rd_targblock be initially invalid */ Assert(NewHeap->rd_targblock == InvalidBlockNumber); diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 265b50cc1ce..b7e1a175b53 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.320 2010/01/02 16:57:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.321 2010/01/15 09:19:01 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -1725,7 +1725,7 @@ CopyFrom(CopyState cstate) /*---------- * Check to see if we can avoid writing WAL * - * If archive logging is not enabled *and* either + * If archive logging/streaming is not enabled *and* either * - table was created in same transaction as this COPY * - data is being written to relfilenode created in this transaction * then we can skip writing WAL. It's safe because if the transaction @@ -1753,7 +1753,7 @@ CopyFrom(CopyState cstate) cstate->rel->rd_newRelfilenodeSubid != InvalidSubTransactionId) { hi_options |= HEAP_INSERT_SKIP_FSM; - if (!XLogArchivingActive()) + if (!XLogIsNeeded()) hi_options |= HEAP_INSERT_SKIP_WAL; } diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index dd7da742d22..bf1234614c9 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.314 2010/01/06 03:04:00 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.315 2010/01/15 09:19:01 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -7044,10 +7044,10 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst, Page page = (Page) buf; /* - * We need to log the copied data in WAL iff WAL archiving is enabled AND - * it's not a temp rel. + * We need to log the copied data in WAL iff WAL archiving/streaming is + * enabled AND it's not a temp rel. */ - use_wal = XLogArchivingActive() && !istemp; + use_wal = XLogIsNeeded() && !istemp; nblocks = smgrnblocks(src, forkNum); |