database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Commit to match discussed elog() changes. Only update is that LOG is

Browse Source 
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
This commit is contained in:
Bruce Momjian
2002-03-02 21:39:36 +00:00
parent 8d8aa931ef
commit a033daf566
85 changed files with 1053 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/src/sgml/ref/postgres-ref.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.23 2001/12/08 03:24:38 thomas Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.24 2002/03/02 21:39:16 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -141,8 +141,10 @@ PostgreSQL documentation
<para> <para>
The options <option>-A</option>, <option>-B</option>, The options <option>-A</option>, <option>-B</option>,
<option>-c</option>, <option>-d</option>, <option>-D</option>, <option>-c</option>, <option>-d</option>, <option>-D</option>,
<option>-F</option>, and <option>--name</> have the same meanings as <option>-F</option>, and <option>--name</> have the same meanings
for the <xref linkend="app-postmaster">. as the <xref linkend="app-postmaster"> except that
<option>-d</option> <literal>0</> prevents the debugging level of
the postmaster from being propogated to the backend.
</para> </para>
<variablelist> <variablelist>

7
doc/src/sgml/ref/postmaster.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.26 2001/12/08 03:24:38 thomas Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.27 2002/03/02 21:39:16 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -127,9 +127,8 @@ PostgreSQL documentation
<listitem> <listitem>
<para> <para>
Sets the debug level. The higher this value is set, the more Sets the debug level. The higher this value is set, the more
debugging output is written to the server log. The default is debugging output is written to the server log. Values are from
0, which means no debugging. Values up to 4 are useful; higher 1 to 5.
numbers produce no additional output.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

47
doc/src/sgml/runtime.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.104 2002/03/01 22:45:05 petere Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.105 2002/03/02 21:39:15 momjian Exp $
--> -->
<Chapter Id="runtime"> <Chapter Id="runtime">
@ -813,6 +813,38 @@ env PGOPTIONS='-c geqo=off' psql
<para> <para>
<variablelist> <variablelist>
<varlistentry>
<term><varname>SERVER_MIN_MESSAGES</varname> (<type>string</type>)</term>
<listitem>
<para>
This controls how much detail is written to the server logs. The
default is <literal>NOTICE</>. Valid values are <literal>DEBUG5</>,
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
<literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
<literal>ERROR</>, <literal>LOG</>, <literal>FATAL</>,
<literal>PANIC</>. Later values send less detail to the logs.
<literal>LOG</> has a different precedence here than in
<literal>CLIENT_MIN_MESSAGES</>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
<listitem>
<para>
This controls how much detail is written to the client. The
default is <literal>INFO</>. Valid values are
<literal>DEBUG5</>, <literal>DEBUG4</>, <literal>DEBUG3</>,
<literal>DEBUG2</>, <literal>DEBUG1</>, <literal>LOG</>,
<literal>INFO</>, <literal>NOTICE</>, <literal>ERROR</>,
<literal>FATAL</>, <literal>PANIC</>. Later values send less
information to the user. literal>LOG</> has a different
precedence here than in <literal>SERVER_MIN_MESSAGES</>.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>DEBUG_ASSERTIONS</varname> (<type>boolean</type>)</term> <term><varname>DEBUG_ASSERTIONS</varname> (<type>boolean</type>)</term>
<listitem> <listitem>
@ -829,19 +861,6 @@ env PGOPTIONS='-c geqo=off' psql
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>DEBUG_LEVEL</varname> (<type>integer</type>)</term>
<listitem>
<para>
The higher this value is set, the more
<quote>debugging</quote> output of various sorts is generated
in the server log during operation. This option is 0 by
default, which means no debugging output. Values up to about 4
currently make sense.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>DEBUG_PRINT_QUERY</varname> (<type>boolean</type>)</term> <term><varname>DEBUG_PRINT_QUERY</varname> (<type>boolean</type>)</term>
<term><varname>DEBUG_PRINT_PARSE</varname> (<type>boolean</type>)</term> <term><varname>DEBUG_PRINT_PARSE</varname> (<type>boolean</type>)</term>

6
src/backend/access/gist/gist.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.88 2002/02/11 22:41:59 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.89 2002/03/02 21:39:16 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1953,13 +1953,13 @@ gist_dumptree(Relation r, int level, BlockNumber blk, OffsetNumber coff)
void void
gist_redo(XLogRecPtr lsn, XLogRecord *record) gist_redo(XLogRecPtr lsn, XLogRecord *record)
{ {
elog(STOP, "gist_redo: unimplemented"); elog(PANIC, "gist_redo: unimplemented");
} }
void void
gist_undo(XLogRecPtr lsn, XLogRecord *record) gist_undo(XLogRecPtr lsn, XLogRecord *record)
{ {
elog(STOP, "gist_undo: unimplemented"); elog(PANIC, "gist_undo: unimplemented");
} }
void void

6
src/backend/access/hash/hash.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.53 2001/10/25 05:49:20 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.54 2002/03/02 21:39:16 momjian Exp $
* *
* NOTES * NOTES
* This file contains only the public interface routines. * This file contains only the public interface routines.
@ -468,13 +468,13 @@ hashbulkdelete(PG_FUNCTION_ARGS)
void void
hash_redo(XLogRecPtr lsn, XLogRecord *record) hash_redo(XLogRecPtr lsn, XLogRecord *record)
{ {
elog(STOP, "hash_redo: unimplemented"); elog(PANIC, "hash_redo: unimplemented");
} }
void void
hash_undo(XLogRecPtr lsn, XLogRecord *record) hash_undo(XLogRecPtr lsn, XLogRecord *record)
{ {
elog(STOP, "hash_undo: unimplemented"); elog(PANIC, "hash_undo: unimplemented");
} }
void void

78
src/backend/access/heap/heapam.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.129 2002/01/15 22:14:17 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.130 2002/03/02 21:39:17 momjian Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
@ -142,21 +142,21 @@ heapgettup(Relation relation,
#ifdef HEAPDEBUGALL #ifdef HEAPDEBUGALL
if (ItemPointerIsValid(tid)) if (ItemPointerIsValid(tid))
{ {
elog(DEBUG, "heapgettup(%s, tid=0x%x[%d,%d], dir=%d, ...)", elog(LOG, "heapgettup(%s, tid=0x%x[%d,%d], dir=%d, ...)",
RelationGetRelationName(relation), tid, tid->ip_blkid, RelationGetRelationName(relation), tid, tid->ip_blkid,
tid->ip_posid, dir); tid->ip_posid, dir);
} }
else else
{ {
elog(DEBUG, "heapgettup(%s, tid=0x%x, dir=%d, ...)", elog(LOG, "heapgettup(%s, tid=0x%x, dir=%d, ...)",
RelationGetRelationName(relation), tid, dir); RelationGetRelationName(relation), tid, dir);
} }
elog(DEBUG, "heapgettup(..., b=0x%x, nkeys=%d, key=0x%x", buffer, nkeys, key); elog(LOG, "heapgettup(..., b=0x%x, nkeys=%d, key=0x%x", buffer, nkeys, key);
elog(DEBUG, "heapgettup: relation(%c)=`%s', %p", elog(LOG, "heapgettup: relation(%c)=`%s', %p",
relation->rd_rel->relkind, RelationGetRelationName(relation), relation->rd_rel->relkind, RelationGetRelationName(relation),
snapshot); snapshot);
#endif /* !defined(HEAPDEBUGALL) */ #endif /* !defined(HEAPLOGALL) */
if (!ItemPointerIsValid(tid)) if (!ItemPointerIsValid(tid))
{ {
@ -745,14 +745,14 @@ heap_endscan(HeapScanDesc scan)
#ifdef HEAPDEBUGALL #ifdef HEAPDEBUGALL
#define HEAPDEBUG_1 \ #define HEAPDEBUG_1 \
elog(DEBUG, "heap_getnext([%s,nkeys=%d],backw=%d) called", \ elog(LOG, "heap_getnext([%s,nkeys=%d],backw=%d) called", \
RelationGetRelationName(scan->rs_rd), scan->rs_nkeys, backw) RelationGetRelationName(scan->rs_rd), scan->rs_nkeys, backw)
#define HEAPDEBUG_2 \ #define HEAPDEBUG_2 \
elog(DEBUG, "heap_getnext returning EOS") elog(LOG, "heap_getnext returning EOS")
#define HEAPDEBUG_3 \ #define HEAPDEBUG_3 \
elog(DEBUG, "heap_getnext returning tuple"); elog(LOG, "heap_getnext returning tuple");
#else #else
#define HEAPDEBUG_1 #define HEAPDEBUG_1
#define HEAPDEBUG_2 #define HEAPDEBUG_2
@ -1958,11 +1958,11 @@ heap_xlog_clean(bool redo, XLogRecPtr lsn, XLogRecord *record)
buffer = XLogReadBuffer(false, reln, xlrec->block); buffer = XLogReadBuffer(false, reln, xlrec->block);
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "heap_clean_redo: no block"); elog(PANIC, "heap_clean_redo: no block");
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (PageIsNew((PageHeader) page)) if (PageIsNew((PageHeader) page))
elog(STOP, "heap_clean_redo: uninitialized page"); elog(PANIC, "heap_clean_redo: uninitialized page");
if (XLByteLE(lsn, PageGetLSN(page))) if (XLByteLE(lsn, PageGetLSN(page)))
{ {
@ -2015,11 +2015,11 @@ heap_xlog_delete(bool redo, XLogRecPtr lsn, XLogRecord *record)
buffer = XLogReadBuffer(false, reln, buffer = XLogReadBuffer(false, reln,
ItemPointerGetBlockNumber(&(xlrec->target.tid))); ItemPointerGetBlockNumber(&(xlrec->target.tid)));
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "heap_delete_%sdo: no block", (redo) ? "re" : "un"); elog(PANIC, "heap_delete_%sdo: no block", (redo) ? "re" : "un");
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (PageIsNew((PageHeader) page)) if (PageIsNew((PageHeader) page))
elog(STOP, "heap_delete_%sdo: uninitialized page", (redo) ? "re" : "un"); elog(PANIC, "heap_delete_%sdo: uninitialized page", (redo) ? "re" : "un");
if (redo) if (redo)
{ {
@ -2031,14 +2031,14 @@ heap_xlog_delete(bool redo, XLogRecPtr lsn, XLogRecord *record)
} }
else if (XLByteLT(PageGetLSN(page), lsn)) /* changes are not applied else if (XLByteLT(PageGetLSN(page), lsn)) /* changes are not applied
* ?! */ * ?! */
elog(STOP, "heap_delete_undo: bad page LSN"); elog(PANIC, "heap_delete_undo: bad page LSN");
offnum = ItemPointerGetOffsetNumber(&(xlrec->target.tid)); offnum = ItemPointerGetOffsetNumber(&(xlrec->target.tid));
if (PageGetMaxOffsetNumber(page) >= offnum) if (PageGetMaxOffsetNumber(page) >= offnum)
lp = PageGetItemId(page, offnum); lp = PageGetItemId(page, offnum);
if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsUsed(lp)) if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsUsed(lp))
elog(STOP, "heap_delete_%sdo: invalid lp", (redo) ? "re" : "un"); elog(PANIC, "heap_delete_%sdo: invalid lp", (redo) ? "re" : "un");
htup = (HeapTupleHeader) PageGetItem(page, lp); htup = (HeapTupleHeader) PageGetItem(page, lp);
@ -2054,7 +2054,7 @@ heap_xlog_delete(bool redo, XLogRecPtr lsn, XLogRecord *record)
return; return;
} }
elog(STOP, "heap_delete_undo: unimplemented"); elog(PANIC, "heap_delete_undo: unimplemented");
} }
static void static void
@ -2080,7 +2080,7 @@ heap_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (PageIsNew((PageHeader) page) && if (PageIsNew((PageHeader) page) &&
(!redo || !(record->xl_info & XLOG_HEAP_INIT_PAGE))) (!redo || !(record->xl_info & XLOG_HEAP_INIT_PAGE)))
elog(STOP, "heap_insert_%sdo: uninitialized page", (redo) ? "re" : "un"); elog(PANIC, "heap_insert_%sdo: uninitialized page", (redo) ? "re" : "un");
if (redo) if (redo)
{ {
@ -2104,7 +2104,7 @@ heap_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
offnum = ItemPointerGetOffsetNumber(&(xlrec->target.tid)); offnum = ItemPointerGetOffsetNumber(&(xlrec->target.tid));
if (PageGetMaxOffsetNumber(page) + 1 < offnum) if (PageGetMaxOffsetNumber(page) + 1 < offnum)
elog(STOP, "heap_insert_redo: invalid max offset number"); elog(PANIC, "heap_insert_redo: invalid max offset number");
newlen = record->xl_len - SizeOfHeapInsert - SizeOfHeapHeader; newlen = record->xl_len - SizeOfHeapInsert - SizeOfHeapHeader;
Assert(newlen <= MaxTupleSize); Assert(newlen <= MaxTupleSize);
@ -2128,7 +2128,7 @@ heap_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
offnum = PageAddItem(page, (Item) htup, newlen, offnum, offnum = PageAddItem(page, (Item) htup, newlen, offnum,
LP_USED | OverwritePageMode); LP_USED | OverwritePageMode);
if (offnum == InvalidOffsetNumber) if (offnum == InvalidOffsetNumber)
elog(STOP, "heap_insert_redo: failed to add tuple"); elog(PANIC, "heap_insert_redo: failed to add tuple");
PageSetLSN(page, lsn); PageSetLSN(page, lsn);
PageSetSUI(page, ThisStartUpID); /* prev sui */ PageSetSUI(page, ThisStartUpID); /* prev sui */
UnlockAndWriteBuffer(buffer); UnlockAndWriteBuffer(buffer);
@ -2138,9 +2138,9 @@ heap_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
/* undo insert */ /* undo insert */
if (XLByteLT(PageGetLSN(page), lsn)) /* changes are not applied if (XLByteLT(PageGetLSN(page), lsn)) /* changes are not applied
* ?! */ * ?! */
elog(STOP, "heap_insert_undo: bad page LSN"); elog(PANIC, "heap_insert_undo: bad page LSN");
elog(STOP, "heap_insert_undo: unimplemented"); elog(PANIC, "heap_insert_undo: unimplemented");
} }
/* /*
@ -2171,11 +2171,11 @@ heap_xlog_update(bool redo, XLogRecPtr lsn, XLogRecord *record, bool move)
buffer = XLogReadBuffer(false, reln, buffer = XLogReadBuffer(false, reln,
ItemPointerGetBlockNumber(&(xlrec->target.tid))); ItemPointerGetBlockNumber(&(xlrec->target.tid)));
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "heap_update_%sdo: no block", (redo) ? "re" : "un"); elog(PANIC, "heap_update_%sdo: no block", (redo) ? "re" : "un");
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (PageIsNew((PageHeader) page)) if (PageIsNew((PageHeader) page))
elog(STOP, "heap_update_%sdo: uninitialized old page", (redo) ? "re" : "un"); elog(PANIC, "heap_update_%sdo: uninitialized old page", (redo) ? "re" : "un");
if (redo) if (redo)
{ {
@ -2189,14 +2189,14 @@ heap_xlog_update(bool redo, XLogRecPtr lsn, XLogRecord *record, bool move)
} }
else if (XLByteLT(PageGetLSN(page), lsn)) /* changes are not applied else if (XLByteLT(PageGetLSN(page), lsn)) /* changes are not applied
* ?! */ * ?! */
elog(STOP, "heap_update_undo: bad old tuple page LSN"); elog(PANIC, "heap_update_undo: bad old tuple page LSN");
offnum = ItemPointerGetOffsetNumber(&(xlrec->target.tid)); offnum = ItemPointerGetOffsetNumber(&(xlrec->target.tid));
if (PageGetMaxOffsetNumber(page) >= offnum) if (PageGetMaxOffsetNumber(page) >= offnum)
lp = PageGetItemId(page, offnum); lp = PageGetItemId(page, offnum);
if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsUsed(lp)) if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsUsed(lp))
elog(STOP, "heap_update_%sdo: invalid lp", (redo) ? "re" : "un"); elog(PANIC, "heap_update_%sdo: invalid lp", (redo) ? "re" : "un");
htup = (HeapTupleHeader) PageGetItem(page, lp); htup = (HeapTupleHeader) PageGetItem(page, lp);
@ -2224,7 +2224,7 @@ heap_xlog_update(bool redo, XLogRecPtr lsn, XLogRecord *record, bool move)
goto newt; goto newt;
} }
elog(STOP, "heap_update_undo: unimplemented"); elog(PANIC, "heap_update_undo: unimplemented");
/* Deal with new tuple */ /* Deal with new tuple */
@ -2245,7 +2245,7 @@ newt:;
newsame:; newsame:;
if (PageIsNew((PageHeader) page) && if (PageIsNew((PageHeader) page) &&
(!redo || !(record->xl_info & XLOG_HEAP_INIT_PAGE))) (!redo || !(record->xl_info & XLOG_HEAP_INIT_PAGE)))
elog(STOP, "heap_update_%sdo: uninitialized page", (redo) ? "re" : "un"); elog(PANIC, "heap_update_%sdo: uninitialized page", (redo) ? "re" : "un");
if (redo) if (redo)
{ {
@ -2269,7 +2269,7 @@ newsame:;
offnum = ItemPointerGetOffsetNumber(&(xlrec->newtid)); offnum = ItemPointerGetOffsetNumber(&(xlrec->newtid));
if (PageGetMaxOffsetNumber(page) + 1 < offnum) if (PageGetMaxOffsetNumber(page) + 1 < offnum)
elog(STOP, "heap_update_redo: invalid max offset number"); elog(PANIC, "heap_update_redo: invalid max offset number");
hsize = SizeOfHeapUpdate + SizeOfHeapHeader; hsize = SizeOfHeapUpdate + SizeOfHeapHeader;
if (move) if (move)
@ -2315,7 +2315,7 @@ newsame:;
offnum = PageAddItem(page, (Item) htup, newlen, offnum, offnum = PageAddItem(page, (Item) htup, newlen, offnum,
LP_USED | OverwritePageMode); LP_USED | OverwritePageMode);
if (offnum == InvalidOffsetNumber) if (offnum == InvalidOffsetNumber)
elog(STOP, "heap_update_redo: failed to add tuple"); elog(PANIC, "heap_update_redo: failed to add tuple");
PageSetLSN(page, lsn); PageSetLSN(page, lsn);
PageSetSUI(page, ThisStartUpID); /* prev sui */ PageSetSUI(page, ThisStartUpID); /* prev sui */
UnlockAndWriteBuffer(buffer); UnlockAndWriteBuffer(buffer);
@ -2324,9 +2324,9 @@ newsame:;
/* undo */ /* undo */
if (XLByteLT(PageGetLSN(page), lsn)) /* changes not applied?! */ if (XLByteLT(PageGetLSN(page), lsn)) /* changes not applied?! */
elog(STOP, "heap_update_undo: bad new tuple page LSN"); elog(PANIC, "heap_update_undo: bad new tuple page LSN");
elog(STOP, "heap_update_undo: unimplemented"); elog(PANIC, "heap_update_undo: unimplemented");
} }
@ -2342,30 +2342,30 @@ _heap_unlock_tuple(void *data)
HeapTupleHeader htup; HeapTupleHeader htup;
if (!RelationIsValid(reln)) if (!RelationIsValid(reln))
elog(STOP, "_heap_unlock_tuple: can't open relation"); elog(PANIC, "_heap_unlock_tuple: can't open relation");
buffer = XLogReadBuffer(false, reln, buffer = XLogReadBuffer(false, reln,
ItemPointerGetBlockNumber(&(xltid->tid))); ItemPointerGetBlockNumber(&(xltid->tid)));
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "_heap_unlock_tuple: can't read buffer"); elog(PANIC, "_heap_unlock_tuple: can't read buffer");
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (PageIsNew((PageHeader) page)) if (PageIsNew((PageHeader) page))
elog(STOP, "_heap_unlock_tuple: uninitialized page"); elog(PANIC, "_heap_unlock_tuple: uninitialized page");
offnum = ItemPointerGetOffsetNumber(&(xltid->tid)); offnum = ItemPointerGetOffsetNumber(&(xltid->tid));
if (offnum > PageGetMaxOffsetNumber(page)) if (offnum > PageGetMaxOffsetNumber(page))
elog(STOP, "_heap_unlock_tuple: invalid itemid"); elog(PANIC, "_heap_unlock_tuple: invalid itemid");
lp = PageGetItemId(page, offnum); lp = PageGetItemId(page, offnum);
if (!ItemIdIsUsed(lp) || ItemIdDeleted(lp)) if (!ItemIdIsUsed(lp) || ItemIdDeleted(lp))
elog(STOP, "_heap_unlock_tuple: unused/deleted tuple in rollback"); elog(PANIC, "_heap_unlock_tuple: unused/deleted tuple in rollback");
htup = (HeapTupleHeader) PageGetItem(page, lp); htup = (HeapTupleHeader) PageGetItem(page, lp);
if (!TransactionIdEquals(htup->t_xmax, GetCurrentTransactionId()) || if (!TransactionIdEquals(htup->t_xmax, GetCurrentTransactionId()) ||
htup->t_cmax != GetCurrentCommandId()) htup->t_cmax != GetCurrentCommandId())
elog(STOP, "_heap_unlock_tuple: invalid xmax/cmax in rollback"); elog(PANIC, "_heap_unlock_tuple: invalid xmax/cmax in rollback");
htup->t_infomask &= ~HEAP_XMAX_UNLOGGED; htup->t_infomask &= ~HEAP_XMAX_UNLOGGED;
htup->t_infomask |= HEAP_XMAX_INVALID; htup->t_infomask |= HEAP_XMAX_INVALID;
UnlockAndWriteBuffer(buffer); UnlockAndWriteBuffer(buffer);
@ -2389,7 +2389,7 @@ heap_redo(XLogRecPtr lsn, XLogRecord *record)
else if (info == XLOG_HEAP_CLEAN) else if (info == XLOG_HEAP_CLEAN)
heap_xlog_clean(true, lsn, record); heap_xlog_clean(true, lsn, record);
else else
elog(STOP, "heap_redo: unknown op code %u", info); elog(PANIC, "heap_redo: unknown op code %u", info);
} }
void void
@ -2409,7 +2409,7 @@ heap_undo(XLogRecPtr lsn, XLogRecord *record)
else if (info == XLOG_HEAP_CLEAN) else if (info == XLOG_HEAP_CLEAN)
heap_xlog_clean(false, lsn, record); heap_xlog_clean(false, lsn, record);
else else
elog(STOP, "heap_undo: unknown op code %u", info); elog(PANIC, "heap_undo: unknown op code %u", info);
} }
static void static void

6
src/backend/access/heap/hio.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Id: hio.c,v 1.43 2001/10/25 05:49:21 momjian Exp $ * $Id: hio.c,v 1.44 2002/03/02 21:39:18 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -50,7 +50,7 @@ RelationPutHeapTuple(Relation relation,
tuple->t_len, InvalidOffsetNumber, LP_USED); tuple->t_len, InvalidOffsetNumber, LP_USED);
if (offnum == InvalidOffsetNumber) if (offnum == InvalidOffsetNumber)
elog(STOP, "RelationPutHeapTuple: failed to add tuple"); elog(PANIC, "RelationPutHeapTuple: failed to add tuple");
/* Update tuple->t_self to the actual position where it was stored */ /* Update tuple->t_self to the actual position where it was stored */
ItemPointerSet(&(tuple->t_self), BufferGetBlockNumber(buffer), offnum); ItemPointerSet(&(tuple->t_self), BufferGetBlockNumber(buffer), offnum);
@ -270,7 +270,7 @@ RelationGetBufferForTuple(Relation relation, Size len,
if (len > PageGetFreeSpace(pageHeader)) if (len > PageGetFreeSpace(pageHeader))
{ {
/* We should not get here given the test at the top */ /* We should not get here given the test at the top */
elog(STOP, "Tuple is too big: size %lu", (unsigned long) len); elog(PANIC, "Tuple is too big: size %lu", (unsigned long) len);
} }
/* /*

14
src/backend/access/nbtree/nbtinsert.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.88 2002/01/01 20:32:37 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.89 2002/03/02 21:39:18 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -507,7 +507,7 @@ _bt_insertonpg(Relation rel,
/* If root page was splitted */ /* If root page was splitted */
if (stack == (BTStack) NULL) if (stack == (BTStack) NULL)
{ {
elog(DEBUG, "btree: concurrent ROOT page split"); elog(LOG, "btree: concurrent ROOT page split");
/* /*
* If root page splitter failed to create new root page * If root page splitter failed to create new root page
@ -735,7 +735,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
item = (BTItem) PageGetItem(origpage, itemid); item = (BTItem) PageGetItem(origpage, itemid);
if (PageAddItem(rightpage, (Item) item, itemsz, rightoff, if (PageAddItem(rightpage, (Item) item, itemsz, rightoff,
LP_USED) == InvalidOffsetNumber) LP_USED) == InvalidOffsetNumber)
elog(STOP, "btree: failed to add hikey to the right sibling"); elog(PANIC, "btree: failed to add hikey to the right sibling");
rightoff = OffsetNumberNext(rightoff); rightoff = OffsetNumberNext(rightoff);
} }
@ -761,7 +761,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
lhikey = item; lhikey = item;
if (PageAddItem(leftpage, (Item) item, itemsz, leftoff, if (PageAddItem(leftpage, (Item) item, itemsz, leftoff,
LP_USED) == InvalidOffsetNumber) LP_USED) == InvalidOffsetNumber)
elog(STOP, "btree: failed to add hikey to the left sibling"); elog(PANIC, "btree: failed to add hikey to the left sibling");
leftoff = OffsetNumberNext(leftoff); leftoff = OffsetNumberNext(leftoff);
/* /*
@ -1316,7 +1316,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
* the two items will go into positions P_HIKEY and P_FIRSTKEY. * the two items will go into positions P_HIKEY and P_FIRSTKEY.
*/ */
if (PageAddItem(rootpage, (Item) new_item, itemsz, P_HIKEY, LP_USED) == InvalidOffsetNumber) if (PageAddItem(rootpage, (Item) new_item, itemsz, P_HIKEY, LP_USED) == InvalidOffsetNumber)
elog(STOP, "btree: failed to add leftkey to new root page"); elog(PANIC, "btree: failed to add leftkey to new root page");
pfree(new_item); pfree(new_item);
/* /*
@ -1333,7 +1333,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
* insert the right page pointer into the new root page. * insert the right page pointer into the new root page.
*/ */
if (PageAddItem(rootpage, (Item) new_item, itemsz, P_FIRSTKEY, LP_USED) == InvalidOffsetNumber) if (PageAddItem(rootpage, (Item) new_item, itemsz, P_FIRSTKEY, LP_USED) == InvalidOffsetNumber)
elog(STOP, "btree: failed to add rightkey to new root page"); elog(PANIC, "btree: failed to add rightkey to new root page");
pfree(new_item); pfree(new_item);
metad->btm_root = rootblknum; metad->btm_root = rootblknum;
@ -2034,7 +2034,7 @@ _bt_pgaddtup(Relation rel,
if (PageAddItem(page, (Item) btitem, itemsize, itup_off, if (PageAddItem(page, (Item) btitem, itemsize, itup_off,
LP_USED) == InvalidOffsetNumber) LP_USED) == InvalidOffsetNumber)
elog(STOP, "btree: failed to add item to the %s for %s", elog(PANIC, "btree: failed to add item to the %s for %s",
where, RelationGetRelationName(rel)); where, RelationGetRelationName(rel));
} }

46
src/backend/access/nbtree/nbtree.c
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.87 2002/01/06 00:37:43 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.88 2002/03/02 21:39:18 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -776,7 +776,7 @@ _bt_restore_page(Page page, char *from, int len)
itemsz = MAXALIGN(itemsz); itemsz = MAXALIGN(itemsz);
if (PageAddItem(page, (Item) from, itemsz, if (PageAddItem(page, (Item) from, itemsz,
FirstOffsetNumber, LP_USED) == InvalidOffsetNumber) FirstOffsetNumber, LP_USED) == InvalidOffsetNumber)
elog(STOP, "_bt_restore_page: can't add item to page"); elog(PANIC, "_bt_restore_page: can't add item to page");
from += itemsz; from += itemsz;
} }
} }
@ -799,10 +799,10 @@ btree_xlog_delete(bool redo, XLogRecPtr lsn, XLogRecord *record)
buffer = XLogReadBuffer(false, reln, buffer = XLogReadBuffer(false, reln,
ItemPointerGetBlockNumber(&(xlrec->target.tid))); ItemPointerGetBlockNumber(&(xlrec->target.tid)));
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "btree_delete_redo: block unfound"); elog(PANIC, "btree_delete_redo: block unfound");
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (PageIsNew((PageHeader) page)) if (PageIsNew((PageHeader) page))
elog(STOP, "btree_delete_redo: uninitialized page"); elog(PANIC, "btree_delete_redo: uninitialized page");
if (XLByteLE(lsn, PageGetLSN(page))) if (XLByteLE(lsn, PageGetLSN(page)))
{ {
@ -838,10 +838,10 @@ btree_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
buffer = XLogReadBuffer(false, reln, buffer = XLogReadBuffer(false, reln,
ItemPointerGetBlockNumber(&(xlrec->target.tid))); ItemPointerGetBlockNumber(&(xlrec->target.tid)));
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "btree_insert_%sdo: block unfound", (redo) ? "re" : "un"); elog(PANIC, "btree_insert_%sdo: block unfound", (redo) ? "re" : "un");
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (PageIsNew((PageHeader) page)) if (PageIsNew((PageHeader) page))
elog(STOP, "btree_insert_%sdo: uninitialized page", (redo) ? "re" : "un"); elog(PANIC, "btree_insert_%sdo: uninitialized page", (redo) ? "re" : "un");
pageop = (BTPageOpaque) PageGetSpecialPointer(page); pageop = (BTPageOpaque) PageGetSpecialPointer(page);
if (redo) if (redo)
@ -855,7 +855,7 @@ btree_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
record->xl_len - SizeOfBtreeInsert, record->xl_len - SizeOfBtreeInsert,
ItemPointerGetOffsetNumber(&(xlrec->target.tid)), ItemPointerGetOffsetNumber(&(xlrec->target.tid)),
LP_USED) == InvalidOffsetNumber) LP_USED) == InvalidOffsetNumber)
elog(STOP, "btree_insert_redo: failed to add item"); elog(PANIC, "btree_insert_redo: failed to add item");
PageSetLSN(page, lsn); PageSetLSN(page, lsn);
PageSetSUI(page, ThisStartUpID); PageSetSUI(page, ThisStartUpID);
@ -864,7 +864,7 @@ btree_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
else else
{ {
if (XLByteLT(PageGetLSN(page), lsn)) if (XLByteLT(PageGetLSN(page), lsn))
elog(STOP, "btree_insert_undo: bad page LSN"); elog(PANIC, "btree_insert_undo: bad page LSN");
if (!P_ISLEAF(pageop)) if (!P_ISLEAF(pageop))
{ {
@ -872,7 +872,7 @@ btree_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
return; return;
} }
elog(STOP, "btree_insert_undo: unimplemented"); elog(PANIC, "btree_insert_undo: unimplemented");
} }
return; return;
@ -899,13 +899,13 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record)
BlockIdGetBlockNumber(&(xlrec->otherblk)); BlockIdGetBlockNumber(&(xlrec->otherblk));
buffer = XLogReadBuffer(false, reln, blkno); buffer = XLogReadBuffer(false, reln, blkno);
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "btree_split_%s: lost left sibling", op); elog(PANIC, "btree_split_%s: lost left sibling", op);
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (redo) if (redo)
_bt_pageinit(page, BufferGetPageSize(buffer)); _bt_pageinit(page, BufferGetPageSize(buffer));
else if (PageIsNew((PageHeader) page)) else if (PageIsNew((PageHeader) page))
elog(STOP, "btree_split_undo: uninitialized left sibling"); elog(PANIC, "btree_split_undo: uninitialized left sibling");
pageop = (BTPageOpaque) PageGetSpecialPointer(page); pageop = (BTPageOpaque) PageGetSpecialPointer(page);
if (redo) if (redo)
@ -928,8 +928,8 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record)
/* undo */ /* undo */
{ {
if (XLByteLT(PageGetLSN(page), lsn)) if (XLByteLT(PageGetLSN(page), lsn))
elog(STOP, "btree_split_undo: bad left sibling LSN"); elog(PANIC, "btree_split_undo: bad left sibling LSN");
elog(STOP, "btree_split_undo: unimplemented"); elog(PANIC, "btree_split_undo: unimplemented");
} }
/* Right (new) sibling */ /* Right (new) sibling */
@ -937,13 +937,13 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record)
ItemPointerGetBlockNumber(&(xlrec->target.tid)); ItemPointerGetBlockNumber(&(xlrec->target.tid));
buffer = XLogReadBuffer((redo) ? true : false, reln, blkno); buffer = XLogReadBuffer((redo) ? true : false, reln, blkno);
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "btree_split_%s: lost right sibling", op); elog(PANIC, "btree_split_%s: lost right sibling", op);
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (redo) if (redo)
_bt_pageinit(page, BufferGetPageSize(buffer)); _bt_pageinit(page, BufferGetPageSize(buffer));
else if (PageIsNew((PageHeader) page)) else if (PageIsNew((PageHeader) page))
elog(STOP, "btree_split_undo: uninitialized right sibling"); elog(PANIC, "btree_split_undo: uninitialized right sibling");
pageop = (BTPageOpaque) PageGetSpecialPointer(page); pageop = (BTPageOpaque) PageGetSpecialPointer(page);
if (redo) if (redo)
@ -967,8 +967,8 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record)
/* undo */ /* undo */
{ {
if (XLByteLT(PageGetLSN(page), lsn)) if (XLByteLT(PageGetLSN(page), lsn))
elog(STOP, "btree_split_undo: bad right sibling LSN"); elog(PANIC, "btree_split_undo: bad right sibling LSN");
elog(STOP, "btree_split_undo: unimplemented"); elog(PANIC, "btree_split_undo: unimplemented");
} }
if (!redo || (record->xl_info & XLR_BKP_BLOCK_1)) if (!redo || (record->xl_info & XLR_BKP_BLOCK_1))
@ -981,11 +981,11 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record)
buffer = XLogReadBuffer(false, reln, blkno); buffer = XLogReadBuffer(false, reln, blkno);
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "btree_split_redo: lost next right page"); elog(PANIC, "btree_split_redo: lost next right page");
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
if (PageIsNew((PageHeader) page)) if (PageIsNew((PageHeader) page))
elog(STOP, "btree_split_redo: uninitialized next right page"); elog(PANIC, "btree_split_redo: uninitialized next right page");
if (XLByteLE(lsn, PageGetLSN(page))) if (XLByteLE(lsn, PageGetLSN(page)))
{ {
@ -1022,10 +1022,10 @@ btree_xlog_newroot(bool redo, XLogRecPtr lsn, XLogRecord *record)
return; return;
buffer = XLogReadBuffer(true, reln, BlockIdGetBlockNumber(&(xlrec->rootblk))); buffer = XLogReadBuffer(true, reln, BlockIdGetBlockNumber(&(xlrec->rootblk)));
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "btree_newroot_redo: no root page"); elog(PANIC, "btree_newroot_redo: no root page");
metabuf = XLogReadBuffer(false, reln, BTREE_METAPAGE); metabuf = XLogReadBuffer(false, reln, BTREE_METAPAGE);
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "btree_newroot_redo: no metapage"); elog(PANIC, "btree_newroot_redo: no metapage");
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
_bt_pageinit(page, BufferGetPageSize(buffer)); _bt_pageinit(page, BufferGetPageSize(buffer));
pageop = (BTPageOpaque) PageGetSpecialPointer(page); pageop = (BTPageOpaque) PageGetSpecialPointer(page);
@ -1079,7 +1079,7 @@ btree_redo(XLogRecPtr lsn, XLogRecord *record)
else if (info == XLOG_BTREE_NEWROOT) else if (info == XLOG_BTREE_NEWROOT)
btree_xlog_newroot(true, lsn, record); btree_xlog_newroot(true, lsn, record);
else else
elog(STOP, "btree_redo: unknown op code %u", info); elog(PANIC, "btree_redo: unknown op code %u", info);
} }
void void
@ -1099,7 +1099,7 @@ btree_undo(XLogRecPtr lsn, XLogRecord *record)
else if (info == XLOG_BTREE_NEWROOT) else if (info == XLOG_BTREE_NEWROOT)
btree_xlog_newroot(false, lsn, record); btree_xlog_newroot(false, lsn, record);
else else
elog(STOP, "btree_undo: unknown op code %u", info); elog(PANIC, "btree_undo: unknown op code %u", info);
} }
static void static void

