Extend GUC concepts of parse_hook and assign_hook to all four supported

tglsfdc · tglsfdc · commit 2938eec7fe3d · 2001-06-12T22:54:06.000Z
datatypes, not only strings.  parse_hook is useless for bool, I suppose,
but it seems possibly useful for int and double to apply variable-specific
constraints that are more complex than simple range limits.  assign_hook
is definitely useful for all datatypes --- we need it right now for bool
to support date cache reset when changing Australian timezone rule setting.
Also, clean up some residual problems with the reset all/show all patch,
including memory leaks and mistaken reset of PostPortNumber.  It seems
best that RESET ALL not touch variables that don't have SUSET or
USERSET context.
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.108 2001/06/03 14:53:56 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.109 2001/06/12 22:54:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -243,7 +243,7 @@ BootstrapMain(int argc, char *argv[])
 	dbName = NULL;
 	if (!IsUnderPostmaster)
 	{
-		ResetAllOptions();
+		ResetAllOptions(true);
 		potential_DataDir = getenv("PGDATA");	/* Null if no PGDATA
 												 * variable */
 	}
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.49 2001/06/07 04:50:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.50 2001/06/12 22:54:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -792,7 +792,9 @@ ResetPGVariable(const char *name)
 		reset_datestyle();
 		reset_timezone();
 
-		ResetAllOptions();
+		ResetAllOptions(false);
 	} else
-		SetConfigOption(name, NULL, superuser() ? PGC_SUSET : PGC_USERSET, false);
+		SetConfigOption(name, NULL,
+						superuser() ? PGC_SUSET : PGC_USERSET,
+						false);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -28,7 +28,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.218 2001/06/11 04:12:29 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.219 2001/06/12 22:54:05 tgl Exp $
  *
  * NOTES
  *
@@ -362,9 +362,13 @@ PostmasterMain(int argc, char *argv[])
 	/*
 	 * Options setup
 	 */
-	potential_DataDir = getenv("PGDATA");		/* default value */
+	ResetAllOptions(true);
+
+	/* PGPORT environment variable, if set, overrides GUC setting */
+	if (getenv("PGPORT"))
+		PostPortNumber = atoi(getenv("PGPORT"));
 
-	ResetAllOptions();
+	potential_DataDir = getenv("PGDATA");		/* default value */
 
 	/*
 	 * First we must scan for a -D argument to get the data dir. Then read
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.219 2001/06/07 04:50:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.220 2001/06/12 22:54:06 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1156,7 +1156,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 
 	if (!IsUnderPostmaster)
 	{
-		ResetAllOptions();
+		ResetAllOptions(true);
 		potential_DataDir = getenv("PGDATA");
 	}
 	StatFp = stderr;
@@ -1709,7 +1709,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.219 $ $Date: 2001/06/07 04:50:57 $\n");
+		puts("$Revision: 1.220 $ $Date: 2001/06/12 22:54:06 $\n");
 	}
 
 	/*
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.108 2001/06/03 14:53:56 petere Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.109 2001/06/12 22:54:05 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -243,7 +243,7 @@ BootstrapMain(int argc, char *argv[])`
`243`	`243`	`dbName = NULL;`
`244`	`244`	`if (!IsUnderPostmaster)`
`245`	`245`	`{`
`246`		`- ResetAllOptions();`
	`246`	`+ ResetAllOptions(true);`
`247`	`247`	`potential_DataDir = getenv("PGDATA"); /* Null if no PGDATA`
`248`	`248`	`* variable */`
`249`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.49 2001/06/07 04:50:56 momjian Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.50 2001/06/12 22:54:05 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -792,7 +792,9 @@ ResetPGVariable(const char *name)`
`792`	`792`	`reset_datestyle();`
`793`	`793`	`reset_timezone();`
`794`	`794`
`795`		`- ResetAllOptions();`
	`795`	`+ ResetAllOptions(false);`
`796`	`796`	`} else`
`797`		`- SetConfigOption(name, NULL, superuser() ? PGC_SUSET : PGC_USERSET, false);`
	`797`	`+ SetConfigOption(name, NULL,`
	`798`	`+ superuser() ? PGC_SUSET : PGC_USERSET,`
	`799`	`+ false);`
`798`	`800`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`*`
`30`	`30`	`* IDENTIFICATION`
`31`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.218 2001/06/11 04:12:29 tgl Exp $`
	`31`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.219 2001/06/12 22:54:05 tgl Exp $`
`32`	`32`	`*`
`33`	`33`	`* NOTES`
`34`	`34`	`*`
`@@ -362,9 +362,13 @@ PostmasterMain(int argc, char *argv[])`
`362`	`362`	`/*`
`363`	`363`	`* Options setup`
`364`	`364`	`*/`
`365`		`- potential_DataDir = getenv("PGDATA"); /* default value */`
	`365`	`+ ResetAllOptions(true);`
	`366`	`+`
	`367`	`+ /* PGPORT environment variable, if set, overrides GUC setting */`
	`368`	`+ if (getenv("PGPORT"))`
	`369`	`+ PostPortNumber = atoi(getenv("PGPORT"));`
`366`	`370`
`367`		`- ResetAllOptions();`
	`371`	`+ potential_DataDir = getenv("PGDATA"); /* default value */`
`368`	`372`
`369`	`373`	`/*`
`370`	`374`	`* First we must scan for a -D argument to get the data dir. Then read`