database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Rename standby_keep_segments to wal_keep_segments.

Browse Source 
Also, make the name of the GUC and the name of the backing variable match.
Alnong the way, clean up a couple of slight typographical errors in the
related docs.
This commit is contained in:
Robert Haas
2010-04-20 11:15:06 +00:00
parent c670410e7f
commit 481cb5d9b5
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/access/transam/xlog.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.400 2010/04/18 18:44:53 sriggs Exp $
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.401 2010/04/20 11:15:06 rhaas Exp $
*
*-------------------------------------------------------------------------
*/
@ -66,7 +66,7 @@
/* User-settable parameters */
int CheckPointSegments = 3;
int StandbySegments = 0;
int wal_keep_segments = 0;
int XLOGbuffers = 8;
int XLogArchiveTimeout = 0;
bool XLogArchiveMode = false;
@ -7285,10 +7285,10 @@ CreateCheckPoint(int flags)
{
/*
* Calculate the last segment that we need to retain because of
* standby_keep_segments, by subtracting StandbySegments from the
* wal_keep_segments, by subtracting wal_keep_segments from the
* new checkpoint location.
*/
if (StandbySegments > 0)
if (wal_keep_segments > 0)
{
uint32 log;
uint32 seg;
@ -7297,8 +7297,8 @@ CreateCheckPoint(int flags)
XLByteToSeg(recptr, log, seg);
d_seg = StandbySegments % XLogSegsPerFile;
d_log = StandbySegments / XLogSegsPerFile;
d_seg = wal_keep_segments % XLogSegsPerFile;
d_log = wal_keep_segments / XLogSegsPerFile;
if (seg < d_seg)
{
d_log += 1;

6
src/backend/utils/misc/guc.c
View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.548 2010/04/19 00:55:25 rhaas Exp $
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.549 2010/04/20 11:15:06 rhaas Exp $
*
*--------------------------------------------------------------------
*/
@ -1656,11 +1656,11 @@ static struct config_int ConfigureNamesInt[] =
},
{
{"standby_keep_segments", PGC_SIGHUP, WAL_CHECKPOINTS,
{"wal_keep_segments", PGC_SIGHUP, WAL_CHECKPOINTS,
gettext_noop("Sets the number of WAL files held for standby servers"),
NULL
},
&StandbySegments,
&wal_keep_segments,
0, 0, INT_MAX, NULL, NULL
},

2
src/backend/utils/misc/postgresql.conf.sample
View File

@ -193,7 +193,7 @@
#max_wal_senders = 0 # max number of walsender processes
#wal_sender_delay = 200ms # 1-10000 milliseconds
#standby_keep_segments = 0 # in logfile segments, 16MB each; 0 disables
#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables
#------------------------------------------------------------------------------

4
src/include/access/xlog.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.108 2010/04/18 18:17:12 sriggs Exp $
* $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.109 2010/04/20 11:15:06 rhaas Exp $
*/
#ifndef XLOG_H
#define XLOG_H
@ -187,7 +187,7 @@ extern XLogRecPtr XactLastRecEnd;
/* these variables are GUC parameters related to XLOG */
extern int CheckPointSegments;
extern int StandbySegments;
extern int wal_keep_segments;
extern int XLOGbuffers;
extern bool XLogArchiveMode;
extern char *XLogArchiveCommand;