6
src/backend/access/rtree/rtree.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.69 2002/01/15 22:14:17 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.70 2002/03/02 21:39:19 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1345,13 +1345,13 @@ _rtdump(Relation r)
void void
rtree_redo(XLogRecPtr lsn, XLogRecord *record) rtree_redo(XLogRecPtr lsn, XLogRecord *record)
{ {
elog(STOP, "rtree_redo: unimplemented"); elog(PANIC, "rtree_redo: unimplemented");
} }
void void
rtree_undo(XLogRecPtr lsn, XLogRecord *record) rtree_undo(XLogRecPtr lsn, XLogRecord *record)
{ {
elog(STOP, "rtree_undo: unimplemented"); elog(PANIC, "rtree_undo: unimplemented");
} }
void void

22
src/backend/access/transam/clog.c
View File

@ -13,7 +13,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/backend/access/transam/clog.c,v 1.7 2001/10/28 06:25:42 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/transam/clog.c,v 1.8 2002/03/02 21:39:19 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -544,19 +544,19 @@ CLOGPhysicalReadPage(int pageno, int slotno)
if (fd < 0) if (fd < 0)
{ {
if (errno != ENOENT || !InRecovery) if (errno != ENOENT || !InRecovery)
elog(STOP, "open of %s failed: %m", path); elog(PANIC, "open of %s failed: %m", path);
elog(DEBUG, "clog file %s doesn't exist, reading as zeroes", path); elog(LOG, "clog file %s doesn't exist, reading as zeroes", path);
MemSet(ClogCtl->page_buffer[slotno], 0, CLOG_BLCKSZ); MemSet(ClogCtl->page_buffer[slotno], 0, CLOG_BLCKSZ);
return; return;
} }
if (lseek(fd, (off_t) offset, SEEK_SET) < 0) if (lseek(fd, (off_t) offset, SEEK_SET) < 0)
elog(STOP, "lseek of clog file %u, offset %u failed: %m", elog(PANIC, "lseek of clog file %u, offset %u failed: %m",
segno, offset); segno, offset);
errno = 0; errno = 0;
if (read(fd, ClogCtl->page_buffer[slotno], CLOG_BLCKSZ) != CLOG_BLCKSZ) if (read(fd, ClogCtl->page_buffer[slotno], CLOG_BLCKSZ) != CLOG_BLCKSZ)
elog(STOP, "read of clog file %u, offset %u failed: %m", elog(PANIC, "read of clog file %u, offset %u failed: %m",
segno, offset); segno, offset);
close(fd); close(fd);
@ -596,15 +596,15 @@ CLOGPhysicalWritePage(int pageno, int slotno)
if (fd < 0) if (fd < 0)
{ {
if (errno != ENOENT) if (errno != ENOENT)
elog(STOP, "open of %s failed: %m", path); elog(PANIC, "open of %s failed: %m", path);
fd = BasicOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, fd = BasicOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
S_IRUSR | S_IWUSR); S_IRUSR | S_IWUSR);
if (fd < 0) if (fd < 0)
elog(STOP, "creation of file %s failed: %m", path); elog(PANIC, "creation of file %s failed: %m", path);
} }
if (lseek(fd, (off_t) offset, SEEK_SET) < 0) if (lseek(fd, (off_t) offset, SEEK_SET) < 0)
elog(STOP, "lseek of clog file %u, offset %u failed: %m", elog(PANIC, "lseek of clog file %u, offset %u failed: %m",
segno, offset); segno, offset);
errno = 0; errno = 0;
@ -613,7 +613,7 @@ CLOGPhysicalWritePage(int pageno, int slotno)
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
if (errno == 0) if (errno == 0)
errno = ENOSPC; errno = ENOSPC;
elog(STOP, "write of clog file %u, offset %u failed: %m", elog(PANIC, "write of clog file %u, offset %u failed: %m",
segno, offset); segno, offset);
} }
@ -887,7 +887,7 @@ ScanCLOGDirectory(int cutoffPage, bool doDeletions)
cldir = opendir(ClogDir); cldir = opendir(ClogDir);
if (cldir == NULL) if (cldir == NULL)
elog(STOP, "could not open transaction-commit log directory (%s): %m", elog(PANIC, "could not open transaction-commit log directory (%s): %m",
ClogDir); ClogDir);
errno = 0; errno = 0;
@ -912,7 +912,7 @@ ScanCLOGDirectory(int cutoffPage, bool doDeletions)
errno = 0; errno = 0;
} }
if (errno) if (errno)
elog(STOP, "could not read transaction-commit log directory (%s): %m", elog(PANIC, "could not read transaction-commit log directory (%s): %m",
ClogDir); ClogDir);
closedir(cldir); closedir(cldir);

10
src/backend/access/transam/xact.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.115 2001/11/01 06:17:01 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.116 2002/03/02 21:39:19 momjian Exp $
* *
* NOTES * NOTES
* Transaction aborts can now occur two ways: * Transaction aborts can now occur two ways:
@ -1606,7 +1606,7 @@ xact_redo(XLogRecPtr lsn, XLogRecord *record)
/* SHOULD REMOVE FILES OF ALL FAILED-TO-BE-CREATED RELATIONS */ /* SHOULD REMOVE FILES OF ALL FAILED-TO-BE-CREATED RELATIONS */
} }
else else
elog(STOP, "xact_redo: unknown op code %u", info); elog(PANIC, "xact_redo: unknown op code %u", info);
} }
void void
@ -1615,9 +1615,9 @@ xact_undo(XLogRecPtr lsn, XLogRecord *record)
uint8 info = record->xl_info & ~XLR_INFO_MASK; uint8 info = record->xl_info & ~XLR_INFO_MASK;
if (info == XLOG_XACT_COMMIT) /* shouldn't be called by XLOG */ if (info == XLOG_XACT_COMMIT) /* shouldn't be called by XLOG */
elog(STOP, "xact_undo: can't undo committed xaction"); elog(PANIC, "xact_undo: can't undo committed xaction");
else if (info != XLOG_XACT_ABORT) else if (info != XLOG_XACT_ABORT)
elog(STOP, "xact_redo: unknown op code %u", info); elog(PANIC, "xact_redo: unknown op code %u", info);
} }
void void
@ -1652,7 +1652,7 @@ void
{ {
#ifdef XLOG_II #ifdef XLOG_II
if (_RollbackFunc != NULL) if (_RollbackFunc != NULL)
elog(STOP, "XactPushRollback: already installed"); elog(PANIC, "XactPushRollback: already installed");
#endif #endif
_RollbackFunc = func; _RollbackFunc = func;

128
src/backend/access/transam/xlog.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.87 2002/02/18 05:44:45 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.88 2002/03/02 21:39:20 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -489,7 +489,7 @@ XLogInsert(RmgrId rmid, uint8 info, XLogRecData *rdata)
if (info & XLR_INFO_MASK) if (info & XLR_INFO_MASK)
{ {
if ((info & XLR_INFO_MASK) != XLOG_NO_TRAN) if ((info & XLR_INFO_MASK) != XLOG_NO_TRAN)
elog(STOP, "XLogInsert: invalid info mask %02X", elog(PANIC, "XLogInsert: invalid info mask %02X",
(info & XLR_INFO_MASK)); (info & XLR_INFO_MASK));
no_tran = true; no_tran = true;
info &= ~XLR_INFO_MASK; info &= ~XLR_INFO_MASK;
@ -594,7 +594,7 @@ begin:;
} }
} }
if (i >= XLR_MAX_BKP_BLOCKS) if (i >= XLR_MAX_BKP_BLOCKS)
elog(STOP, "XLogInsert: can backup %d blocks at most", elog(PANIC, "XLogInsert: can backup %d blocks at most",
XLR_MAX_BKP_BLOCKS); XLR_MAX_BKP_BLOCKS);
} }
/* Break out of loop when rdt points to last list item */ /* Break out of loop when rdt points to last list item */
@ -612,7 +612,7 @@ begin:;
* also remove the check for xl_len == 0 in ReadRecord, below. * also remove the check for xl_len == 0 in ReadRecord, below.
*/ */
if (len == 0 || len > MAXLOGRECSZ) if (len == 0 || len > MAXLOGRECSZ)
elog(STOP, "XLogInsert: invalid record length %u", len); elog(PANIC, "XLogInsert: invalid record length %u", len);
START_CRIT_SECTION(); START_CRIT_SECTION();
@ -769,7 +769,7 @@ begin:;
strcat(buf, " - "); strcat(buf, " - ");
RmgrTable[record->xl_rmid].rm_desc(buf, record->xl_info, rdata->data); RmgrTable[record->xl_rmid].rm_desc(buf, record->xl_info, rdata->data);
} }
elog(DEBUG, "%s", buf); elog(LOG, "%s", buf);
} }
/* Record begin of record in appropriate places */ /* Record begin of record in appropriate places */
@ -1010,7 +1010,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
* AdvanceXLInsertBuffer. * AdvanceXLInsertBuffer.
*/ */
if (!XLByteLT(LogwrtResult.Write, XLogCtl->xlblocks[Write->curridx])) if (!XLByteLT(LogwrtResult.Write, XLogCtl->xlblocks[Write->curridx]))
elog(STOP, "XLogWrite: write request %X/%X is past end of log %X/%X", elog(PANIC, "XLogWrite: write request %X/%X is past end of log %X/%X",
LogwrtResult.Write.xlogid, LogwrtResult.Write.xrecoff, LogwrtResult.Write.xlogid, LogwrtResult.Write.xrecoff,
XLogCtl->xlblocks[Write->curridx].xlogid, XLogCtl->xlblocks[Write->curridx].xlogid,
XLogCtl->xlblocks[Write->curridx].xrecoff); XLogCtl->xlblocks[Write->curridx].xrecoff);
@ -1027,7 +1027,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
if (openLogFile >= 0) if (openLogFile >= 0)
{ {
if (close(openLogFile) != 0) if (close(openLogFile) != 0)
elog(STOP, "close of log file %u, segment %u failed: %m", elog(PANIC, "close of log file %u, segment %u failed: %m",
openLogId, openLogSeg); openLogId, openLogSeg);
openLogFile = -1; openLogFile = -1;
} }
@ -1066,7 +1066,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
(uint32) CheckPointSegments)) (uint32) CheckPointSegments))
{ {
if (XLOG_DEBUG) if (XLOG_DEBUG)
elog(DEBUG, "XLogWrite: time for a checkpoint, signaling postmaster"); elog(LOG, "XLogWrite: time for a checkpoint, signaling postmaster");
SendPostmasterSignal(PMSIGNAL_DO_CHECKPOINT); SendPostmasterSignal(PMSIGNAL_DO_CHECKPOINT);
} }
} }
@ -1085,7 +1085,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
{ {
openLogOff = (LogwrtResult.Write.xrecoff - BLCKSZ) % XLogSegSize; openLogOff = (LogwrtResult.Write.xrecoff - BLCKSZ) % XLogSegSize;
if (lseek(openLogFile, (off_t) openLogOff, SEEK_SET) < 0) if (lseek(openLogFile, (off_t) openLogOff, SEEK_SET) < 0)
elog(STOP, "lseek of log file %u, segment %u, offset %u failed: %m", elog(PANIC, "lseek of log file %u, segment %u, offset %u failed: %m",
openLogId, openLogSeg, openLogOff); openLogId, openLogSeg, openLogOff);
} }
@ -1097,7 +1097,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
if (errno == 0) if (errno == 0)
errno = ENOSPC; errno = ENOSPC;
elog(STOP, "write of log file %u, segment %u, offset %u failed: %m", elog(PANIC, "write of log file %u, segment %u, offset %u failed: %m",
openLogId, openLogSeg, openLogOff); openLogId, openLogSeg, openLogOff);
} }
openLogOff += BLCKSZ; openLogOff += BLCKSZ;
@ -1141,7 +1141,7 @@ XLogWrite(XLogwrtRqst WriteRqst)
!XLByteInPrevSeg(LogwrtResult.Write, openLogId, openLogSeg)) !XLByteInPrevSeg(LogwrtResult.Write, openLogId, openLogSeg))
{ {
if (close(openLogFile) != 0) if (close(openLogFile) != 0)
elog(STOP, "close of log file %u, segment %u failed: %m", elog(PANIC, "close of log file %u, segment %u failed: %m",
openLogId, openLogSeg); openLogId, openLogSeg);
openLogFile = -1; openLogFile = -1;
} }
@ -1193,7 +1193,7 @@ XLogFlush(XLogRecPtr record)
if (XLOG_DEBUG) if (XLOG_DEBUG)
{ {
elog(DEBUG, "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X\n", elog(LOG, "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X\n",
(IsBootstrapProcessingMode()) ? "(bootstrap)" : "", (IsBootstrapProcessingMode()) ? "(bootstrap)" : "",
(InRedo) ? "(redo)" : "", (InRedo) ? "(redo)" : "",
record.xlogid, record.xrecoff, record.xlogid, record.xrecoff,
@ -1273,7 +1273,7 @@ XLogFlush(XLogRecPtr record)
* problem; most likely, the requested flush point is past end of XLOG. * problem; most likely, the requested flush point is past end of XLOG.
* This has been seen to occur when a disk page has a corrupted LSN. * This has been seen to occur when a disk page has a corrupted LSN.
* *
* Formerly we treated this as a STOP condition, but that hurts the * Formerly we treated this as a PANIC condition, but that hurts the
* system's robustness rather than helping it: we do not want to take * system's robustness rather than helping it: we do not want to take
* down the whole system due to corruption on one data page. In * down the whole system due to corruption on one data page. In
* particular, if the bad page is encountered again during recovery then * particular, if the bad page is encountered again during recovery then
@ -1286,7 +1286,7 @@ XLogFlush(XLogRecPtr record)
* The current approach is to ERROR under normal conditions, but only * The current approach is to ERROR under normal conditions, but only
* NOTICE during recovery, so that the system can be brought up even if * NOTICE during recovery, so that the system can be brought up even if
* there's a corrupt LSN. Note that for calls from xact.c, the ERROR * there's a corrupt LSN. Note that for calls from xact.c, the ERROR
* will be promoted to STOP since xact.c calls this routine inside a * will be promoted to PANIC since xact.c calls this routine inside a
* critical section. However, calls from bufmgr.c are not within * critical section. However, calls from bufmgr.c are not within
* critical sections and so we will not force a restart for a bad LSN * critical sections and so we will not force a restart for a bad LSN
* on a data page. * on a data page.
@ -1336,7 +1336,7 @@ XLogFileInit(uint32 log, uint32 seg,
if (fd < 0) if (fd < 0)
{ {
if (errno != ENOENT) if (errno != ENOENT)
elog(STOP, "open of %s (log file %u, segment %u) failed: %m", elog(PANIC, "open of %s (log file %u, segment %u) failed: %m",
path, log, seg); path, log, seg);
} }
else else
@ -1358,7 +1358,7 @@ XLogFileInit(uint32 log, uint32 seg,
fd = BasicOpenFile(tmppath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, fd = BasicOpenFile(tmppath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
S_IRUSR | S_IWUSR); S_IRUSR | S_IWUSR);
if (fd < 0) if (fd < 0)
elog(STOP, "creation of file %s failed: %m", tmppath); elog(PANIC, "creation of file %s failed: %m", tmppath);
/* /*
* Zero-fill the file. We have to do this the hard way to ensure that * Zero-fill the file. We have to do this the hard way to ensure that
@ -1385,12 +1385,12 @@ XLogFileInit(uint32 log, uint32 seg,
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
errno = save_errno ? save_errno : ENOSPC; errno = save_errno ? save_errno : ENOSPC;
elog(STOP, "ZeroFill failed to write %s: %m", tmppath); elog(PANIC, "ZeroFill failed to write %s: %m", tmppath);
} }
} }
if (pg_fsync(fd) != 0) if (pg_fsync(fd) != 0)
elog(STOP, "fsync of file %s failed: %m", tmppath); elog(PANIC, "fsync of file %s failed: %m", tmppath);
close(fd); close(fd);
@ -1417,7 +1417,7 @@ XLogFileInit(uint32 log, uint32 seg,
fd = BasicOpenFile(path, O_RDWR | PG_BINARY | XLOG_SYNC_BIT, fd = BasicOpenFile(path, O_RDWR | PG_BINARY | XLOG_SYNC_BIT,
S_IRUSR | S_IWUSR); S_IRUSR | S_IWUSR);
if (fd < 0) if (fd < 0)
elog(STOP, "open of %s (log file %u, segment %u) failed: %m", elog(PANIC, "open of %s (log file %u, segment %u) failed: %m",
path, log, seg); path, log, seg);
return (fd); return (fd);
@ -1495,12 +1495,12 @@ InstallXLogFileSegment(uint32 log, uint32 seg, char *tmppath,
*/ */
#ifndef __BEOS__ #ifndef __BEOS__
if (link(tmppath, path) < 0) if (link(tmppath, path) < 0)
elog(STOP, "link from %s to %s (initialization of log file %u, segment %u) failed: %m", elog(PANIC, "link from %s to %s (initialization of log file %u, segment %u) failed: %m",
tmppath, path, log, seg); tmppath, path, log, seg);
unlink(tmppath); unlink(tmppath);
#else #else
if (rename(tmppath, path) < 0) if (rename(tmppath, path) < 0)
elog(STOP, "rename from %s to %s (initialization of log file %u, segment %u) failed: %m", elog(PANIC, "rename from %s to %s (initialization of log file %u, segment %u) failed: %m",
tmppath, path, log, seg); tmppath, path, log, seg);
#endif #endif
@ -1531,7 +1531,7 @@ XLogFileOpen(uint32 log, uint32 seg, bool econt)
path, log, seg); path, log, seg);
return (fd); return (fd);
} }
elog(STOP, "open of %s (log file %u, segment %u) failed: %m", elog(PANIC, "open of %s (log file %u, segment %u) failed: %m",
path, log, seg); path, log, seg);
} }
@ -1592,7 +1592,7 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr)
xldir = opendir(XLogDir); xldir = opendir(XLogDir);
if (xldir == NULL) if (xldir == NULL)
elog(STOP, "could not open transaction log directory (%s): %m", elog(PANIC, "could not open transaction log directory (%s): %m",
XLogDir); XLogDir);
sprintf(lastoff, "%08X%08X", log, seg); sprintf(lastoff, "%08X%08X", log, seg);
@ -1638,7 +1638,7 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr)
errno = 0; errno = 0;
} }
if (errno) if (errno)
elog(STOP, "could not read transaction log directory (%s): %m", elog(PANIC, "could not read transaction log directory (%s): %m",
XLogDir); XLogDir);
closedir(xldir); closedir(xldir);
} }
@ -1749,8 +1749,8 @@ RecordIsValid(XLogRecord *record, XLogRecPtr recptr, int emode)
* If RecPtr is not NULL, try to read a record at that position. Otherwise * If RecPtr is not NULL, try to read a record at that position. Otherwise
* try to read a record just after the last one previously read. * try to read a record just after the last one previously read.
* *
* If no valid record is available, returns NULL, or fails if emode is STOP. * If no valid record is available, returns NULL, or fails if emode is PANIC.
* (emode must be either STOP or LOG.) * (emode must be either PANIC or LOG.)
* *
* buffer is a workspace at least _INTL_MAXLOGRECSZ bytes long. It is needed * buffer is a workspace at least _INTL_MAXLOGRECSZ bytes long. It is needed
* to reassemble a record that crosses block boundaries. Note that on * to reassemble a record that crosses block boundaries. Note that on
@ -1802,7 +1802,7 @@ ReadRecord(XLogRecPtr *RecPtr, int emode, char *buffer)
tmpRecPtr.xrecoff += SizeOfXLogPHD; tmpRecPtr.xrecoff += SizeOfXLogPHD;
} }
else if (!XRecOffIsValid(RecPtr->xrecoff)) else if (!XRecOffIsValid(RecPtr->xrecoff))
elog(STOP, "ReadRecord: invalid record offset at %X/%X", elog(PANIC, "ReadRecord: invalid record offset at %X/%X",
RecPtr->xlogid, RecPtr->xrecoff); RecPtr->xlogid, RecPtr->xrecoff);
if (readFile >= 0 && !XLByteInSeg(*RecPtr, readId, readSeg)) if (readFile >= 0 && !XLByteInSeg(*RecPtr, readId, readSeg))
@ -2083,11 +2083,11 @@ WriteControlFile(void)
#ifdef USE_LOCALE #ifdef USE_LOCALE
localeptr = setlocale(LC_COLLATE, NULL); localeptr = setlocale(LC_COLLATE, NULL);
if (!localeptr) if (!localeptr)
elog(STOP, "invalid LC_COLLATE setting"); elog(PANIC, "invalid LC_COLLATE setting");
StrNCpy(ControlFile->lc_collate, localeptr, LOCALE_NAME_BUFLEN); StrNCpy(ControlFile->lc_collate, localeptr, LOCALE_NAME_BUFLEN);
localeptr = setlocale(LC_CTYPE, NULL); localeptr = setlocale(LC_CTYPE, NULL);
if (!localeptr) if (!localeptr)
elog(STOP, "invalid LC_CTYPE setting"); elog(PANIC, "invalid LC_CTYPE setting");
StrNCpy(ControlFile->lc_ctype, localeptr, LOCALE_NAME_BUFLEN); StrNCpy(ControlFile->lc_ctype, localeptr, LOCALE_NAME_BUFLEN);
/* /*
@ -2122,7 +2122,7 @@ WriteControlFile(void)
* specific error than "couldn't read pg_control". * specific error than "couldn't read pg_control".
*/ */
if (sizeof(ControlFileData) > BLCKSZ) if (sizeof(ControlFileData) > BLCKSZ)
elog(STOP, "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"); elog(PANIC, "sizeof(ControlFileData) is larger than BLCKSZ; fix either one");
memset(buffer, 0, BLCKSZ); memset(buffer, 0, BLCKSZ);
memcpy(buffer, ControlFile, sizeof(ControlFileData)); memcpy(buffer, ControlFile, sizeof(ControlFileData));
@ -2130,7 +2130,7 @@ WriteControlFile(void)
fd = BasicOpenFile(ControlFilePath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, fd = BasicOpenFile(ControlFilePath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
S_IRUSR | S_IWUSR); S_IRUSR | S_IWUSR);
if (fd < 0) if (fd < 0)
elog(STOP, "WriteControlFile: could not create control file (%s): %m", elog(PANIC, "WriteControlFile: could not create control file (%s): %m",
ControlFilePath); ControlFilePath);
errno = 0; errno = 0;
@ -2139,11 +2139,11 @@ WriteControlFile(void)
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
if (errno == 0) if (errno == 0)
errno = ENOSPC; errno = ENOSPC;
elog(STOP, "WriteControlFile: write to control file failed: %m"); elog(PANIC, "WriteControlFile: write to control file failed: %m");
} }
if (pg_fsync(fd) != 0) if (pg_fsync(fd) != 0)
elog(STOP, "WriteControlFile: fsync of control file failed: %m"); elog(PANIC, "WriteControlFile: fsync of control file failed: %m");
close(fd); close(fd);
} }
@ -2159,10 +2159,10 @@ ReadControlFile(void)
*/ */
fd = BasicOpenFile(ControlFilePath, O_RDWR | PG_BINARY, S_IRUSR | S_IWUSR); fd = BasicOpenFile(ControlFilePath, O_RDWR | PG_BINARY, S_IRUSR | S_IWUSR);
if (fd < 0) if (fd < 0)
elog(STOP, "could not open control file (%s): %m", ControlFilePath); elog(PANIC, "could not open control file (%s): %m", ControlFilePath);
if (read(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData)) if (read(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
elog(STOP, "read from control file failed: %m"); elog(PANIC, "read from control file failed: %m");
close(fd); close(fd);
@ -2173,7 +2173,7 @@ ReadControlFile(void)
* more enlightening than complaining about wrong CRC. * more enlightening than complaining about wrong CRC.
*/ */
if (ControlFile->pg_control_version != PG_CONTROL_VERSION) if (ControlFile->pg_control_version != PG_CONTROL_VERSION)
elog(STOP, elog(PANIC,
"The database cluster was initialized with PG_CONTROL_VERSION %d,\n" "The database cluster was initialized with PG_CONTROL_VERSION %d,\n"
"\tbut the server was compiled with PG_CONTROL_VERSION %d.\n" "\tbut the server was compiled with PG_CONTROL_VERSION %d.\n"
"\tIt looks like you need to initdb.", "\tIt looks like you need to initdb.",
@ -2187,7 +2187,7 @@ ReadControlFile(void)
FIN_CRC64(crc); FIN_CRC64(crc);
if (!EQ_CRC64(crc, ControlFile->crc)) if (!EQ_CRC64(crc, ControlFile->crc))
elog(STOP, "invalid checksum in control file"); elog(PANIC, "invalid checksum in control file");
/* /*
* Do compatibility checking immediately. We do this here for 2 * Do compatibility checking immediately. We do this here for 2
@ -2202,32 +2202,32 @@ ReadControlFile(void)
* compatibility items because they can affect sort order of indexes.) * compatibility items because they can affect sort order of indexes.)
*/ */
if (ControlFile->catalog_version_no != CATALOG_VERSION_NO) if (ControlFile->catalog_version_no != CATALOG_VERSION_NO)
elog(STOP, elog(PANIC,
"The database cluster was initialized with CATALOG_VERSION_NO %d,\n" "The database cluster was initialized with CATALOG_VERSION_NO %d,\n"
"\tbut the backend was compiled with CATALOG_VERSION_NO %d.\n" "\tbut the backend was compiled with CATALOG_VERSION_NO %d.\n"
"\tIt looks like you need to initdb.", "\tIt looks like you need to initdb.",
ControlFile->catalog_version_no, CATALOG_VERSION_NO); ControlFile->catalog_version_no, CATALOG_VERSION_NO);
if (ControlFile->blcksz != BLCKSZ) if (ControlFile->blcksz != BLCKSZ)
elog(STOP, elog(PANIC,
"The database cluster was initialized with BLCKSZ %d,\n" "The database cluster was initialized with BLCKSZ %d,\n"
"\tbut the backend was compiled with BLCKSZ %d.\n" "\tbut the backend was compiled with BLCKSZ %d.\n"
"\tIt looks like you need to initdb.", "\tIt looks like you need to initdb.",
ControlFile->blcksz, BLCKSZ); ControlFile->blcksz, BLCKSZ);
if (ControlFile->relseg_size != RELSEG_SIZE) if (ControlFile->relseg_size != RELSEG_SIZE)
elog(STOP, elog(PANIC,
"The database cluster was initialized with RELSEG_SIZE %d,\n" "The database cluster was initialized with RELSEG_SIZE %d,\n"
"\tbut the backend was compiled with RELSEG_SIZE %d.\n" "\tbut the backend was compiled with RELSEG_SIZE %d.\n"
"\tIt looks like you need to initdb.", "\tIt looks like you need to initdb.",
ControlFile->relseg_size, RELSEG_SIZE); ControlFile->relseg_size, RELSEG_SIZE);
#ifdef USE_LOCALE #ifdef USE_LOCALE
if (setlocale(LC_COLLATE, ControlFile->lc_collate) == NULL) if (setlocale(LC_COLLATE, ControlFile->lc_collate) == NULL)
elog(STOP, elog(PANIC,
"The database cluster was initialized with LC_COLLATE '%s',\n" "The database cluster was initialized with LC_COLLATE '%s',\n"
"\twhich is not recognized by setlocale().\n" "\twhich is not recognized by setlocale().\n"
"\tIt looks like you need to initdb.", "\tIt looks like you need to initdb.",
ControlFile->lc_collate); ControlFile->lc_collate);
if (setlocale(LC_CTYPE, ControlFile->lc_ctype) == NULL) if (setlocale(LC_CTYPE, ControlFile->lc_ctype) == NULL)
elog(STOP, elog(PANIC,
"The database cluster was initialized with LC_CTYPE '%s',\n" "The database cluster was initialized with LC_CTYPE '%s',\n"
"\twhich is not recognized by setlocale().\n" "\twhich is not recognized by setlocale().\n"
"\tIt looks like you need to initdb.", "\tIt looks like you need to initdb.",
@ -2235,7 +2235,7 @@ ReadControlFile(void)
#else /* not USE_LOCALE */ #else /* not USE_LOCALE */
if (strcmp(ControlFile->lc_collate, "C") != 0 || if (strcmp(ControlFile->lc_collate, "C") != 0 ||
strcmp(ControlFile->lc_ctype, "C") != 0) strcmp(ControlFile->lc_ctype, "C") != 0)
elog(STOP, elog(PANIC,
"The database cluster was initialized with LC_COLLATE '%s' and\n" "The database cluster was initialized with LC_COLLATE '%s' and\n"
"\tLC_CTYPE '%s', but the server was compiled without locale support.\n" "\tLC_CTYPE '%s', but the server was compiled without locale support.\n"
"\tIt looks like you need to initdb or recompile.", "\tIt looks like you need to initdb or recompile.",
@ -2256,7 +2256,7 @@ UpdateControlFile(void)
fd = BasicOpenFile(ControlFilePath, O_RDWR | PG_BINARY, S_IRUSR | S_IWUSR); fd = BasicOpenFile(ControlFilePath, O_RDWR | PG_BINARY, S_IRUSR | S_IWUSR);
if (fd < 0) if (fd < 0)
elog(STOP, "could not open control file (%s): %m", ControlFilePath); elog(PANIC, "could not open control file (%s): %m", ControlFilePath);
errno = 0; errno = 0;
if (write(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData)) if (write(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
@ -2264,11 +2264,11 @@ UpdateControlFile(void)
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
if (errno == 0) if (errno == 0)
errno = ENOSPC; errno = ENOSPC;
elog(STOP, "write to control file failed: %m"); elog(PANIC, "write to control file failed: %m");
} }
if (pg_fsync(fd) != 0) if (pg_fsync(fd) != 0)
elog(STOP, "fsync of control file failed: %m"); elog(PANIC, "fsync of control file failed: %m");
close(fd); close(fd);
} }
@ -2408,11 +2408,11 @@ BootStrapXLOG(void)
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
if (errno == 0) if (errno == 0)
errno = ENOSPC; errno = ENOSPC;
elog(STOP, "BootStrapXLOG failed to write log file: %m"); elog(PANIC, "BootStrapXLOG failed to write log file: %m");
} }
if (pg_fsync(openLogFile) != 0) if (pg_fsync(openLogFile) != 0)
elog(STOP, "BootStrapXLOG failed to fsync log file: %m"); elog(PANIC, "BootStrapXLOG failed to fsync log file: %m");
close(openLogFile); close(openLogFile);
openLogFile = -1; openLogFile = -1;
@ -2478,7 +2478,7 @@ StartupXLOG(void)
ControlFile->state < DB_SHUTDOWNED || ControlFile->state < DB_SHUTDOWNED ||
ControlFile->state > DB_IN_PRODUCTION || ControlFile->state > DB_IN_PRODUCTION ||
!XRecOffIsValid(ControlFile->checkPoint.xrecoff)) !XRecOffIsValid(ControlFile->checkPoint.xrecoff))
elog(STOP, "control file context is broken"); elog(PANIC, "control file context is broken");
if (ControlFile->state == DB_SHUTDOWNED) if (ControlFile->state == DB_SHUTDOWNED)
elog(LOG, "database system was shut down at %s", elog(LOG, "database system was shut down at %s",
@ -2517,7 +2517,7 @@ StartupXLOG(void)
InRecovery = true; /* force recovery even if SHUTDOWNED */ InRecovery = true; /* force recovery even if SHUTDOWNED */
} }
else else
elog(STOP, "unable to locate a valid checkpoint record"); elog(PANIC, "unable to locate a valid checkpoint record");
} }
LastRec = RecPtr = checkPointLoc; LastRec = RecPtr = checkPointLoc;
memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint)); memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
@ -2530,7 +2530,7 @@ StartupXLOG(void)
elog(LOG, "next transaction id: %u; next oid: %u", elog(LOG, "next transaction id: %u; next oid: %u",
checkPoint.nextXid, checkPoint.nextOid); checkPoint.nextXid, checkPoint.nextOid);
if (!TransactionIdIsNormal(checkPoint.nextXid)) if (!TransactionIdIsNormal(checkPoint.nextXid))
elog(STOP, "invalid next transaction id"); elog(PANIC, "invalid next transaction id");
ShmemVariableCache->nextXid = checkPoint.nextXid; ShmemVariableCache->nextXid = checkPoint.nextXid;
ShmemVariableCache->nextOid = checkPoint.nextOid; ShmemVariableCache->nextOid = checkPoint.nextOid;
@ -2541,7 +2541,7 @@ StartupXLOG(void)
XLogCtl->RedoRecPtr = checkPoint.redo; XLogCtl->RedoRecPtr = checkPoint.redo;
if (XLByteLT(RecPtr, checkPoint.redo)) if (XLByteLT(RecPtr, checkPoint.redo))
elog(STOP, "invalid redo in checkpoint record"); elog(PANIC, "invalid redo in checkpoint record");
if (checkPoint.undo.xrecoff == 0) if (checkPoint.undo.xrecoff == 0)
checkPoint.undo = RecPtr; checkPoint.undo = RecPtr;
@ -2549,7 +2549,7 @@ StartupXLOG(void)
XLByteLT(checkPoint.redo, RecPtr)) XLByteLT(checkPoint.redo, RecPtr))
{ {
if (wasShutdown) if (wasShutdown)
elog(STOP, "invalid redo/undo record in shutdown checkpoint"); elog(PANIC, "invalid redo/undo record in shutdown checkpoint");
InRecovery = true; InRecovery = true;
} }
else if (ControlFile->state != DB_SHUTDOWNED) else if (ControlFile->state != DB_SHUTDOWNED)
@ -2568,7 +2568,7 @@ StartupXLOG(void)
/* Is REDO required ? */ /* Is REDO required ? */
if (XLByteLT(checkPoint.redo, RecPtr)) if (XLByteLT(checkPoint.redo, RecPtr))
record = ReadRecord(&(checkPoint.redo), STOP, buffer); record = ReadRecord(&(checkPoint.redo), PANIC, buffer);
else else
{ {
/* read past CheckPoint record */ /* read past CheckPoint record */
@ -2600,7 +2600,7 @@ StartupXLOG(void)
strcat(buf, " - "); strcat(buf, " - ");
RmgrTable[record->xl_rmid].rm_desc(buf, RmgrTable[record->xl_rmid].rm_desc(buf,
record->xl_info, XLogRecGetData(record)); record->xl_info, XLogRecGetData(record));
elog(DEBUG, "%s", buf); elog(LOG, "%s", buf);
} }
if (record->xl_info & XLR_BKP_BLOCK_MASK) if (record->xl_info & XLR_BKP_BLOCK_MASK)
@ -2622,7 +2622,7 @@ StartupXLOG(void)
* Init xlog buffer cache using the block containing the last valid * Init xlog buffer cache using the block containing the last valid
* record from the previous incarnation. * record from the previous incarnation.
*/ */
record = ReadRecord(&LastRec, STOP, buffer); record = ReadRecord(&LastRec, PANIC, buffer);
EndOfLog = EndRecPtr; EndOfLog = EndRecPtr;
XLByteToPrevSeg(EndOfLog, openLogId, openLogSeg); XLByteToPrevSeg(EndOfLog, openLogId, openLogSeg);
openLogFile = XLogFileOpen(openLogId, openLogSeg, false); openLogFile = XLogFileOpen(openLogId, openLogSeg, false);
@ -2701,7 +2701,7 @@ StartupXLOG(void)
RecPtr.xlogid, RecPtr.xrecoff); RecPtr.xlogid, RecPtr.xrecoff);
do do
{ {
record = ReadRecord(&RecPtr, STOP, buffer); record = ReadRecord(&RecPtr, PANIC, buffer);
if (TransactionIdIsValid(record->xl_xid) && if (TransactionIdIsValid(record->xl_xid) &&
!TransactionIdDidCommit(record->xl_xid)) !TransactionIdDidCommit(record->xl_xid))
RmgrTable[record->xl_rmid].rm_undo(EndRecPtr, record); RmgrTable[record->xl_rmid].rm_undo(EndRecPtr, record);
@ -2995,7 +2995,7 @@ CreateCheckPoint(bool shutdown)
checkPoint.undo = GetUndoRecPtr(); checkPoint.undo = GetUndoRecPtr();
if (shutdown && checkPoint.undo.xrecoff != 0) if (shutdown && checkPoint.undo.xrecoff != 0)
elog(STOP, "active transaction while database system is shutting down"); elog(PANIC, "active transaction while database system is shutting down");
#endif #endif
/* /*
@ -3043,7 +3043,7 @@ CreateCheckPoint(bool shutdown)
* recptr = end of actual checkpoint record. * recptr = end of actual checkpoint record.
*/ */
if (shutdown && !XLByteEQ(checkPoint.redo, ProcLastRecPtr)) if (shutdown && !XLByteEQ(checkPoint.redo, ProcLastRecPtr))
elog(STOP, "concurrent transaction log activity while database system is shutting down"); elog(PANIC, "concurrent transaction log activity while database system is shutting down");
/* /*
* Select point at which we can truncate the log, which we base on the * Select point at which we can truncate the log, which we base on the
@ -3297,12 +3297,12 @@ assign_xlog_sync_method(const char *method)
if (openLogFile >= 0) if (openLogFile >= 0)
{ {
if (pg_fsync(openLogFile) != 0) if (pg_fsync(openLogFile) != 0)
elog(STOP, "fsync of log file %u, segment %u failed: %m", elog(PANIC, "fsync of log file %u, segment %u failed: %m",
openLogId, openLogSeg); openLogId, openLogSeg);
if (open_sync_bit != new_sync_bit) if (open_sync_bit != new_sync_bit)
{ {
if (close(openLogFile) != 0) if (close(openLogFile) != 0)
elog(STOP, "close of log file %u, segment %u failed: %m", elog(PANIC, "close of log file %u, segment %u failed: %m",
openLogId, openLogSeg); openLogId, openLogSeg);
openLogFile = -1; openLogFile = -1;
} }
@ -3323,13 +3323,13 @@ issue_xlog_fsync(void)
{ {
case SYNC_METHOD_FSYNC: case SYNC_METHOD_FSYNC:
if (pg_fsync(openLogFile) != 0) if (pg_fsync(openLogFile) != 0)
elog(STOP, "fsync of log file %u, segment %u failed: %m", elog(PANIC, "fsync of log file %u, segment %u failed: %m",
openLogId, openLogSeg); openLogId, openLogSeg);
break; break;
#ifdef HAVE_FDATASYNC #ifdef HAVE_FDATASYNC
case SYNC_METHOD_FDATASYNC: case SYNC_METHOD_FDATASYNC:
if (pg_fdatasync(openLogFile) != 0) if (pg_fdatasync(openLogFile) != 0)
elog(STOP, "fdatasync of log file %u, segment %u failed: %m", elog(PANIC, "fdatasync of log file %u, segment %u failed: %m",
openLogId, openLogSeg); openLogId, openLogSeg);
break; break;
#endif #endif
@ -3337,7 +3337,7 @@ issue_xlog_fsync(void)
/* write synced it already */ /* write synced it already */
break; break;
default: default:
elog(STOP, "bogus wal_sync_method %d", sync_method); elog(PANIC, "bogus wal_sync_method %d", sync_method);
break; break;
} }
} }

