1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-29 10:41:53 +03:00

Reverse out XLogDir/-X write-ahead log handling, per discussion.

Original patch from Thomas.
This commit is contained in:
Bruce Momjian
2002-08-17 15:12:07 +00:00
parent 7c02c86d0f
commit d04e9137c9
8 changed files with 57 additions and 157 deletions

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.101 2002/08/06 02:36:33 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.102 2002/08/17 15:12:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -398,8 +398,7 @@ static ControlFileData *ControlFile = NULL;
/* File path names */
char *XLogDir = NULL;
static char XLogDir[MAXPGPATH];
static char ControlFilePath[MAXPGPATH];
/*
@ -2075,29 +2074,11 @@ ValidXLOGHeader(XLogPageHeader hdr, int emode, bool checkSUI)
* I/O and compatibility-check functions, but there seems no need currently.
*/
void
SetXLogDir(char *path)
{
char *xsubdir = "/pg_xlog";
if (path != NULL)
{
XLogDir = malloc(strlen(path)+1);
strcpy(XLogDir, path);
}
else
{
XLogDir = malloc(strlen(DataDir)+strlen(xsubdir)+1);
snprintf(XLogDir, MAXPGPATH, "%s%s", DataDir, xsubdir);
}
}
void
XLOGPathInit(void)
{
/* Init XLOG file paths */
if (XLogDir == NULL)
SetXLogDir(NULL);
snprintf(XLogDir, MAXPGPATH, "%s/pg_xlog", DataDir);
snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
}