TablespaceCreateDbspace should function normally even on platforms that do not

tglsfdc · tglsfdc · commit 2154e1c11e4f · 2006-03-29T15:15:43.000Z
have symlinks (ie, Windows).  Although it'll never be called on to do anything
useful during normal operation on such a platform, it's still needed to
re-create dropped directories during WAL replay.
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.32 2006/03/24 04:32:13 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.33 2006/03/29 15:15:43 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,21 +81,21 @@ static void set_short_version(const char *path);
  * object in the tablespace, create the subdirectory.  If the subdirectory
  * already exists, just fall through quietly.
  *
- * If tablespaces are not supported, this is just a no-op; CREATE DATABASE
- * is expected to create the default subdirectory for the database.
- *
  * isRedo indicates that we are creating an object during WAL replay.
  * In this case we will cope with the possibility of the tablespace
  * directory not being there either --- this could happen if we are
  * replaying an operation on a table in a subsequently-dropped tablespace.
  * We handle this by making a directory in the place where the tablespace
  * symlink would normally be.  This isn't an exact replay of course, but
  * it's the best we can do given the available information.
+ *
+ * If tablespaces are not supported, you might think this could be a no-op,
+ * but you'd be wrong: we still need it in case we have to re-create a
+ * database subdirectory (of $PGDATA/base) during WAL replay.
  */
 void
 TablespaceCreateDbspace(Oid spcNode, Oid dbNode, bool isRedo)
 {
-#ifdef HAVE_SYMLINK
 	struct stat st;
 	char	   *dir;
 
@@ -178,7 +178,6 @@ TablespaceCreateDbspace(Oid spcNode, Oid dbNode, bool isRedo)
 	}
 
 	pfree(dir);
-#endif   /* HAVE_SYMLINK */
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.32 2006/03/24 04:32:13 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.33 2006/03/29 15:15:43 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -81,21 +81,21 @@ static void set_short_version(const char *path);`
`81`	`81`	`* object in the tablespace, create the subdirectory. If the subdirectory`
`82`	`82`	`* already exists, just fall through quietly.`
`83`	`83`	`*`
`84`		`- * If tablespaces are not supported, this is just a no-op; CREATE DATABASE`
`85`		`- * is expected to create the default subdirectory for the database.`
`86`		`- *`
`87`	`84`	`* isRedo indicates that we are creating an object during WAL replay.`
`88`	`85`	`* In this case we will cope with the possibility of the tablespace`
`89`	`86`	`* directory not being there either --- this could happen if we are`
`90`	`87`	`* replaying an operation on a table in a subsequently-dropped tablespace.`
`91`	`88`	`* We handle this by making a directory in the place where the tablespace`
`92`	`89`	`* symlink would normally be. This isn't an exact replay of course, but`
`93`	`90`	`* it's the best we can do given the available information.`
	`91`	`+ *`
	`92`	`+ * If tablespaces are not supported, you might think this could be a no-op,`
	`93`	`+ * but you'd be wrong: we still need it in case we have to re-create a`
	`94`	`+ * database subdirectory (of $PGDATA/base) during WAL replay.`
`94`	`95`	`*/`
`95`	`96`	`void`
`96`	`97`	`TablespaceCreateDbspace(Oid spcNode, Oid dbNode, bool isRedo)`
`97`	`98`	`{`
`98`		`-#ifdef HAVE_SYMLINK`
`99`	`99`	`struct stat st;`
`100`	`100`	`char *dir;`
`101`	`101`
`@@ -178,7 +178,6 @@ TablespaceCreateDbspace(Oid spcNode, Oid dbNode, bool isRedo)`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`pfree(dir);`
`181`		`-#endif /* HAVE_SYMLINK */`
`182`	`181`	`}`
`183`	`182`
`184`	`183`	`/*`