8
src/backend/access/transam/xlogutils.c
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlogutils.c,v 1.21 2001/10/25 05:49:22 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlogutils.c,v 1.22 2002/03/02 21:39:20 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -249,7 +249,7 @@ _xl_remove_hash_entry(XLogRelDesc *rdesc)
hentry = (XLogRelCacheEntry *) hash_search(_xlrelcache, hentry = (XLogRelCacheEntry *) hash_search(_xlrelcache,
(void *) &(rdesc->reldata.rd_node), HASH_REMOVE, NULL); (void *) &(rdesc->reldata.rd_node), HASH_REMOVE, NULL);
if (hentry == NULL) if (hentry == NULL)
elog(STOP, "_xl_remove_hash_entry: file was not found in cache"); elog(PANIC, "_xl_remove_hash_entry: file was not found in cache");
if (rdesc->reldata.rd_fd >= 0) if (rdesc->reldata.rd_fd >= 0)
smgrclose(DEFAULT_SMGR, &(rdesc->reldata)); smgrclose(DEFAULT_SMGR, &(rdesc->reldata));
@ -346,10 +346,10 @@ XLogOpenRelation(bool redo, RmgrId rmid, RelFileNode rnode)
hash_search(_xlrelcache, (void *) &rnode, HASH_ENTER, &found); hash_search(_xlrelcache, (void *) &rnode, HASH_ENTER, &found);
if (hentry == NULL) if (hentry == NULL)
elog(STOP, "XLogOpenRelation: out of memory for cache"); elog(PANIC, "XLogOpenRelation: out of memory for cache");
if (found) if (found)
elog(STOP, "XLogOpenRelation: file found on insert into cache"); elog(PANIC, "XLogOpenRelation: file found on insert into cache");
hentry->rdesc = res; hentry->rdesc = res;

30
src/backend/bootstrap/bootparse.y
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.39 2001/09/29 04:02:22 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.40 2002/03/02 21:39:20 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -54,8 +54,7 @@ static void
do_start() do_start()
{ {
StartTransactionCommand(); StartTransactionCommand();
if (DebugMode) elog(DEBUG3, "start transaction");
elog(DEBUG, "start transaction");
} }
@ -63,8 +62,7 @@ static void
do_end() do_end()
{ {
CommitTransactionCommand(); CommitTransactionCommand();
if (DebugMode) elog(DEBUG3, "commit transaction");
elog(DEBUG, "commit transaction");
if (isatty(0)) if (isatty(0))
{ {
printf("bootstrap> "); printf("bootstrap> ");
@ -154,16 +152,13 @@ Boot_CreateStmt:
{ {
do_start(); do_start();
numattr = 0; numattr = 0;
if (DebugMode)
{
if ($2) if ($2)
elog(DEBUG, "creating bootstrap relation %s...", elog(DEBUG3, "creating bootstrap relation %s...",
LexIDStr($4)); LexIDStr($4));
else else
elog(DEBUG, "creating relation %s...", elog(DEBUG3, "creating relation %s...",
LexIDStr($4)); LexIDStr($4));
} }
}
boot_typelist boot_typelist
{ {
do_end(); do_end();
@ -179,7 +174,7 @@ Boot_CreateStmt:
if (reldesc) if (reldesc)
{ {
elog(DEBUG, "create bootstrap: warning, open relation exists, closing first"); elog(DEBUG3, "create bootstrap: warning, open relation exists, closing first");
closerel(NULL); closerel(NULL);
} }
@ -187,8 +182,7 @@ Boot_CreateStmt:
reldesc = heap_create(LexIDStr($4), tupdesc, reldesc = heap_create(LexIDStr($4), tupdesc,
false, true, true); false, true, true);
reldesc->rd_rel->relhasoids = ! ($3); reldesc->rd_rel->relhasoids = ! ($3);
if (DebugMode) elog(DEBUG3, "bootstrap relation created");
elog(DEBUG, "bootstrap relation created");
} }
else else
{ {
@ -202,8 +196,7 @@ Boot_CreateStmt:
! ($3), ! ($3),
false, false,
true); true);
if (DebugMode) elog(DEBUG3, "relation created with oid %u", id);
elog(DEBUG, "relation created with oid %u", id);
} }
do_end(); do_end();
} }
@ -213,13 +206,10 @@ Boot_InsertStmt:
INSERT_TUPLE optoideq INSERT_TUPLE optoideq
{ {
do_start(); do_start();
if (DebugMode)
{
if ($2) if ($2)
elog(DEBUG, "inserting row with oid %u...", $2); elog(DEBUG3, "inserting row with oid %u...", $2);
else else
elog(DEBUG, "inserting row..."); elog(DEBUG3, "inserting row...");
}
num_columns_read = 0; num_columns_read = 0;
} }
LPAREN boot_tuplelist RPAREN LPAREN boot_tuplelist RPAREN

72
src/backend/bootstrap/bootstrap.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.121 2002/02/23 01:31:34 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.122 2002/03/02 21:39:21 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -140,8 +140,6 @@ Form_pg_attribute attrtypes[MAXATTR]; /* points to attribute info */
static Datum values[MAXATTR]; /* corresponding attribute values */ static Datum values[MAXATTR]; /* corresponding attribute values */
int numattr; /* number of attributes for cur. rel */ int numattr; /* number of attributes for cur. rel */
int DebugMode;
static MemoryContext nogc = NULL; /* special no-gc mem context */ static MemoryContext nogc = NULL; /* special no-gc mem context */
extern int optind; extern int optind;
@ -188,8 +186,8 @@ usage(void)
{ {
fprintf(stderr, fprintf(stderr,
gettext("Usage:\n" gettext("Usage:\n"
" postgres -boot [-d] [-D datadir] [-F] [-o file] [-x num] dbname\n" " postgres -boot [-d level] [-D datadir] [-F] [-o file] [-x num] dbname\n"
" -d debug mode\n" " -d 1-5 debug mode\n"
" -D datadir data directory\n" " -D datadir data directory\n"
" -F turn off fsync\n" " -F turn off fsync\n"
" -o file send debug output to file\n" " -o file send debug output to file\n"
@ -258,8 +256,16 @@ BootstrapMain(int argc, char *argv[])
potential_DataDir = optarg; potential_DataDir = optarg;
break; break;
case 'd': case 'd':
DebugMode = true; /* print out debugging info while {
* parsing */ /* Turn on debugging for the postmaster. */
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
sprintf(debugstr, "debug%s", optarg);
/* We use PGC_S_SESSION because we will reset in backend */
SetConfigOption("server_min_messages", debugstr, PGC_POSTMASTER, PGC_S_ARGV);
SetConfigOption("client_min_messages", debugstr, PGC_POSTMASTER, PGC_S_ARGV);
pfree(debugstr);
break;
}
break; break;
case 'F': case 'F':
SetConfigOption("fsync", "false", PGC_POSTMASTER, PGC_S_ARGV); SetConfigOption("fsync", "false", PGC_POSTMASTER, PGC_S_ARGV);
@ -392,7 +398,7 @@ BootstrapMain(int argc, char *argv[])
proc_exit(0); /* done */ proc_exit(0); /* done */
default: default:
elog(STOP, "Unsupported XLOG op %d", xlogop); elog(PANIC, "Unsupported XLOG op %d", xlogop);
proc_exit(0); proc_exit(0);
} }
@ -495,8 +501,7 @@ boot_openrel(char *relname)
if (reldesc != NULL) if (reldesc != NULL)
closerel(NULL); closerel(NULL);
if (DebugMode) elog(DEBUG3, "open relation %s, attrsize %d", relname ? relname : "(null)",
elog(DEBUG, "open relation %s, attrsize %d", relname ? relname : "(null)",
(int) ATTRIBUTE_TUPLE_SIZE); (int) ATTRIBUTE_TUPLE_SIZE);
reldesc = heap_openr(relname, NoLock); reldesc = heap_openr(relname, NoLock);
@ -521,14 +526,12 @@ boot_openrel(char *relname)
else else
attrtypes[i]->attisset = false; attrtypes[i]->attisset = false;
if (DebugMode)
{ {
Form_pg_attribute at = attrtypes[i]; Form_pg_attribute at = attrtypes[i];
elog(DEBUG, "create attribute %d name %s len %d num %d type %u", elog(DEBUG3, "create attribute %d name %s len %d num %d type %u",
i, NameStr(at->attname), at->attlen, at->attnum, i, NameStr(at->attname), at->attlen, at->attnum,
at->atttypid at->atttypid);
);
} }
} }
} }
@ -558,8 +561,7 @@ closerel(char *name)
elog(ERROR, "no open relation to close"); elog(ERROR, "no open relation to close");
else else
{ {
if (DebugMode) elog(DEBUG3, "close relation %s", relname ? relname : "(null)");
elog(DEBUG, "close relation %s", relname ? relname : "(null)");
heap_close(reldesc, NoLock); heap_close(reldesc, NoLock);
reldesc = (Relation) NULL; reldesc = (Relation) NULL;
} }
@ -583,7 +585,7 @@ DefineAttr(char *name, char *type, int attnum)
if (reldesc != NULL) if (reldesc != NULL)
{ {
elog(DEBUG, "warning: no open relations allowed with 'create' command"); elog(LOG, "warning: no open relations allowed with 'create' command");
closerel(relname); closerel(relname);
} }
@ -594,8 +596,7 @@ DefineAttr(char *name, char *type, int attnum)
{ {
attrtypes[attnum]->atttypid = Ap->am_oid; attrtypes[attnum]->atttypid = Ap->am_oid;
namestrcpy(&attrtypes[attnum]->attname, name); namestrcpy(&attrtypes[attnum]->attname, name);
if (DebugMode) elog(DEBUG3, "column %s %s", NameStr(attrtypes[attnum]->attname), type);
elog(DEBUG, "column %s %s", NameStr(attrtypes[attnum]->attname), type);
attrtypes[attnum]->attnum = 1 + attnum; /* fillatt */ attrtypes[attnum]->attnum = 1 + attnum; /* fillatt */
attlen = attrtypes[attnum]->attlen = Ap->am_typ.typlen; attlen = attrtypes[attnum]->attlen = Ap->am_typ.typlen;
attrtypes[attnum]->attbyval = Ap->am_typ.typbyval; attrtypes[attnum]->attbyval = Ap->am_typ.typbyval;
@ -606,8 +607,7 @@ DefineAttr(char *name, char *type, int attnum)
{ {
attrtypes[attnum]->atttypid = Procid[typeoid].oid; attrtypes[attnum]->atttypid = Procid[typeoid].oid;
namestrcpy(&attrtypes[attnum]->attname, name); namestrcpy(&attrtypes[attnum]->attname, name);
if (DebugMode) elog(DEBUG3, "column %s %s", NameStr(attrtypes[attnum]->attname), type);
elog(DEBUG, "column %s %s", NameStr(attrtypes[attnum]->attname), type);
attrtypes[attnum]->attnum = 1 + attnum; /* fillatt */ attrtypes[attnum]->attnum = 1 + attnum; /* fillatt */
attlen = attrtypes[attnum]->attlen = Procid[typeoid].len; attlen = attrtypes[attnum]->attlen = Procid[typeoid].len;
attrtypes[attnum]->attstorage = 'p'; attrtypes[attnum]->attstorage = 'p';
@ -655,8 +655,7 @@ InsertOneTuple(Oid objectid)
TupleDesc tupDesc; TupleDesc tupDesc;
int i; int i;
if (DebugMode) elog(DEBUG3, "inserting row oid %u, %d columns", objectid, numattr);
elog(DEBUG, "inserting row oid %u, %d columns", objectid, numattr);
tupDesc = CreateTupleDesc(numattr, attrtypes); tupDesc = CreateTupleDesc(numattr, attrtypes);
tuple = heap_formtuple(tupDesc, values, Blanks); tuple = heap_formtuple(tupDesc, values, Blanks);
@ -666,8 +665,7 @@ InsertOneTuple(Oid objectid)
tuple->t_data->t_oid = objectid; tuple->t_data->t_oid = objectid;
heap_insert(reldesc, tuple); heap_insert(reldesc, tuple);
heap_freetuple(tuple); heap_freetuple(tuple);
if (DebugMode) elog(DEBUG3, "row inserted");
elog(DEBUG, "row inserted");
/* /*
* Reset blanks for next tuple * Reset blanks for next tuple
@ -689,15 +687,13 @@ InsertOneValue(char *value, int i)
AssertArg(i >= 0 || i < MAXATTR); AssertArg(i >= 0 || i < MAXATTR);
if (DebugMode) elog(DEBUG3, "inserting column %d value '%s'", i, value);
elog(DEBUG, "inserting column %d value '%s'", i, value);
if (Typ != (struct typmap **) NULL) if (Typ != (struct typmap **) NULL)
{ {
struct typmap *ap; struct typmap *ap;
if (DebugMode) elog(DEBUG3, "Typ != NULL");
elog(DEBUG, "Typ != NULL");
app = Typ; app = Typ;
while (*app && (*app)->am_oid != reldesc->rd_att->attrs[i]->atttypid) while (*app && (*app)->am_oid != reldesc->rd_att->attrs[i]->atttypid)
++app; ++app;
@ -715,8 +711,7 @@ InsertOneValue(char *value, int i)
values[i], values[i],
ObjectIdGetDatum(ap->am_typ.typelem), ObjectIdGetDatum(ap->am_typ.typelem),
Int32GetDatum(-1))); Int32GetDatum(-1)));
if (DebugMode) elog(DEBUG3, " -> %s", prt);
elog(DEBUG, " -> %s", prt);
pfree(prt); pfree(prt);
} }
else else
@ -728,8 +723,7 @@ InsertOneValue(char *value, int i)
} }
if (typeindex >= n_types) if (typeindex >= n_types)
elog(ERROR, "type oid %u not found", attrtypes[i]->atttypid); elog(ERROR, "type oid %u not found", attrtypes[i]->atttypid);
if (DebugMode) elog(DEBUG3, "Typ == NULL, typeindex = %u", typeindex);
elog(DEBUG, "Typ == NULL, typeindex = %u", typeindex);
values[i] = OidFunctionCall3(Procid[typeindex].inproc, values[i] = OidFunctionCall3(Procid[typeindex].inproc,
CStringGetDatum(value), CStringGetDatum(value),
ObjectIdGetDatum(Procid[typeindex].elem), ObjectIdGetDatum(Procid[typeindex].elem),
@ -738,12 +732,10 @@ InsertOneValue(char *value, int i)
values[i], values[i],
ObjectIdGetDatum(Procid[typeindex].elem), ObjectIdGetDatum(Procid[typeindex].elem),
Int32GetDatum(-1))); Int32GetDatum(-1)));
if (DebugMode) elog(DEBUG3, " -> %s", prt);
elog(DEBUG, " -> %s", prt);
pfree(prt); pfree(prt);
} }
if (DebugMode) elog(DEBUG3, "inserted");
elog(DEBUG, "inserted");
} }
/* ---------------- /* ----------------
@ -753,8 +745,7 @@ InsertOneValue(char *value, int i)
void void
InsertOneNull(int i) InsertOneNull(int i)
{ {
if (DebugMode) elog(DEBUG3, "inserting column %d NULL", i);
elog(DEBUG, "inserting column %d NULL", i);
Assert(i >= 0 || i < MAXATTR); Assert(i >= 0 || i < MAXATTR);
values[i] = PointerGetDatum(NULL); values[i] = PointerGetDatum(NULL);
Blanks[i] = 'n'; Blanks[i] = 'n';
@ -841,8 +832,7 @@ gettype(char *type)
if (strncmp(type, Procid[i].name, NAMEDATALEN) == 0) if (strncmp(type, Procid[i].name, NAMEDATALEN) == 0)
return i; return i;
} }
if (DebugMode) elog(DEBUG3, "external type: %s", type);
elog(DEBUG, "external type: %s", type);
rel = heap_openr(TypeRelationName, NoLock); rel = heap_openr(TypeRelationName, NoLock);
scan = heap_beginscan(rel, 0, SnapshotNow, 0, (ScanKey) NULL); scan = heap_beginscan(rel, 0, SnapshotNow, 0, (ScanKey) NULL);
i = 0; i = 0;

30
src/backend/catalog/aclchk.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.54 2002/02/18 23:11:07 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.55 2002/03/02 21:39:22 momjian Exp $
* *
* NOTES * NOTES
* See acl.h. * See acl.h.
@ -66,11 +66,11 @@ dumpacl(Acl *acl)
int i; int i;
AclItem *aip; AclItem *aip;
elog(DEBUG, "acl size = %d, # acls = %d", elog(LOG, "acl size = %d, # acls = %d",
ACL_SIZE(acl), ACL_NUM(acl)); ACL_SIZE(acl), ACL_NUM(acl));
aip = ACL_DAT(acl); aip = ACL_DAT(acl);
for (i = 0; i < ACL_NUM(acl); ++i) for (i = 0; i < ACL_NUM(acl); ++i)
elog(DEBUG, " acl[%d]: %s", i, elog(LOG, " acl[%d]: %s", i,
DatumGetCString(DirectFunctionCall1(aclitemout, DatumGetCString(DirectFunctionCall1(aclitemout,
PointerGetDatum(aip + i)))); PointerGetDatum(aip + i))));
} }
@ -658,7 +658,7 @@ aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
*/ */
if (!acl) if (!acl)
{ {
elog(DEBUG, "aclcheck: null ACL, returning OK"); elog(LOG, "aclcheck: null ACL, returning OK");
return ACLCHECK_OK; return ACLCHECK_OK;
} }
@ -673,7 +673,7 @@ aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
*/ */
if (num < 1) if (num < 1)
{ {
elog(DEBUG, "aclcheck: zero-length ACL, returning OK"); elog(LOG, "aclcheck: zero-length ACL, returning OK");
return ACLCHECK_OK; return ACLCHECK_OK;
} }
@ -686,7 +686,7 @@ aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
if (aidat->ai_mode & mode) if (aidat->ai_mode & mode)
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "aclcheck: using world=%d", aidat->ai_mode); elog(LOG, "aclcheck: using world=%d", aidat->ai_mode);
#endif #endif
return ACLCHECK_OK; return ACLCHECK_OK;
} }
@ -702,7 +702,7 @@ aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
if (aip->ai_id == id) if (aip->ai_id == id)
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "aclcheck: found user %u/%d", elog(LOG, "aclcheck: found user %u/%d",
aip->ai_id, aip->ai_mode); aip->ai_id, aip->ai_mode);
#endif #endif
if (aip->ai_mode & mode) if (aip->ai_mode & mode)
@ -719,7 +719,7 @@ aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
if (in_group(id, aip->ai_id)) if (in_group(id, aip->ai_id))
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "aclcheck: found group %u/%d", elog(LOG, "aclcheck: found group %u/%d",
aip->ai_id, aip->ai_mode); aip->ai_id, aip->ai_mode);
#endif #endif
return ACLCHECK_OK; return ACLCHECK_OK;
@ -740,7 +740,7 @@ aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
if (aip->ai_id == id) if (aip->ai_id == id)
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "aclcheck: found group %u/%d", elog(LOG, "aclcheck: found group %u/%d",
aip->ai_id, aip->ai_mode); aip->ai_id, aip->ai_mode);
#endif #endif
if (aip->ai_mode & mode) if (aip->ai_mode & mode)
@ -798,7 +798,7 @@ pg_aclcheck(char *relname, Oid userid, AclMode mode)
!((Form_pg_shadow) GETSTRUCT(tuple))->usecatupd) !((Form_pg_shadow) GETSTRUCT(tuple))->usecatupd)
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "pg_aclcheck: catalog update to \"%s\": permission denied", elog(LOG, "pg_aclcheck: catalog update to \"%s\": permission denied",
relname); relname);
#endif #endif
ReleaseSysCache(tuple); ReleaseSysCache(tuple);
@ -811,7 +811,7 @@ pg_aclcheck(char *relname, Oid userid, AclMode mode)
if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper) if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper)
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "pg_aclcheck: \"%s\" is superuser", elog(LOG, "pg_aclcheck: \"%s\" is superuser",
usename); usename);
#endif #endif
ReleaseSysCache(tuple); ReleaseSysCache(tuple);
@ -888,7 +888,7 @@ pg_ownercheck(Oid userid,
if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper) if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper)
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "pg_ownercheck: user \"%s\" is superuser", elog(LOG, "pg_ownercheck: user \"%s\" is superuser",
usename); usename);
#endif #endif
ReleaseSysCache(tuple); ReleaseSysCache(tuple);
@ -950,7 +950,7 @@ pg_oper_ownercheck(Oid userid, Oid oprid)
if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper) if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper)
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "pg_ownercheck: user \"%s\" is superuser", elog(LOG, "pg_ownercheck: user \"%s\" is superuser",
usename); usename);
#endif #endif
ReleaseSysCache(tuple); ReleaseSysCache(tuple);
@ -1001,7 +1001,7 @@ pg_func_ownercheck(Oid userid,
if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper) if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper)
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "pg_ownercheck: user \"%s\" is superuser", elog(LOG, "pg_ownercheck: user \"%s\" is superuser",
usename); usename);
#endif #endif
ReleaseSysCache(tuple); ReleaseSysCache(tuple);
@ -1053,7 +1053,7 @@ pg_aggr_ownercheck(Oid userid,
if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper) if (((Form_pg_shadow) GETSTRUCT(tuple))->usesuper)
{ {
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "pg_aggr_ownercheck: user \"%s\" is superuser", elog(LOG, "pg_aggr_ownercheck: user \"%s\" is superuser",
usename); usename);
#endif #endif
ReleaseSysCache(tuple); ReleaseSysCache(tuple);

11
src/backend/commands/analyze.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.26 2002/02/18 16:04:14 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.27 2002/03/02 21:39:22 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -105,8 +105,7 @@ typedef struct
#define swapInt(a,b) do {int _tmp; _tmp=a; a=b; b=_tmp;} while(0) #define swapInt(a,b) do {int _tmp; _tmp=a; a=b; b=_tmp;} while(0)
#define swapDatum(a,b) do {Datum _tmp; _tmp=a; a=b; b=_tmp;} while(0) #define swapDatum(a,b) do {Datum _tmp; _tmp=a; a=b; b=_tmp;} while(0)
static int elevel = -1;
static int MESSAGE_LEVEL;
/* context information for compare_scalars() */ /* context information for compare_scalars() */
static FmgrInfo *datumCmpFn; static FmgrInfo *datumCmpFn;
@ -151,9 +150,9 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt)
HeapTuple tuple; HeapTuple tuple;
if (vacstmt->verbose) if (vacstmt->verbose)
MESSAGE_LEVEL = NOTICE; elevel = INFO;
else else
MESSAGE_LEVEL = DEBUG; elevel = DEBUG1;
/* /*
* Begin a transaction for analyzing this relation. * Begin a transaction for analyzing this relation.
@ -214,7 +213,7 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt)
return; return;
} }
elog(MESSAGE_LEVEL, "Analyzing %s", RelationGetRelationName(onerel)); elog(elevel, "Analyzing %s", RelationGetRelationName(onerel));
/* /*
* Determine which columns to analyze * Determine which columns to analyze

34
src/backend/commands/async.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.81 2001/10/25 05:49:23 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.82 2002/03/02 21:39:22 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -150,7 +150,7 @@ void
Async_Notify(char *relname) Async_Notify(char *relname)
{ {
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "Async_Notify: %s", relname); elog(LOG, "Async_Notify: %s", relname);
/* no point in making duplicate entries in the list ... */ /* no point in making duplicate entries in the list ... */
if (!AsyncExistsPendingNotify(relname)) if (!AsyncExistsPendingNotify(relname))
@ -198,7 +198,7 @@ Async_Listen(char *relname, int pid)
bool alreadyListener = false; bool alreadyListener = false;
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "Async_Listen: %s", relname); elog(LOG, "Async_Listen: %s", relname);
lRel = heap_openr(ListenerRelationName, AccessExclusiveLock); lRel = heap_openr(ListenerRelationName, AccessExclusiveLock);
@ -300,7 +300,7 @@ Async_Unlisten(char *relname, int pid)
} }
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "Async_Unlisten %s", relname); elog(LOG, "Async_Unlisten %s", relname);
lRel = heap_openr(ListenerRelationName, AccessExclusiveLock); lRel = heap_openr(ListenerRelationName, AccessExclusiveLock);
@ -358,7 +358,7 @@ Async_UnlistenAll(void)
ScanKeyData key[1]; ScanKeyData key[1];
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "Async_UnlistenAll"); elog(LOG, "Async_UnlistenAll");
lRel = heap_openr(ListenerRelationName, AccessExclusiveLock); lRel = heap_openr(ListenerRelationName, AccessExclusiveLock);
tdesc = RelationGetDescr(lRel); tdesc = RelationGetDescr(lRel);
@ -460,7 +460,7 @@ AtCommit_Notify(void)
} }
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "AtCommit_Notify"); elog(LOG, "AtCommit_Notify");
/* preset data to update notify column to MyProcPid */ /* preset data to update notify column to MyProcPid */
nulls[0] = nulls[1] = nulls[2] = ' '; nulls[0] = nulls[1] = nulls[2] = ' ';
@ -492,14 +492,14 @@ AtCommit_Notify(void)
*/ */
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "AtCommit_Notify: notifying self"); elog(LOG, "AtCommit_Notify: notifying self");
NotifyMyFrontEnd(relname, listenerPID); NotifyMyFrontEnd(relname, listenerPID);
} }
else else
{ {
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "AtCommit_Notify: notifying pid %d", elog(LOG, "AtCommit_Notify: notifying pid %d",
listenerPID); listenerPID);
/* /*
@ -555,7 +555,7 @@ AtCommit_Notify(void)
ClearPendingNotifies(); ClearPendingNotifies();
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "AtCommit_Notify: done"); elog(LOG, "AtCommit_Notify: done");
} }
/* /*
@ -628,12 +628,12 @@ Async_NotifyHandler(SIGNAL_ARGS)
{ {
/* Here, it is finally safe to do stuff. */ /* Here, it is finally safe to do stuff. */
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "Async_NotifyHandler: perform async notify"); elog(LOG, "Async_NotifyHandler: perform async notify");
ProcessIncomingNotify(); ProcessIncomingNotify();
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "Async_NotifyHandler: done"); elog(LOG, "Async_NotifyHandler: done");
} }
} }
} }
@ -700,12 +700,12 @@ EnableNotifyInterrupt(void)
if (notifyInterruptOccurred) if (notifyInterruptOccurred)
{ {
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "EnableNotifyInterrupt: perform async notify"); elog(LOG, "EnableNotifyInterrupt: perform async notify");
ProcessIncomingNotify(); ProcessIncomingNotify();
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "EnableNotifyInterrupt: done"); elog(LOG, "EnableNotifyInterrupt: done");
} }
} }
} }
@ -756,7 +756,7 @@ ProcessIncomingNotify(void)
nulls[Natts_pg_listener]; nulls[Natts_pg_listener];
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "ProcessIncomingNotify"); elog(LOG, "ProcessIncomingNotify");
set_ps_display("async_notify"); set_ps_display("async_notify");
@ -792,7 +792,7 @@ ProcessIncomingNotify(void)
/* Notify the frontend */ /* Notify the frontend */
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "ProcessIncomingNotify: received %s from %d", elog(LOG, "ProcessIncomingNotify: received %s from %d",
relname, (int) sourcePID); relname, (int) sourcePID);
NotifyMyFrontEnd(relname, sourcePID); NotifyMyFrontEnd(relname, sourcePID);
@ -834,7 +834,7 @@ ProcessIncomingNotify(void)
set_ps_display("idle"); set_ps_display("idle");
if (Trace_notify) if (Trace_notify)
elog(DEBUG, "ProcessIncomingNotify: done"); elog(LOG, "ProcessIncomingNotify: done");
} }
/* /*
@ -861,7 +861,7 @@ NotifyMyFrontEnd(char *relname, int32 listenerPID)
*/ */
} }
else else
elog(NOTICE, "NOTIFY for %s", relname); elog(INFO, "NOTIFY for %s", relname);
} }
/* Does pendingNotifies include the given relname? */ /* Does pendingNotifies include the given relname? */

5
src/backend/commands/command.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.156 2002/02/27 19:34:38 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.157 2002/03/02 21:39:22 momjian Exp $
* *
* NOTES * NOTES
* The PerformAddAttribute() code, like most of the relation * The PerformAddAttribute() code, like most of the relation
@ -1501,8 +1501,7 @@ AlterTableDropConstraint(const char *relationName,
constrName); constrName);
/* Otherwise if more than one constraint deleted, notify */ /* Otherwise if more than one constraint deleted, notify */
else if (deleted > 1) else if (deleted > 1)
elog(NOTICE, "Multiple constraints dropped"); elog(INFO, "Multiple constraints dropped");
} }

6
src/backend/commands/creatinh.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.81 2001/10/25 05:49:24 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.82 2002/03/02 21:39:22 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -425,7 +425,7 @@ MergeAttributes(List *schema, List *supers, bool istemp,
* Yes, try to merge the two column definitions. They must * Yes, try to merge the two column definitions. They must
* have the same type and typmod. * have the same type and typmod.
*/ */
elog(NOTICE, "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\"", elog(INFO, "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\"",
attributeName); attributeName);
def = (ColumnDef *) nth(exist_attno - 1, inhSchema); def = (ColumnDef *) nth(exist_attno - 1, inhSchema);
if (strcmp(def->typename->name, attributeType) != 0 || if (strcmp(def->typename->name, attributeType) != 0 ||
@ -564,7 +564,7 @@ MergeAttributes(List *schema, List *supers, bool istemp,
* Yes, try to merge the two column definitions. They must * Yes, try to merge the two column definitions. They must
* have the same type and typmod. * have the same type and typmod.
*/ */
elog(NOTICE, "CREATE TABLE: merging attribute \"%s\" with inherited definition", elog(INFO, "CREATE TABLE: merging attribute \"%s\" with inherited definition",
attributeName); attributeName);
def = (ColumnDef *) nth(exist_attno - 1, inhSchema); def = (ColumnDef *) nth(exist_attno - 1, inhSchema);
if (strcmp(def->typename->name, attributeType) != 0 || if (strcmp(def->typename->name, attributeType) != 0 ||

6
src/backend/commands/define.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.65 2002/02/18 23:11:10 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.66 2002/03/02 21:39:23 momjian Exp $
* *
* DESCRIPTION * DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the * The "DefineFoo" routines take the parse tree and pick out the
@ -348,12 +348,12 @@ DefineOperator(char *oprName,
else if (strcasecmp(defel->defname, "precedence") == 0) else if (strcasecmp(defel->defname, "precedence") == 0)
{ {
/* NOT IMPLEMENTED (never worked in v4.2) */ /* NOT IMPLEMENTED (never worked in v4.2) */
elog(NOTICE, "CREATE OPERATOR: precedence not implemented"); elog(INFO, "CREATE OPERATOR: precedence not implemented");
} }
else if (strcasecmp(defel->defname, "associativity") == 0) else if (strcasecmp(defel->defname, "associativity") == 0)
{ {
/* NOT IMPLEMENTED (never worked in v4.2) */ /* NOT IMPLEMENTED (never worked in v4.2) */
elog(NOTICE, "CREATE OPERATOR: associativity not implemented"); elog(INFO, "CREATE OPERATOR: associativity not implemented");
} }
else if (strcasecmp(defel->defname, "commutator") == 0) else if (strcasecmp(defel->defname, "commutator") == 0)
commutatorName = defGetString(defel); commutatorName = defGetString(defel);

14
src/backend/commands/explain.c
View File

@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994-5, Regents of the University of California * Portions Copyright (c) 1994-5, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.68 2002/02/26 22:47:04 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.69 2002/03/02 21:39:23 momjian Exp $
* *
*/ */
@ -59,7 +59,7 @@ ExplainQuery(Query *query, bool verbose, bool analyze, CommandDest dest)
/* rewriter will not cope with utility statements */ /* rewriter will not cope with utility statements */
if (query->commandType == CMD_UTILITY) if (query->commandType == CMD_UTILITY)
{ {
elog(NOTICE, "Utility statements have no plan structure"); elog(INFO, "Utility statements have no plan structure");
return; return;
} }
@ -69,7 +69,7 @@ ExplainQuery(Query *query, bool verbose, bool analyze, CommandDest dest)
/* In the case of an INSTEAD NOTHING, tell at least that */ /* In the case of an INSTEAD NOTHING, tell at least that */
if (rewritten == NIL) if (rewritten == NIL)
{ {
elog(NOTICE, "Query rewrites to nothing"); elog(INFO, "Query rewrites to nothing");
return; return;
} }
@ -94,9 +94,9 @@ ExplainOneQuery(Query *query, bool verbose, bool analyze, CommandDest dest)
if (query->commandType == CMD_UTILITY) if (query->commandType == CMD_UTILITY)
{ {
if (query->utilityStmt && IsA(query->utilityStmt, NotifyStmt)) if (query->utilityStmt && IsA(query->utilityStmt, NotifyStmt))
elog(NOTICE, "QUERY PLAN:\n\nNOTIFY\n"); elog(INFO, "QUERY PLAN:\n\nNOTIFY\n");
else else
elog(NOTICE, "QUERY PLAN:\n\nUTILITY\n"); elog(INFO, "QUERY PLAN:\n\nUTILITY\n");
return; return;
} }
@ -152,7 +152,7 @@ ExplainOneQuery(Query *query, bool verbose, bool analyze, CommandDest dest)
s = nodeToString(plan); s = nodeToString(plan);
if (s) if (s)
{ {
elog(NOTICE, "QUERY DUMP:\n\n%s", s); elog(INFO, "QUERY DUMP:\n\n%s", s);
pfree(s); pfree(s);
} }
} }
@ -165,7 +165,7 @@ ExplainOneQuery(Query *query, bool verbose, bool analyze, CommandDest dest)
if (analyze) if (analyze)
appendStringInfo(str, "Total runtime: %.2f msec\n", appendStringInfo(str, "Total runtime: %.2f msec\n",
1000.0 * totaltime); 1000.0 * totaltime);
elog(NOTICE, "QUERY PLAN:\n\n%s", str->data); elog(INFO, "QUERY PLAN:\n\n%s", str->data);
pfree(str->data); pfree(str->data);
pfree(str); pfree(str);
} }

8
src/backend/commands/sequence.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.68 2002/01/11 18:16:04 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.69 2002/03/02 21:39:23 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -879,7 +879,7 @@ seq_redo(XLogRecPtr lsn, XLogRecord *record)
sequence_magic *sm; sequence_magic *sm;
if (info != XLOG_SEQ_LOG) if (info != XLOG_SEQ_LOG)
elog(STOP, "seq_redo: unknown op code %u", info); elog(PANIC, "seq_redo: unknown op code %u", info);
reln = XLogOpenRelation(true, RM_SEQ_ID, xlrec->node); reln = XLogOpenRelation(true, RM_SEQ_ID, xlrec->node);
if (!RelationIsValid(reln)) if (!RelationIsValid(reln))
@ -887,7 +887,7 @@ seq_redo(XLogRecPtr lsn, XLogRecord *record)
buffer = XLogReadBuffer(true, reln, 0); buffer = XLogReadBuffer(true, reln, 0);
if (!BufferIsValid(buffer)) if (!BufferIsValid(buffer))
elog(STOP, "seq_redo: can't read block of %u/%u", elog(PANIC, "seq_redo: can't read block of %u/%u",
xlrec->node.tblNode, xlrec->node.relNode); xlrec->node.tblNode, xlrec->node.relNode);
page = (Page) BufferGetPage(buffer); page = (Page) BufferGetPage(buffer);
@ -903,7 +903,7 @@ seq_redo(XLogRecPtr lsn, XLogRecord *record)
itemsz = MAXALIGN(itemsz); itemsz = MAXALIGN(itemsz);
if (PageAddItem(page, (Item) item, itemsz, if (PageAddItem(page, (Item) item, itemsz,
FirstOffsetNumber, LP_USED) == InvalidOffsetNumber) FirstOffsetNumber, LP_USED) == InvalidOffsetNumber)
elog(STOP, "seq_redo: failed to add item to page"); elog(PANIC, "seq_redo: failed to add item to page");
PageSetLSN(page, lsn); PageSetLSN(page, lsn);
PageSetSUI(page, ThisStartUpID); PageSetSUI(page, ThisStartUpID);

6
src/backend/commands/trigger.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.102 2002/02/19 20:11:12 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.103 2002/03/02 21:39:23 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -368,7 +368,7 @@ DropTrigger(DropTrigStmt *stmt)
elog(ERROR, "DropTrigger: there is no trigger %s on relation %s", elog(ERROR, "DropTrigger: there is no trigger %s on relation %s",
stmt->trigname, stmt->relname); stmt->trigname, stmt->relname);
if (tgfound > 1) if (tgfound > 1)
elog(NOTICE, "DropTrigger: found (and deleted) %d triggers %s on relation %s", elog(INFO, "DropTrigger: found (and deleted) %d triggers %s on relation %s",
tgfound, stmt->trigname, stmt->relname); tgfound, stmt->trigname, stmt->relname);
/* /*
@ -489,7 +489,7 @@ RelationRemoveTriggers(Relation rel)
stmt.relname = pstrdup(RelationGetRelationName(refrel)); stmt.relname = pstrdup(RelationGetRelationName(refrel));
heap_close(refrel, NoLock); heap_close(refrel, NoLock);
elog(NOTICE, "DROP TABLE implicitly drops referential integrity trigger from table \"%s\"", stmt.relname); elog(INFO, "DROP TABLE implicitly drops referential integrity trigger from table \"%s\"", stmt.relname);
DropTrigger(&stmt); DropTrigger(&stmt);

6
src/backend/commands/user.c
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.91 2002/03/01 22:45:08 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.92 2002/03/02 21:39:23 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -547,7 +547,7 @@ AlterUser(AlterUserStmt *stmt)
/* changes to the flat password file cannot be rolled back */ /* changes to the flat password file cannot be rolled back */
if (IsTransactionBlock() && password) if (IsTransactionBlock() && password)
elog(NOTICE, "ALTER USER: password changes cannot be rolled back"); elog(INFO, "ALTER USER: password changes cannot be rolled back");
/* /*
* Scan the pg_shadow relation to be certain the user exists. Note we * Scan the pg_shadow relation to be certain the user exists. Note we
@ -785,7 +785,7 @@ DropUser(DropUserStmt *stmt)
elog(ERROR, "DROP USER: permission denied"); elog(ERROR, "DROP USER: permission denied");
if (IsTransactionBlock()) if (IsTransactionBlock())
elog(NOTICE, "DROP USER cannot be rolled back completely"); elog(INFO, "DROP USER cannot be rolled back completely");
/* /*
* Scan the pg_shadow relation to find the usesysid of the user to be * Scan the pg_shadow relation to find the usesysid of the user to be

24
src/backend/commands/vacuum.c
View File

@ -13,7 +13,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.214 2002/02/19 20:11:12 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.215 2002/03/02 21:39:23 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -108,7 +108,7 @@ typedef struct VRelStats
static MemoryContext vac_context = NULL; static MemoryContext vac_context = NULL;
static int MESSAGE_LEVEL; /* message level */ static int elevel = -1;
static TransactionId OldestXmin; static TransactionId OldestXmin;
static TransactionId FreezeLimit; static TransactionId FreezeLimit;
@ -192,9 +192,9 @@ vacuum(VacuumStmt *vacstmt)
pgstat_vacuum_tabstat(); pgstat_vacuum_tabstat();
if (vacstmt->verbose) if (vacstmt->verbose)
MESSAGE_LEVEL = NOTICE; elevel = INFO;
else else
MESSAGE_LEVEL = DEBUG; elevel = DEBUG1;
/* /*
* Create special memory context for cross-transaction storage. * Create special memory context for cross-transaction storage.
@ -964,7 +964,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
vac_init_rusage(&ru0); vac_init_rusage(&ru0);
relname = RelationGetRelationName(onerel); relname = RelationGetRelationName(onerel);
elog(MESSAGE_LEVEL, "--Relation %s--", relname); elog(elevel, "--Relation %s--", relname);
empty_pages = new_pages = changed_pages = empty_end_pages = 0; empty_pages = new_pages = changed_pages = empty_end_pages = 0;
num_tuples = tups_vacuumed = nkeep = nunused = 0; num_tuples = tups_vacuumed = nkeep = nunused = 0;
@ -1275,7 +1275,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
pfree(vtlinks); pfree(vtlinks);
} }
elog(MESSAGE_LEVEL, "Pages %u: Changed %u, reaped %u, Empty %u, New %u; \ elog(elevel, "Pages %u: Changed %u, reaped %u, Empty %u, New %u; \
Tup %.0f: Vac %.0f, Keep/VTL %.0f/%u, UnUsed %.0f, MinLen %lu, MaxLen %lu; \ Tup %.0f: Vac %.0f, Keep/VTL %.0f/%u, UnUsed %.0f, MinLen %lu, MaxLen %lu; \
Re-using: Free/Avail. Space %.0f/%.0f; EndEmpty/Avail. Pages %u/%u.\n\t%s", Re-using: Free/Avail. Space %.0f/%.0f; EndEmpty/Avail. Pages %u/%u.\n\t%s",
nblocks, changed_pages, vacuum_pages->num_pages, empty_pages, nblocks, changed_pages, vacuum_pages->num_pages, empty_pages,
@ -1849,7 +1849,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
InvalidOffsetNumber, LP_USED); InvalidOffsetNumber, LP_USED);
if (newoff == InvalidOffsetNumber) if (newoff == InvalidOffsetNumber)
{ {
elog(STOP, "moving chain: failed to add item with len = %lu to page %u", elog(PANIC, "moving chain: failed to add item with len = %lu to page %u",
(unsigned long) tuple_len, destvacpage->blkno); (unsigned long) tuple_len, destvacpage->blkno);
} }
newitemid = PageGetItemId(ToPage, newoff); newitemid = PageGetItemId(ToPage, newoff);
@ -1972,7 +1972,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
InvalidOffsetNumber, LP_USED); InvalidOffsetNumber, LP_USED);
if (newoff == InvalidOffsetNumber) if (newoff == InvalidOffsetNumber)
{ {
elog(STOP, "failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %u)", elog(PANIC, "failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %u)",
(unsigned long) tuple_len, (unsigned long) tuple_len,
cur_page->blkno, (unsigned long) cur_page->free, cur_page->blkno, (unsigned long) cur_page->free,
cur_page->offsets_used, cur_page->offsets_free); cur_page->offsets_used, cur_page->offsets_free);
@ -2197,7 +2197,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
} }
Assert(num_moved == checked_moved); Assert(num_moved == checked_moved);
elog(MESSAGE_LEVEL, "Rel %s: Pages: %u --> %u; Tuple(s) moved: %u.\n\t%s", elog(elevel, "Rel %s: Pages: %u --> %u; Tuple(s) moved: %u.\n\t%s",
RelationGetRelationName(onerel), RelationGetRelationName(onerel),
nblocks, blkno, num_moved, nblocks, blkno, num_moved,
vac_show_rusage(&ru0)); vac_show_rusage(&ru0));
@ -2369,7 +2369,7 @@ vacuum_heap(VRelStats *vacrelstats, Relation onerel, VacPageList vacuum_pages)
/* truncate relation if there are some empty end-pages */ /* truncate relation if there are some empty end-pages */
if (vacuum_pages->empty_end_pages > 0) if (vacuum_pages->empty_end_pages > 0)
{ {
elog(MESSAGE_LEVEL, "Rel %s: Pages: %u --> %u.", elog(elevel, "Rel %s: Pages: %u --> %u.",
RelationGetRelationName(onerel), RelationGetRelationName(onerel),
vacrelstats->rel_pages, relblocks); vacrelstats->rel_pages, relblocks);
relblocks = smgrtruncate(DEFAULT_SMGR, onerel, relblocks); relblocks = smgrtruncate(DEFAULT_SMGR, onerel, relblocks);
@ -2443,7 +2443,7 @@ scan_index(Relation indrel, double num_tuples)
stats->num_pages, stats->num_index_tuples, stats->num_pages, stats->num_index_tuples,
false); false);
elog(MESSAGE_LEVEL, "Index %s: Pages %u; Tuples %.0f.\n\t%s", elog(elevel, "Index %s: Pages %u; Tuples %.0f.\n\t%s",
RelationGetRelationName(indrel), RelationGetRelationName(indrel),
stats->num_pages, stats->num_index_tuples, stats->num_pages, stats->num_index_tuples,
vac_show_rusage(&ru0)); vac_show_rusage(&ru0));
@ -2497,7 +2497,7 @@ vacuum_index(VacPageList vacpagelist, Relation indrel,
stats->num_pages, stats->num_index_tuples, stats->num_pages, stats->num_index_tuples,
false); false);
elog(MESSAGE_LEVEL, "Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n\t%s", elog(elevel, "Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n\t%s",
RelationGetRelationName(indrel), stats->num_pages, RelationGetRelationName(indrel), stats->num_pages,
stats->num_index_tuples - keep_tuples, stats->tuples_removed, stats->num_index_tuples - keep_tuples, stats->tuples_removed,
vac_show_rusage(&ru0)); vac_show_rusage(&ru0));

25
src/backend/commands/vacuumlazy.c
View File

@ -31,7 +31,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.11 2002/01/06 00:37:44 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.12 2002/03/02 21:39:23 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -92,7 +92,7 @@ typedef struct LVRelStats
} LVRelStats; } LVRelStats;
static int MESSAGE_LEVEL; /* message level */ static int elevel = -1;
static TransactionId OldestXmin; static TransactionId OldestXmin;
static TransactionId FreezeLimit; static TransactionId FreezeLimit;
@ -138,11 +138,10 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt)
bool hasindex; bool hasindex;
BlockNumber possibly_freeable; BlockNumber possibly_freeable;
/* initialize */
if (vacstmt->verbose) if (vacstmt->verbose)
MESSAGE_LEVEL = NOTICE; elevel = INFO;
else else
MESSAGE_LEVEL = DEBUG; elevel = DEBUG1;
vacuum_set_xid_limits(vacstmt, onerel->rd_rel->relisshared, vacuum_set_xid_limits(vacstmt, onerel->rd_rel->relisshared,
&OldestXmin, &FreezeLimit); &OldestXmin, &FreezeLimit);
@ -208,7 +207,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
vac_init_rusage(&ru0); vac_init_rusage(&ru0);
relname = RelationGetRelationName(onerel); relname = RelationGetRelationName(onerel);
elog(MESSAGE_LEVEL, "--Relation %s--", relname); elog(elevel, "--Relation %s--", relname);
empty_pages = changed_pages = 0; empty_pages = changed_pages = 0;
num_tuples = tups_vacuumed = nkeep = nunused = 0; num_tuples = tups_vacuumed = nkeep = nunused = 0;
@ -430,7 +429,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
lazy_scan_index(Irel[i], vacrelstats); lazy_scan_index(Irel[i], vacrelstats);
} }
elog(MESSAGE_LEVEL, "Pages %u: Changed %u, Empty %u; \ elog(elevel, "Pages %u: Changed %u, Empty %u; \
Tup %.0f: Vac %.0f, Keep %.0f, UnUsed %.0f.\n\tTotal %s", Tup %.0f: Vac %.0f, Keep %.0f, UnUsed %.0f.\n\tTotal %s",
nblocks, changed_pages, empty_pages, nblocks, changed_pages, empty_pages,
num_tuples, tups_vacuumed, nkeep, nunused, num_tuples, tups_vacuumed, nkeep, nunused,
@ -481,8 +480,7 @@ lazy_vacuum_heap(Relation onerel, LVRelStats *vacrelstats)
npages++; npages++;
} }
elog(MESSAGE_LEVEL, "Removed %d tuples in %d pages.\n\t%s", elog(elevel, "Removed %d tuples in %d pages.\n\t%s", tupindex, npages,
tupindex, npages,
vac_show_rusage(&ru0)); vac_show_rusage(&ru0));
} }
@ -589,7 +587,7 @@ lazy_scan_index(Relation indrel, LVRelStats *vacrelstats)
stats->num_pages, stats->num_index_tuples, stats->num_pages, stats->num_index_tuples,
false); false);
elog(MESSAGE_LEVEL, "Index %s: Pages %u; Tuples %.0f.\n\t%s", elog(elevel, "Index %s: Pages %u; Tuples %.0f.\n\t%s",
RelationGetRelationName(indrel), RelationGetRelationName(indrel),
stats->num_pages, stats->num_index_tuples, stats->num_pages, stats->num_index_tuples,
vac_show_rusage(&ru0)); vac_show_rusage(&ru0));
@ -636,7 +634,7 @@ lazy_vacuum_index(Relation indrel, LVRelStats *vacrelstats)
stats->num_pages, stats->num_index_tuples, stats->num_pages, stats->num_index_tuples,
false); false);
elog(MESSAGE_LEVEL, "Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n\t%s", elog(elevel, "Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n\t%s",
RelationGetRelationName(indrel), stats->num_pages, RelationGetRelationName(indrel), stats->num_pages,
stats->num_index_tuples, stats->tuples_removed, stats->num_index_tuples, stats->tuples_removed,
vac_show_rusage(&ru0)); vac_show_rusage(&ru0));
@ -746,9 +744,8 @@ lazy_truncate_heap(Relation onerel, LVRelStats *vacrelstats)
* We keep the exclusive lock until commit (perhaps not necessary)? * We keep the exclusive lock until commit (perhaps not necessary)?
*/ */
elog(MESSAGE_LEVEL, "Truncated %u --> %u pages.\n\t%s", elog(elevel, "Truncated %u --> %u pages.\n\t%s", old_rel_pages,
old_rel_pages, new_rel_pages, new_rel_pages, vac_show_rusage(&ru0));
vac_show_rusage(&ru0));
} }
/* /*

24
src/backend/commands/variable.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.58 2002/02/23 01:31:35 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.59 2002/03/02 21:39:23 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -295,7 +295,7 @@ show_datestyle(void)
strcat(buf, ((EuroDates) ? "European" : "US (NonEuropean)")); strcat(buf, ((EuroDates) ? "European" : "US (NonEuropean)"));
strcat(buf, " conventions"); strcat(buf, " conventions");
elog(NOTICE, buf, NULL); elog(INFO, buf, NULL);
return TRUE; return TRUE;
} }
@ -482,9 +482,9 @@ show_timezone(void)
tzn = getenv("TZ"); tzn = getenv("TZ");
if (tzn != NULL) if (tzn != NULL)
elog(NOTICE, "Time zone is '%s'", tzn); elog(INFO, "Time zone is '%s'", tzn);
else else
elog(NOTICE, "Time zone is unset"); elog(INFO, "Time zone is unset");
return TRUE; return TRUE;
} /* show_timezone() */ } /* show_timezone() */
@ -576,9 +576,9 @@ show_XactIsoLevel(void)
{ {
if (XactIsoLevel == XACT_SERIALIZABLE) if (XactIsoLevel == XACT_SERIALIZABLE)
elog(NOTICE, "TRANSACTION ISOLATION LEVEL is SERIALIZABLE"); elog(INFO, "TRANSACTION ISOLATION LEVEL is SERIALIZABLE");
else else
elog(NOTICE, "TRANSACTION ISOLATION LEVEL is READ COMMITTED"); elog(INFO, "TRANSACTION ISOLATION LEVEL is READ COMMITTED");
return TRUE; return TRUE;
} }
@ -623,7 +623,7 @@ parse_random_seed(List *args)
static bool static bool
show_random_seed(void) show_random_seed(void)
{ {
elog(NOTICE, "Seed for random number generator is unavailable"); elog(INFO, "Seed for random number generator is unavailable");
return (TRUE); return (TRUE);
} }
@ -690,7 +690,7 @@ parse_client_encoding(List *args)
static bool static bool
show_client_encoding(void) show_client_encoding(void)
{ {
elog(NOTICE, "Current client encoding is '%s'", elog(INFO, "Current client encoding is '%s'",
pg_get_client_encoding_name()); pg_get_client_encoding_name());
return TRUE; return TRUE;
} }
@ -727,21 +727,21 @@ set_default_client_encoding(void)
static bool static bool
parse_server_encoding(List *args) parse_server_encoding(List *args)
{ {
elog(NOTICE, "SET SERVER_ENCODING is not supported"); elog(INFO, "SET SERVER_ENCODING is not supported");
return TRUE; return TRUE;
} }
static bool static bool
show_server_encoding(void) show_server_encoding(void)
{ {
elog(NOTICE, "Current server encoding is '%s'", GetDatabaseEncodingName()); elog(INFO, "Current server encoding is '%s'", GetDatabaseEncodingName());
return TRUE; return TRUE;
} }
static bool static bool
reset_server_encoding(void) reset_server_encoding(void)
{ {
elog(NOTICE, "RESET SERVER_ENCODING is not supported"); elog(INFO, "RESET SERVER_ENCODING is not supported");
return TRUE; return TRUE;
} }
@ -814,7 +814,7 @@ GetPGVariable(const char *name)
{ {
const char *val = GetConfigOption(name); const char *val = GetConfigOption(name);
elog(NOTICE, "%s is %s", name, val); elog(INFO, "%s is %s", name, val);
} }
} }

4
src/backend/executor/execAmi.c
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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: default:
/* don't make hard error unless caller asks to restore... */ /* 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)); nodeTag(node));
break; break;
} }

4
src/backend/executor/execMain.c
View File

@ -27,7 +27,7 @@
* *
* *
* IDENTIFICATION * 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; break;
default: default:
elog(DEBUG, "ExecutePlan: unknown operation in queryDesc"); elog(LOG, "ExecutePlan: unknown operation in queryDesc");
result = NULL; result = NULL;
break; break;
} }

6
src/backend/executor/instrument.c
View File

@ -7,7 +7,7 @@
* Copyright (c) 2001, PostgreSQL Global Development Group * Copyright (c) 2001, PostgreSQL Global Development Group
* *
* IDENTIFICATION * 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; return;
if (instr->starttime.tv_sec != 0 || instr->starttime.tv_usec != 0) 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 else
gettimeofday(&instr->starttime, NULL); gettimeofday(&instr->starttime, NULL);
} }
@ -53,7 +53,7 @@ InstrStopNode(Instrumentation *instr, bool returnedTuple)
if (instr->starttime.tv_sec == 0 && instr->starttime.tv_usec == 0) if (instr->starttime.tv_sec == 0 && instr->starttime.tv_usec == 0)
{ {
elog(DEBUG, "InstrStopNode without start"); elog(LOG, "InstrStopNode without start");
return; return;
} }

4
src/backend/executor/nodeAgg.c
View File

@ -46,7 +46,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * 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 * So, just make a debug note, and force numaggs positive so that
* palloc()s below don't choke. * 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; numaggs = 1;
} }

4
src/backend/executor/nodeAppend.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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); subnode = (Plan *) nth(whichplan, appendplans);
if (subnode == NULL) if (subnode == NULL)
elog(DEBUG, "ExecProcAppend: subnode is NULL"); elog(LOG, "ExecProcAppend: subnode is NULL");
/* /*
* get a tuple from the subplan * get a tuple from the subplan

9
src/backend/libpq/auth.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.75 2002/02/25 20:07:02 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.76 2002/03/02 21:39:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -691,9 +691,7 @@ pam_passwd_conv_proc(int num_msg, const struct pam_message ** msg, struct pam_re
initStringInfo(&buf); initStringInfo(&buf);
pq_getstr(&buf); pq_getstr(&buf);
if (DebugLvl > 5) elog(DEBUG5, "received PAM packet with len=%d, pw=%s\n", len, buf.data);
fprintf(stderr, "received PAM packet with len=%d, pw=%s\n",
len, buf.data);
if (strlen(buf.data) == 0) if (strlen(buf.data) == 0)
{ {
@ -856,8 +854,7 @@ recv_and_check_password_packet(Port *port)
return STATUS_EOF; return STATUS_EOF;
} }
if (DebugLvl > 5) /* this is probably a BAD idea... */ elog(DEBUG5, "received password packet with len=%d, pw=%s\n",
fprintf(stderr, "received password packet with len=%d, pw=%s\n",
len, buf.data); len, buf.data);
result = checkPassword(port, port->user, buf.data); result = checkPassword(port, port->user, buf.data);

4
src/backend/libpq/crypt.c
View File

@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/backend/libpq/crypt.c,v 1.42 2001/11/05 17:46:25 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/crypt.c,v 1.43 2002/03/02 21:39:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -65,7 +65,7 @@ crypt_openpwdfile(void)
pwdfile = AllocateFile(filename, "r"); pwdfile = AllocateFile(filename, "r");
if (pwdfile == NULL && errno != ENOENT) if (pwdfile == NULL && errno != ENOENT)
elog(DEBUG, "could not open %s: %m", filename); elog(LOG, "could not open %s: %m", filename);
pfree(filename); pfree(filename);

14
src/backend/libpq/pqcomm.c
View File

@ -29,7 +29,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pqcomm.c,v 1.126 2001/12/04 20:57:22 tgl Exp $ * $Id: pqcomm.c,v 1.127 2002/03/02 21:39:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -507,15 +507,15 @@ pq_recvbuf(void)
* Careful: an elog() that tries to write to the client * Careful: an elog() that tries to write to the client
* would cause recursion to here, leading to stack overflow * would cause recursion to here, leading to stack overflow
* and core dump! This message must go *only* to the postmaster * and core dump! This message must go *only* to the postmaster
* log. elog(DEBUG) is presently safe. * log. elog(LOG) is presently safe.
*/ */
elog(DEBUG, "pq_recvbuf: recv() failed: %m"); elog(LOG, "pq_recvbuf: recv() failed: %m");
return EOF; return EOF;
} }
if (r == 0) if (r == 0)
{ {
/* as above, only write to postmaster log */ /* as above, only write to postmaster log */
elog(DEBUG, "pq_recvbuf: unexpected EOF on client connection"); elog(LOG, "pq_recvbuf: unexpected EOF on client connection");
return EOF; return EOF;
} }
/* r contains number of bytes read, so just incr length */ /* r contains number of bytes read, so just incr length */
@ -680,7 +680,7 @@ pq_flush(void)
* Careful: an elog() that tries to write to the client * Careful: an elog() that tries to write to the client
* would cause recursion to here, leading to stack overflow * would cause recursion to here, leading to stack overflow
* and core dump! This message must go *only* to the postmaster * and core dump! This message must go *only* to the postmaster
* log. elog(DEBUG) is presently safe. * log. elog(LOG) is presently safe.
* *
* If a client disconnects while we're in the midst of output, * If a client disconnects while we're in the midst of output,
* we might write quite a bit of data before we get to a safe * we might write quite a bit of data before we get to a safe
@ -689,7 +689,7 @@ pq_flush(void)
if (errno != last_reported_send_errno) if (errno != last_reported_send_errno)
{ {
last_reported_send_errno = errno; last_reported_send_errno = errno;
elog(DEBUG, "pq_flush: send() failed: %m"); elog(LOG, "pq_flush: send() failed: %m");
} }
/* /*
@ -723,7 +723,7 @@ pq_eof(void)
if (res < 0) if (res < 0)
{ {
/* can log to postmaster log only */ /* can log to postmaster log only */
elog(DEBUG, "pq_eof: recv() failed: %m"); elog(LOG, "pq_eof: recv() failed: %m");
return EOF; return EOF;
} }
if (res == 0) if (res == 0)

8
src/backend/optimizer/geqo/geqo_erx.c
View File

@ -3,7 +3,7 @@
* geqo_erx.c * geqo_erx.c
* edge recombination crossover [ER] * edge recombination crossover [ER]
* *
* $Id: geqo_erx.c,v 1.16 2001/10/25 05:49:31 momjian Exp $ * $Id: geqo_erx.c,v 1.17 2002/03/02 21:39:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -419,7 +419,7 @@ edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene)
} }
} }
elog(DEBUG, "edge_failure(1): no edge found via random decision and total_edges == 4"); elog(LOG, "edge_failure(1): no edge found via random decision and total_edges == 4");
} }
else else
@ -444,7 +444,7 @@ edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene)
} }
} }
elog(DEBUG, "edge_failure(2): no edge found via random decision and remainig edges"); elog(LOG, "edge_failure(2): no edge found via random decision and remainig edges");
} }
/* /*
@ -462,7 +462,7 @@ edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene)
if (edge_table[i].unused_edges >= 0) if (edge_table[i].unused_edges >= 0)
return (Gene) i; return (Gene) i;
elog(DEBUG, "edge_failure(3): no edge found via looking for the last ununsed point"); elog(LOG, "edge_failure(3): no edge found via looking for the last ununsed point");
} }

22
src/backend/optimizer/geqo/geqo_main.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: geqo_main.c,v 1.29 2001/10/25 05:49:31 momjian Exp $ * $Id: geqo_main.c,v 1.30 2002/03/02 21:39:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -120,30 +120,30 @@ geqo(Query *root, int number_of_rels, List *initial_rels)
daddy = alloc_chromo(pool->string_length); daddy = alloc_chromo(pool->string_length);
#if defined (ERX) #if defined (ERX)
elog(DEBUG, "geqo_main: using edge recombination crossover [ERX]"); elog(LOG, "geqo_main: using edge recombination crossover [ERX]");
/* allocate edge table memory */ /* allocate edge table memory */
edge_table = alloc_edge_table(pool->string_length); edge_table = alloc_edge_table(pool->string_length);
#elif defined(PMX) #elif defined(PMX)
elog(DEBUG, "geqo_main: using partially matched crossover [PMX]"); elog(LOG, "geqo_main: using partially matched crossover [PMX]");
/* allocate chromosome kid memory */ /* allocate chromosome kid memory */
kid = alloc_chromo(pool->string_length); kid = alloc_chromo(pool->string_length);
#elif defined(CX) #elif defined(CX)
elog(DEBUG, "geqo_main: using cycle crossover [CX]"); elog(LOG, "geqo_main: using cycle crossover [CX]");
/* allocate city table memory */ /* allocate city table memory */
kid = alloc_chromo(pool->string_length); kid = alloc_chromo(pool->string_length);
city_table = alloc_city_table(pool->string_length); city_table = alloc_city_table(pool->string_length);
#elif defined(PX) #elif defined(PX)
elog(DEBUG, "geqo_main: using position crossover [PX]"); elog(LOG, "geqo_main: using position crossover [PX]");
/* allocate city table memory */ /* allocate city table memory */
kid = alloc_chromo(pool->string_length); kid = alloc_chromo(pool->string_length);
city_table = alloc_city_table(pool->string_length); city_table = alloc_city_table(pool->string_length);
#elif defined(OX1) #elif defined(OX1)
elog(DEBUG, "geqo_main: using order crossover [OX1]"); elog(LOG, "geqo_main: using order crossover [OX1]");
/* allocate city table memory */ /* allocate city table memory */
kid = alloc_chromo(pool->string_length); kid = alloc_chromo(pool->string_length);
city_table = alloc_city_table(pool->string_length); city_table = alloc_city_table(pool->string_length);
#elif defined(OX2) #elif defined(OX2)
elog(DEBUG, "geqo_main: using order crossover [OX2]"); elog(LOG, "geqo_main: using order crossover [OX2]");
/* allocate city table memory */ /* allocate city table memory */
kid = alloc_chromo(pool->string_length); kid = alloc_chromo(pool->string_length);
city_table = alloc_city_table(pool->string_length); city_table = alloc_city_table(pool->string_length);
@ -214,18 +214,18 @@ geqo(Query *root, int number_of_rels, List *initial_rels)
#if defined(ERX) && defined(GEQO_DEBUG) #if defined(ERX) && defined(GEQO_DEBUG)
if (edge_failures != 0) if (edge_failures != 0)
elog(DEBUG, "[GEQO] failures: %d, average: %d", elog(LOG, "[GEQO] failures: %d, average: %d",
edge_failures, (int) generation / edge_failures); edge_failures, (int) generation / edge_failures);
else else
elog(DEBUG, "[GEQO] No edge failures detected."); elog(LOG, "[GEQO] No edge failures detected.");
#endif #endif
#if defined(CX) && defined(GEQO_DEBUG) #if defined(CX) && defined(GEQO_DEBUG)
if (mutations != 0) if (mutations != 0)
elog(DEBUG, "[GEQO] mutations: %d, generations: %d", mutations, generation); elog(LOG, "[GEQO] mutations: %d, generations: %d", mutations, generation);
else else
elog(DEBUG, "[GEQO] No mutations processed."); elog(LOG, "[GEQO] No mutations processed.");
#endif #endif

6
src/backend/optimizer/path/indxpath.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.112 2001/10/25 05:49:32 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.113 2002/03/02 21:39:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1299,7 +1299,7 @@ pred_test_simple_clause(Expr *predicate, Node *clause)
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))
{ {
/* this probably shouldn't fail? */ /* this probably shouldn't fail? */
elog(DEBUG, "pred_test_simple_clause: unknown test_op"); elog(LOG, "pred_test_simple_clause: unknown test_op");
return false; return false;
} }
aform = (Form_pg_amop) GETSTRUCT(tuple); aform = (Form_pg_amop) GETSTRUCT(tuple);
@ -1327,7 +1327,7 @@ pred_test_simple_clause(Expr *predicate, Node *clause)
if (isNull) if (isNull)
{ {
elog(DEBUG, "pred_test_simple_clause: null test result"); elog(LOG, "pred_test_simple_clause: null test result");
return false; return false;
} }
return DatumGetBool(test_result); return DatumGetBool(test_result);

10
src/backend/parser/analyze.c
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.215 2002/02/26 22:47:08 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.216 2002/03/02 21:39:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -849,7 +849,7 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
sequence->istemp = cxt->istemp; sequence->istemp = cxt->istemp;
sequence->options = NIL; sequence->options = NIL;
elog(NOTICE, "%s will create implicit sequence '%s' for SERIAL column '%s.%s'", elog(INFO, "%s will create implicit sequence '%s' for SERIAL column '%s.%s'",
cxt->stmtType, sequence->seqname, cxt->relname, column->colname); cxt->stmtType, sequence->seqname, cxt->relname, column->colname);
cxt->blist = lappend(cxt->blist, sequence); cxt->blist = lappend(cxt->blist, sequence);
@ -1264,7 +1264,7 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt)
elog(ERROR, "%s: failed to make implicit index name", elog(ERROR, "%s: failed to make implicit index name",
cxt->stmtType); cxt->stmtType);
elog(NOTICE, "%s / %s%s will create implicit index '%s' for table '%s'", elog(INFO, "%s / %s%s will create implicit index '%s' for table '%s'",
cxt->stmtType, cxt->stmtType,
(strcmp(cxt->stmtType, "ALTER TABLE") == 0) ? "ADD " : "", (strcmp(cxt->stmtType, "ALTER TABLE") == 0) ? "ADD " : "",
(index->primary ? "PRIMARY KEY" : "UNIQUE"), (index->primary ? "PRIMARY KEY" : "UNIQUE"),
@ -1288,7 +1288,7 @@ transformFKConstraints(ParseState *pstate, CreateStmtContext *cxt)
if (cxt->fkconstraints == NIL) if (cxt->fkconstraints == NIL)
return; return;
elog(NOTICE, "%s will create implicit trigger(s) for FOREIGN KEY check(s)", elog(INFO, "%s will create implicit trigger(s) for FOREIGN KEY check(s)",
cxt->stmtType); cxt->stmtType);
foreach(fkclist, cxt->fkconstraints) foreach(fkclist, cxt->fkconstraints)
@ -2710,7 +2710,7 @@ transformTypeRef(ParseState *pstate, TypeName *tn)
elog(ERROR, "unsupported expression in %%TYPE"); elog(ERROR, "unsupported expression in %%TYPE");
v = (Var *) n; v = (Var *) n;
tyn = typeidTypeName(v->vartype); tyn = typeidTypeName(v->vartype);
elog(NOTICE, "%s.%s%%TYPE converted to %s", tn->name, tn->attrname, tyn); elog(INFO, "%s.%s%%TYPE converted to %s", tn->name, tn->attrname, tyn);
tn->name = tyn; tn->name = tyn;
tn->typmod = v->vartypmod; tn->typmod = v->vartypmod;
tn->attrname = NULL; tn->attrname = NULL;

6
src/backend/parser/gram.y
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.282 2002/03/01 22:45:12 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.283 2002/03/02 21:39:27 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -1338,7 +1338,7 @@ columnDef: ColId Typename ColQualList opt_collate
n->constraints = $3; n->constraints = $3;
if ($4 != NULL) if ($4 != NULL)
elog(NOTICE,"CREATE TABLE / COLLATE %s not yet implemented" elog(INFO,"CREATE TABLE / COLLATE %s not yet implemented"
"; clause ignored", $4); "; clause ignored", $4);
$$ = (Node *)n; $$ = (Node *)n;
@ -2336,7 +2336,7 @@ direction: FORWARD { $$ = FORWARD; }
| RELATIVE { $$ = RELATIVE; } | RELATIVE { $$ = RELATIVE; }
| ABSOLUTE | ABSOLUTE
{ {
elog(NOTICE,"FETCH / ABSOLUTE not supported, using RELATIVE"); elog(INFO,"FETCH / ABSOLUTE not supported, using RELATIVE");
$$ = RELATIVE; $$ = RELATIVE;
} }
; ;

4
src/backend/parser/parse_relation.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.60 2001/11/05 17:46:26 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.61 2002/03/02 21:39:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1041,7 +1041,7 @@ warnAutoRange(ParseState *pstate, char *refname)
} }
} }
if (foundInFromCl) if (foundInFromCl)
elog(NOTICE, "Adding missing FROM-clause entry%s for table \"%s\"", elog(INFO, "Adding missing FROM-clause entry%s for table \"%s\"",
pstate->parentParseState != NULL ? " in subquery" : "", pstate->parentParseState != NULL ? " in subquery" : "",
refname); refname);
} }

