mirror of
https://github.com/postgres/postgres.git
synced 2025-06-27 23:21:58 +03:00
Change elog(WARN) to elog(ERROR) and elog(ABORT).
This commit is contained in:
@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.9 1997/12/11 17:36:38 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.10 1998/01/05 03:32:44 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -98,7 +98,7 @@ InsertRule(char *rulname,
|
||||
eventrel = heap_openr(evobj);
|
||||
if (eventrel == NULL)
|
||||
{
|
||||
elog(WARN, "rules cannot be defined on relations not in schema");
|
||||
elog(ABORT, "rules cannot be defined on relations not in schema");
|
||||
}
|
||||
eventrel_oid = RelationGetRelationId(eventrel);
|
||||
|
||||
@ -118,7 +118,7 @@ InsertRule(char *rulname,
|
||||
evqual = "nil";
|
||||
|
||||
if (IsDefinedRewriteRule(rulname))
|
||||
elog(WARN, "Attempt to insert rule '%s' failed: already exists",
|
||||
elog(ABORT, "Attempt to insert rule '%s' failed: already exists",
|
||||
rulname);
|
||||
strcpyq(actionbuf, actiontree);
|
||||
strcpyq(qualbuf, evqual);
|
||||
@ -130,7 +130,7 @@ InsertRule(char *rulname,
|
||||
if (strlen(template) + strlen(rulname) + strlen(actionbuf) +
|
||||
strlen(qualbuf) + 20 /* fudge fac */ > RULE_PLAN_SIZE)
|
||||
{
|
||||
elog(WARN, "DefineQueryRewrite: rule plan string too big.");
|
||||
elog(ABORT, "DefineQueryRewrite: rule plan string too big.");
|
||||
}
|
||||
sprintf(rulebuf, template,
|
||||
rulname, evtype, eventrel_oid, evslot_index, actionbuf,
|
||||
@ -156,12 +156,12 @@ ValidateRule(int event_type,
|
||||
if (((event_type == CMD_INSERT) || (event_type == CMD_DELETE)) &&
|
||||
eslot_string)
|
||||
{
|
||||
elog(WARN,
|
||||
elog(ABORT,
|
||||
"rules not allowed for insert or delete events to an attribute");
|
||||
}
|
||||
|
||||
if (event_qual && !*action && is_instead)
|
||||
elog(WARN,
|
||||
elog(ABORT,
|
||||
"event_quals on 'instead nothing' rules not currently supported");
|
||||
|
||||
#if 0
|
||||
@ -211,7 +211,7 @@ DefineQueryRewrite(RuleStmt *stmt)
|
||||
event_relation = heap_openr(event_obj->relname);
|
||||
if (event_relation == NULL)
|
||||
{
|
||||
elog(WARN, "virtual relations not supported yet");
|
||||
elog(ABORT, "virtual relations not supported yet");
|
||||
}
|
||||
ev_relid = RelationGetRelationId(event_relation);
|
||||
|
||||
@ -265,7 +265,7 @@ DefineQueryRewrite(RuleStmt *stmt)
|
||||
|
||||
/* what is the max size of type text? XXX -- glass */
|
||||
if (length(action) > 15)
|
||||
elog(WARN, "max # of actions exceeded");
|
||||
elog(ABORT, "max # of actions exceeded");
|
||||
prs2_addToRelation(ev_relid, ruleId, event_type, event_attno,
|
||||
is_instead, event_qual, action);
|
||||
}
|
||||
|
@ -6,7 +6,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.7 1998/01/04 04:31:28 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.8 1998/01/05 03:32:45 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -647,7 +647,7 @@ deepRewriteQuery(Query *parsetree)
|
||||
|
||||
if (++numQueryRewriteInvoked > REWRITE_INVOKE_MAX)
|
||||
{
|
||||
elog(WARN, "query rewritten %d times, may contain cycles",
|
||||
elog(ABORT, "query rewritten %d times, may contain cycles",
|
||||
numQueryRewriteInvoked - 1);
|
||||
}
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.7 1997/11/24 05:08:40 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.8 1998/01/05 03:32:46 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -39,13 +39,13 @@ RewriteGetRuleEventRel(char *rulename)
|
||||
htp = SearchSysCacheTuple(REWRITENAME, PointerGetDatum(rulename),
|
||||
0, 0, 0);
|
||||
if (!HeapTupleIsValid(htp))
|
||||
elog(WARN, "RewriteGetRuleEventRel: rule \"%s\" not found",
|
||||
elog(ABORT, "RewriteGetRuleEventRel: rule \"%s\" not found",
|
||||
rulename);
|
||||
eventrel = ((Form_pg_rewrite) GETSTRUCT(htp))->ev_class;
|
||||
htp = SearchSysCacheTuple(RELOID, PointerGetDatum(eventrel),
|
||||
0, 0, 0);
|
||||
if (!HeapTupleIsValid(htp))
|
||||
elog(WARN, "RewriteGetRuleEventRel: class %d not found",
|
||||
elog(ABORT, "RewriteGetRuleEventRel: class %d not found",
|
||||
eventrel);
|
||||
return ((Form_pg_class) GETSTRUCT(htp))->relname.data;
|
||||
}
|
||||
@ -99,7 +99,7 @@ RemoveRewriteRule(char *ruleName)
|
||||
if (!HeapTupleIsValid(tuple))
|
||||
{
|
||||
heap_close(RewriteRelation);
|
||||
elog(WARN, "No rule with name = '%s' was found.\n", ruleName);
|
||||
elog(ABORT, "No rule with name = '%s' was found.\n", ruleName);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -116,7 +116,7 @@ RemoveRewriteRule(char *ruleName)
|
||||
if (isNull)
|
||||
{
|
||||
/* XXX strange!!! */
|
||||
elog(WARN, "RemoveRewriteRule: null event target relation!");
|
||||
elog(ABORT, "RemoveRewriteRule: null event target relation!");
|
||||
}
|
||||
eventRelationOid = DatumGetObjectId(eventRelationOidDatum);
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.12 1997/11/20 23:22:39 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.13 1998/01/05 03:32:47 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -56,7 +56,7 @@ RuleIdGetActionInfo(Oid ruleoid, bool *instead_flag, Query **parseTrees)
|
||||
ObjectIdGetDatum(ruleoid),
|
||||
0, 0, 0);
|
||||
if (ruletuple == NULL)
|
||||
elog(WARN, "rule %u isn't in rewrite system relation", ruleoid);
|
||||
elog(ABORT, "rule %u isn't in rewrite system relation", ruleoid);
|
||||
|
||||
ruleaction = (char *)heap_getattr(ruletuple,
|
||||
InvalidBuffer,
|
||||
@ -72,7 +72,7 @@ RuleIdGetActionInfo(Oid ruleoid, bool *instead_flag, Query **parseTrees)
|
||||
|
||||
if (action_is_null || instead_is_null)
|
||||
{
|
||||
elog(WARN, "internal error: rewrite rule not properly set up");
|
||||
elog(ABORT, "internal error: rewrite rule not properly set up");
|
||||
}
|
||||
|
||||
ruleaction = textout((struct varlena *) ruleaction);
|
||||
|
Reference in New Issue
Block a user