Back out check for unreferenced files.

bmomjian · bmomjian · commit 35e165150808 · 2005-05-10T22:27:30.000Z
Heikki Linnakangas
diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.42 2005/05/02 18:26:52 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.43 2005/05/10 22:27:29 momjian Exp $
 -->
 
 <chapter id="maintenance">
@@ -474,23 +474,6 @@ HINT:  Stop the postmaster and use a standalone backend to VACUUM in "mydb".
   </para>
  </sect1>
 
- <sect1 id="check-files-after-crash">
-  <title>Check files after crash</title>
-
-  <indexterm zone="check-files-after-crash">
-   <primary>stale file</primary>
-  </indexterm>
-
-  <para>
-   <productname>PostgreSQL</productname> recovers automatically after crash
-   using the write-ahead log (see <xref linkend="wal">) and no manual 
-   operations are normally needed. However, if there was a transaction running 
-   when the crash occured that created or dropped a relation, the 
-   transaction might have left a stale file in the data directory. If this 
-   happens, you will get a notice in the log file stating which files can be 
-   deleted.
-  </para>
- </sect1>
 
  <sect1 id="logfile-maintenance">
   <title>Log File Maintenance</title>
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.190 2005/05/02 18:26:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.191 2005/05/10 22:27:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,7 +43,6 @@
 #include "utils/builtins.h"
 #include "utils/guc.h"
 #include "utils/relcache.h"
-#include "utils/flatfiles.h"
 
 
 /*
@@ -4526,8 +4525,6 @@ StartupXLOG(void)
 
 		CreateCheckPoint(true, true);
 
-		CheckStaleRelFiles();
-
 		/*
 		 * Close down recovery environment
 		 */
@@ -4539,12 +4536,6 @@ StartupXLOG(void)
 		 */
 		remove_backup_label();
 	}
-	else
-	{
-		XLogInitRelationCache();
-		CheckStaleRelFiles();
-		XLogCloseRelationCache();
-	}
 
 	/*
 	 * Preallocate additional log files, if wanted.
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.60 2005/05/02 18:26:53 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.61 2005/05/10 22:27:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -106,39 +106,6 @@ GetDatabasePath(Oid dbNode, Oid spcNode)
 	return path;
 }
 
-/*
- * GetTablespacePath	- construct path to a tablespace symbolic link
- *
- * Result is a palloc'd string.
- *
- * XXX this must agree with relpath and GetDatabasePath!
- */
-char *
-GetTablespacePath(Oid spcNode)
-{
-	int			pathlen;
-	char	   *path;
-
-	Assert(spcNode != GLOBALTABLESPACE_OID);
-
-	if (spcNode == DEFAULTTABLESPACE_OID)
-	{
-		/* The default tablespace is {datadir}/base */
-		pathlen = strlen(DataDir) + 5 + 1;
-		path = (char *) palloc(pathlen);
-		snprintf(path, pathlen, "%s/base",
-				 DataDir);
-	}
-	else
-	{
-		/* All other tablespaces have symlinks in pg_tblspc */
-		pathlen = strlen(DataDir) + 11 + OIDCHARS + 1;
-		path = (char *) palloc(pathlen);
-		snprintf(path, pathlen, "%s/pg_tblspc/%u",
-				 DataDir, spcNode);
-	}
-	return path;
-}
 
 /*
  * IsSystemRelation
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.18 2005/05/02 18:26:53 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.19 2005/05/10 22:27:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -341,7 +341,8 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)
 	/*
 	 * All seems well, create the symlink
 	 */
-	linkloc = GetTablespacePath(tablespaceoid);
+	linkloc = (char *) palloc(strlen(DataDir) + 11 + 10 + 1);
+	sprintf(linkloc, "%s/pg_tblspc/%u", DataDir, tablespaceoid);
 
 	if (symlink(location, linkloc) < 0)
 		ereport(ERROR,
@@ -494,7 +495,8 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
 	char	   *subfile;
 	struct stat st;
 
-	location = GetTablespacePath(tablespaceoid);
+	location = (char *) palloc(strlen(DataDir) + 11 + 10 + 1);
+	sprintf(location, "%s/pg_tblspc/%u", DataDir, tablespaceoid);
 
 	/*
 	 * Check if the tablespace still contains any files.  We try to rmdir
@@ -1034,7 +1036,8 @@ tblspc_redo(XLogRecPtr lsn, XLogRecord *record)
 		set_short_version(location);
 
 		/* Create the symlink if not already present */
-		linkloc = GetTablespacePath(xlrec->ts_id);
+		linkloc = (char *) palloc(strlen(DataDir) + 11 + 10 + 1);
+		sprintf(linkloc, "%s/pg_tblspc/%u", DataDir, xlrec->ts_id);
 
 		if (symlink(location, linkloc) < 0)
 		{
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.41 2005/05/02 18:26:53 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.42 2005/05/10 22:27:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,6 @@
 #include "funcapi.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_tablespace.h"
-#include "catalog/catalog.h"
 
 #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
 
@@ -145,6 +144,11 @@ pg_tablespace_databases(PG_FUNCTION_ARGS)
 
 		fctx = palloc(sizeof(ts_db_fctx));
 
+		/*
+		 * size = path length + tablespace dirname length + 2 dir sep
+		 * chars + oid + terminator
+		 */
+		fctx->location = (char *) palloc(strlen(DataDir) + 11 + 10 + 1);
 		if (tablespaceOid == GLOBALTABLESPACE_OID)
 		{
 			fctx->dirdesc = NULL;
@@ -153,7 +157,12 @@ pg_tablespace_databases(PG_FUNCTION_ARGS)
 		}
 		else
 		{
-			fctx->location = GetTablespacePath(tablespaceOid);
+			if (tablespaceOid == DEFAULTTABLESPACE_OID)
+				sprintf(fctx->location, "%s/base", DataDir);
+			else
+				sprintf(fctx->location, "%s/pg_tblspc/%u", DataDir,
+						tablespaceOid);
+
 			fctx->dirdesc = AllocateDir(fctx->location);
 
 			if (!fctx->dirdesc)
diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile
@@ -4,15 +4,15 @@
 #    Makefile for utils/init
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/init/Makefile,v 1.19 2005/05/02 18:26:53 momjian Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/init/Makefile,v 1.20 2005/05/10 22:27:30 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/backend/utils/init
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = flatfiles.o globals.o miscinit.o postinit.o checkfiles.o
+OBJS = flatfiles.o globals.o miscinit.o postinit.o
 
 all: SUBSYS.o
 
diff --git a/src/backend/utils/init/checkfiles.c b/src/backend/utils/init/checkfiles.c
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
diff --git a/src/include/utils/flatfiles.h b/src/include/utils/flatfiles.h

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`	`# Makefile for utils/init`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/backend/utils/init/Makefile,v 1.19 2005/05/02 18:26:53 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/backend/utils/init/Makefile,v 1.20 2005/05/10 22:27:30 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`	`11`	`subdir = src/backend/utils/init`
`12`	`12`	`top_builddir = ../../../..`
`13`	`13`	`include $(top_builddir)/src/Makefile.global`
`14`	`14`
`15`		`-OBJS = flatfiles.o globals.o miscinit.o postinit.o checkfiles.o`
	`15`	`+OBJS = flatfiles.o globals.o miscinit.o postinit.o`
`16`	`16`
`17`	`17`	`all: SUBSYS.o`
`18`	`18`