142
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.268 2002/03/02 20:46:12 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.269 2002/03/02 21:39:28 momjian Exp $
* *
* NOTES * NOTES
* *
@ -436,13 +436,15 @@ PostmasterMain(int argc, char *argv[])
potential_DataDir = optarg; potential_DataDir = optarg;
break; break;
case 'd': case 'd':
{
/* /* Turn on debugging for the postmaster. */
* Turn on debugging for the postmaster and the backend char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
* servers descended from it. sprintf(debugstr, "debug%s", optarg);
*/ /* We use PGC_S_SESSION because we will reset in backend */
SetConfigOption("debug_level", optarg, PGC_POSTMASTER, PGC_S_ARGV); SetConfigOption("server_min_messages", debugstr, PGC_POSTMASTER, PGC_S_SESSION);
pfree(debugstr);
break; break;
}
case 'F': case 'F':
SetConfigOption("fsync", "false", PGC_POSTMASTER, PGC_S_ARGV); SetConfigOption("fsync", "false", PGC_POSTMASTER, PGC_S_ARGV);
break; break;
@ -580,17 +582,15 @@ PostmasterMain(int argc, char *argv[])
#endif #endif
/* For debugging: display postmaster environment */ /* For debugging: display postmaster environment */
if (DebugLvl > 2)
{ {
extern char **environ; extern char **environ;
char **p; char **p;
fprintf(stderr, "%s: PostmasterMain: initial environ dump:\n", elog(DEBUG2, "%s: PostmasterMain: initial environ dump:", progname);
progname); elog(DEBUG2, "-----------------------------------------");
fprintf(stderr, "-----------------------------------------\n");
for (p = environ; *p; ++p) for (p = environ; *p; ++p)
fprintf(stderr, "\t%s\n", *p); elog(DEBUG2, "\t%s", *p);
fprintf(stderr, "-----------------------------------------\n"); elog(DEBUG2, "-----------------------------------------");
} }
/* /*
@ -932,7 +932,7 @@ ServerLoop(void)
PG_SETMASK(&BlockSig); PG_SETMASK(&BlockSig);
if (errno == EINTR || errno == EWOULDBLOCK) if (errno == EINTR || errno == EWOULDBLOCK)
continue; continue;
elog(DEBUG, "ServerLoop: select failed: %m"); elog(LOG, "ServerLoop: select failed: %m");
return STATUS_ERROR; return STATUS_ERROR;
} }
@ -1058,7 +1058,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
if (pq_getbytes((char *) &len, 4) == EOF) if (pq_getbytes((char *) &len, 4) == EOF)
{ {
elog(DEBUG, "incomplete startup packet"); elog(LOG, "incomplete startup packet");
return STATUS_ERROR; return STATUS_ERROR;
} }
@ -1072,7 +1072,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
if (pq_getbytes(buf, len) == EOF) if (pq_getbytes(buf, len) == EOF)
{ {
elog(DEBUG, "incomplete startup packet"); elog(LOG, "incomplete startup packet");
return STATUS_ERROR; return STATUS_ERROR;
} }
@ -1105,7 +1105,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
#endif #endif
if (send(port->sock, &SSLok, 1, 0) != 1) if (send(port->sock, &SSLok, 1, 0) != 1)
{ {
elog(DEBUG, "failed to send SSL negotiation response: %s", elog(LOG, "failed to send SSL negotiation response: %s",
strerror(errno)); strerror(errno));
return STATUS_ERROR; /* close the connection */ return STATUS_ERROR; /* close the connection */
} }
@ -1117,7 +1117,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
!SSL_set_fd(port->ssl, port->sock) || !SSL_set_fd(port->ssl, port->sock) ||
SSL_accept(port->ssl) <= 0) SSL_accept(port->ssl) <= 0)
{ {
elog(DEBUG, "failed to initialize SSL connection: %s (%m)", elog(LOG, "failed to initialize SSL connection: %s (%m)",
SSLerrmessage()); SSLerrmessage());
return STATUS_ERROR; return STATUS_ERROR;
} }
@ -1215,8 +1215,7 @@ processCancelRequest(Port *port, void *pkt)
if (backendPID == CheckPointPID) if (backendPID == CheckPointPID)
{ {
if (DebugLvl) elog(DEBUG1, "processCancelRequest: CheckPointPID in cancel request for process %d", backendPID);
elog(DEBUG, "processCancelRequest: CheckPointPID in cancel request for process %d", backendPID);
return; return;
} }
@ -1230,25 +1229,20 @@ processCancelRequest(Port *port, void *pkt)
if (bp->cancel_key == cancelAuthCode) if (bp->cancel_key == cancelAuthCode)
{ {
/* Found a match; signal that backend to cancel current op */ /* Found a match; signal that backend to cancel current op */
if (DebugLvl) elog(DEBUG1, "processing cancel request: sending SIGINT to process %d",
elog(DEBUG, "processing cancel request: sending SIGINT to process %d",
backendPID); backendPID);
kill(bp->pid, SIGINT); kill(bp->pid, SIGINT);
} }
else else
{
/* Right PID, wrong key: no way, Jose */ /* Right PID, wrong key: no way, Jose */
if (DebugLvl) elog(DEBUG1, "bad key in cancel request for process %d",
elog(DEBUG, "bad key in cancel request for process %d",
backendPID); backendPID);
}
return; return;
} }
} }
/* No matching backend */ /* No matching backend */
if (DebugLvl) elog(DEBUG1, "bad pid in cancel request for process %d", backendPID);
elog(DEBUG, "bad pid in cancel request for process %d", backendPID);
} }
/* /*
@ -1291,7 +1285,7 @@ ConnCreate(int serverFd)
if (!(port = (Port *) calloc(1, sizeof(Port)))) if (!(port = (Port *) calloc(1, sizeof(Port))))
{ {
elog(DEBUG, "ConnCreate: malloc failed"); elog(LOG, "ConnCreate: malloc failed");
SignalChildren(SIGQUIT); SignalChildren(SIGQUIT);
ExitPostmaster(1); ExitPostmaster(1);
} }
@ -1412,8 +1406,7 @@ pmdie(SIGNAL_ARGS)
PG_SETMASK(&BlockSig); PG_SETMASK(&BlockSig);
if (DebugLvl >= 1) elog(DEBUG1, "pmdie %d", postgres_signal_arg);
elog(DEBUG, "pmdie %d", postgres_signal_arg);
switch (postgres_signal_arg) switch (postgres_signal_arg)
{ {
@ -1427,7 +1420,7 @@ pmdie(SIGNAL_ARGS)
if (Shutdown >= SmartShutdown) if (Shutdown >= SmartShutdown)
break; break;
Shutdown = SmartShutdown; Shutdown = SmartShutdown;
elog(DEBUG, "smart shutdown request"); elog(LOG, "smart shutdown request");
if (DLGetHead(BackendList)) /* let reaper() handle this */ if (DLGetHead(BackendList)) /* let reaper() handle this */
break; break;
@ -1439,7 +1432,7 @@ pmdie(SIGNAL_ARGS)
break; break;
if (ShutdownPID > 0) if (ShutdownPID > 0)
{ {
elog(REALLYFATAL, "shutdown process %d already running", elog(PANIC, "shutdown process %d already running",
(int) ShutdownPID); (int) ShutdownPID);
abort(); abort();
} }
@ -1457,13 +1450,13 @@ pmdie(SIGNAL_ARGS)
*/ */
if (Shutdown >= FastShutdown) if (Shutdown >= FastShutdown)
break; break;
elog(DEBUG, "fast shutdown request"); elog(LOG, "fast shutdown request");
if (DLGetHead(BackendList)) /* let reaper() handle this */ if (DLGetHead(BackendList)) /* let reaper() handle this */
{ {
Shutdown = FastShutdown; Shutdown = FastShutdown;
if (!FatalError) if (!FatalError)
{ {
elog(DEBUG, "aborting any active transactions"); elog(LOG, "aborting any active transactions");
SignalChildren(SIGTERM); SignalChildren(SIGTERM);
} }
break; break;
@ -1483,7 +1476,7 @@ pmdie(SIGNAL_ARGS)
break; break;
if (ShutdownPID > 0) if (ShutdownPID > 0)
{ {
elog(REALLYFATAL, "shutdown process %d already running", elog(PANIC, "shutdown process %d already running",
(int) ShutdownPID); (int) ShutdownPID);
abort(); abort();
} }
@ -1499,7 +1492,7 @@ pmdie(SIGNAL_ARGS)
* abort all children with SIGQUIT and exit without attempt to * abort all children with SIGQUIT and exit without attempt to
* properly shutdown data base system. * properly shutdown data base system.
*/ */
elog(DEBUG, "immediate shutdown request"); elog(LOG, "immediate shutdown request");
if (ShutdownPID > 0) if (ShutdownPID > 0)
kill(ShutdownPID, SIGQUIT); kill(ShutdownPID, SIGQUIT);
if (StartupPID > 0) if (StartupPID > 0)
@ -1534,8 +1527,7 @@ reaper(SIGNAL_ARGS)
PG_SETMASK(&BlockSig); PG_SETMASK(&BlockSig);
if (DebugLvl) elog(DEBUG1, "reaping dead processes");
elog(DEBUG, "reaping dead processes");
#ifdef HAVE_WAITPID #ifdef HAVE_WAITPID
while ((pid = waitpid(-1, &status, WNOHANG)) > 0) while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
{ {
@ -1578,7 +1570,7 @@ reaper(SIGNAL_ARGS)
{ {
LogChildExit(gettext("startup process"), LogChildExit(gettext("startup process"),
pid, exitstatus); pid, exitstatus);
elog(DEBUG, "aborting startup due to startup process failure"); elog(LOG, "aborting startup due to startup process failure");
ExitPostmaster(1); ExitPostmaster(1);
} }
StartupPID = 0; StartupPID = 0;
@ -1587,7 +1579,7 @@ reaper(SIGNAL_ARGS)
{ {
if (ShutdownPID > 0) if (ShutdownPID > 0)
{ {
elog(STOP, "startup process %d died while shutdown process %d already running", elog(PANIC, "startup process %d died while shutdown process %d already running",
pid, (int) ShutdownPID); pid, (int) ShutdownPID);
abort(); abort();
} }
@ -1619,7 +1611,7 @@ reaper(SIGNAL_ARGS)
*/ */
if (DLGetHead(BackendList) || StartupPID > 0 || ShutdownPID > 0) if (DLGetHead(BackendList) || StartupPID > 0 || ShutdownPID > 0)
goto reaper_done; goto reaper_done;
elog(DEBUG, "all server processes terminated; reinitializing shared memory and semaphores"); elog(LOG, "all server processes terminated; reinitializing shared memory and semaphores");
shmem_exit(0); shmem_exit(0);
reset_shared(PostPortNumber); reset_shared(PostPortNumber);
@ -1657,7 +1649,6 @@ CleanupProc(int pid,
*next; *next;
Backend *bp; Backend *bp;
if (DebugLvl)
LogChildExit(gettext("child process"), pid, exitstatus); LogChildExit(gettext("child process"), pid, exitstatus);
/* /*
@ -1704,7 +1695,7 @@ CleanupProc(int pid,
if (!FatalError) if (!FatalError)
{ {
LogChildExit(gettext("server process"), pid, exitstatus); LogChildExit(gettext("server process"), pid, exitstatus);
elog(DEBUG, "terminating any other active server processes"); elog(LOG, "terminating any other active server processes");
} }
curr = DLGetHead(BackendList); curr = DLGetHead(BackendList);
@ -1725,10 +1716,8 @@ CleanupProc(int pid,
*/ */
if (!FatalError) if (!FatalError)
{ {
if (DebugLvl) elog(DEBUG1, "CleanupProc: sending %s to process %d",
elog(DEBUG, "CleanupProc: sending %s to process %d", (SendStop ? "SIGSTOP" : "SIGQUIT"), (int) bp->pid);
(SendStop ? "SIGSTOP" : "SIGQUIT"),
(int) bp->pid);
kill(bp->pid, (SendStop ? SIGSTOP : SIGQUIT)); kill(bp->pid, (SendStop ? SIGSTOP : SIGQUIT));
} }
} }
@ -1771,13 +1760,13 @@ LogChildExit(const char *procname, int pid, int exitstatus)
* describing a child process, such as "server process" * describing a child process, such as "server process"
*/ */
if (WIFEXITED(exitstatus)) if (WIFEXITED(exitstatus))
elog(DEBUG, "%s (pid %d) exited with exit code %d", elog(LOG, "%s (pid %d) exited with exit code %d",
procname, pid, WEXITSTATUS(exitstatus)); procname, pid, WEXITSTATUS(exitstatus));
else if (WIFSIGNALED(exitstatus)) else if (WIFSIGNALED(exitstatus))
elog(DEBUG, "%s (pid %d) was terminated by signal %d", elog(LOG, "%s (pid %d) was terminated by signal %d",
procname, pid, WTERMSIG(exitstatus)); procname, pid, WTERMSIG(exitstatus));
else else
elog(DEBUG, "%s (pid %d) exited with unexpected status %d", elog(LOG, "%s (pid %d) exited with unexpected status %d",
procname, pid, exitstatus); procname, pid, exitstatus);
} }
@ -1799,10 +1788,8 @@ SignalChildren(int signal)
if (bp->pid != MyProcPid) if (bp->pid != MyProcPid)
{ {
if (DebugLvl >= 1) elog(DEBUG1, "SignalChildren: sending signal %d to process %d",
elog(DEBUG, "SignalChildren: sending signal %d to process %d",
signal, (int) bp->pid); signal, (int) bp->pid);
kill(bp->pid, signal); kill(bp->pid, signal);
} }
@ -1838,7 +1825,7 @@ BackendStartup(Port *port)
bn = (Backend *) malloc(sizeof(Backend)); bn = (Backend *) malloc(sizeof(Backend));
if (!bn) if (!bn)
{ {
elog(DEBUG, "out of memory; connection startup aborted"); elog(LOG, "out of memory; connection startup aborted");
return STATUS_ERROR; return STATUS_ERROR;
} }
@ -1887,7 +1874,7 @@ BackendStartup(Port *port)
status = DoBackend(port); status = DoBackend(port);
if (status != 0) if (status != 0)
{ {
elog(DEBUG, "connection startup failed"); elog(LOG, "connection startup failed");
proc_exit(status); proc_exit(status);
} }
else else
@ -1904,16 +1891,15 @@ BackendStartup(Port *port)
beos_backend_startup_failed(); beos_backend_startup_failed();
#endif #endif
free(bn); free(bn);
elog(DEBUG, "connection startup failed (fork failure): %s", elog(LOG, "connection startup failed (fork failure): %s",
strerror(save_errno)); strerror(save_errno));
report_fork_failure_to_client(port, save_errno); report_fork_failure_to_client(port, save_errno);
return STATUS_ERROR; return STATUS_ERROR;
} }
/* in parent, normal */ /* in parent, normal */
if (DebugLvl >= 1) elog(DEBUG1, "BackendStartup: forked pid=%d socket=%d", (int) pid,
elog(DEBUG, "BackendStartup: forked pid=%d socket=%d", port->sock);
(int) pid, port->sock);
/* /*
* Everything's been successful, it's safe to add this backend to our * Everything's been successful, it's safe to add this backend to our
@ -2007,7 +1993,6 @@ DoBackend(Port *port)
char *remote_host; char *remote_host;
char *av[ARGV_SIZE * 2]; char *av[ARGV_SIZE * 2];
int ac = 0; int ac = 0;
char debugbuf[ARGV_SIZE];
char protobuf[ARGV_SIZE]; char protobuf[ARGV_SIZE];
char dbbuf[ARGV_SIZE]; char dbbuf[ARGV_SIZE];
char optbuf[ARGV_SIZE]; char optbuf[ARGV_SIZE];
@ -2151,7 +2136,7 @@ DoBackend(Port *port)
PG_SETMASK(&BlockSig); PG_SETMASK(&BlockSig);
if (Log_connections) if (Log_connections)
elog(DEBUG, "connection: host=%s user=%s database=%s", elog(LOG, "connection: host=%s user=%s database=%s",
remote_host, port->user, port->database); remote_host, port->user, port->database);
/* /*
@ -2174,19 +2159,6 @@ DoBackend(Port *port)
av[ac++] = "postgres"; av[ac++] = "postgres";
/*
* Pass the requested debugging level along to the backend. Level one
* debugging in the postmaster traces postmaster connection activity,
* and levels two and higher are passed along to the backend. This
* allows us to watch only the postmaster or the postmaster and the
* backend.
*/
if (DebugLvl > 1)
{
sprintf(debugbuf, "-d%d", DebugLvl);
av[ac++] = debugbuf;
}
/* /*
* Pass any backend switches specified with -o in the postmaster's own * Pass any backend switches specified with -o in the postmaster's own
* command line. We assume these are secure. (It's OK to mangle * command line. We assume these are secure. (It's OK to mangle
@ -2244,14 +2216,10 @@ DoBackend(Port *port)
/* /*
* Debug: print arguments being passed to backend * Debug: print arguments being passed to backend
*/ */
if (DebugLvl > 1) elog(DEBUG2, "%s child[%d]: starting with (", progname, MyProcPid);
{
fprintf(stderr, "%s child[%d]: starting with (",
progname, MyProcPid);
for (i = 0; i < ac; ++i) for (i = 0; i < ac; ++i)
fprintf(stderr, "%s ", av[i]); elog(DEBUG2, "%s ", av[i]);
fprintf(stderr, ")\n"); elog(DEBUG2, ")\n");
}
return (PostgresMain(ac, av, port->user)); return (PostgresMain(ac, av, port->user));
} }
@ -2584,8 +2552,6 @@ SSDataBase(int xlop)
/* Set up command-line arguments for subprocess */ /* Set up command-line arguments for subprocess */
av[ac++] = "postgres"; av[ac++] = "postgres";
av[ac++] = "-d";
sprintf(nbbuf, "-B%d", NBuffers); sprintf(nbbuf, "-B%d", NBuffers);
av[ac++] = nbbuf; av[ac++] = nbbuf;
@ -2614,16 +2580,16 @@ SSDataBase(int xlop)
switch (xlop) switch (xlop)
{ {
case BS_XLOG_STARTUP: case BS_XLOG_STARTUP:
elog(DEBUG, "could not launch startup process (fork failure): %s", elog(LOG, "could not launch startup process (fork failure): %s",
strerror(errno)); strerror(errno));
break; break;
case BS_XLOG_CHECKPOINT: case BS_XLOG_CHECKPOINT:
elog(DEBUG, "could not launch checkpoint process (fork failure): %s", elog(LOG, "could not launch checkpoint process (fork failure): %s",
strerror(errno)); strerror(errno));
break; break;
case BS_XLOG_SHUTDOWN: case BS_XLOG_SHUTDOWN:
default: default:
elog(DEBUG, "could not launch shutdown process (fork failure): %s", elog(LOG, "could not launch shutdown process (fork failure): %s",
strerror(errno)); strerror(errno));
break; break;
} }
@ -2646,7 +2612,7 @@ SSDataBase(int xlop)
{ {
if (!(bn = (Backend *) malloc(sizeof(Backend)))) if (!(bn = (Backend *) malloc(sizeof(Backend))))
{ {
elog(DEBUG, "CheckPointDataBase: malloc failed"); elog(LOG, "CheckPointDataBase: malloc failed");
ExitPostmaster(1); ExitPostmaster(1);
} }

10
src/backend/storage/buffer/bufmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.120 2001/11/10 23:51:14 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.121 2002/03/02 21:39:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -443,7 +443,7 @@ BufferAlloc(Relation reln,
*/ */
if (buf->flags & BM_JUST_DIRTIED) if (buf->flags & BM_JUST_DIRTIED)
{ {
elog(STOP, "BufferAlloc: content of block %u (%u/%u) changed while flushing", elog(PANIC, "BufferAlloc: content of block %u (%u/%u) changed while flushing",
buf->tag.blockNum, buf->tag.blockNum,
buf->tag.rnode.tblNode, buf->tag.rnode.relNode); buf->tag.rnode.tblNode, buf->tag.rnode.relNode);
} }
@ -804,7 +804,7 @@ BufferSync()
} }
if (status == SM_FAIL) /* disk failure ?! */ if (status == SM_FAIL) /* disk failure ?! */
elog(STOP, "BufferSync: cannot write %u for %u/%u", elog(PANIC, "BufferSync: cannot write %u for %u/%u",
bufHdr->tag.blockNum, bufHdr->tag.blockNum,
bufHdr->tag.rnode.tblNode, bufHdr->tag.rnode.relNode); bufHdr->tag.rnode.tblNode, bufHdr->tag.rnode.relNode);
@ -1371,7 +1371,7 @@ PrintBufferDescs()
LWLockAcquire(BufMgrLock, LW_EXCLUSIVE); LWLockAcquire(BufMgrLock, LW_EXCLUSIVE);
for (i = 0; i < NBuffers; ++i, ++buf) for (i = 0; i < NBuffers; ++i, ++buf)
{ {
elog(DEBUG, "[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, \ elog(LOG, "[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, \
blockNum=%u, flags=0x%x, refcount=%d %ld)", blockNum=%u, flags=0x%x, refcount=%d %ld)",
i, buf->freeNext, buf->freePrev, i, buf->freeNext, buf->freePrev,
buf->tag.rnode.tblNode, buf->tag.rnode.relNode, buf->tag.rnode.tblNode, buf->tag.rnode.relNode,
@ -1566,7 +1566,7 @@ FlushRelationBuffers(Relation rel, BlockNumber firstDelBlock)
(char *) MAKE_PTR(bufHdr->data)); (char *) MAKE_PTR(bufHdr->data));
if (status == SM_FAIL) /* disk failure ?! */ if (status == SM_FAIL) /* disk failure ?! */
elog(STOP, "FlushRelationBuffers: cannot write %u for %u/%u", elog(PANIC, "FlushRelationBuffers: cannot write %u for %u/%u",
bufHdr->tag.blockNum, bufHdr->tag.blockNum,
bufHdr->tag.rnode.tblNode, bufHdr->tag.rnode.tblNode,
bufHdr->tag.rnode.relNode); bufHdr->tag.rnode.relNode);

64
src/backend/storage/file/fd.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.88 2002/02/10 22:56:31 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.89 2002/03/02 21:39:29 momjian Exp $
* *
* NOTES: * NOTES:
* *
@ -270,7 +270,7 @@ tryAgain:
{ {
int save_errno = errno; int save_errno = errno;
DO_DB(elog(DEBUG, "BasicOpenFile: not enough descs, retry, er= %d", DO_DB(elog(LOG, "BasicOpenFile: not enough descs, retry, er= %d",
errno)); errno));
errno = 0; errno = 0;
if (ReleaseLruFile()) if (ReleaseLruFile())
@ -304,7 +304,7 @@ pg_nofile(void)
#else #else
no_files = (long) max_files_per_process; no_files = (long) max_files_per_process;
#endif #endif
elog(DEBUG, "pg_nofile: sysconf(_SC_OPEN_MAX) failed; using %ld", elog(LOG, "pg_nofile: sysconf(_SC_OPEN_MAX) failed; using %ld",
no_files); no_files);
} }
#else /* !HAVE_SYSCONF */ #else /* !HAVE_SYSCONF */
@ -353,7 +353,7 @@ _dump_lru(void)
sprintf(buf + strlen(buf), "%d ", mru); sprintf(buf + strlen(buf), "%d ", mru);
} }
sprintf(buf + strlen(buf), "LEAST"); sprintf(buf + strlen(buf), "LEAST");
elog(DEBUG, buf); elog(LOG, buf);
} }
#endif /* FDDEBUG */ #endif /* FDDEBUG */
@ -364,7 +364,7 @@ Delete(File file)
Assert(file != 0); Assert(file != 0);
DO_DB(elog(DEBUG, "Delete %d (%s)", DO_DB(elog(LOG, "Delete %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
DO_DB(_dump_lru()); DO_DB(_dump_lru());
@ -383,7 +383,7 @@ LruDelete(File file)
Assert(file != 0); Assert(file != 0);
DO_DB(elog(DEBUG, "LruDelete %d (%s)", DO_DB(elog(LOG, "LruDelete %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
vfdP = &VfdCache[file]; vfdP = &VfdCache[file];
@ -399,14 +399,14 @@ LruDelete(File file)
if (vfdP->fdstate & FD_DIRTY) if (vfdP->fdstate & FD_DIRTY)
{ {
if (pg_fsync(vfdP->fd)) if (pg_fsync(vfdP->fd))
elog(DEBUG, "LruDelete: failed to fsync %s: %m", elog(LOG, "LruDelete: failed to fsync %s: %m",
vfdP->fileName); vfdP->fileName);
vfdP->fdstate &= ~FD_DIRTY; vfdP->fdstate &= ~FD_DIRTY;
} }
/* close the file */ /* close the file */
if (close(vfdP->fd)) if (close(vfdP->fd))
elog(DEBUG, "LruDelete: failed to close %s: %m", elog(LOG, "LruDelete: failed to close %s: %m",
vfdP->fileName); vfdP->fileName);
--nfile; --nfile;
@ -420,7 +420,7 @@ Insert(File file)
Assert(file != 0); Assert(file != 0);
DO_DB(elog(DEBUG, "Insert %d (%s)", DO_DB(elog(LOG, "Insert %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
DO_DB(_dump_lru()); DO_DB(_dump_lru());
@ -441,7 +441,7 @@ LruInsert(File file)
Assert(file != 0); Assert(file != 0);
DO_DB(elog(DEBUG, "LruInsert %d (%s)", DO_DB(elog(LOG, "LruInsert %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
vfdP = &VfdCache[file]; vfdP = &VfdCache[file];
@ -463,12 +463,12 @@ LruInsert(File file)
vfdP->fileMode); vfdP->fileMode);
if (vfdP->fd < 0) if (vfdP->fd < 0)
{ {
DO_DB(elog(DEBUG, "RE_OPEN FAILED: %d", errno)); DO_DB(elog(LOG, "RE_OPEN FAILED: %d", errno));
return vfdP->fd; return vfdP->fd;
} }
else else
{ {
DO_DB(elog(DEBUG, "RE_OPEN SUCCESS")); DO_DB(elog(LOG, "RE_OPEN SUCCESS"));
++nfile; ++nfile;
} }
@ -494,7 +494,7 @@ LruInsert(File file)
static bool static bool
ReleaseLruFile(void) ReleaseLruFile(void)
{ {
DO_DB(elog(DEBUG, "ReleaseLruFile. Opened %d", nfile)); DO_DB(elog(LOG, "ReleaseLruFile. Opened %d", nfile));
if (nfile > 0) if (nfile > 0)
{ {
@ -515,7 +515,7 @@ AllocateVfd(void)
Index i; Index i;
File file; File file;
DO_DB(elog(DEBUG, "AllocateVfd. Size %d", SizeVfdCache)); DO_DB(elog(LOG, "AllocateVfd. Size %d", SizeVfdCache));
if (SizeVfdCache == 0) if (SizeVfdCache == 0)
{ {
@ -587,7 +587,7 @@ FreeVfd(File file)
{ {
Vfd *vfdP = &VfdCache[file]; Vfd *vfdP = &VfdCache[file];
DO_DB(elog(DEBUG, "FreeVfd: %d (%s)", DO_DB(elog(LOG, "FreeVfd: %d (%s)",
file, vfdP->fileName ? vfdP->fileName : "")); file, vfdP->fileName ? vfdP->fileName : ""));
if (vfdP->fileName != NULL) if (vfdP->fileName != NULL)
@ -637,7 +637,7 @@ FileAccess(File file)
{ {
int returnValue; int returnValue;
DO_DB(elog(DEBUG, "FileAccess %d (%s)", DO_DB(elog(LOG, "FileAccess %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
/* /*
@ -691,7 +691,7 @@ fileNameOpenFile(FileName fileName,
if (fileName == NULL) if (fileName == NULL)
elog(ERROR, "fileNameOpenFile: NULL fname"); elog(ERROR, "fileNameOpenFile: NULL fname");
DO_DB(elog(DEBUG, "fileNameOpenFile: %s %x %o", DO_DB(elog(LOG, "fileNameOpenFile: %s %x %o",
fileName, fileFlags, fileMode)); fileName, fileFlags, fileMode));
file = AllocateVfd(); file = AllocateVfd();
@ -711,7 +711,7 @@ fileNameOpenFile(FileName fileName,
return -1; return -1;
} }
++nfile; ++nfile;
DO_DB(elog(DEBUG, "fileNameOpenFile: success %d", DO_DB(elog(LOG, "fileNameOpenFile: success %d",
vfdP->fd)); vfdP->fd));
Insert(file); Insert(file);
@ -830,7 +830,7 @@ FileClose(File file)
Assert(FileIsValid(file)); Assert(FileIsValid(file));
DO_DB(elog(DEBUG, "FileClose: %d (%s)", DO_DB(elog(LOG, "FileClose: %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
vfdP = &VfdCache[file]; vfdP = &VfdCache[file];
@ -844,14 +844,14 @@ FileClose(File file)
if (vfdP->fdstate & FD_DIRTY) if (vfdP->fdstate & FD_DIRTY)
{ {
if (pg_fsync(vfdP->fd)) if (pg_fsync(vfdP->fd))
elog(DEBUG, "FileClose: failed to fsync %s: %m", elog(LOG, "FileClose: failed to fsync %s: %m",
vfdP->fileName); vfdP->fileName);
vfdP->fdstate &= ~FD_DIRTY; vfdP->fdstate &= ~FD_DIRTY;
} }
/* close the file */ /* close the file */
if (close(vfdP->fd)) if (close(vfdP->fd))
elog(DEBUG, "FileClose: failed to close %s: %m", elog(LOG, "FileClose: failed to close %s: %m",
vfdP->fileName); vfdP->fileName);
--nfile; --nfile;
@ -866,7 +866,7 @@ FileClose(File file)
/* reset flag so that die() interrupt won't cause problems */ /* reset flag so that die() interrupt won't cause problems */
vfdP->fdstate &= ~FD_TEMPORARY; vfdP->fdstate &= ~FD_TEMPORARY;
if (unlink(vfdP->fileName)) if (unlink(vfdP->fileName))
elog(DEBUG, "FileClose: failed to unlink %s: %m", elog(LOG, "FileClose: failed to unlink %s: %m",
vfdP->fileName); vfdP->fileName);
} }
@ -884,7 +884,7 @@ FileUnlink(File file)
{ {
Assert(FileIsValid(file)); Assert(FileIsValid(file));
DO_DB(elog(DEBUG, "FileUnlink: %d (%s)", DO_DB(elog(LOG, "FileUnlink: %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
/* force FileClose to delete it */ /* force FileClose to delete it */
@ -900,7 +900,7 @@ FileRead(File file, char *buffer, int amount)
Assert(FileIsValid(file)); Assert(FileIsValid(file));
DO_DB(elog(DEBUG, "FileRead: %d (%s) %ld %d %p", DO_DB(elog(LOG, "FileRead: %d (%s) %ld %d %p",
file, VfdCache[file].fileName, file, VfdCache[file].fileName,
VfdCache[file].seekPos, amount, buffer)); VfdCache[file].seekPos, amount, buffer));
@ -921,7 +921,7 @@ FileWrite(File file, char *buffer, int amount)
Assert(FileIsValid(file)); Assert(FileIsValid(file));
DO_DB(elog(DEBUG, "FileWrite: %d (%s) %ld %d %p", DO_DB(elog(LOG, "FileWrite: %d (%s) %ld %d %p",
file, VfdCache[file].fileName, file, VfdCache[file].fileName,
VfdCache[file].seekPos, amount, buffer)); VfdCache[file].seekPos, amount, buffer));
@ -947,7 +947,7 @@ FileSeek(File file, long offset, int whence)
{ {
Assert(FileIsValid(file)); Assert(FileIsValid(file));
DO_DB(elog(DEBUG, "FileSeek: %d (%s) %ld %ld %d", DO_DB(elog(LOG, "FileSeek: %d (%s) %ld %ld %d",
file, VfdCache[file].fileName, file, VfdCache[file].fileName,
VfdCache[file].seekPos, offset, whence)); VfdCache[file].seekPos, offset, whence));
@ -1005,7 +1005,7 @@ long
FileTell(File file) FileTell(File file)
{ {
Assert(FileIsValid(file)); Assert(FileIsValid(file));
DO_DB(elog(DEBUG, "FileTell %d (%s)", DO_DB(elog(LOG, "FileTell %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
return VfdCache[file].seekPos; return VfdCache[file].seekPos;
} }
@ -1018,7 +1018,7 @@ FileTruncate(File file, long offset)
Assert(FileIsValid(file)); Assert(FileIsValid(file));
DO_DB(elog(DEBUG, "FileTruncate %d (%s)", DO_DB(elog(LOG, "FileTruncate %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
FileSync(file); FileSync(file);
@ -1117,7 +1117,7 @@ FileMarkDirty(File file)
{ {
Assert(FileIsValid(file)); Assert(FileIsValid(file));
DO_DB(elog(DEBUG, "FileMarkDirty: %d (%s)", DO_DB(elog(LOG, "FileMarkDirty: %d (%s)",
file, VfdCache[file].fileName)); file, VfdCache[file].fileName));
VfdCache[file].fdstate |= FD_DIRTY; VfdCache[file].fdstate |= FD_DIRTY;
@ -1147,7 +1147,7 @@ AllocateFile(char *name, char *mode)
{ {
FILE *file; FILE *file;
DO_DB(elog(DEBUG, "AllocateFile: Allocated %d", numAllocatedFiles)); DO_DB(elog(LOG, "AllocateFile: Allocated %d", numAllocatedFiles));
if (numAllocatedFiles >= MAX_ALLOCATED_FILES) if (numAllocatedFiles >= MAX_ALLOCATED_FILES)
elog(ERROR, "AllocateFile: too many private FDs demanded"); elog(ERROR, "AllocateFile: too many private FDs demanded");
@ -1164,7 +1164,7 @@ TryAgain:
{ {
int save_errno = errno; int save_errno = errno;
DO_DB(elog(DEBUG, "AllocateFile: not enough descs, retry, er= %d", DO_DB(elog(LOG, "AllocateFile: not enough descs, retry, er= %d",
errno)); errno));
errno = 0; errno = 0;
if (ReleaseLruFile()) if (ReleaseLruFile())
@ -1180,7 +1180,7 @@ FreeFile(FILE *file)
{ {
int i; int i;
DO_DB(elog(DEBUG, "FreeFile: Allocated %d", numAllocatedFiles)); DO_DB(elog(LOG, "FreeFile: Allocated %d", numAllocatedFiles));
/* Remove file from list of allocated files, if it's present */ /* Remove file from list of allocated files, if it's present */
for (i = numAllocatedFiles; --i >= 0;) for (i = numAllocatedFiles; --i >= 0;)

11
src/backend/storage/ipc/ipc.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.75 2001/11/05 17:46:28 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.76 2002/03/02 21:39:29 momjian Exp $
* *
* NOTES * NOTES
* *
@ -131,8 +131,7 @@ proc_exit(int code)
InterruptHoldoffCount = 1; InterruptHoldoffCount = 1;
CritSectionCount = 0; CritSectionCount = 0;
if (DebugLvl > 1) elog(DEBUG2, "proc_exit(%d)", code);
elog(DEBUG, "proc_exit(%d)", code);
/* do our shared memory exits first */ /* do our shared memory exits first */
shmem_exit(code); shmem_exit(code);
@ -150,8 +149,7 @@ proc_exit(int code)
(*on_proc_exit_list[on_proc_exit_index].function) (code, (*on_proc_exit_list[on_proc_exit_index].function) (code,
on_proc_exit_list[on_proc_exit_index].arg); on_proc_exit_list[on_proc_exit_index].arg);
if (DebugLvl > 1) elog(DEBUG2, "exit(%d)", code);
elog(DEBUG, "exit(%d)", code);
exit(code); exit(code);
} }
@ -164,8 +162,7 @@ proc_exit(int code)
void void
shmem_exit(int code) shmem_exit(int code)
{ {
if (DebugLvl > 1) elog(DEBUG2, "shmem_exit(%d)", code);
elog(DEBUG, "shmem_exit(%d)", code);
/* /*
* call all the registered callbacks. * call all the registered callbacks.

5
src/backend/storage/ipc/ipci.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.45 2001/11/04 19:55:31 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.46 2002/03/02 21:39:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -65,8 +65,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int maxBackends)
/* might as well round it off to a multiple of a typical page size */ /* might as well round it off to a multiple of a typical page size */
size += 8192 - (size % 8192); size += 8192 - (size % 8192);
if (DebugLvl > 1) elog(DEBUG2, "invoking IpcMemoryCreate(size=%d)", size);
fprintf(stderr, "invoking IpcMemoryCreate(size=%d)\n", size);
/* /*
* Create the shmem segment * Create the shmem segment

6
src/backend/storage/ipc/sinval.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.43 2001/10/25 05:49:42 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.44 2002/03/02 21:39:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -66,7 +66,7 @@ SendSharedInvalidMessage(SharedInvalidationMessage *msg)
insertOK = SIInsertDataEntry(shmInvalBuffer, msg); insertOK = SIInsertDataEntry(shmInvalBuffer, msg);
LWLockRelease(SInvalLock); LWLockRelease(SInvalLock);
if (!insertOK) if (!insertOK)
elog(DEBUG, "SendSharedInvalidMessage: SI buffer overflow"); elog(LOG, "SendSharedInvalidMessage: SI buffer overflow");
} }
/* /*
@ -108,7 +108,7 @@ ReceiveSharedInvalidMessages(
if (getResult < 0) if (getResult < 0)
{ {
/* got a reset message */ /* got a reset message */
elog(DEBUG, "ReceiveSharedInvalidMessages: cache state reset"); elog(LOG, "ReceiveSharedInvalidMessages: cache state reset");
resetFunction(); resetFunction();
} }
else else

7
src/backend/storage/ipc/sinvaladt.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.43 2001/11/05 17:46:28 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.44 2002/03/02 21:39:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -119,7 +119,7 @@ SIBackendInit(SISeg *segP)
MyBackendId = (stateP - &segP->procState[0]) + 1; MyBackendId = (stateP - &segP->procState[0]) + 1;
#ifdef INVALIDDEBUG #ifdef INVALIDDEBUG
elog(DEBUG, "SIBackendInit: backend id %d", MyBackendId); elog(LOG, "SIBackendInit: backend id %d", MyBackendId);
#endif /* INVALIDDEBUG */ #endif /* INVALIDDEBUG */
/* mark myself active, with all extant messages already read */ /* mark myself active, with all extant messages already read */
@ -218,8 +218,7 @@ SIInsertDataEntry(SISeg *segP, SharedInvalidationMessage *data)
if (numMsgs == (MAXNUMMESSAGES * 70 / 100) && if (numMsgs == (MAXNUMMESSAGES * 70 / 100) &&
IsUnderPostmaster) IsUnderPostmaster)
{ {
if (DebugLvl >= 1) elog(DEBUG1, "SIInsertDataEntry: table is 70%% full, signaling postmaster");
elog(DEBUG, "SIInsertDataEntry: table is 70%% full, signaling postmaster");
SendPostmasterSignal(PMSIGNAL_WAKEN_CHILDREN); SendPostmasterSignal(PMSIGNAL_WAKEN_CHILDREN);
} }

18
src/backend/storage/lmgr/lock.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.104 2001/11/05 17:46:28 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.105 2002/03/02 21:39:29 momjian Exp $
* *
* NOTES * NOTES
* Outside modules can create a lock table and acquire/release * Outside modules can create a lock table and acquire/release
@ -107,7 +107,7 @@ inline static void
LOCK_PRINT(const char *where, const LOCK *lock, LOCKMODE type) LOCK_PRINT(const char *where, const LOCK *lock, LOCKMODE type)
{ {
if (LOCK_DEBUG_ENABLED(lock)) if (LOCK_DEBUG_ENABLED(lock))
elog(DEBUG, elog(LOG,
"%s: lock(%lx) tbl(%d) rel(%u) db(%u) obj(%u) grantMask(%x) " "%s: lock(%lx) tbl(%d) rel(%u) db(%u) obj(%u) grantMask(%x) "
"req(%d,%d,%d,%d,%d,%d,%d)=%d " "req(%d,%d,%d,%d,%d,%d,%d)=%d "
"grant(%d,%d,%d,%d,%d,%d,%d)=%d wait(%d) type(%s)", "grant(%d,%d,%d,%d,%d,%d,%d)=%d wait(%d) type(%s)",
@ -133,7 +133,7 @@ HOLDER_PRINT(const char *where, const HOLDER *holderP)
&& (((LOCK *) MAKE_PTR(holderP->tag.lock))->tag.relId >= (Oid) Trace_lock_oidmin)) && (((LOCK *) MAKE_PTR(holderP->tag.lock))->tag.relId >= (Oid) Trace_lock_oidmin))
|| (Trace_lock_table && (((LOCK *) MAKE_PTR(holderP->tag.lock))->tag.relId == Trace_lock_table)) || (Trace_lock_table && (((LOCK *) MAKE_PTR(holderP->tag.lock))->tag.relId == Trace_lock_table))
) )
elog(DEBUG, elog(LOG,
"%s: holder(%lx) lock(%lx) tbl(%d) proc(%lx) xid(%u) hold(%d,%d,%d,%d,%d,%d,%d)=%d", "%s: holder(%lx) lock(%lx) tbl(%d) proc(%lx) xid(%u) hold(%d,%d,%d,%d,%d,%d,%d)=%d",
where, MAKE_OFFSET(holderP), holderP->tag.lock, where, MAKE_OFFSET(holderP), holderP->tag.lock,
HOLDER_LOCKMETHOD(*(holderP)), HOLDER_LOCKMETHOD(*(holderP)),
@ -461,7 +461,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag,
#ifdef LOCK_DEBUG #ifdef LOCK_DEBUG
if (lockmethod == USER_LOCKMETHOD && Trace_userlocks) if (lockmethod == USER_LOCKMETHOD && Trace_userlocks)
elog(DEBUG, "LockAcquire: user lock [%u] %s", elog(LOG, "LockAcquire: user lock [%u] %s",
locktag->objId.blkno, lock_mode_names[lockmode]); locktag->objId.blkno, lock_mode_names[lockmode]);
#endif #endif
@ -582,7 +582,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag,
{ {
if (i >= (int) lockmode) if (i >= (int) lockmode)
break; /* safe: we have a lock >= req level */ break; /* safe: we have a lock >= req level */
elog(DEBUG, "Deadlock risk: raising lock level" elog(LOG, "Deadlock risk: raising lock level"
" from %s to %s on object %u/%u/%u", " from %s to %s on object %u/%u/%u",
lock_mode_names[i], lock_mode_names[lockmode], lock_mode_names[i], lock_mode_names[lockmode],
lock->tag.relId, lock->tag.dbId, lock->tag.objId.blkno); lock->tag.relId, lock->tag.dbId, lock->tag.objId.blkno);
@ -1000,7 +1000,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag,
#ifdef LOCK_DEBUG #ifdef LOCK_DEBUG
if (lockmethod == USER_LOCKMETHOD && Trace_userlocks) if (lockmethod == USER_LOCKMETHOD && Trace_userlocks)
elog(DEBUG, "LockRelease: user lock tag [%u] %d", locktag->objId.blkno, lockmode); elog(LOG, "LockRelease: user lock tag [%u] %d", locktag->objId.blkno, lockmode);
#endif #endif
/* ???????? This must be changed when short term locks will be used */ /* ???????? This must be changed when short term locks will be used */
@ -1196,7 +1196,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, PROC *proc,
#ifdef LOCK_DEBUG #ifdef LOCK_DEBUG
if (lockmethod == USER_LOCKMETHOD ? Trace_userlocks : Trace_locks) if (lockmethod == USER_LOCKMETHOD ? Trace_userlocks : Trace_locks)
elog(DEBUG, "LockReleaseAll: lockmethod=%d, pid=%d", elog(LOG, "LockReleaseAll: lockmethod=%d, pid=%d",
lockmethod, proc->pid); lockmethod, proc->pid);
#endif #endif
@ -1341,7 +1341,7 @@ next_item:
#ifdef LOCK_DEBUG #ifdef LOCK_DEBUG
if (lockmethod == USER_LOCKMETHOD ? Trace_userlocks : Trace_locks) if (lockmethod == USER_LOCKMETHOD ? Trace_userlocks : Trace_locks)
elog(DEBUG, "LockReleaseAll: done"); elog(LOG, "LockReleaseAll: done");
#endif #endif
return TRUE; return TRUE;
@ -1460,7 +1460,7 @@ DumpAllLocks(void)
LOCK_PRINT("DumpAllLocks", lock, 0); LOCK_PRINT("DumpAllLocks", lock, 0);
} }
else else
elog(DEBUG, "DumpAllLocks: holder->tag.lock = NULL"); elog(LOG, "DumpAllLocks: holder->tag.lock = NULL");
} }
} }

7
src/backend/storage/lmgr/lwlock.c
View File

@ -15,7 +15,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lwlock.c,v 1.8 2002/01/07 16:33:00 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lwlock.c,v 1.9 2002/03/02 21:39:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -68,7 +68,7 @@ inline static void
PRINT_LWDEBUG(const char *where, LWLockId lockid, const volatile LWLock *lock) PRINT_LWDEBUG(const char *where, LWLockId lockid, const volatile LWLock *lock)
{ {
if (Trace_lwlocks) if (Trace_lwlocks)
elog(DEBUG, "%s(%d): excl %d shared %d head %p rOK %d", elog(LOG, "%s(%d): excl %d shared %d head %p rOK %d",
where, (int) lockid, where, (int) lockid,
(int) lock->exclusive, lock->shared, lock->head, (int) lock->exclusive, lock->shared, lock->head,
(int) lock->releaseOK); (int) lock->releaseOK);
@ -78,8 +78,7 @@ inline static void
LOG_LWDEBUG(const char *where, LWLockId lockid, const char *msg) LOG_LWDEBUG(const char *where, LWLockId lockid, const char *msg)
{ {
if (Trace_lwlocks) if (Trace_lwlocks)
elog(DEBUG, "%s(%d): %s", elog(LOG, "%s(%d): %s", where, (int) lockid, msg);
where, (int) lockid, msg);
} }
#else /* not LOCK_DEBUG */ #else /* not LOCK_DEBUG */

6
src/backend/storage/lmgr/proc.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.117 2001/12/28 18:16:43 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.118 2002/03/02 21:39:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -211,7 +211,7 @@ InitProcess(void)
* we are a backend, we inherit this by fork() from the postmaster). * we are a backend, we inherit this by fork() from the postmaster).
*/ */
if (procglobal == NULL) if (procglobal == NULL)
elog(STOP, "InitProcess: Proc Header uninitialized"); elog(PANIC, "InitProcess: Proc Header uninitialized");
if (MyProc != NULL) if (MyProc != NULL)
elog(ERROR, "InitProcess: you already exist"); elog(ERROR, "InitProcess: you already exist");
@ -300,7 +300,7 @@ InitDummyProcess(void)
* inherit this by fork() from the postmaster). * inherit this by fork() from the postmaster).
*/ */
if (ProcGlobal == NULL || DummyProc == NULL) if (ProcGlobal == NULL || DummyProc == NULL)
elog(STOP, "InitDummyProcess: Proc Header uninitialized"); elog(PANIC, "InitDummyProcess: Proc Header uninitialized");
if (MyProc != NULL) if (MyProc != NULL)
elog(ERROR, "InitDummyProcess: you already exist"); elog(ERROR, "InitDummyProcess: you already exist");

10
src/backend/storage/smgr/md.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.89 2001/10/28 06:25:51 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.90 2002/03/02 21:39:30 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -571,7 +571,7 @@ mdblindwrt(RelFileNode rnode,
if (lseek(fd, seekpos, SEEK_SET) != seekpos) if (lseek(fd, seekpos, SEEK_SET) != seekpos)
{ {
elog(DEBUG, "mdblindwrt: lseek(%ld) failed: %m", seekpos); elog(LOG, "mdblindwrt: lseek(%ld) failed: %m", seekpos);
close(fd); close(fd);
return SM_FAIL; return SM_FAIL;
} }
@ -585,13 +585,13 @@ mdblindwrt(RelFileNode rnode,
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
if (errno == 0) if (errno == 0)
errno = ENOSPC; errno = ENOSPC;
elog(DEBUG, "mdblindwrt: write() failed: %m"); elog(LOG, "mdblindwrt: write() failed: %m");
status = SM_FAIL; status = SM_FAIL;
} }
if (close(fd) < 0) if (close(fd) < 0)
{ {
elog(DEBUG, "mdblindwrt: close() failed: %m"); elog(LOG, "mdblindwrt: close() failed: %m");
status = SM_FAIL; status = SM_FAIL;
} }
@ -1085,7 +1085,7 @@ _mdfd_blind_getseg(RelFileNode rnode, BlockNumber blkno)
/* call fd.c to allow other FDs to be closed if needed */ /* call fd.c to allow other FDs to be closed if needed */
fd = BasicOpenFile(path, O_RDWR | PG_BINARY, 0600); fd = BasicOpenFile(path, O_RDWR | PG_BINARY, 0600);
if (fd < 0) if (fd < 0)
elog(DEBUG, "_mdfd_blind_getseg: couldn't open %s: %m", path); elog(LOG, "_mdfd_blind_getseg: couldn't open %s: %m", path);
pfree(path); pfree(path);

4
src/backend/storage/smgr/smgr.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.54 2001/10/25 05:49:43 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.55 2002/03/02 21:39:30 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -582,7 +582,7 @@ smgrsync()
if (smgrsw[i].smgr_sync) if (smgrsw[i].smgr_sync)
{ {
if ((*(smgrsw[i].smgr_sync)) () == SM_FAIL) if ((*(smgrsw[i].smgr_sync)) () == SM_FAIL)
elog(STOP, "storage sync failed on %s: %m", elog(PANIC, "storage sync failed on %s: %m",
DatumGetCString(DirectFunctionCall1(smgrout, DatumGetCString(DirectFunctionCall1(smgrout,
Int16GetDatum(i)))); Int16GetDatum(i))));
} }

82
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.251 2002/03/01 22:45:13 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.252 2002/03/02 21:39:31 momjian Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -370,7 +370,7 @@ pg_parse_query(char *query_string, Oid *typev, int nargs)
List *raw_parsetree_list; List *raw_parsetree_list;
if (Debug_print_query) if (Debug_print_query)
elog(DEBUG, "query: %s", query_string); elog(LOG, "query: %s", query_string);
if (Show_parser_stats) if (Show_parser_stats)
ResetUsage(); ResetUsage();
@ -429,11 +429,11 @@ pg_analyze_and_rewrite(Node *parsetree)
{ {
if (Debug_pretty_print) if (Debug_pretty_print)
{ {
elog(DEBUG, "parse tree:"); elog(LOG, "parse tree:");
nodeDisplay(querytree); nodeDisplay(querytree);
} }
else else
elog(DEBUG, "parse tree: %s", nodeToString(querytree)); elog(LOG, "parse tree: %s", nodeToString(querytree));
} }
if (querytree->commandType == CMD_UTILITY) if (querytree->commandType == CMD_UTILITY)
@ -473,7 +473,7 @@ pg_analyze_and_rewrite(Node *parsetree)
{ {
if (Debug_pretty_print) if (Debug_pretty_print)
{ {
elog(DEBUG, "rewritten parse tree:"); elog(LOG, "rewritten parse tree:");
foreach(list_item, querytree_list) foreach(list_item, querytree_list)
{ {
querytree = (Query *) lfirst(list_item); querytree = (Query *) lfirst(list_item);
@ -483,11 +483,11 @@ pg_analyze_and_rewrite(Node *parsetree)
} }
else else
{ {
elog(DEBUG, "rewritten parse tree:"); elog(LOG, "rewritten parse tree:");
foreach(list_item, querytree_list) foreach(list_item, querytree_list)
{ {
querytree = (Query *) lfirst(list_item); querytree = (Query *) lfirst(list_item);
elog(DEBUG, "%s", nodeToString(querytree)); elog(LOG, "%s", nodeToString(querytree));
} }
} }
} }
@ -541,11 +541,11 @@ pg_plan_query(Query *querytree)
{ {
if (Debug_pretty_print) if (Debug_pretty_print)
{ {
elog(DEBUG, "plan:"); elog(LOG, "plan:");
nodeDisplay(plan); nodeDisplay(plan);
} }
else else
elog(DEBUG, "plan: %s", nodeToString(plan)); elog(LOG, "plan: %s", nodeToString(plan));
} }
return plan; return plan;
@ -759,9 +759,8 @@ pg_exec_query_string(char *query_string, /* string to execute */
* process utility functions (create, destroy, etc..) * process utility functions (create, destroy, etc..)
*/ */
if (Debug_print_query) if (Debug_print_query)
elog(DEBUG, "ProcessUtility: %s", query_string); elog(LOG, "ProcessUtility: %s", query_string);
else if (DebugLvl > 1) else elog(DEBUG2, "ProcessUtility");
elog(DEBUG, "ProcessUtility");
if (querytree->originalQuery) if (querytree->originalQuery)
{ {
@ -805,8 +804,7 @@ pg_exec_query_string(char *query_string, /* string to execute */
} }
else else
{ {
if (DebugLvl > 1) elog(DEBUG2, "ProcessQuery");
elog(DEBUG, "ProcessQuery");
if (querytree->originalQuery) if (querytree->originalQuery)
{ {
@ -916,8 +914,7 @@ pg_exec_query_string(char *query_string, /* string to execute */
static void static void
start_xact_command(void) start_xact_command(void)
{ {
if (DebugLvl >= 1) elog(DEBUG1, "StartTransactionCommand");
elog(DEBUG, "StartTransactionCommand");
StartTransactionCommand(); StartTransactionCommand();
} }
@ -928,8 +925,7 @@ finish_xact_command(void)
DeferredTriggerEndQuery(); DeferredTriggerEndQuery();
/* Now commit the command */ /* Now commit the command */
if (DebugLvl >= 1) elog(DEBUG1, "CommitTransactionCommand");
elog(DEBUG, "CommitTransactionCommand");
CommitTransactionCommand(); CommitTransactionCommand();
@ -1130,7 +1126,7 @@ usage(char *progname)
#endif #endif
printf(" -B NBUFFERS number of shared buffers (default %d)\n", DEF_NBUFFERS); printf(" -B NBUFFERS number of shared buffers (default %d)\n", DEF_NBUFFERS);
printf(" -c NAME=VALUE set run-time parameter\n"); printf(" -c NAME=VALUE set run-time parameter\n");
printf(" -d 1-5 debugging level\n"); printf(" -d 1-5,0 debugging level (0 is off)\n");
printf(" -D DATADIR database directory\n"); printf(" -D DATADIR database directory\n");
printf(" -e use European date format\n"); printf(" -e use European date format\n");
printf(" -E echo query before execution\n"); printf(" -E echo query before execution\n");
@ -1281,17 +1277,37 @@ PostgresMain(int argc, char *argv[], const char *username)
break; break;
case 'd': /* debug level */ case 'd': /* debug level */
SetConfigOption("debug_level", optarg, ctx, gucsource); {
if (DebugLvl >= 1) /* Set server debugging level. */
if (atoi(optarg) != 0)
{
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
sprintf(debugstr, "debug%s", optarg);
SetConfigOption("server_min_messages", debugstr, ctx, gucsource);
pfree(debugstr);
/*
* -d is not the same as setting client_min_messages
* because it enables other output options.
*/
if (atoi(optarg) >= 1)
SetConfigOption("log_connections", "true", ctx, gucsource); SetConfigOption("log_connections", "true", ctx, gucsource);
if (DebugLvl >= 2) if (atoi(optarg) >= 2)
SetConfigOption("debug_print_query", "true", ctx, gucsource); SetConfigOption("debug_print_query", "true", ctx, gucsource);
if (DebugLvl >= 3) if (atoi(optarg) >= 3)
SetConfigOption("debug_print_parse", "true", ctx, gucsource); SetConfigOption("debug_print_parse", "true", ctx, gucsource);
if (DebugLvl >= 4) if (atoi(optarg) >= 4)
SetConfigOption("debug_print_plan", "true", ctx, gucsource); SetConfigOption("debug_print_plan", "true", ctx, gucsource);
if (DebugLvl >= 5) if (atoi(optarg) >= 5)
SetConfigOption("debug_print_rewritten", "true", ctx, gucsource); SetConfigOption("debug_print_rewritten", "true", ctx, gucsource);
}
else
/*
* -d 0 allows user to prevent postmaster debug from
* propogating to backend.
*/
SetConfigOption("server_min_messages", "notice", PGC_POSTMASTER, PGC_S_ARGV);
}
break; break;
case 'E': case 'E':
@ -1682,8 +1698,7 @@ PostgresMain(int argc, char *argv[], const char *username)
* putting it inside InitPostgres() instead. In particular, anything * putting it inside InitPostgres() instead. In particular, anything
* that involves database access should be there, not here. * that involves database access should be there, not here.
*/ */
if (DebugLvl > 1) elog(DEBUG2, "InitPostgres");
elog(DEBUG, "InitPostgres");
InitPostgres(DBName, username); InitPostgres(DBName, username);
SetProcessingMode(NormalProcessing); SetProcessingMode(NormalProcessing);
@ -1707,7 +1722,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.251 $ $Date: 2002/03/01 22:45:13 $\n"); puts("$Revision: 1.252 $ $Date: 2002/03/02 21:39:31 $\n");
} }
/* /*
@ -1765,8 +1780,7 @@ PostgresMain(int argc, char *argv[], const char *username)
MemoryContextSwitchTo(ErrorContext); MemoryContextSwitchTo(ErrorContext);
/* Do the recovery */ /* Do the recovery */
if (DebugLvl >= 1) elog(DEBUG1, "AbortCurrentTransaction");
elog(DEBUG, "AbortCurrentTransaction");
AbortCurrentTransaction(); AbortCurrentTransaction();
/* /*
@ -2086,7 +2100,7 @@ ShowUsage(const char *title)
if (str.data[str.len-1] == '\n') if (str.data[str.len-1] == '\n')
str.data[--str.len] = '\0'; str.data[--str.len] = '\0';
elog(DEBUG, "%s\n%s", title, str.data); elog(LOG, "%s\n%s", title, str.data);
pfree(str.data); pfree(str.data);
} }
@ -2108,10 +2122,10 @@ assertTest(int val)
if (assert_enabled) if (assert_enabled)
{ {
/* val != 0 should be trapped by previous Assert */ /* val != 0 should be trapped by previous Assert */
elog(NOTICE, "Assert test successfull (val = %d)", val); elog(INFO, "Assert test successfull (val = %d)", val);
} }
else else
elog(NOTICE, "Assert checking is disabled (val = %d)", val); elog(INFO, "Assert checking is disabled (val = %d)", val);
return val; return val;
} }
@ -2383,7 +2397,7 @@ CreateCommandTag(Node *parsetree)
break; break;
default: default:
elog(DEBUG, "CreateCommandTag: unknown parse node type %d", elog(LOG, "CreateCommandTag: unknown parse node type %d",
nodeTag(parsetree)); nodeTag(parsetree));
tag = "???"; tag = "???";
break; break;

6
src/backend/utils/adt/acl.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.67 2002/02/18 23:11:22 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.68 2002/03/02 21:39:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -122,7 +122,7 @@ aclparse(const char *s, AclItem *aip, unsigned *modechg)
Assert(s && aip && modechg); Assert(s && aip && modechg);
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "aclparse: input = '%s'", s); elog(LOG, "aclparse: input = '%s'", s);
#endif #endif
aip->ai_idtype = ACL_IDTYPE_UID; aip->ai_idtype = ACL_IDTYPE_UID;
s = getid(s, name); s = getid(s, name);
@ -204,7 +204,7 @@ aclparse(const char *s, AclItem *aip, unsigned *modechg)
} }
#ifdef ACLDEBUG #ifdef ACLDEBUG
elog(DEBUG, "aclparse: correctly read [%x %d %x], modechg=%x", elog(LOG, "aclparse: correctly read [%x %d %x], modechg=%x",
aip->ai_idtype, aip->ai_id, aip->ai_mode, *modechg); aip->ai_idtype, aip->ai_id, aip->ai_mode, *modechg);
#endif #endif
return s; return s;

4
src/backend/utils/adt/format_type.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.23 2001/11/19 19:51:20 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.24 2002/03/02 21:39:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -294,7 +294,7 @@ format_type_internal(Oid type_oid, int32 typemod,
fieldstr = ""; fieldstr = "";
break; break;
default: default:
elog(DEBUG, "Invalid INTERVAL typmod 0x%x", typemod); elog(LOG, "Invalid INTERVAL typmod 0x%x", typemod);
fieldstr = ""; fieldstr = "";
break; break;
} }

6
src/backend/utils/adt/pg_locale.c
View File

@ -4,7 +4,7 @@
* The PostgreSQL locale utils. * The PostgreSQL locale utils.
* *
* *
* $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.13 2001/11/05 17:46:29 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/pg_locale.c,v 1.14 2002/03/02 21:39:32 momjian Exp $
* *
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
* *
@ -86,7 +86,7 @@ static void
PGLC_debug_lc(PG_LocaleCategories *lc) PGLC_debug_lc(PG_LocaleCategories *lc)
{ {
#ifdef LC_MESSAGES #ifdef LC_MESSAGES
elog(DEBUG, "CURRENT LOCALE ENVIRONMENT:\n\nLANG: \t%s\nLC_CTYPE:\t%s\nLC_NUMERIC:\t%s\nLC_TIME:\t%s\nLC_COLLATE:\t%s\nLC_MONETARY:\t%s\nLC_MESSAGES:\t%s\n", elog(LOG, "CURRENT LOCALE ENVIRONMENT:\n\nLANG: \t%s\nLC_CTYPE:\t%s\nLC_NUMERIC:\t%s\nLC_TIME:\t%s\nLC_COLLATE:\t%s\nLC_MONETARY:\t%s\nLC_MESSAGES:\t%s\n",
lc->lang, lc->lang,
lc->lc_ctype, lc->lc_ctype,
lc->lc_numeric, lc->lc_numeric,
@ -95,7 +95,7 @@ PGLC_debug_lc(PG_LocaleCategories *lc)
lc->lc_monetary, lc->lc_monetary,
lc->lc_messages); lc->lc_messages);
#else #else
elog(DEBUG, "CURRENT LOCALE ENVIRONMENT:\n\nLANG: \t%s\nLC_CTYPE:\t%s\nLC_NUMERIC:\t%s\nLC_TIME:\t%s\nLC_COLLATE:\t%s\nLC_MONETARY:\t%s\n", elog(LOG, "CURRENT LOCALE ENVIRONMENT:\n\nLANG: \t%s\nLC_CTYPE:\t%s\nLC_NUMERIC:\t%s\nLC_TIME:\t%s\nLC_COLLATE:\t%s\nLC_MONETARY:\t%s\n",
lc->lang, lc->lang,
lc->lc_ctype, lc->lc_ctype,
lc->lc_numeric, lc->lc_numeric,

4
src/backend/utils/adt/selfuncs.c
View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.104 2002/03/01 04:09:25 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.105 2002/03/02 21:39:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3169,7 +3169,7 @@ locale_is_like_safe(void)
return (bool) result; return (bool) result;
localeptr = setlocale(LC_COLLATE, NULL); localeptr = setlocale(LC_COLLATE, NULL);
if (!localeptr) if (!localeptr)
elog(STOP, "Invalid LC_COLLATE setting"); elog(PANIC, "Invalid LC_COLLATE setting");
/* /*
* Currently we accept only "C" and "POSIX" (do any systems still * Currently we accept only "C" and "POSIX" (do any systems still

50
src/backend/utils/cache/catcache.c vendored
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.88 2002/02/25 04:06:50 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.89 2002/03/02 21:39:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -146,14 +146,14 @@ CatCachePrintStats(void)
long cc_hits = 0; long cc_hits = 0;
long cc_newloads = 0; long cc_newloads = 0;
elog(DEBUG, "Catcache stats dump: %d/%d tuples in catcaches", elog(LOG, "Catcache stats dump: %d/%d tuples in catcaches",
CacheHdr->ch_ntup, CacheHdr->ch_maxtup); CacheHdr->ch_ntup, CacheHdr->ch_maxtup);
for (cache = CacheHdr->ch_caches; cache; cache = cache->cc_next) for (cache = CacheHdr->ch_caches; cache; cache = cache->cc_next)
{ {
if (cache->cc_ntup == 0 && cache->cc_searches == 0) if (cache->cc_ntup == 0 && cache->cc_searches == 0)
continue; /* don't print unused caches */ continue; /* don't print unused caches */
elog(DEBUG, "Catcache %s/%s: %d tup, %ld srch, %ld hits, %ld loads, %ld not found", elog(LOG, "Catcache %s/%s: %d tup, %ld srch, %ld hits, %ld loads, %ld not found",
cache->cc_relname, cache->cc_relname,
cache->cc_indname, cache->cc_indname,
cache->cc_ntup, cache->cc_ntup,
@ -165,7 +165,7 @@ CatCachePrintStats(void)
cc_hits += cache->cc_hits; cc_hits += cache->cc_hits;
cc_newloads += cache->cc_newloads; cc_newloads += cache->cc_newloads;
} }
elog(DEBUG, "Catcache totals: %d tup, %ld srch, %ld hits, %ld loads, %ld not found", elog(LOG, "Catcache totals: %d tup, %ld srch, %ld hits, %ld loads, %ld not found",
CacheHdr->ch_ntup, CacheHdr->ch_ntup,
cc_searches, cc_searches,
cc_hits, cc_hits,
@ -208,17 +208,17 @@ CreateCacheMemoryContext(void)
*/ */
#ifdef CACHEDEBUG #ifdef CACHEDEBUG
#define CatalogCacheInitializeCache_DEBUG1 \ #define CatalogCacheInitializeCache_DEBUG1 \
elog(DEBUG, "CatalogCacheInitializeCache: cache @%p %s", cache, \ elog(LOG, "CatalogCacheInitializeCache: cache @%p %s", cache, \
cache->cc_relname) cache->cc_relname)
#define CatalogCacheInitializeCache_DEBUG2 \ #define CatalogCacheInitializeCache_DEBUG2 \
do { \ do { \
if (cache->cc_key[i] > 0) { \ if (cache->cc_key[i] > 0) { \
elog(DEBUG, "CatalogCacheInitializeCache: load %d/%d w/%d, %u", \ elog(LOG, "CatalogCacheInitializeCache: load %d/%d w/%d, %u", \
i+1, cache->cc_nkeys, cache->cc_key[i], \ i+1, cache->cc_nkeys, cache->cc_key[i], \
tupdesc->attrs[cache->cc_key[i] - 1]->atttypid); \ tupdesc->attrs[cache->cc_key[i] - 1]->atttypid); \
} else { \ } else { \
elog(DEBUG, "CatalogCacheInitializeCache: load %d/%d w/%d", \ elog(LOG, "CatalogCacheInitializeCache: load %d/%d w/%d", \
i+1, cache->cc_nkeys, cache->cc_key[i]); \ i+1, cache->cc_nkeys, cache->cc_key[i]); \
} \ } \
} while(0) } while(0)
@ -270,7 +270,7 @@ CatalogCacheInitializeCache(CatCache *cache)
heap_close(relation, NoLock); heap_close(relation, NoLock);
CACHE3_elog(DEBUG, "CatalogCacheInitializeCache: %s, %d keys", CACHE3_elog(LOG, "CatalogCacheInitializeCache: %s, %d keys",
cache->cc_relname, cache->cc_nkeys); cache->cc_relname, cache->cc_nkeys);
/* /*
@ -306,7 +306,7 @@ CatalogCacheInitializeCache(CatCache *cache)
/* Initialize sk_attno suitably for HeapKeyTest() and heap scans */ /* Initialize sk_attno suitably for HeapKeyTest() and heap scans */
cache->cc_skey[i].sk_attno = cache->cc_key[i]; cache->cc_skey[i].sk_attno = cache->cc_key[i];
CACHE4_elog(DEBUG, "CatalogCacheInit %s %d %p", CACHE4_elog(LOG, "CatalogCacheInit %s %d %p",
cache->cc_relname, cache->cc_relname,
i, i,
cache); cache);
@ -350,7 +350,7 @@ CatalogCacheComputeHashIndex(CatCache *cache, ScanKey cur_skey)
{ {
uint32 hashIndex = 0; uint32 hashIndex = 0;
CACHE4_elog(DEBUG, "CatalogCacheComputeHashIndex %s %d %p", CACHE4_elog(LOG, "CatalogCacheComputeHashIndex %s %d %p",
cache->cc_relname, cache->cc_relname,
cache->cc_nkeys, cache->cc_nkeys,
cache); cache);
@ -491,7 +491,7 @@ CatalogCacheIdInvalidate(int cacheId,
* sanity checks * sanity checks
*/ */
Assert(ItemPointerIsValid(pointer)); Assert(ItemPointerIsValid(pointer));
CACHE1_elog(DEBUG, "CatalogCacheIdInvalidate: called"); CACHE1_elog(LOG, "CatalogCacheIdInvalidate: called");
/* /*
* inspect caches to find the proper cache * inspect caches to find the proper cache
@ -521,7 +521,7 @@ CatalogCacheIdInvalidate(int cacheId,
ct->dead = true; ct->dead = true;
else else
CatCacheRemoveCTup(ccp, ct); CatCacheRemoveCTup(ccp, ct);
CACHE1_elog(DEBUG, "CatalogCacheIdInvalidate: invalidated"); CACHE1_elog(LOG, "CatalogCacheIdInvalidate: invalidated");
/* could be multiple matches, so keep looking! */ /* could be multiple matches, so keep looking! */
} }
} }
@ -623,12 +623,12 @@ ResetCatalogCaches(void)
{ {
CatCache *cache; CatCache *cache;
CACHE1_elog(DEBUG, "ResetCatalogCaches called"); CACHE1_elog(LOG, "ResetCatalogCaches called");
for (cache = CacheHdr->ch_caches; cache; cache = cache->cc_next) for (cache = CacheHdr->ch_caches; cache; cache = cache->cc_next)
ResetCatalogCache(cache); ResetCatalogCache(cache);
CACHE1_elog(DEBUG, "end of ResetCatalogCaches call"); CACHE1_elog(LOG, "end of ResetCatalogCaches call");
} }
/* /*
@ -656,7 +656,7 @@ CatalogCacheFlushRelation(Oid relId)
{ {
CatCache *cache; CatCache *cache;
CACHE2_elog(DEBUG, "CatalogCacheFlushRelation called for %u", relId); CACHE2_elog(LOG, "CatalogCacheFlushRelation called for %u", relId);
for (cache = CacheHdr->ch_caches; cache; cache = cache->cc_next) for (cache = CacheHdr->ch_caches; cache; cache = cache->cc_next)
{ {
@ -716,7 +716,7 @@ CatalogCacheFlushRelation(Oid relId)
} }
} }
CACHE1_elog(DEBUG, "end of CatalogCacheFlushRelation call"); CACHE1_elog(LOG, "end of CatalogCacheFlushRelation call");
} }
/* /*
@ -730,7 +730,7 @@ CatalogCacheFlushRelation(Oid relId)
#ifdef CACHEDEBUG #ifdef CACHEDEBUG
#define InitCatCache_DEBUG1 \ #define InitCatCache_DEBUG1 \
do { \ do { \
elog(DEBUG, "InitCatCache: rel=%s id=%d nkeys=%d size=%d\n", \ elog(LOG, "InitCatCache: rel=%s id=%d nkeys=%d size=%d\n", \
cp->cc_relname, cp->id, cp->cc_nkeys, cp->cc_size); \ cp->cc_relname, cp->id, cp->cc_nkeys, cp->cc_size); \
} while(0) } while(0)
@ -958,7 +958,7 @@ SearchCatCache(CatCache *cache,
DLMoveToFront(&ct->cache_elem); DLMoveToFront(&ct->cache_elem);
#ifdef CACHEDEBUG #ifdef CACHEDEBUG
CACHE3_elog(DEBUG, "SearchCatCache(%s): found in bucket %d", CACHE3_elog(LOG, "SearchCatCache(%s): found in bucket %d",
cache->cc_relname, hash); cache->cc_relname, hash);
#endif /* CACHEDEBUG */ #endif /* CACHEDEBUG */
@ -1006,7 +1006,7 @@ SearchCatCache(CatCache *cache,
Buffer buffer; Buffer buffer;
int i; int i;
CACHE2_elog(DEBUG, "SearchCatCache(%s): performing index scan", CACHE2_elog(LOG, "SearchCatCache(%s): performing index scan",
cache->cc_relname); cache->cc_relname);
/* /*
@ -1045,7 +1045,7 @@ SearchCatCache(CatCache *cache,
{ {
HeapScanDesc sd; HeapScanDesc sd;
CACHE2_elog(DEBUG, "SearchCatCache(%s): performing heap scan", CACHE2_elog(LOG, "SearchCatCache(%s): performing heap scan",
cache->cc_relname); cache->cc_relname);
sd = heap_beginscan(relation, 0, SnapshotNow, sd = heap_beginscan(relation, 0, SnapshotNow,
@ -1081,7 +1081,7 @@ SearchCatCache(CatCache *cache,
* Finish initializing the CatCTup header, and add it to the linked * Finish initializing the CatCTup header, and add it to the linked
* lists. * lists.
*/ */
CACHE1_elog(DEBUG, "SearchCatCache: found tuple"); CACHE1_elog(LOG, "SearchCatCache: found tuple");
ct->ct_magic = CT_MAGIC; ct->ct_magic = CT_MAGIC;
ct->my_cache = cache; ct->my_cache = cache;
@ -1112,7 +1112,7 @@ SearchCatCache(CatCache *cache,
if (oldct->refcount == 0) if (oldct->refcount == 0)
{ {
CACHE2_elog(DEBUG, "SearchCatCache(%s): Overflow, LRU removal", CACHE2_elog(LOG, "SearchCatCache(%s): Overflow, LRU removal",
cache->cc_relname); cache->cc_relname);
CatCacheRemoveCTup(oldct->my_cache, oldct); CatCacheRemoveCTup(oldct->my_cache, oldct);
break; break;
@ -1120,9 +1120,9 @@ SearchCatCache(CatCache *cache,
} }
} }
CACHE4_elog(DEBUG, "SearchCatCache(%s): Contains %d/%d tuples", CACHE4_elog(LOG, "SearchCatCache(%s): Contains %d/%d tuples",
cache->cc_relname, cache->cc_ntup, CacheHdr->ch_ntup); cache->cc_relname, cache->cc_ntup, CacheHdr->ch_ntup);
CACHE3_elog(DEBUG, "SearchCatCache(%s): put in bucket %d", CACHE3_elog(LOG, "SearchCatCache(%s): put in bucket %d",
cache->cc_relname, hash); cache->cc_relname, hash);
return &ct->tuple; return &ct->tuple;
@ -1194,7 +1194,7 @@ PrepareToInvalidateCacheTuple(Relation relation,
{ {
CatCache *ccp; CatCache *ccp;
CACHE1_elog(DEBUG, "PrepareToInvalidateCacheTuple: called"); CACHE1_elog(LOG, "PrepareToInvalidateCacheTuple: called");
/* /*
* sanity checks * sanity checks

216
src/backend/utils/error/elog.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.91 2001/11/05 17:46:30 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.92 2002/03/02 21:39:33 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -38,6 +38,16 @@
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif #endif
#define DEFAULT_SERVER_MIN_MESSAGES_STR "notice"
int server_min_messages;
char *server_min_messages_str = NULL;
const char server_min_messages_str_default[] = DEFAULT_SERVER_MIN_MESSAGES_STR;
#define DEFAULT_CLIENT_MIN_MESSAGES_STR "info"
int client_min_messages;
char *client_min_messages_str = NULL;
const char client_min_messages_str_default[] = DEFAULT_CLIENT_MIN_MESSAGES_STR;
#ifdef ENABLE_SYSLOG #ifdef ENABLE_SYSLOG
/* /*
* 0 = only stdout/stderr * 0 = only stdout/stderr
@ -109,7 +119,7 @@ elog(int lev, const char *fmt,...)
* Note that we use malloc() not palloc() because we want to retain * Note that we use malloc() not palloc() because we want to retain
* control if we run out of memory. palloc() would recursively call * control if we run out of memory. palloc() would recursively call
* elog(ERROR), which would be all right except if we are working on a * elog(ERROR), which would be all right except if we are working on a
* FATAL or REALLYFATAL error. We'd lose track of the fatal condition * FATAL or PANIC error. We'd lose track of the fatal condition
* and report a mere ERROR to outer loop, which would be a Bad Thing. * and report a mere ERROR to outer loop, which would be a Bad Thing.
* So, we substitute an appropriate message in-place, without * So, we substitute an appropriate message in-place, without
* downgrading the level if it's above ERROR. * downgrading the level if it's above ERROR.
@ -127,10 +137,47 @@ elog(int lev, const char *fmt,...)
const char *cp; const char *cp;
char *bp; char *bp;
size_t space_needed; size_t space_needed;
bool output_to_server = false;
bool output_to_client = false;
/* size of the prefix needed for timestamp and pid, if enabled */ /* size of the prefix needed for timestamp and pid, if enabled */
size_t timestamp_size; size_t timestamp_size;
/* Check for old elog calls. Codes were renumbered in 7.3. 2002-02-24 */
if (lev < DEBUG5)
elog(FATAL, "Pre-7.3 object file made an elog() call. Recompile.");
if (Use_syslog <= 1 || whereToSendOutput == Debug)
{
if (lev == LOG)
{
if (server_min_messages == LOG)
output_to_server = true;
else if (server_min_messages < FATAL)
output_to_server = true;
}
/* lev != LOG */
else
{
if (server_min_messages == LOG)
{
if (lev >= FATAL)
output_to_server = true;
}
/* Neither is LOG */
else if (lev >= server_min_messages)
output_to_server = true;
}
}
if (lev >= client_min_messages && whereToSendOutput == Remote)
output_to_client = true;
/* optimization to prevent work for messages that would never be output */
if (lev < ERROR && Use_syslog < 1 &&
output_to_server == false && output_to_client == false)
return;
/* Save error str before calling any function that might change errno */ /* Save error str before calling any function that might change errno */
errorstr = useful_strerror(errno); errorstr = useful_strerror(errno);
@ -142,13 +189,13 @@ elog(int lev, const char *fmt,...)
lev = FATAL; lev = FATAL;
/* /*
* If we are inside a critical section, all errors become REALLYFATAL * If we are inside a critical section, all errors become PANIC
* errors. See miscadmin.h. * errors. See miscadmin.h.
*/ */
if (lev == ERROR || lev == FATAL) if (lev == ERROR || lev == FATAL)
{ {
if (CritSectionCount > 0) if (CritSectionCount > 0)
lev = REALLYFATAL; lev = PANIC;
} }
prefix = elog_message_prefix(lev); prefix = elog_message_prefix(lev);
@ -167,12 +214,15 @@ elog(int lev, const char *fmt,...)
* vsnprintf won't know what to do with %m). To keep space * vsnprintf won't know what to do with %m). To keep space
* calculation simple, we only allow one %m. * calculation simple, we only allow one %m.
*/ */
space_needed = timestamp_size + strlen(prefix) space_needed = timestamp_size + strlen(prefix) +
+ strlen(fmt) + strlen(errorstr) + 1; strlen(fmt) + strlen(errorstr) + 1;
if (copy_lineno) if (copy_lineno)
{ {
/* translator: This string will be truncated at 31 characters. */ /*
* Prints the failure line of the COPY. Wow, what a hack! bjm
* Translators: Error message will be truncated at 31 characters.
*/
snprintf(copylineno_buf, 32, gettext("copy: line %d, "), copy_lineno); snprintf(copylineno_buf, 32, gettext("copy: line %d, "), copy_lineno);
space_needed += strlen(copylineno_buf); space_needed += strlen(copylineno_buf);
} }
@ -184,7 +234,7 @@ elog(int lev, const char *fmt,...)
{ {
/* We're up against it, convert to out-of-memory error */ /* We're up against it, convert to out-of-memory error */
fmt_buf = fmt_fixedbuf; fmt_buf = fmt_fixedbuf;
if (lev != FATAL && lev != REALLYFATAL) if (lev != FATAL && lev != PANIC)
{ {
lev = ERROR; lev = ERROR;
prefix = elog_message_prefix(lev); prefix = elog_message_prefix(lev);
@ -213,7 +263,7 @@ elog(int lev, const char *fmt,...)
if (copy_lineno) if (copy_lineno)
{ {
strcat(fmt_buf, copylineno_buf); strcat(fmt_buf, copylineno_buf);
if (lev == ERROR || lev == FATAL || lev == REALLYFATAL) if (lev == ERROR || lev == FATAL || lev == PANIC)
copy_lineno = 0; copy_lineno = 0;
} }
@ -281,7 +331,7 @@ elog(int lev, const char *fmt,...)
{ {
/* We're up against it, convert to out-of-memory error */ /* We're up against it, convert to out-of-memory error */
msg_buf = msg_fixedbuf; msg_buf = msg_fixedbuf;
if (lev != FATAL && lev != REALLYFATAL) if (lev != FATAL && lev != PANIC)
{ {
lev = ERROR; lev = ERROR;
prefix = elog_message_prefix(lev); prefix = elog_message_prefix(lev);
@ -309,9 +359,17 @@ elog(int lev, const char *fmt,...)
switch (lev) switch (lev)
{ {
case DEBUG: case DEBUG1:
case DEBUG2:
case DEBUG3:
case DEBUG4:
case DEBUG5:
syslog_level = LOG_DEBUG; syslog_level = LOG_DEBUG;
break; break;
case LOG:
case INFO:
syslog_level = LOG_INFO;
break;
case NOTICE: case NOTICE:
syslog_level = LOG_NOTICE; syslog_level = LOG_NOTICE;
break; break;
@ -321,7 +379,7 @@ elog(int lev, const char *fmt,...)
case FATAL: case FATAL:
syslog_level = LOG_ERR; syslog_level = LOG_ERR;
break; break;
case REALLYFATAL: case PANIC:
default: default:
syslog_level = LOG_CRIT; syslog_level = LOG_CRIT;
break; break;
@ -334,11 +392,12 @@ elog(int lev, const char *fmt,...)
/* syslog doesn't want a trailing newline, but other destinations do */ /* syslog doesn't want a trailing newline, but other destinations do */
strcat(msg_buf, "\n"); strcat(msg_buf, "\n");
/* write to terminal */ /* Write to server logs or server terminal */
if (Use_syslog <= 1 || whereToSendOutput == Debug) if (output_to_server)
write(2, msg_buf, strlen(msg_buf)); write(2, msg_buf, strlen(msg_buf));
if (lev > DEBUG && whereToSendOutput == Remote) /* Should we output to the client too? */
if (output_to_client)
{ {
/* Send IPC message to the front-end program */ /* Send IPC message to the front-end program */
MemoryContext oldcxt; MemoryContext oldcxt;
@ -351,7 +410,7 @@ elog(int lev, const char *fmt,...)
*/ */
oldcxt = MemoryContextSwitchTo(ErrorContext); oldcxt = MemoryContextSwitchTo(ErrorContext);
if (lev == NOTICE) if (lev <= NOTICE)
/* exclude the timestamp from msg sent to frontend */ /* exclude the timestamp from msg sent to frontend */
send_notice_to_frontend(msg_buf + timestamp_size); send_notice_to_frontend(msg_buf + timestamp_size);
else else
@ -414,7 +473,7 @@ elog(int lev, const char *fmt,...)
* Guard against infinite loop from elog() during error recovery. * Guard against infinite loop from elog() during error recovery.
*/ */
if (InError) if (InError)
elog(REALLYFATAL, "elog: error during error recovery, giving up!"); elog(PANIC, "elog: error during error recovery, giving up!");
InError = true; InError = true;
/* /*
@ -423,7 +482,7 @@ elog(int lev, const char *fmt,...)
siglongjmp(Warn_restart, 1); siglongjmp(Warn_restart, 1);
} }
if (lev == FATAL || lev == REALLYFATAL) if (lev == FATAL || lev == PANIC)
{ {
/* /*
* Serious crash time. Postmaster will observe nonzero process * Serious crash time. Postmaster will observe nonzero process
@ -673,10 +732,10 @@ send_message_to_frontend(int type, const char *msg)
{ {
StringInfoData buf; StringInfoData buf;
AssertArg(type == NOTICE || type == ERROR); AssertArg(type <= ERROR);
pq_beginmessage(&buf); pq_beginmessage(&buf);
pq_sendbyte(&buf, type == NOTICE ? 'N' : 'E'); pq_sendbyte(&buf, type != ERROR ? 'N' : 'E'); /* N is INFO or NOTICE */
pq_sendstring(&buf, msg); pq_sendstring(&buf, msg);
pq_endmessage(&buf); pq_endmessage(&buf);
@ -731,9 +790,19 @@ elog_message_prefix(int lev)
switch (lev) switch (lev)
{ {
case DEBUG: case DEBUG1:
case DEBUG2:
case DEBUG3:
case DEBUG4:
case DEBUG5:
prefix = gettext("DEBUG: "); prefix = gettext("DEBUG: ");
break; break;
case LOG:
prefix = gettext("LOG: ");
break;
case INFO:
prefix = gettext("INFO: ");
break;
case NOTICE: case NOTICE:
prefix = gettext("NOTICE: "); prefix = gettext("NOTICE: ");
break; break;
@ -741,13 +810,112 @@ elog_message_prefix(int lev)
prefix = gettext("ERROR: "); prefix = gettext("ERROR: ");
break; break;
case FATAL: case FATAL:
prefix = gettext("FATAL 1: "); prefix = gettext("FATAL: ");
break; break;
case REALLYFATAL: case PANIC:
prefix = gettext("FATAL 2: "); prefix = gettext("PANIC: ");
break; break;
} }
Assert(prefix != NULL); Assert(prefix != NULL);
return prefix; return prefix;
} }
/*
* GUC support routines
*/
bool
check_server_min_messages(const char *lev)
{
if (strcasecmp(lev, "debug") == 0 ||
strcasecmp(lev, "debug1") == 0 ||
strcasecmp(lev, "debug2") == 0 ||
strcasecmp(lev, "debub3") == 0 ||
strcasecmp(lev, "debug4") == 0 ||
strcasecmp(lev, "debug5") == 0 ||
strcasecmp(lev, "log") == 0 ||
strcasecmp(lev, "info") == 0 ||
strcasecmp(lev, "notice") == 0 ||
strcasecmp(lev, "error") == 0 ||
strcasecmp(lev, "fatal") == 0 ||
strcasecmp(lev, "panic") == 0)
return true;
return false;
}
void
assign_server_min_messages(const char *lev)
{
if (strcasecmp(lev, "debug1") == 0)
server_min_messages = DEBUG1;
else if (strcasecmp(lev, "debug2") == 0)
server_min_messages = DEBUG2;
else if (strcasecmp(lev, "debug3") == 0)
server_min_messages = DEBUG3;
else if (strcasecmp(lev, "debug4") == 0)
server_min_messages = DEBUG4;
else if (strcasecmp(lev, "debug5") == 0)
server_min_messages = DEBUG5;
else if (strcasecmp(lev, "log") == 0)
server_min_messages = LOG;
else if (strcasecmp(lev, "info") == 0)
server_min_messages = INFO;
else if (strcasecmp(lev, "notice") == 0)
server_min_messages = NOTICE;
else if (strcasecmp(lev, "error") == 0)
server_min_messages = ERROR;
else if (strcasecmp(lev, "fatal") == 0)
server_min_messages = FATAL;
else if (strcasecmp(lev, "panic") == 0)
server_min_messages = PANIC;
else
/* Can't get here unless guc.c screwed up */
elog(ERROR, "bogus server_min_messages %s", lev);
}
bool
check_client_min_messages(const char *lev)
{
if (strcasecmp(lev, "debug") == 0 ||
strcasecmp(lev, "debug1") == 0 ||
strcasecmp(lev, "debug2") == 0 ||
strcasecmp(lev, "debug3") == 0 ||
strcasecmp(lev, "debug4") == 0 ||
strcasecmp(lev, "debug5") == 0 ||
strcasecmp(lev, "log") == 0 ||
strcasecmp(lev, "info") == 0 ||
strcasecmp(lev, "notice") == 0 ||
strcasecmp(lev, "error") == 0)
return true;
return false;
}
void
assign_client_min_messages(const char *lev)
{
if (strcasecmp(lev, "debug1") == 0)
client_min_messages = DEBUG1;
else if (strcasecmp(lev, "debug2") == 0)
client_min_messages = DEBUG2;
else if (strcasecmp(lev, "debug3") == 0)
client_min_messages = DEBUG3;
else if (strcasecmp(lev, "debug4") == 0)
client_min_messages = DEBUG4;
else if (strcasecmp(lev, "debug5") == 0)
client_min_messages = DEBUG5;
else if (strcasecmp(lev, "log") == 0)
client_min_messages = LOG;
else if (strcasecmp(lev, "info") == 0)
client_min_messages = INFO;
else if (strcasecmp(lev, "notice") == 0)
client_min_messages = NOTICE;
else if (strcasecmp(lev, "error") == 0)
client_min_messages = ERROR;
else
/* Can't get here unless guc.c screwed up */
elog(ERROR, "bogus client_min_messages %s", lev);
}

5
src/backend/utils/fmgr/dfmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.54 2001/10/25 05:49:48 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.55 2002/03/02 21:39:33 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -399,8 +399,7 @@ find_in_dynamic_libpath(const char *basename)
sprintf(full, "%s/%s", mangled, basename); sprintf(full, "%s/%s", mangled, basename);
pfree(mangled); pfree(mangled);
if (DebugLvl > 1) elog(DEBUG2, "find_in_dynamic_libpath: trying %s", full);
elog(DEBUG, "find_in_dynamic_libpath: trying %s", full);
if (file_exists(full)) if (file_exists(full))
return full; return full;

4
src/backend/utils/hash/dynahash.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.40 2001/10/28 06:25:54 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.41 2002/03/02 21:39:33 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -933,7 +933,7 @@ hash_corrupted(HTAB *hashp)
* systemwide restart. Otherwise, just shut down this one backend. * systemwide restart. Otherwise, just shut down this one backend.
*/ */
if (hashp->isshared) if (hashp->isshared)
elog(STOP, "Hash table '%s' corrupted", hashp->tabname); elog(PANIC, "Hash table '%s' corrupted", hashp->tabname);
else else
elog(FATAL, "Hash table '%s' corrupted", hashp->tabname); elog(FATAL, "Hash table '%s' corrupted", hashp->tabname);
} }

33
src/backend/utils/init/findbe.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.26 2002/02/08 16:30:11 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.27 2002/03/02 21:39:33 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -61,17 +61,13 @@ ValidateBinary(char *path)
*/ */
if (stat(path, &buf) < 0) if (stat(path, &buf) < 0)
{ {
if (DebugLvl > 1) elog(DEBUG2, "ValidateBinary: can't stat \"%s\"", path);
fprintf(stderr, "ValidateBinary: can't stat \"%s\"\n",
path);
return -1; return -1;
} }
if ((buf.st_mode & S_IFMT) != S_IFREG) if ((buf.st_mode & S_IFMT) != S_IFREG)
{ {
if (DebugLvl > 1) elog(DEBUG2, "ValidateBinary: \"%s\" is not a regular file", path);
fprintf(stderr, "ValidateBinary: \"%s\" is not a regular file\n",
path);
return -1; return -1;
} }
@ -92,9 +88,8 @@ ValidateBinary(char *path)
{ {
is_r = buf.st_mode & S_IRUSR; is_r = buf.st_mode & S_IRUSR;
is_x = buf.st_mode & S_IXUSR; is_x = buf.st_mode & S_IXUSR;
if (DebugLvl > 1 && !(is_r && is_x)) if (!(is_r && is_x))
fprintf(stderr, "ValidateBinary: \"%s\" is not user read/execute\n", elog(DEBUG2, "ValidateBinary: \"%s\" is not user read/execute", path);
path);
return is_x ? (is_r ? 0 : -2) : -1; return is_x ? (is_r ? 0 : -2) : -1;
} }
pwp = getpwuid(euid); pwp = getpwuid(euid);
@ -119,16 +114,16 @@ ValidateBinary(char *path)
{ {
is_r = buf.st_mode & S_IRGRP; is_r = buf.st_mode & S_IRGRP;
is_x = buf.st_mode & S_IXGRP; is_x = buf.st_mode & S_IXGRP;
if (DebugLvl > 1 && !(is_r && is_x)) if (!(is_r && is_x))
fprintf(stderr, "ValidateBinary: \"%s\" is not group read/execute\n", elog(DEBUG2, "ValidateBinary: \"%s\" is not group read/execute",
path); path);
return is_x ? (is_r ? 0 : -2) : -1; return is_x ? (is_r ? 0 : -2) : -1;
} }
} }
is_r = buf.st_mode & S_IROTH; is_r = buf.st_mode & S_IROTH;
is_x = buf.st_mode & S_IXOTH; is_x = buf.st_mode & S_IXOTH;
if (DebugLvl > 1 && !(is_r && is_x)) if (!(is_r && is_x))
fprintf(stderr, "ValidateBinary: \"%s\" is not other read/execute\n", elog(DEBUG2, "ValidateBinary: \"%s\" is not other read/execute",
path); path);
return is_x ? (is_r ? 0 : -2) : -1; return is_x ? (is_r ? 0 : -2) : -1;
} }
@ -177,9 +172,7 @@ FindExec(char *full_path, const char *argv0, const char *binary_name)
if (ValidateBinary(buf) == 0) if (ValidateBinary(buf) == 0)
{ {
strncpy(full_path, buf, MAXPGPATH); strncpy(full_path, buf, MAXPGPATH);
if (DebugLvl) elog(DEBUG1, "FindExec: found \"%s\" using argv[0]", full_path);
fprintf(stderr, "FindExec: found \"%s\" using argv[0]\n",
full_path);
return 0; return 0;
} }
fprintf(stderr, "FindExec: invalid binary \"%s\"\n", fprintf(stderr, "FindExec: invalid binary \"%s\"\n",
@ -193,8 +186,7 @@ FindExec(char *full_path, const char *argv0, const char *binary_name)
*/ */
if ((p = getenv("PATH")) && *p) if ((p = getenv("PATH")) && *p)
{ {
if (DebugLvl) elog(DEBUG1, "FindExec: searching PATH ...");
fprintf(stderr, "FindExec: searching PATH ...\n");
path = strdup(p); /* make a modifiable copy */ path = strdup(p); /* make a modifiable copy */
for (startp = path, endp = strchr(path, ':'); for (startp = path, endp = strchr(path, ':');
startp && *startp; startp && *startp;
@ -215,8 +207,7 @@ FindExec(char *full_path, const char *argv0, const char *binary_name)
{ {
case 0: /* found ok */ case 0: /* found ok */
strncpy(full_path, buf, MAXPGPATH); strncpy(full_path, buf, MAXPGPATH);
if (DebugLvl) elog(DEBUG1, "FindExec: found \"%s\" using PATH",
fprintf(stderr, "FindExec: found \"%s\" using PATH\n",
full_path); full_path);
free(path); free(path);
return 0; return 0;

4
src/backend/utils/init/globals.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.62 2001/10/25 05:49:51 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.63 2002/03/02 21:39:33 momjian Exp $
* *
* NOTES * NOTES
* Globals used all over the place should be declared here and not * Globals used all over the place should be declared here and not
@ -69,8 +69,6 @@ Oid MyDatabaseId = InvalidOid;
bool IsUnderPostmaster = false; bool IsUnderPostmaster = false;
int DebugLvl = 0;
int DateStyle = USE_ISO_DATES; int DateStyle = USE_ISO_DATES;
bool EuroDates = false; bool EuroDates = false;
bool HasCTZSet = false; bool HasCTZSet = false;

10
src/backend/utils/init/miscinit.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.83 2002/03/01 22:45:15 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.84 2002/03/02 21:39:33 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -817,13 +817,13 @@ RecordSharedMemoryInLockFile(IpcMemoryKey shmKey, IpcMemoryId shmId)
fd = open(directoryLockFile, O_RDWR | PG_BINARY, 0); fd = open(directoryLockFile, O_RDWR | PG_BINARY, 0);
if (fd < 0) if (fd < 0)
{ {
elog(DEBUG, "Failed to rewrite %s: %m", directoryLockFile); elog(LOG, "Failed to rewrite %s: %m", directoryLockFile);
return; return;
} }
len = read(fd, buffer, sizeof(buffer) - 100); len = read(fd, buffer, sizeof(buffer) - 100);
if (len <= 0) if (len <= 0)
{ {
elog(DEBUG, "Failed to read %s: %m", directoryLockFile); elog(LOG, "Failed to read %s: %m", directoryLockFile);
close(fd); close(fd);
return; return;
} }
@ -836,7 +836,7 @@ RecordSharedMemoryInLockFile(IpcMemoryKey shmKey, IpcMemoryId shmId)
if (ptr == NULL || if (ptr == NULL ||
(ptr = strchr(ptr + 1, '\n')) == NULL) (ptr = strchr(ptr + 1, '\n')) == NULL)
{ {
elog(DEBUG, "Bogus data in %s", directoryLockFile); elog(LOG, "Bogus data in %s", directoryLockFile);
close(fd); close(fd);
return; return;
} }
@ -861,7 +861,7 @@ RecordSharedMemoryInLockFile(IpcMemoryKey shmKey, IpcMemoryId shmId)
/* if write didn't set errno, assume problem is no disk space */ /* if write didn't set errno, assume problem is no disk space */
if (errno == 0) if (errno == 0)
errno = ENOSPC; errno = ENOSPC;
elog(DEBUG, "Failed to write %s: %m", directoryLockFile); elog(LOG, "Failed to write %s: %m", directoryLockFile);
close(fd); close(fd);
return; return;
} }

4
src/backend/utils/misc/guc-file.l
View File

@ -4,7 +4,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.10 2002/02/23 01:31:36 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.11 2002/03/02 21:39:33 momjian Exp $
*/ */
%{ %{
@ -137,7 +137,7 @@ ProcessConfigFile(GucContext context)
Assert(context == PGC_POSTMASTER || context == PGC_BACKEND Assert(context == PGC_POSTMASTER || context == PGC_BACKEND
|| context == PGC_SIGHUP); || context == PGC_SIGHUP);
Assert(DataDir); Assert(DataDir);
elevel = (context == PGC_SIGHUP) ? DEBUG : ERROR; elevel = (context == PGC_SIGHUP) ? DEBUG3 : ERROR;
/* /*
* Open file * Open file

25
src/backend/utils/misc/guc.c
View File

@ -4,7 +4,7 @@
* Support for grand unified configuration scheme, including SET * Support for grand unified configuration scheme, including SET
* command, configuration file, and command line options. * command, configuration file, and command line options.
* *
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.60 2002/03/01 22:45:16 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.61 2002/03/02 21:39:34 momjian Exp $
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
@ -39,6 +39,7 @@
#include "utils/array.h" #include "utils/array.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/datetime.h" #include "utils/datetime.h"
#include "utils/elog.h"
#include "pgstat.h" #include "pgstat.h"
@ -432,11 +433,6 @@ static struct config_int
1000, 25, INT_MAX, NULL, NULL 1000, 25, INT_MAX, NULL, NULL
}, },
{
"debug_level", PGC_USERSET, PGC_S_DEFAULT, &DebugLvl,
0, 0, 16, NULL, NULL
},
#ifdef LOCK_DEBUG #ifdef LOCK_DEBUG
{ {
"trace_lock_oidmin", PGC_SUSET, PGC_S_DEFAULT, &Trace_lock_oidmin, "trace_lock_oidmin", PGC_SUSET, PGC_S_DEFAULT, &Trace_lock_oidmin,
@ -556,6 +552,12 @@ static struct config_real
static struct config_string static struct config_string
ConfigureNamesString[] = ConfigureNamesString[] =
{ {
{
"client_min_messages", PGC_USERSET, PGC_S_DEFAULT, &client_min_messages_str,
client_min_messages_str_default, check_client_min_messages,
assign_client_min_messages
},
{ {
"default_transaction_isolation", PGC_USERSET, PGC_S_DEFAULT, &default_iso_level_string, "default_transaction_isolation", PGC_USERSET, PGC_S_DEFAULT, &default_iso_level_string,
"read committed", check_defaultxactisolevel, assign_defaultxactisolevel "read committed", check_defaultxactisolevel, assign_defaultxactisolevel
@ -571,6 +573,12 @@ static struct config_string
PG_KRB_SRVTAB, NULL, NULL PG_KRB_SRVTAB, NULL, NULL
}, },
{
"server_min_messages", PGC_USERSET, PGC_S_DEFAULT, &server_min_messages_str,
server_min_messages_str_default, check_server_min_messages,
assign_server_min_messages
},
#ifdef ENABLE_SYSLOG #ifdef ENABLE_SYSLOG
{ {
"syslog_facility", PGC_POSTMASTER, PGC_S_DEFAULT, &Syslog_facility, "syslog_facility", PGC_POSTMASTER, PGC_S_DEFAULT, &Syslog_facility,
@ -886,7 +894,7 @@ set_config_option(const char *name, const char *value,
bool makeDefault; bool makeDefault;
if (context == PGC_SIGHUP) if (context == PGC_SIGHUP)
elevel = DEBUG; elevel = DEBUG1;
else if (guc_session_init) else if (guc_session_init)
elevel = NOTICE; elevel = NOTICE;
else else
@ -901,8 +909,7 @@ set_config_option(const char *name, const char *value,
if (record->source > source) if (record->source > source)
{ {
if (DebugLvl > 1) elog(DEBUG2, "setting %s refused because previous source is higher",
elog(DEBUG, "setting %s refused because previous source is higher",
name); name);
return false; return false;
} }

9
src/backend/utils/misc/postgresql.conf.sample
View File

@ -108,8 +108,15 @@
# #
# Debug display # Message display
# #
#server_min_messages = log # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# info, notice, error, log, fatal, panic
#client_min_messages = info # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# log, info, notice, error
#silent_mode = false #silent_mode = false
#log_connections = false #log_connections = false

4
src/bin/initdb/initdb.sh
View File

@ -27,7 +27,7 @@
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.144 2002/03/01 22:45:16 petere Exp $ # $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.145 2002/03/02 21:39:34 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -452,7 +452,7 @@ PGSQL_OPT="-F -D$PGDATA"
if [ "$debug" = yes ] if [ "$debug" = yes ]
then then
BACKEND_TALK_ARG="-d" BACKEND_TALK_ARG="-d 5"
else else
PGSQL_OPT="$PGSQL_OPT -o /dev/null" PGSQL_OPT="$PGSQL_OPT -o /dev/null"
fi fi

5
src/bin/psql/tab-complete.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.41 2001/11/05 17:46:31 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.42 2002/03/02 21:39:34 momjian Exp $
*/ */
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -229,6 +229,8 @@ psql_completion(char *text, int start, int end)
"ksqo", "ksqo",
"geqo", "geqo",
"fsync", "fsync",
"server_min_messages",
"client_min_messages",
"debug_assertions", "debug_assertions",
"debug_print_query", "debug_print_query",
"debug_print_parse", "debug_print_parse",
@ -252,7 +254,6 @@ psql_completion(char *text, int start, int end)
"geqo_random_seed", "geqo_random_seed",
"sort_mem", "sort_mem",
"vacuum_mem", "vacuum_mem",
"debug_level",
"max_expr_depth", "max_expr_depth",
"commit_delay", "commit_delay",
"commit_siblings", "commit_siblings",

4
src/include/bootstrap/bootstrap.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: bootstrap.h,v 1.26 2001/11/05 17:46:31 momjian Exp $ * $Id: bootstrap.h,v 1.27 2002/03/02 21:39:34 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -34,8 +34,6 @@ typedef struct hashnode
extern Relation reldesc; extern Relation reldesc;
extern Form_pg_attribute attrtypes[MAXATTR]; extern Form_pg_attribute attrtypes[MAXATTR];
extern int numattr; extern int numattr;
extern int DebugMode;
extern int BootstrapMain(int ac, char *av[]); extern int BootstrapMain(int ac, char *av[]);
extern void index_register(char *heap, char *ind, IndexInfo *indexInfo); extern void index_register(char *heap, char *ind, IndexInfo *indexInfo);

4
src/include/miscadmin.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: miscadmin.h,v 1.99 2002/02/18 23:11:31 petere Exp $ * $Id: miscadmin.h,v 1.100 2002/03/02 21:39:34 momjian Exp $
* *
* NOTES * NOTES
* some of the information in this file should be moved to * some of the information in this file should be moved to
@ -129,8 +129,6 @@ extern DLLIMPORT Oid MyDatabaseId;
extern bool IsUnderPostmaster; extern bool IsUnderPostmaster;
extern int DebugLvl;
/* Date/Time Configuration /* Date/Time Configuration
* *
* Constants to pass info from runtime environment: * Constants to pass info from runtime environment:

37
src/include/utils/elog.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: elog.h,v 1.30 2001/11/05 17:46:36 momjian Exp $ * $Id: elog.h,v 1.31 2002/03/02 21:39:35 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -15,15 +15,25 @@
#define ELOG_H #define ELOG_H
/* Error level codes */ /* Error level codes */
#define NOTICE 0 /* random info, sent to frontend */ #define DEBUG5 10 /* sent only to server logs, label DEBUG */
#define ERROR (-1) /* user error - return to known state */ #define DEBUG4 11 /* logs in decreasing detail */
#define FATAL 1 /* fatal error - abort process */ #define DEBUG3 12
#define REALLYFATAL 2 /* take down the other backends with me */ #define DEBUG2 13
#define DEBUG (-2) /* debug message */ #define DEBUG1 14
#define LOG 15 /* sent only to server logs by default,
* label LOG. */
#define INFO 16 /* sent only to client by default, for
* informative messages that are part of
* normal query operation. */
#define NOTICE 17 /* sent to client and server by default,
* important messages, for unusual cases that
* should be reported but are not serious
* enough to abort the query. */
#define ERROR 18 /* user error - return to known state */
#define FATAL 19 /* fatal error - abort process */
#define PANIC 20 /* take down the other backends with me */
/* temporary nonsense... */ /*#define DEBUG DEBUG5*/ /* Backward compatibility with pre-7.3 */
#define STOP REALLYFATAL
#define LOG DEBUG
/* Configurable parameters */ /* Configurable parameters */
#ifdef ENABLE_SYSLOG #ifdef ENABLE_SYSLOG
@ -32,6 +42,10 @@ extern int Use_syslog;
extern bool Log_timestamp; extern bool Log_timestamp;
extern bool Log_pid; extern bool Log_pid;
extern char *server_min_messages_str;
extern char *client_min_messages_str;
extern const char server_min_messages_str_default[];
extern const char client_min_messages_str_default[];
extern void extern void
elog(int lev, const char *fmt,...) elog(int lev, const char *fmt,...)
@ -41,4 +55,9 @@ __attribute__((format(printf, 2, 3)));
extern int DebugFileOpen(void); extern int DebugFileOpen(void);
extern bool check_server_min_messages(const char *lev);
extern void assign_server_min_messages(const char *lev);
extern bool check_client_min_messages(const char *lev);
extern void assign_client_min_messages(const char *lev);
#endif /* ELOG_H */ #endif /* ELOG_H */

2
src/pl/plperl/eloglvl.c
View File

@ -13,7 +13,7 @@
int int
elog_DEBUG(void) elog_DEBUG(void)
{ {
return DEBUG; return LOG;
} }
int int

4
src/pl/plpgsql/src/gram.y
View File

@ -4,7 +4,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.29 2001/11/29 22:57:37 tgl Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.30 2002/03/02 21:39:35 momjian Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -1207,7 +1207,7 @@ raise_level : K_EXCEPTION
} }
| K_DEBUG | K_DEBUG
{ {
$$ = DEBUG; $$ = DEBUG5;
} }
; ;

6
src/pl/plpython/plpython.c
View File

@ -29,7 +29,7 @@
* MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.13 2001/11/16 18:04:31 tgl Exp $ * $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.14 2002/03/02 21:39:35 momjian Exp $
* *
********************************************************************* *********************************************************************
*/ */
@ -2632,7 +2632,7 @@ static PyObject *PLy_log(int, PyObject *, PyObject *);
PyObject * PyObject *
PLy_debug(PyObject * self, PyObject * args) PLy_debug(PyObject * self, PyObject * args)
{ {
return PLy_log(DEBUG, self, args); return PLy_log(LOG, self, args);
} }
PyObject * PyObject *
@ -2690,7 +2690,7 @@ PLy_log(volatile int level, PyObject * self, PyObject * args)
} }
/* /*
* ok, this is a NOTICE, or DEBUG message * ok, this is a NOTICE, or LOG message
* *
* but just in case DON'T long jump out of the interpreter! * but just in case DON'T long jump out of the interpreter!
*/ */

4
src/pl/tcl/pltcl.c
View File

@ -31,7 +31,7 @@
* ENHANCEMENTS, OR MODIFICATIONS. * ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.49 2002/01/24 19:31:36 tgl Exp $ * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.50 2002/03/02 21:39:35 momjian Exp $
* *
**********************************************************************/ **********************************************************************/
@ -1268,7 +1268,7 @@ pltcl_elog(ClientData cdata, Tcl_Interp *interp,
else if (strcmp(argv[1], "FATAL") == 0) else if (strcmp(argv[1], "FATAL") == 0)
level = FATAL; level = FATAL;
else if (strcmp(argv[1], "DEBUG") == 0) else if (strcmp(argv[1], "DEBUG") == 0)
level = DEBUG; level = DEBUG1;
else else
{ {
Tcl_AppendResult(interp, "Unknown elog level '", argv[1], Tcl_AppendResult(interp, "Unknown elog level '", argv[1],

54
src/test/regress/expected/alter_table.out
View File

@ -271,10 +271,10 @@ SELECT unique1 FROM tenk1 WHERE unique1 < 5;
-- FOREIGN KEY CONSTRAINT adding TEST -- FOREIGN KEY CONSTRAINT adding TEST
CREATE TABLE tmp2 (a int primary key); CREATE TABLE tmp2 (a int primary key);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'tmp2_pkey' for table 'tmp2' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'tmp2_pkey' for table 'tmp2'
CREATE TABLE tmp3 (a int, b int); CREATE TABLE tmp3 (a int, b int);
CREATE TABLE tmp4 (a int, b int, unique(a,b)); CREATE TABLE tmp4 (a int, b int, unique(a,b));
NOTICE: CREATE TABLE / UNIQUE will create implicit index 'tmp4_a_key' for table 'tmp4' INFO: CREATE TABLE / UNIQUE will create implicit index 'tmp4_a_key' for table 'tmp4'
CREATE TABLE tmp5 (a int, b int); CREATE TABLE tmp5 (a int, b int);
-- Insert rows into tmp2 (pktable) -- Insert rows into tmp2 (pktable)
INSERT INTO tmp2 values (1); INSERT INTO tmp2 values (1);
@ -287,47 +287,47 @@ INSERT INTO tmp3 values (1,20);
INSERT INTO tmp3 values (5,50); INSERT INTO tmp3 values (5,50);
-- Try (and fail) to add constraint due to invalid source columns -- Try (and fail) to add constraint due to invalid source columns
ALTER TABLE tmp3 add constraint tmpconstr foreign key(c) references tmp2 match full; ALTER TABLE tmp3 add constraint tmpconstr foreign key(c) references tmp2 match full;
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: ALTER TABLE: column "c" referenced in foreign key constraint does not exist ERROR: ALTER TABLE: column "c" referenced in foreign key constraint does not exist
-- Try (and fail) to add constraint due to invalide destination columns explicitly given -- Try (and fail) to add constraint due to invalide destination columns explicitly given
ALTER TABLE tmp3 add constraint tmpconstr foreign key(a) references tmp2(b) match full; ALTER TABLE tmp3 add constraint tmpconstr foreign key(a) references tmp2(b) match full;
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: UNIQUE constraint matching given keys for referenced table "tmp2" not found ERROR: UNIQUE constraint matching given keys for referenced table "tmp2" not found
-- Try (and fail) to add constraint due to invalid data -- Try (and fail) to add constraint due to invalid data
ALTER TABLE tmp3 add constraint tmpconstr foreign key (a) references tmp2 match full; ALTER TABLE tmp3 add constraint tmpconstr foreign key (a) references tmp2 match full;
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: tmpconstr referential integrity violation - key referenced from tmp3 not found in tmp2 ERROR: tmpconstr referential integrity violation - key referenced from tmp3 not found in tmp2
-- Delete failing row -- Delete failing row
DELETE FROM tmp3 where a=5; DELETE FROM tmp3 where a=5;
-- Try (and succeed) -- Try (and succeed)
ALTER TABLE tmp3 add constraint tmpconstr foreign key (a) references tmp2 match full; ALTER TABLE tmp3 add constraint tmpconstr foreign key (a) references tmp2 match full;
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- Try (and fail) to create constraint from tmp5(a) to tmp4(a) - unique constraint on -- Try (and fail) to create constraint from tmp5(a) to tmp4(a) - unique constraint on
-- tmp4 is a,b -- tmp4 is a,b
ALTER TABLE tmp5 add constraint tmpconstr foreign key(a) references tmp4(a) match full; ALTER TABLE tmp5 add constraint tmpconstr foreign key(a) references tmp4(a) match full;
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: UNIQUE constraint matching given keys for referenced table "tmp4" not found ERROR: UNIQUE constraint matching given keys for referenced table "tmp4" not found
DROP TABLE tmp5; DROP TABLE tmp5;
DROP TABLE tmp4; DROP TABLE tmp4;
DROP TABLE tmp3; DROP TABLE tmp3;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "tmp2" INFO: DROP TABLE implicitly drops referential integrity trigger from table "tmp2"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "tmp2" INFO: DROP TABLE implicitly drops referential integrity trigger from table "tmp2"
DROP TABLE tmp2; DROP TABLE tmp2;
-- Foreign key adding test with mixed types -- Foreign key adding test with mixed types
-- Note: these tables are TEMP to avoid name conflicts when this test -- Note: these tables are TEMP to avoid name conflicts when this test
-- is run in parallel with foreign_key.sql. -- is run in parallel with foreign_key.sql.
CREATE TEMP TABLE PKTABLE (ptest1 int PRIMARY KEY); CREATE TEMP TABLE PKTABLE (ptest1 int PRIMARY KEY);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TEMP TABLE FKTABLE (ftest1 text); CREATE TEMP TABLE FKTABLE (ftest1 text);
-- This next should fail, because text=int does not exist -- This next should fail, because text=int does not exist
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable; ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable;
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- This should also fail for the same reason, but here we -- This should also fail for the same reason, but here we
-- give the column name -- give the column name
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable(ptest1); ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable(ptest1);
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- This should succeed, even though they are different types -- This should succeed, even though they are different types
@ -335,21 +335,21 @@ ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
CREATE TEMP TABLE FKTABLE (ftest1 varchar); CREATE TEMP TABLE FKTABLE (ftest1 varchar);
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable; ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable;
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- As should this -- As should this
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable(ptest1); ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable(ptest1);
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
DROP TABLE pktable; DROP TABLE pktable;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable"
DROP TABLE fktable; DROP TABLE fktable;
CREATE TEMP TABLE PKTABLE (ptest1 int, ptest2 text, CREATE TEMP TABLE PKTABLE (ptest1 int, ptest2 text,
PRIMARY KEY(ptest1, ptest2)); PRIMARY KEY(ptest1, ptest2));
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
-- This should fail, because we just chose really odd types -- This should fail, because we just chose really odd types
CREATE TEMP TABLE FKTABLE (ftest1 cidr, ftest2 datetime); CREATE TEMP TABLE FKTABLE (ftest1 cidr, ftest2 datetime);
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) references pktable; ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) references pktable;
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- Again, so should this... -- Again, so should this...
@ -357,7 +357,7 @@ DROP TABLE FKTABLE;
CREATE TEMP TABLE FKTABLE (ftest1 cidr, ftest2 datetime); CREATE TEMP TABLE FKTABLE (ftest1 cidr, ftest2 datetime);
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2)
references pktable(ptest1, ptest2); references pktable(ptest1, ptest2);
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- This fails because we mixed up the column ordering -- This fails because we mixed up the column ordering
@ -365,13 +365,13 @@ DROP TABLE FKTABLE;
CREATE TEMP TABLE FKTABLE (ftest1 int, ftest2 text); CREATE TEMP TABLE FKTABLE (ftest1 int, ftest2 text);
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2)
references pktable(ptest2, ptest1); references pktable(ptest2, ptest1);
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'integer' and 'text' ERROR: Unable to identify an operator '=' for types 'integer' and 'text'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- As does this... -- As does this...
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest2, ftest1) ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest2, ftest1)
references pktable(ptest1, ptest2); references pktable(ptest1, ptest2);
NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- temp tables should go away by themselves, need not drop them. -- temp tables should go away by themselves, need not drop them.
@ -452,7 +452,7 @@ drop table atacc1;
create table atacc1 ( test int ); create table atacc1 ( test int );
-- add a unique constraint -- add a unique constraint
alter table atacc1 add constraint atacc_test1 unique (test); alter table atacc1 add constraint atacc_test1 unique (test);
NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
-- insert first value -- insert first value
insert into atacc1 (test) values (2); insert into atacc1 (test) values (2);
-- should fail -- should fail
@ -462,7 +462,7 @@ ERROR: Cannot insert a duplicate key into unique index atacc_test1
insert into atacc1 (test) values (4); insert into atacc1 (test) values (4);
-- try adding a unique oid constraint -- try adding a unique oid constraint
alter table atacc1 add constraint atacc_oid1 unique(oid); alter table atacc1 add constraint atacc_oid1 unique(oid);
NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_oid1' for table 'atacc1' INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_oid1' for table 'atacc1'
drop table atacc1; drop table atacc1;
-- let's do one where the unique constraint fails when added -- let's do one where the unique constraint fails when added
create table atacc1 ( test int ); create table atacc1 ( test int );
@ -471,7 +471,7 @@ insert into atacc1 (test) values (2);
insert into atacc1 (test) values (2); insert into atacc1 (test) values (2);
-- add a unique constraint (fails) -- add a unique constraint (fails)
alter table atacc1 add constraint atacc_test1 unique (test); alter table atacc1 add constraint atacc_test1 unique (test);
NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
ERROR: Cannot create unique index. Table contains non-unique values ERROR: Cannot create unique index. Table contains non-unique values
insert into atacc1 (test) values (3); insert into atacc1 (test) values (3);
drop table atacc1; drop table atacc1;
@ -486,7 +486,7 @@ drop table atacc1;
create table atacc1 ( test int, test2 int); create table atacc1 ( test int, test2 int);
-- add a unique constraint -- add a unique constraint
alter table atacc1 add constraint atacc_test1 unique (test, test2); alter table atacc1 add constraint atacc_test1 unique (test, test2);
NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
-- insert initial value -- insert initial value
insert into atacc1 (test,test2) values (4,4); insert into atacc1 (test,test2) values (4,4);
-- should fail -- should fail
@ -499,9 +499,9 @@ insert into atacc1 (test,test2) values (5,5);
drop table atacc1; drop table atacc1;
-- lets do some naming tests -- lets do some naming tests
create table atacc1 (test int, test2 int, unique(test)); create table atacc1 (test int, test2 int, unique(test));
NOTICE: CREATE TABLE / UNIQUE will create implicit index 'atacc1_test_key' for table 'atacc1' INFO: CREATE TABLE / UNIQUE will create implicit index 'atacc1_test_key' for table 'atacc1'
alter table atacc1 add unique (test2); alter table atacc1 add unique (test2);
NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc1_test2_key' for table 'atacc1' INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc1_test2_key' for table 'atacc1'
-- should fail for @@ second one @@ -- should fail for @@ second one @@
insert into atacc1 (test2, test) values (3, 3); insert into atacc1 (test2, test) values (3, 3);
insert into atacc1 (test2, test) values (2, 3); insert into atacc1 (test2, test) values (2, 3);

4
src/test/regress/expected/create_misc.out
View File

@ -136,8 +136,8 @@ INSERT INTO iportaltest (i, d, p)
--- test creation of SERIAL column --- test creation of SERIAL column
--- ---
CREATE TABLE serialTest (f1 text, f2 serial); CREATE TABLE serialTest (f1 text, f2 serial);
NOTICE: CREATE TABLE will create implicit sequence 'serialtest_f2_seq' for SERIAL column 'serialtest.f2' INFO: CREATE TABLE will create implicit sequence 'serialtest_f2_seq' for SERIAL column 'serialtest.f2'
NOTICE: CREATE TABLE / UNIQUE will create implicit index 'serialtest_f2_key' for table 'serialtest' INFO: CREATE TABLE / UNIQUE will create implicit index 'serialtest_f2_key' for table 'serialtest'
INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('foo');
INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('bar');
INSERT INTO serialTest VALUES ('force', 100); INSERT INTO serialTest VALUES ('force', 100);

10
src/test/regress/expected/create_table.out
View File

@ -81,9 +81,9 @@ CREATE TABLE student (
CREATE TABLE stud_emp ( CREATE TABLE stud_emp (
percent int4 percent int4
) INHERITS (emp, student); ) INHERITS (emp, student);
NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "name" INFO: CREATE TABLE: merging multiple inherited definitions of attribute "name"
NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "age" INFO: CREATE TABLE: merging multiple inherited definitions of attribute "age"
NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "location" INFO: CREATE TABLE: merging multiple inherited definitions of attribute "location"
CREATE TABLE city ( CREATE TABLE city (
name name, name name,
location box, location box,
@ -135,8 +135,8 @@ CREATE TABLE c_star (
CREATE TABLE d_star ( CREATE TABLE d_star (
d float8 d float8
) INHERITS (b_star, c_star); ) INHERITS (b_star, c_star);
NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "class" INFO: CREATE TABLE: merging multiple inherited definitions of attribute "class"
NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "a" INFO: CREATE TABLE: merging multiple inherited definitions of attribute "a"
CREATE TABLE e_star ( CREATE TABLE e_star (
e int2 e int2
) INHERITS (c_star); ) INHERITS (c_star);

176
src/test/regress/expected/foreign_key.out
View File

@ -6,9 +6,9 @@
-- First test, check and cascade -- First test, check and cascade
-- --
CREATE TABLE PKTABLE ( ptest1 int PRIMARY KEY, ptest2 text ); CREATE TABLE PKTABLE ( ptest1 int PRIMARY KEY, ptest2 text );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TABLE FKTABLE ( ftest1 int REFERENCES PKTABLE MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE, ftest2 int ); CREATE TABLE FKTABLE ( ftest1 int REFERENCES PKTABLE MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE, ftest2 int );
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- Insert test data into PKTABLE -- Insert test data into PKTABLE
INSERT INTO PKTABLE VALUES (1, 'Test1'); INSERT INTO PKTABLE VALUES (1, 'Test1');
INSERT INTO PKTABLE VALUES (2, 'Test2'); INSERT INTO PKTABLE VALUES (2, 'Test2');
@ -56,16 +56,16 @@ SELECT * FROM FKTABLE;
(3 rows) (3 rows)
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable"
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
-- --
-- check set NULL and table constraint on multiple columns -- check set NULL and table constraint on multiple columns
-- --
CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2) CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2)
REFERENCES PKTABLE MATCH FULL ON DELETE SET NULL ON UPDATE SET NULL); REFERENCES PKTABLE MATCH FULL ON DELETE SET NULL ON UPDATE SET NULL);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- Insert test data into PKTABLE -- Insert test data into PKTABLE
INSERT INTO PKTABLE VALUES (1, 2, 'Test1'); INSERT INTO PKTABLE VALUES (1, 2, 'Test1');
INSERT INTO PKTABLE VALUES (1, 3, 'Test1-2'); INSERT INTO PKTABLE VALUES (1, 3, 'Test1-2');
@ -139,16 +139,16 @@ SELECT * FROM FKTABLE;
(5 rows) (5 rows)
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable"
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
-- --
-- check set default and table constraint on multiple columns -- check set default and table constraint on multiple columns
-- --
CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2) CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2)
REFERENCES PKTABLE MATCH FULL ON DELETE SET DEFAULT ON UPDATE SET DEFAULT); REFERENCES PKTABLE MATCH FULL ON DELETE SET DEFAULT ON UPDATE SET DEFAULT);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- Insert a value in PKTABLE for default -- Insert a value in PKTABLE for default
INSERT INTO PKTABLE VALUES (-1, -2, 'The Default!'); INSERT INTO PKTABLE VALUES (-1, -2, 'The Default!');
-- Insert test data into PKTABLE -- Insert test data into PKTABLE
@ -224,15 +224,15 @@ SELECT * FROM FKTABLE;
(5 rows) (5 rows)
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable"
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
-- --
-- First test, check with no on delete or on update -- First test, check with no on delete or on update
-- --
CREATE TABLE PKTABLE ( ptest1 int PRIMARY KEY, ptest2 text ); CREATE TABLE PKTABLE ( ptest1 int PRIMARY KEY, ptest2 text );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TABLE FKTABLE ( ftest1 int REFERENCES PKTABLE MATCH FULL, ftest2 int ); CREATE TABLE FKTABLE ( ftest1 int REFERENCES PKTABLE MATCH FULL, ftest2 int );
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- Insert test data into PKTABLE -- Insert test data into PKTABLE
INSERT INTO PKTABLE VALUES (1, 'Test1'); INSERT INTO PKTABLE VALUES (1, 'Test1');
INSERT INTO PKTABLE VALUES (2, 'Test2'); INSERT INTO PKTABLE VALUES (2, 'Test2');
@ -299,15 +299,15 @@ SELECT * FROM PKTABLE;
(4 rows) (4 rows)
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable"
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
-- MATCH unspecified -- MATCH unspecified
-- Base test restricting update/delete -- Base test restricting update/delete
CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) ); CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, ftest4 int, CONSTRAINT constrname3 CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, ftest4 int, CONSTRAINT constrname3
FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE); FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- Insert Primary Key values -- Insert Primary Key values
INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1'); INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1');
INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2');
@ -363,16 +363,16 @@ SELECT * from FKTABLE;
(5 rows) (5 rows)
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
-- cascade update/delete -- cascade update/delete
CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) ); CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, ftest4 int, CONSTRAINT constrname3 CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, ftest4 int, CONSTRAINT constrname3
FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE
ON DELETE CASCADE ON UPDATE CASCADE); ON DELETE CASCADE ON UPDATE CASCADE);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- Insert Primary Key values -- Insert Primary Key values
INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1'); INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1');
INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2');
@ -462,16 +462,16 @@ SELECT * from FKTABLE;
(4 rows) (4 rows)
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
-- set null update / set default delete -- set null update / set default delete
CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) ); CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TABLE FKTABLE ( ftest1 int DEFAULT 0, ftest2 int, ftest3 int, ftest4 int, CONSTRAINT constrname3 CREATE TABLE FKTABLE ( ftest1 int DEFAULT 0, ftest2 int, ftest3 int, ftest4 int, CONSTRAINT constrname3
FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE
ON DELETE SET DEFAULT ON UPDATE SET NULL); ON DELETE SET DEFAULT ON UPDATE SET NULL);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- Insert Primary Key values -- Insert Primary Key values
INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1'); INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1');
INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2');
@ -568,16 +568,16 @@ SELECT * from FKTABLE;
(6 rows) (6 rows)
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
-- set default update / set null delete -- set default update / set null delete
CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) ); CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) );
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TABLE FKTABLE ( ftest1 int DEFAULT 0, ftest2 int DEFAULT -1, ftest3 int, ftest4 int, CONSTRAINT constrname3 CREATE TABLE FKTABLE ( ftest1 int DEFAULT 0, ftest2 int DEFAULT -1, ftest3 int, ftest4 int, CONSTRAINT constrname3
FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE
ON DELETE SET NULL ON UPDATE SET DEFAULT); ON DELETE SET NULL ON UPDATE SET DEFAULT);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- Insert Primary Key values -- Insert Primary Key values
INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1'); INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1');
INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2');
@ -687,16 +687,16 @@ SELECT * from FKTABLE;
(7 rows) (7 rows)
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY); CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TABLE FKTABLE_FAIL1 ( ftest1 int, CONSTRAINT fkfail1 FOREIGN KEY (ftest2) REFERENCES PKTABLE); CREATE TABLE FKTABLE_FAIL1 ( ftest1 int, CONSTRAINT fkfail1 FOREIGN KEY (ftest2) REFERENCES PKTABLE);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: CREATE TABLE: column "ftest2" referenced in foreign key constraint does not exist ERROR: CREATE TABLE: column "ftest2" referenced in foreign key constraint does not exist
CREATE TABLE FKTABLE_FAIL2 ( ftest1 int, CONSTRAINT fkfail1 FOREIGN KEY (ftest1) REFERENCES PKTABLE(ptest2)); CREATE TABLE FKTABLE_FAIL2 ( ftest1 int, CONSTRAINT fkfail1 FOREIGN KEY (ftest1) REFERENCES PKTABLE(ptest2));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: UNIQUE constraint matching given keys for referenced table "pktable" not found ERROR: UNIQUE constraint matching given keys for referenced table "pktable" not found
DROP TABLE FKTABLE_FAIL1; DROP TABLE FKTABLE_FAIL1;
ERROR: table "fktable_fail1" does not exist ERROR: table "fktable_fail1" does not exist
@ -705,9 +705,9 @@ ERROR: table "fktable_fail2" does not exist
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
-- Test for referencing column number smaller than referenced constraint -- Test for referencing column number smaller than referenced constraint
CREATE TABLE PKTABLE (ptest1 int, ptest2 int, UNIQUE(ptest1, ptest2)); CREATE TABLE PKTABLE (ptest1 int, ptest2 int, UNIQUE(ptest1, ptest2));
NOTICE: CREATE TABLE / UNIQUE will create implicit index 'pktable_ptest1_key' for table 'pktable' INFO: CREATE TABLE / UNIQUE will create implicit index 'pktable_ptest1_key' for table 'pktable'
CREATE TABLE FKTABLE_FAIL1 (ftest1 int REFERENCES pktable(ptest1)); CREATE TABLE FKTABLE_FAIL1 (ftest1 int REFERENCES pktable(ptest1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: UNIQUE constraint matching given keys for referenced table "pktable" not found ERROR: UNIQUE constraint matching given keys for referenced table "pktable" not found
DROP TABLE FKTABLE_FAIL1; DROP TABLE FKTABLE_FAIL1;
ERROR: table "fktable_fail1" does not exist ERROR: table "fktable_fail1" does not exist
@ -717,105 +717,105 @@ DROP TABLE PKTABLE;
-- --
-- Basic one column, two table setup -- Basic one column, two table setup
CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY); CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
-- This next should fail, because text=int does not exist -- This next should fail, because text=int does not exist
CREATE TABLE FKTABLE (ftest1 text REFERENCES pktable); CREATE TABLE FKTABLE (ftest1 text REFERENCES pktable);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- This should also fail for the same reason, but here we -- This should also fail for the same reason, but here we
-- give the column name -- give the column name
CREATE TABLE FKTABLE (ftest1 text REFERENCES pktable(ptest1)); CREATE TABLE FKTABLE (ftest1 text REFERENCES pktable(ptest1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- This should succeed, even though they are different types -- This should succeed, even though they are different types
-- because varchar=int does exist -- because varchar=int does exist
CREATE TABLE FKTABLE (ftest1 varchar REFERENCES pktable); CREATE TABLE FKTABLE (ftest1 varchar REFERENCES pktable);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
-- As should this -- As should this
CREATE TABLE FKTABLE (ftest1 varchar REFERENCES pktable(ptest1)); CREATE TABLE FKTABLE (ftest1 varchar REFERENCES pktable(ptest1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
-- Two columns, two tables -- Two columns, two tables
CREATE TABLE PKTABLE (ptest1 int, ptest2 text, PRIMARY KEY(ptest1, ptest2)); CREATE TABLE PKTABLE (ptest1 int, ptest2 text, PRIMARY KEY(ptest1, ptest2));
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
-- This should fail, because we just chose really odd types -- This should fail, because we just chose really odd types
CREATE TABLE FKTABLE (ftest1 cidr, ftest2 datetime, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable); CREATE TABLE FKTABLE (ftest1 cidr, ftest2 datetime, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- Again, so should this... -- Again, so should this...
CREATE TABLE FKTABLE (ftest1 cidr, ftest2 datetime, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable(ptest1, ptest2)); CREATE TABLE FKTABLE (ftest1 cidr, ftest2 datetime, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable(ptest1, ptest2));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- This fails because we mixed up the column ordering -- This fails because we mixed up the column ordering
CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest2, ftest1) REFERENCES pktable); CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest2, ftest1) REFERENCES pktable);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- As does this... -- As does this...
CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest2, ftest1) REFERENCES pktable(ptest1, ptest2)); CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest2, ftest1) REFERENCES pktable(ptest1, ptest2));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- And again.. -- And again..
CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable(ptest2, ptest1)); CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable(ptest2, ptest1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'integer' and 'text' ERROR: Unable to identify an operator '=' for types 'integer' and 'text'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- This works... -- This works...
CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest2, ftest1) REFERENCES pktable(ptest2, ptest1)); CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest2, ftest1) REFERENCES pktable(ptest2, ptest1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
-- As does this -- As does this
CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable(ptest1, ptest2)); CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable(ptest1, ptest2));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
DROP TABLE FKTABLE; DROP TABLE FKTABLE;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
-- Two columns, same table -- Two columns, same table
-- Make sure this still works... -- Make sure this still works...
CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3,
ptest4) REFERENCES pktable(ptest1, ptest2)); ptest4) REFERENCES pktable(ptest1, ptest2));
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
-- And this, -- And this,
CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3,
ptest4) REFERENCES pktable); ptest4) REFERENCES pktable);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
DROP TABLE PKTABLE; DROP TABLE PKTABLE;
-- This shouldn't (mixed up columns) -- This shouldn't (mixed up columns)
CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3,
ptest4) REFERENCES pktable(ptest2, ptest1)); ptest4) REFERENCES pktable(ptest2, ptest1));
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'integer' and 'text' ERROR: Unable to identify an operator '=' for types 'integer' and 'text'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- Nor should this... (same reason, we have 4,3 referencing 1,2 which mismatches types -- Nor should this... (same reason, we have 4,3 referencing 1,2 which mismatches types
CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest4, CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest4,
ptest3) REFERENCES pktable(ptest1, ptest2)); ptest3) REFERENCES pktable(ptest1, ptest2));
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- Not this one either... Same as the last one except we didn't defined the columns being referenced. -- Not this one either... Same as the last one except we didn't defined the columns being referenced.
CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest4, CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest4,
ptest3) REFERENCES pktable); ptest3) REFERENCES pktable);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- --
@ -823,10 +823,10 @@ ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
-- Basic 2 table case: 1 column of matching types. -- Basic 2 table case: 1 column of matching types.
create table pktable_base (base1 int not null); create table pktable_base (base1 int not null);
create table pktable (ptest1 int, primary key(base1), unique(base1, ptest1)) inherits (pktable_base); create table pktable (ptest1 int, primary key(base1), unique(base1, ptest1)) inherits (pktable_base);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE / UNIQUE will create implicit index 'pktable_base1_key' for table 'pktable' INFO: CREATE TABLE / UNIQUE will create implicit index 'pktable_base1_key' for table 'pktable'
create table fktable (ftest1 int references pktable(base1)); create table fktable (ftest1 int references pktable(base1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- now some ins, upd, del -- now some ins, upd, del
insert into pktable(base1) values (1); insert into pktable(base1) values (1);
insert into pktable(base1) values (2); insert into pktable(base1) values (2);
@ -849,12 +849,12 @@ update pktable set base1=base1*4 where base1<3;
delete from pktable where base1>3; delete from pktable where base1>3;
-- cleanup -- cleanup
drop table fktable; drop table fktable;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
delete from pktable; delete from pktable;
-- Now 2 columns 2 tables, matching types -- Now 2 columns 2 tables, matching types
create table fktable (ftest1 int, ftest2 int, foreign key(ftest1, ftest2) references pktable(base1, ptest1)); create table fktable (ftest1 int, ftest2 int, foreign key(ftest1, ftest2) references pktable(base1, ptest1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
-- now some ins, upd, del -- now some ins, upd, del
insert into pktable(base1, ptest1) values (1, 1); insert into pktable(base1, ptest1) values (1, 1);
insert into pktable(base1, ptest1) values (2, 2); insert into pktable(base1, ptest1) values (2, 2);
@ -877,16 +877,16 @@ update pktable set base1=base1*4 where base1<3;
delete from pktable where base1>3; delete from pktable where base1>3;
-- cleanup -- cleanup
drop table fktable; drop table fktable;
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" INFO: DROP TABLE implicitly drops referential integrity trigger from table "pktable"
drop table pktable; drop table pktable;
drop table pktable_base; drop table pktable_base;
-- Now we'll do one all in 1 table with 2 columns of matching types -- Now we'll do one all in 1 table with 2 columns of matching types
create table pktable_base(base1 int not null, base2 int); create table pktable_base(base1 int not null, base2 int);
create table pktable(ptest1 int, ptest2 int, primary key(base1, ptest1), foreign key(base2, ptest2) references create table pktable(ptest1 int, ptest2 int, primary key(base1, ptest1), foreign key(base2, ptest2) references
pktable(base1, ptest1)) inherits (pktable_base); pktable(base1, ptest1)) inherits (pktable_base);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
insert into pktable (base1, ptest1, base2, ptest2) values (1, 1, 1, 1); insert into pktable (base1, ptest1, base2, ptest2) values (1, 1, 1, 1);
insert into pktable (base1, ptest1, base2, ptest2) values (2, 1, 1, 1); insert into pktable (base1, ptest1, base2, ptest2) values (2, 1, 1, 1);
insert into pktable (base1, ptest1, base2, ptest2) values (2, 2, 2, 1); insert into pktable (base1, ptest1, base2, ptest2) values (2, 2, 2, 1);
@ -908,27 +908,27 @@ drop table pktable_base;
-- 2 columns (2 tables), mismatched types -- 2 columns (2 tables), mismatched types
create table pktable_base(base1 int not null); create table pktable_base(base1 int not null);
create table pktable(ptest1 text, primary key(base1, ptest1)) inherits (pktable_base); create table pktable(ptest1 text, primary key(base1, ptest1)) inherits (pktable_base);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
-- just generally bad types (with and without column references on the referenced table) -- just generally bad types (with and without column references on the referenced table)
create table fktable(ftest1 cidr, ftest2 int[], foreign key (ftest1, ftest2) references pktable); create table fktable(ftest1 cidr, ftest2 int[], foreign key (ftest1, ftest2) references pktable);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
create table fktable(ftest1 cidr, ftest2 int[], foreign key (ftest1, ftest2) references pktable(base1, ptest1)); create table fktable(ftest1 cidr, ftest2 int[], foreign key (ftest1, ftest2) references pktable(base1, ptest1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
-- let's mix up which columns reference which -- let's mix up which columns reference which
create table fktable(ftest1 int, ftest2 text, foreign key(ftest2, ftest1) references pktable); create table fktable(ftest1 int, ftest2 text, foreign key(ftest2, ftest1) references pktable);
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
create table fktable(ftest1 int, ftest2 text, foreign key(ftest2, ftest1) references pktable(base1, ptest1)); create table fktable(ftest1 int, ftest2 text, foreign key(ftest2, ftest1) references pktable(base1, ptest1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
create table fktable(ftest1 int, ftest2 text, foreign key(ftest1, ftest2) references pktable(ptest1, base1)); create table fktable(ftest1 int, ftest2 text, foreign key(ftest1, ftest2) references pktable(ptest1, base1));
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'integer' and 'text' ERROR: Unable to identify an operator '=' for types 'integer' and 'text'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
drop table pktable; drop table pktable;
@ -937,26 +937,26 @@ drop table pktable_base;
create table pktable_base(base1 int not null, base2 int); create table pktable_base(base1 int not null, base2 int);
create table pktable(ptest1 text, ptest2 text[], primary key(base1, ptest1), foreign key(base2, ptest2) references create table pktable(ptest1 text, ptest2 text[], primary key(base1, ptest1), foreign key(base2, ptest2) references
pktable(base1, ptest1)) inherits (pktable_base); pktable(base1, ptest1)) inherits (pktable_base);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text[]' and 'text' ERROR: Unable to identify an operator '=' for types 'text[]' and 'text'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
create table pktable(ptest1 text, ptest2 text, primary key(base1, ptest1), foreign key(base2, ptest2) references create table pktable(ptest1 text, ptest2 text, primary key(base1, ptest1), foreign key(base2, ptest2) references
pktable(ptest1, base1)) inherits (pktable_base); pktable(ptest1, base1)) inherits (pktable_base);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'integer' and 'text' ERROR: Unable to identify an operator '=' for types 'integer' and 'text'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
create table pktable(ptest1 text, ptest2 text, primary key(base1, ptest1), foreign key(ptest2, base2) references create table pktable(ptest1 text, ptest2 text, primary key(base1, ptest1), foreign key(ptest2, base2) references
pktable(base1, ptest1)) inherits (pktable_base); pktable(base1, ptest1)) inherits (pktable_base);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
create table pktable(ptest1 text, ptest2 text, primary key(base1, ptest1), foreign key(ptest2, base2) references create table pktable(ptest1 text, ptest2 text, primary key(base1, ptest1), foreign key(ptest2, base2) references
pktable(base1, ptest1)) inherits (pktable_base); pktable(base1, ptest1)) inherits (pktable_base);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s)
ERROR: Unable to identify an operator '=' for types 'text' and 'integer' ERROR: Unable to identify an operator '=' for types 'text' and 'integer'
You will have to retype this query using an explicit cast You will have to retype this query using an explicit cast
drop table pktable; drop table pktable;

10
src/test/regress/expected/horology.out
View File

@ -2340,7 +2340,7 @@ DROP TABLE TEMP_TIMESTAMP;
-- --
SET DateStyle TO 'US,Postgres'; SET DateStyle TO 'US,Postgres';
SHOW DateStyle; SHOW DateStyle;
NOTICE: DateStyle is Postgres with US (NonEuropean) conventions INFO: DateStyle is Postgres with US (NonEuropean) conventions
SELECT '' AS "64", d1 AS us_postgres FROM TIMESTAMP_TBL; SELECT '' AS "64", d1 AS us_postgres FROM TIMESTAMP_TBL;
64 | us_postgres 64 | us_postgres
----+----------------------------- ----+-----------------------------
@ -2506,7 +2506,7 @@ SELECT '' AS seven, f1 AS us_iso FROM ABSTIME_TBL;
SET DateStyle TO 'US,SQL'; SET DateStyle TO 'US,SQL';
SHOW DateStyle; SHOW DateStyle;
NOTICE: DateStyle is SQL with US (NonEuropean) conventions INFO: DateStyle is SQL with US (NonEuropean) conventions
SELECT '' AS "64", d1 AS us_sql FROM TIMESTAMP_TBL; SELECT '' AS "64", d1 AS us_sql FROM TIMESTAMP_TBL;
64 | us_sql 64 | us_sql
----+------------------------ ----+------------------------
@ -2590,7 +2590,7 @@ SELECT '' AS seven, f1 AS us_sql FROM ABSTIME_TBL;
SET DateStyle TO 'European,Postgres'; SET DateStyle TO 'European,Postgres';
SHOW DateStyle; SHOW DateStyle;
NOTICE: DateStyle is Postgres with European conventions INFO: DateStyle is Postgres with European conventions
INSERT INTO TIMESTAMP_TBL VALUES('13/06/1957'); INSERT INTO TIMESTAMP_TBL VALUES('13/06/1957');
SELECT count(*) as one FROM TIMESTAMP_TBL WHERE d1 = 'Jun 13 1957'; SELECT count(*) as one FROM TIMESTAMP_TBL WHERE d1 = 'Jun 13 1957';
one one
@ -2682,7 +2682,7 @@ SELECT '' AS seven, f1 AS european_postgres FROM ABSTIME_TBL;
SET DateStyle TO 'European,ISO'; SET DateStyle TO 'European,ISO';
SHOW DateStyle; SHOW DateStyle;
NOTICE: DateStyle is ISO with European conventions INFO: DateStyle is ISO with European conventions
SELECT '' AS "65", d1 AS european_iso FROM TIMESTAMP_TBL; SELECT '' AS "65", d1 AS european_iso FROM TIMESTAMP_TBL;
65 | european_iso 65 | european_iso
----+------------------------ ----+------------------------
@ -2767,7 +2767,7 @@ SELECT '' AS seven, f1 AS european_iso FROM ABSTIME_TBL;
SET DateStyle TO 'European,SQL'; SET DateStyle TO 'European,SQL';
SHOW DateStyle; SHOW DateStyle;
NOTICE: DateStyle is SQL with European conventions INFO: DateStyle is SQL with European conventions
SELECT '' AS "65", d1 AS european_sql FROM TIMESTAMP_TBL; SELECT '' AS "65", d1 AS european_sql FROM TIMESTAMP_TBL;
65 | european_sql 65 | european_sql
----+------------------------ ----+------------------------

4
src/test/regress/expected/inherit.out
View File

@ -5,8 +5,8 @@ CREATE TABLE a (aa TEXT);
CREATE TABLE b (bb TEXT) INHERITS (a); CREATE TABLE b (bb TEXT) INHERITS (a);
CREATE TABLE c (cc TEXT) INHERITS (a); CREATE TABLE c (cc TEXT) INHERITS (a);
CREATE TABLE d (dd TEXT) INHERITS (b,c,a); CREATE TABLE d (dd TEXT) INHERITS (b,c,a);
NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "aa" INFO: CREATE TABLE: merging multiple inherited definitions of attribute "aa"
NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "aa" INFO: CREATE TABLE: merging multiple inherited definitions of attribute "aa"
INSERT INTO a(aa) VALUES('aaa'); INSERT INTO a(aa) VALUES('aaa');
INSERT INTO a(aa) VALUES('aaaa'); INSERT INTO a(aa) VALUES('aaaa');
INSERT INTO a(aa) VALUES('aaaaa'); INSERT INTO a(aa) VALUES('aaaaa');