aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2002-03-02 21:39:36 +0000
committerBruce Momjian <bruce@momjian.us>2002-03-02 21:39:36 +0000
commita033daf5663944872080f1f52deb2ffcb40f4042 (patch)
tree660da56fcf1f2d1f9e8ea31610f741bed3a8d778 /src/backend/executor
parent8d8aa931ef5a3489764de222b1bfe43463d58a13 (diff)
downloadpostgresql-a033daf5663944872080f1f52deb2ffcb40f4042.tar.gz
postgresql-a033daf5663944872080f1f52deb2ffcb40f4042.zip
Commit to match discussed elog() changes. Only update is that LOG is
now just below FATAL in server_min_messages. Added more text to highlight ordering difference between it and client_min_messages. --------------------------------------------------------------------------- REALLYFATAL => PANIC STOP => PANIC New INFO level the prints to client by default New LOG level the prints to server log by default Cause VACUUM information to print only to the client NOTICE => INFO where purely information messages are sent DEBUG => LOG for purely server status messages DEBUG removed, kept as backward compatible DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1 added DebugLvl removed in favor of new DEBUG[1-5] symbols New server_min_messages GUC parameter with values: DEBUG[5-1], INFO, NOTICE, ERROR, LOG, FATAL, PANIC New client_min_messages GUC parameter with values: DEBUG[5-1], LOG, INFO, NOTICE, ERROR, FATAL, PANIC Server startup now logged with LOG instead of DEBUG Remove debug_level GUC parameter elog() numbers now start at 10 Add test to print error message if older elog() values are passed to elog() Bootstrap mode now has a -d that requires an argument, like postmaster
Diffstat (limited to 'src/backend/executor')
-rw-r--r--src/backend/executor/execAmi.c4
-rw-r--r--src/backend/executor/execMain.c4
-rw-r--r--src/backend/executor/instrument.c6
-rw-r--r--src/backend/executor/nodeAgg.c4
-rw-r--r--src/backend/executor/nodeAppend.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index e7a335916bd..119c89b1c27 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: execAmi.c,v 1.61 2002/02/19 20:11:13 tgl Exp $
+ * $Id: execAmi.c,v 1.62 2002/03/02 21:39:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -201,7 +201,7 @@ ExecMarkPos(Plan *node)
default:
/* don't make hard error unless caller asks to restore... */
- elog(DEBUG, "ExecMarkPos: node type %d not supported",
+ elog(LOG, "ExecMarkPos: node type %d not supported",
nodeTag(node));
break;
}
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 18b81849ac9..40f03169ba0 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -27,7 +27,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.150 2002/02/27 19:34:48 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.151 2002/03/02 21:39:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1095,7 +1095,7 @@ lnext: ;
break;
default:
- elog(DEBUG, "ExecutePlan: unknown operation in queryDesc");
+ elog(LOG, "ExecutePlan: unknown operation in queryDesc");
result = NULL;
break;
}
diff --git a/src/backend/executor/instrument.c b/src/backend/executor/instrument.c
index e270f7c7717..3b95544706b 100644
--- a/src/backend/executor/instrument.c
+++ b/src/backend/executor/instrument.c
@@ -7,7 +7,7 @@
* Copyright (c) 2001, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/instrument.c,v 1.2 2001/10/25 05:49:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/instrument.c,v 1.3 2002/03/02 21:39:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,7 +37,7 @@ InstrStartNode(Instrumentation *instr)
return;
if (instr->starttime.tv_sec != 0 || instr->starttime.tv_usec != 0)
- elog(DEBUG, "InstrStartTimer called twice in a row");
+ elog(LOG, "InstrStartTimer called twice in a row");
else
gettimeofday(&instr->starttime, NULL);
}
@@ -53,7 +53,7 @@ InstrStopNode(Instrumentation *instr, bool returnedTuple)
if (instr->starttime.tv_sec == 0 && instr->starttime.tv_usec == 0)
{
- elog(DEBUG, "InstrStopNode without start");
+ elog(LOG, "InstrStopNode without start");
return;
}
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 90369c5a7a1..7331cfe796b 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -46,7 +46,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.78 2001/10/25 05:49:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.79 2002/03/02 21:39:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -757,7 +757,7 @@ ExecInitAgg(Agg *node, EState *estate, Plan *parent)
* So, just make a debug note, and force numaggs positive so that
* palloc()s below don't choke.
*/
- elog(DEBUG, "ExecInitAgg: could not find any aggregate functions");
+ elog(LOG, "ExecInitAgg: could not find any aggregate functions");
numaggs = 1;
}
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index 41b05118e0e..992f6acaba9 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.43 2001/10/25 05:49:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.44 2002/03/02 21:39:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -290,7 +290,7 @@ ExecProcAppend(Append *node)
subnode = (Plan *) nth(whichplan, appendplans);
if (subnode == NULL)
- elog(DEBUG, "ExecProcAppend: subnode is NULL");
+ elog(LOG, "ExecProcAppend: subnode is NULL");
/*
* get a tuple from the subplan