The heralded `Grand Unified Configuration scheme' (GUC)

That means you can now set your options in either or all of $PGDATA/configuration,
some postmaster option (--enable-fsync=off), or set a SET command. The list of
options is in backend/utils/misc/guc.c, documentation will be written post haste.

pg_options is gone, so is that pq_geqo config file. Also removed were backend -K,
-Q, and -T options (no longer applicable, although -d0 does the same as -Q).

Added to configure an --enable-syslog option.

changed all callers from TPRINTF to elog(DEBUG)

Author: petere

src/backend/Makefile

@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.51 2000/05/30 16:36:14 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.52 2000/05/31 00:28:13 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -205,9 +205,7 @@ endif
 install-templates: $(TEMPLATEDIR) \
          global1.bki.source local1_template1.bki.source \
          global1.description local1_template1.description \
-         libpq/pg_hba.conf.sample libpq/pg_ident.conf.sample \
-	 optimizer/geqo/pg_geqo.sample \
-         pg_options.sample
+         libpq/pg_hba.conf.sample libpq/pg_ident.conf.sample
 	$(INSTALL) $(INSTLOPTS) global1.bki.source \
 	  $(TEMPLATEDIR)/global1.bki.source
 	$(INSTALL) $(INSTLOPTS) global1.description \
@@ -220,10 +218,6 @@ install-templates: $(TEMPLATEDIR) \
 	  $(TEMPLATEDIR)/pg_hba.conf.sample
 	$(INSTALL) $(INSTLOPTS) libpq/pg_ident.conf.sample \
 	  $(TEMPLATEDIR)/pg_ident.conf.sample
-	$(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
-	  $(TEMPLATEDIR)/pg_geqo.sample
-	$(INSTALL) $(INSTLOPTS) pg_options.sample \
-	  $(TEMPLATEDIR)/pg_options.sample
 
 install-headers: prebuildheaders $(SRCDIR)/include/config.h
 	-@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi

src/backend/access/nbtree/nbtree.c

@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.54 2000/04/12 17:14:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.55 2000/05/31 00:28:14 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,11 +25,8 @@
 #include "catalog/index.h"
 #include "executor/executor.h"
 #include "miscadmin.h"
-
-#ifdef BTREE_BUILD_STATS
-#define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
-#endif
-
+#include "tcop/tcopprot.h"
+#include "utils/guc.h"
 
 bool		BuildingBtree = false;		/* see comment in btbuild() */
 bool		FastBuild = true;	/* use sort/build instead of insertion
@@ -96,9 +93,9 @@ btbuild(Relation heap,
 	usefast = (FastBuild && IsNormalProcessingMode());
 
 #ifdef BTREE_BUILD_STATS
-	if (ShowExecutorStats)
+	if (Show_btree_build_stats)
 		ResetUsage();
-#endif
+#endif /* BTREE_BUILD_STATS */
 
 	/* see if index is unique */
 	isunique = IndexIsUniqueNoCache(RelationGetRelid(index));
@@ -287,13 +284,13 @@ btbuild(Relation heap,
 	}
 
 #ifdef BTREE_BUILD_STATS
-	if (ShowExecutorStats)
+	if (Show_btree_build_stats)
 	{
-		fprintf(stderr, "! BtreeBuild Stats:\n");
+		fprintf(stderr, "BTREE BUILD STATS\n");
 		ShowUsage();
 		ResetUsage();
 	}
-#endif
+#endif /* BTREE_BUILD_STATS */
 
 	/*
 	 * Since we just counted the tuples in the heap, we update its stats

src/backend/access/nbtree/nbtsort.c

@@ -28,21 +28,19 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.52 2000/04/12 17:14:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.53 2000/05/31 00:28:14 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
 #include "access/nbtree.h"
+#include "tcop/tcopprot.h"
+#include "utils/guc.h"
 #include "utils/tuplesort.h"
 
 
-#ifdef BTREE_BUILD_STATS
-#define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
-#endif
-
 /*
  * turn on debugging output.
  *
@@ -136,13 +134,13 @@ void
 _bt_leafbuild(BTSpool *btspool)
 {
 #ifdef BTREE_BUILD_STATS
-	if (ShowExecutorStats)
+	if (Show_btree_build_stats)
 	{
-		fprintf(stderr, "! BtreeBuild (Spool) Stats:\n");
+		fprintf(StatFp, "BTREE BUILD (Spool) STATISTICS\n");
 		ShowUsage();
 		ResetUsage();
 	}
-#endif
+#endif /* BTREE_BUILD_STATS */
 	tuplesort_performsort(btspool->sortstate);
 
 	_bt_load(btspool->index, btspool);

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.83 2000/05/30 04:24:35 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.84 2000/05/31 00:28:14 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -267,7 +267,7 @@ BootstrapMain(int argc, char *argv[])
 				Noversion = true;
 				break;
 			case 'F':
-				disableFsync = true;
+				enableFsync = false;
 				break;
 			case 'Q':
 				Quiet = true;

src/backend/commands/async.c

@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.61 2000/05/28 17:55:54 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.62 2000/05/31 00:28:15 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -90,7 +90,7 @@
 #include "utils/fmgroids.h"
 #include "utils/ps_status.h"
 #include "utils/syscache.h"
-#include "utils/trace.h"
+
 
 /* stuff that we really ought not be touching directly :-( */
 extern TransactionState CurrentTransactionState;
@@ -128,6 +128,8 @@ static void NotifyMyFrontEnd(char *relname, int32 listenerPID);
 static int	AsyncExistsPendingNotify(char *relname);
 static void ClearPendingNotifies(void);
 
+bool Trace_notify = false;
+
 
 /*
  *--------------------------------------------------------------
@@ -149,7 +151,8 @@ Async_Notify(char *relname)
 {
 	char	   *notifyName;
 
-	TPRINTF(TRACE_NOTIFY, "Async_Notify: %s", relname);
+	if (Trace_notify)
+		elog(DEBUG, "Async_Notify: %s", relname);
 
 	if (!pendingNotifies)
 		pendingNotifies = DLNewList();
@@ -202,7 +205,8 @@ Async_Listen(char *relname, int pid)
 	int			alreadyListener = 0;
 	TupleDesc	tupDesc;
 
-	TPRINTF(TRACE_NOTIFY, "Async_Listen: %s", relname);
+	if (Trace_notify)
+		elog(DEBUG, "Async_Listen: %s", relname);
 
 	lRel = heap_openr(ListenerRelationName, AccessExclusiveLock);
 	tdesc = RelationGetDescr(lRel);
@@ -304,7 +308,8 @@ Async_Unlisten(char *relname, int pid)
 		return;
 	}
 
-	TPRINTF(TRACE_NOTIFY, "Async_Unlisten %s", relname);
+	if (Trace_notify)
+		elog(DEBUG, "Async_Unlisten %s", relname);
 
 	lRel = heap_openr(ListenerRelationName, AccessExclusiveLock);
 	/* Note we assume there can be only one matching tuple. */
@@ -346,7 +351,8 @@ Async_UnlistenAll()
 	HeapTuple	lTuple;
 	ScanKeyData key[1];
 
-	TPRINTF(TRACE_NOTIFY, "Async_UnlistenAll");
+	if (Trace_notify)
+		elog(DEBUG, "Async_UnlistenAll");
 
 	lRel = heap_openr(ListenerRelationName, AccessExclusiveLock);
 	tdesc = RelationGetDescr(lRel);
@@ -452,7 +458,8 @@ AtCommit_Notify()
 		return;
 	}
 
-	TPRINTF(TRACE_NOTIFY, "AtCommit_Notify");
+	if (Trace_notify)
+		elog(DEBUG, "AtCommit_Notify");
 
 	lRel = heap_openr(ListenerRelationName, AccessExclusiveLock);
 	tdesc = RelationGetDescr(lRel);
@@ -485,13 +492,16 @@ AtCommit_Notify()
 				 * be bad for applications that ignore self-notify
 				 * messages.
 				 */
-				TPRINTF(TRACE_NOTIFY, "AtCommit_Notify: notifying self");
+
+				if (Trace_notify)
+					elog(DEBUG, "AtCommit_Notify: notifying self");
+
 				NotifyMyFrontEnd(relname, listenerPID);
 			}
 			else
 			{
-				TPRINTF(TRACE_NOTIFY, "AtCommit_Notify: notifying pid %d",
-						listenerPID);
+				if (Trace_notify)
+					elog(DEBUG, "AtCommit_Notify: notifying pid %d", listenerPID);
 
 				/*
 				 * If someone has already notified this listener, we don't
@@ -551,7 +561,8 @@ AtCommit_Notify()
 
 	ClearPendingNotifies();
 
-	TPRINTF(TRACE_NOTIFY, "AtCommit_Notify: done");
+	if (Trace_notify)
+		elog(DEBUG, "AtCommit_Notify: done");
 }
 
 /*
@@ -624,10 +635,13 @@ Async_NotifyHandler(SIGNAL_ARGS)
 			if (notifyInterruptOccurred)
 			{
 				/* Here, it is finally safe to do stuff. */
-				TPRINTF(TRACE_NOTIFY,
-						"Async_NotifyHandler: perform async notify");
+				if (Trace_notify)
+					elog(DEBUG, "Async_NotifyHandler: perform async notify");
+
 				ProcessIncomingNotify();
-				TPRINTF(TRACE_NOTIFY, "Async_NotifyHandler: done");
+
+				if (Trace_notify)
+					elog(DEBUG, "Async_NotifyHandler: done");
 			}
 		}
 	}
@@ -693,10 +707,13 @@ EnableNotifyInterrupt(void)
 		notifyInterruptEnabled = 0;
 		if (notifyInterruptOccurred)
 		{
-			TPRINTF(TRACE_NOTIFY,
-					"EnableNotifyInterrupt: perform async notify");
+			if (Trace_notify)
+				elog(DEBUG, "EnableNotifyInterrupt: perform async notify");
+
 			ProcessIncomingNotify();
-			TPRINTF(TRACE_NOTIFY, "EnableNotifyInterrupt: done");
+
+			if (Trace_notify)
+				elog(DEBUG, "EnableNotifyInterrupt: done");
 		}
 	}
 }
@@ -751,7 +768,9 @@ ProcessIncomingNotify(void)
 	char	   *relname;
 	int32		sourcePID;
 
-	TPRINTF(TRACE_NOTIFY, "ProcessIncomingNotify");
+	if (Trace_notify)
+		elog(DEBUG, "ProcessIncomingNotify");
+
 	PS_SET_STATUS("async_notify");
 
 	notifyInterruptOccurred = 0;
@@ -784,8 +803,11 @@ ProcessIncomingNotify(void)
 			d = heap_getattr(lTuple, Anum_pg_listener_relname, tdesc, &isnull);
 			relname = (char *) DatumGetPointer(d);
 			/* Notify the frontend */
-			TPRINTF(TRACE_NOTIFY, "ProcessIncomingNotify: received %s from %d",
+
+			if (Trace_notify)
+				elog(DEBUG, "ProcessIncomingNotify: received %s from %d",
 					relname, (int) sourcePID);
+
 			NotifyMyFrontEnd(relname, sourcePID);
 			/* Rewrite the tuple with 0 in notification column */
 			rTuple = heap_modifytuple(lTuple, lRel, value, nulls, repl);
@@ -820,7 +842,9 @@ ProcessIncomingNotify(void)
 	pq_flush();
 
 	PS_SET_STATUS("idle");
-	TPRINTF(TRACE_NOTIFY, "ProcessIncomingNotify: done");
+
+	if (Trace_notify)
+		elog(DEBUG, "ProcessIncomingNotify: done");
 }
 
 /* Send NOTIFY message to my front end. */