Commit e78b0079 authored by Peter Eisentraut's avatar Peter Eisentraut

Change some notices to warnings and vice versa according to criteria

developed on -hackers.
parent 5b806ecf
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.37 2003/09/29 00:05:24 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.38 2003/10/02 06:34:03 petere Exp $
* *
* DESCRIPTION * DESCRIPTION
* These routines take the parse tree and pick out the * These routines take the parse tree and pick out the
...@@ -718,7 +718,7 @@ RenameFunction(List *name, List *argtypes, const char *newname) ...@@ -718,7 +718,7 @@ RenameFunction(List *name, List *argtypes, const char *newname)
* *
* This is presently only used for adjusting legacy functions that return * This is presently only used for adjusting legacy functions that return
* OPAQUE to return whatever we find their correct definition should be. * OPAQUE to return whatever we find their correct definition should be.
* The caller should emit a suitable NOTICE explaining what we did. * The caller should emit a suitable warning explaining what we did.
*/ */
void void
SetFunctionReturnType(Oid funcOid, Oid newRetType) SetFunctionReturnType(Oid funcOid, Oid newRetType)
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.113 2003/09/29 16:37:29 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.114 2003/10/02 06:34:03 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -654,7 +654,7 @@ ReindexTable(RangeVar *relation, bool force /* currently unused */ ) ...@@ -654,7 +654,7 @@ ReindexTable(RangeVar *relation, bool force /* currently unused */ )
ReleaseSysCache(tuple); ReleaseSysCache(tuple);
if (!reindex_relation(heapOid)) if (!reindex_relation(heapOid))
ereport(WARNING, ereport(NOTICE,
(errmsg("table \"%s\" has no indexes", (errmsg("table \"%s\" has no indexes",
relation->relname))); relation->relname)));
} }
......
...@@ -7,7 +7,7 @@ ...@@ -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/proclang.c,v 1.50 2003/09/25 06:57:58 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/proclang.c,v 1.51 2003/10/02 06:34:03 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -91,7 +91,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt) ...@@ -91,7 +91,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
*/ */
if (funcrettype == OPAQUEOID) if (funcrettype == OPAQUEOID)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_WRONG_OBJECT_TYPE), (errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("changing return type of function %s from \"opaque\" to \"language_handler\"", errmsg("changing return type of function %s from \"opaque\" to \"language_handler\"",
NameListToString(stmt->plhandler)))); NameListToString(stmt->plhandler))));
......
...@@ -7,7 +7,7 @@ ...@@ -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.158 2003/09/25 18:58:35 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.159 2003/10/02 06:34:03 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -286,7 +286,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint) ...@@ -286,7 +286,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint)
*/ */
if (funcrettype == OPAQUEOID) if (funcrettype == OPAQUEOID)
{ {
ereport(NOTICE, ereport(WARNING,
(errmsg("changing return type of function %s from \"opaque\" to \"trigger\"", (errmsg("changing return type of function %s from \"opaque\" to \"trigger\"",
NameListToString(stmt->funcname)))); NameListToString(stmt->funcname))));
SetFunctionReturnType(funcoid, TRIGGEROID); SetFunctionReturnType(funcoid, TRIGGEROID);
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.47 2003/09/29 00:05:25 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.48 2003/10/02 06:34:03 petere 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
...@@ -271,7 +271,7 @@ DefineType(List *names, List *parameters) ...@@ -271,7 +271,7 @@ DefineType(List *names, List *parameters)
if (resulttype == OPAQUEOID) if (resulttype == OPAQUEOID)
{ {
/* backwards-compatibility hack */ /* backwards-compatibility hack */
ereport(NOTICE, ereport(WARNING,
(errmsg("changing return type of function %s from \"opaque\" to %s", (errmsg("changing return type of function %s from \"opaque\" to %s",
NameListToString(inputName), typeName))); NameListToString(inputName), typeName)));
SetFunctionReturnType(inputOid, typoid); SetFunctionReturnType(inputOid, typoid);
...@@ -288,7 +288,7 @@ DefineType(List *names, List *parameters) ...@@ -288,7 +288,7 @@ DefineType(List *names, List *parameters)
if (resulttype == OPAQUEOID) if (resulttype == OPAQUEOID)
{ {
/* backwards-compatibility hack */ /* backwards-compatibility hack */
ereport(NOTICE, ereport(WARNING,
(errmsg("changing return type of function %s from \"opaque\" to \"cstring\"", (errmsg("changing return type of function %s from \"opaque\" to \"cstring\"",
NameListToString(outputName)))); NameListToString(outputName))));
SetFunctionReturnType(outputOid, CSTRINGOID); SetFunctionReturnType(outputOid, CSTRINGOID);
...@@ -839,7 +839,7 @@ findTypeInputFunction(List *procname, Oid typeOid) ...@@ -839,7 +839,7 @@ findTypeInputFunction(List *procname, Oid typeOid)
* three arguments (string, element OID, typmod). * three arguments (string, element OID, typmod).
* *
* For backwards compatibility we allow OPAQUE in place of CSTRING; if we * For backwards compatibility we allow OPAQUE in place of CSTRING; if we
* see this, we issue a NOTICE and fix up the pg_proc entry. * see this, we issue a warning and fix up the pg_proc entry.
*/ */
MemSet(argList, 0, FUNC_MAX_ARGS * sizeof(Oid)); MemSet(argList, 0, FUNC_MAX_ARGS * sizeof(Oid));
...@@ -874,7 +874,7 @@ findTypeInputFunction(List *procname, Oid typeOid) ...@@ -874,7 +874,7 @@ findTypeInputFunction(List *procname, Oid typeOid)
if (OidIsValid(procOid)) if (OidIsValid(procOid))
{ {
/* Found, but must complain and fix the pg_proc entry */ /* Found, but must complain and fix the pg_proc entry */
ereport(NOTICE, ereport(WARNING,
(errmsg("changing argument type of function %s from \"opaque\" to \"cstring\"", (errmsg("changing argument type of function %s from \"opaque\" to \"cstring\"",
NameListToString(procname)))); NameListToString(procname))));
SetFunctionArgType(procOid, 0, CSTRINGOID); SetFunctionArgType(procOid, 0, CSTRINGOID);
...@@ -910,7 +910,7 @@ findTypeOutputFunction(List *procname, Oid typeOid) ...@@ -910,7 +910,7 @@ findTypeOutputFunction(List *procname, Oid typeOid)
* arguments (data value, element OID). * arguments (data value, element OID).
* *
* For backwards compatibility we allow OPAQUE in place of the actual * For backwards compatibility we allow OPAQUE in place of the actual
* type name; if we see this, we issue a NOTICE and fix up the pg_proc * type name; if we see this, we issue a warning and fix up the pg_proc
* entry. * entry.
*/ */
MemSet(argList, 0, FUNC_MAX_ARGS * sizeof(Oid)); MemSet(argList, 0, FUNC_MAX_ARGS * sizeof(Oid));
...@@ -944,7 +944,7 @@ findTypeOutputFunction(List *procname, Oid typeOid) ...@@ -944,7 +944,7 @@ findTypeOutputFunction(List *procname, Oid typeOid)
if (OidIsValid(procOid)) if (OidIsValid(procOid))
{ {
/* Found, but must complain and fix the pg_proc entry */ /* Found, but must complain and fix the pg_proc entry */
ereport(NOTICE, ereport(WARNING,
(errmsg("changing argument type of function %s from \"opaque\" to %s", (errmsg("changing argument type of function %s from \"opaque\" to %s",
NameListToString(procname), format_type_be(typeOid)))); NameListToString(procname), format_type_be(typeOid))));
SetFunctionArgType(procOid, 0, typeOid); SetFunctionArgType(procOid, 0, typeOid);
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.435 2003/09/26 15:27:32 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.436 2003/10/02 06:34:04 petere Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -973,7 +973,7 @@ zone_value: ...@@ -973,7 +973,7 @@ zone_value:
$3))); $3)));
if ($3 > MAX_INTERVAL_PRECISION) if ($3 > MAX_INTERVAL_PRECISION)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("INTERVAL(%d) precision reduced to maximum allowed, %d", errmsg("INTERVAL(%d) precision reduced to maximum allowed, %d",
$3, MAX_INTERVAL_PRECISION))); $3, MAX_INTERVAL_PRECISION)));
...@@ -5091,7 +5091,7 @@ SimpleTypename: ...@@ -5091,7 +5091,7 @@ SimpleTypename:
$3))); $3)));
if ($3 > MAX_INTERVAL_PRECISION) if ($3 > MAX_INTERVAL_PRECISION)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("INTERVAL(%d) precision reduced to maximum allowed, %d", errmsg("INTERVAL(%d) precision reduced to maximum allowed, %d",
$3, MAX_INTERVAL_PRECISION))); $3, MAX_INTERVAL_PRECISION)));
...@@ -5470,7 +5470,7 @@ ConstDatetime: ...@@ -5470,7 +5470,7 @@ ConstDatetime:
$3, ($5 ? " WITH TIME ZONE": "")))); $3, ($5 ? " WITH TIME ZONE": ""))));
if ($3 > MAX_TIMESTAMP_PRECISION) if ($3 > MAX_TIMESTAMP_PRECISION)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("TIMESTAMP(%d)%s precision reduced to maximum allowed, %d", errmsg("TIMESTAMP(%d)%s precision reduced to maximum allowed, %d",
$3, ($5 ? " WITH TIME ZONE": ""), $3, ($5 ? " WITH TIME ZONE": ""),
...@@ -5511,7 +5511,7 @@ ConstDatetime: ...@@ -5511,7 +5511,7 @@ ConstDatetime:
$3, ($5 ? " WITH TIME ZONE": "")))); $3, ($5 ? " WITH TIME ZONE": ""))));
if ($3 > MAX_TIME_PRECISION) if ($3 > MAX_TIME_PRECISION)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("TIME(%d)%s precision reduced to maximum allowed, %d", errmsg("TIME(%d)%s precision reduced to maximum allowed, %d",
$3, ($5 ? " WITH TIME ZONE": ""), $3, ($5 ? " WITH TIME ZONE": ""),
...@@ -6318,7 +6318,7 @@ c_expr: columnref { $$ = (Node *) $1; } ...@@ -6318,7 +6318,7 @@ c_expr: columnref { $$ = (Node *) $1; }
$3))); $3)));
if ($3 > MAX_TIME_PRECISION) if ($3 > MAX_TIME_PRECISION)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("CURRENT_TIME(%d) precision reduced to maximum allowed, %d", errmsg("CURRENT_TIME(%d) precision reduced to maximum allowed, %d",
$3, MAX_TIME_PRECISION))); $3, MAX_TIME_PRECISION)));
...@@ -6372,7 +6372,7 @@ c_expr: columnref { $$ = (Node *) $1; } ...@@ -6372,7 +6372,7 @@ c_expr: columnref { $$ = (Node *) $1; }
$3))); $3)));
if ($3 > MAX_TIMESTAMP_PRECISION) if ($3 > MAX_TIMESTAMP_PRECISION)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("CURRENT_TIMESTAMP(%d) precision reduced to maximum allowed, %d", errmsg("CURRENT_TIMESTAMP(%d) precision reduced to maximum allowed, %d",
$3, MAX_TIMESTAMP_PRECISION))); $3, MAX_TIMESTAMP_PRECISION)));
...@@ -6425,7 +6425,7 @@ c_expr: columnref { $$ = (Node *) $1; } ...@@ -6425,7 +6425,7 @@ c_expr: columnref { $$ = (Node *) $1; }
$3))); $3)));
if ($3 > MAX_TIME_PRECISION) if ($3 > MAX_TIME_PRECISION)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("LOCALTIME(%d) precision reduced to maximum allowed, %d", errmsg("LOCALTIME(%d) precision reduced to maximum allowed, %d",
$3, MAX_TIME_PRECISION))); $3, MAX_TIME_PRECISION)));
...@@ -6479,7 +6479,7 @@ c_expr: columnref { $$ = (Node *) $1; } ...@@ -6479,7 +6479,7 @@ c_expr: columnref { $$ = (Node *) $1; }
$3))); $3)));
if ($3 > MAX_TIMESTAMP_PRECISION) if ($3 > MAX_TIMESTAMP_PRECISION)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("LOCALTIMESTAMP(%d) precision reduced to maximum allowed, %d", errmsg("LOCALTIMESTAMP(%d) precision reduced to maximum allowed, %d",
$3, MAX_TIMESTAMP_PRECISION))); $3, MAX_TIMESTAMP_PRECISION)));
...@@ -7189,7 +7189,7 @@ AexprConst: Iconst ...@@ -7189,7 +7189,7 @@ AexprConst: Iconst
$3))); $3)));
if ($3 > MAX_INTERVAL_PRECISION) if ($3 > MAX_INTERVAL_PRECISION)
{ {
ereport(NOTICE, ereport(WARNING,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("INTERVAL(%d) precision reduced to maximum allowed, %d", errmsg("INTERVAL(%d) precision reduced to maximum allowed, %d",
$3, MAX_INTERVAL_PRECISION))); $3, MAX_INTERVAL_PRECISION)));
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.368 2003/09/29 18:50:58 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.369 2003/10/02 06:34:04 petere Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
...@@ -559,8 +559,7 @@ pg_rewrite_queries(List *querytree_list) ...@@ -559,8 +559,7 @@ pg_rewrite_queries(List *querytree_list)
new_list = (List *) copyObject(querytree_list); new_list = (List *) copyObject(querytree_list);
/* This checks both copyObject() and the equal() routines... */ /* This checks both copyObject() and the equal() routines... */
if (!equal(new_list, querytree_list)) if (!equal(new_list, querytree_list))
ereport(WARNING, elog(WARNING, "copyObject() failed to produce an equal parse tree");
(errmsg("copyObject() failed to produce an equal parse tree")));
else else
querytree_list = new_list; querytree_list = new_list;
#endif #endif
...@@ -604,8 +603,7 @@ pg_plan_query(Query *querytree) ...@@ -604,8 +603,7 @@ pg_plan_query(Query *querytree)
#ifdef NOT_USED #ifdef NOT_USED
/* This checks both copyObject() and the equal() routines... */ /* This checks both copyObject() and the equal() routines... */
if (!equal(new_plan, plan)) if (!equal(new_plan, plan))
ereport(WARNING, elog(WARNING, "copyObject() failed to produce an equal plan tree");
(errmsg("copyObject() failed to produce an equal plan tree")));
else else
#endif #endif
plan = new_plan; plan = new_plan;
...@@ -2654,7 +2652,7 @@ PostgresMain(int argc, char *argv[], const char *username) ...@@ -2654,7 +2652,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.368 $ $Date: 2003/09/29 18:50:58 $\n"); puts("$Revision: 1.369 $ $Date: 2003/10/02 06:34:04 $\n");
} }
/* /*
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.207 2003/09/24 18:54:01 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.208 2003/10/02 06:34:04 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1555,7 +1555,7 @@ CreateCommandTag(Node *parsetree) ...@@ -1555,7 +1555,7 @@ CreateCommandTag(Node *parsetree)
break; break;
default: default:
elog(NOTICE, "unrecognized node type: %d", elog(WARNING, "unrecognized node type: %d",
(int) nodeTag(parsetree)); (int) nodeTag(parsetree));
tag = "???"; tag = "???";
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment