mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
Change made to elog:
o Change all current CVS messages of NOTICE to WARNING. We were going to do this just before 7.3 beta but it has to be done now, as you will see below. o Change current INFO messages that should be controlled by client_min_messages to NOTICE. o Force remaining INFO messages, like from EXPLAIN, VACUUM VERBOSE, etc. to always go to the client. o Remove INFO from the client_min_messages options and add NOTICE. Seems we do need three non-ERROR elog levels to handle the various behaviors we need for these messages. Regression passed.
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Integer array aggregator / enumerator
|
||||
*
|
||||
* Mark L. Woodward
|
||||
* Mark L. Woodward
|
||||
* DMN Digital Music Network.
|
||||
* www.dmn.com
|
||||
*
|
||||
@ -73,9 +73,9 @@ PG_FUNCTION_INFO_V1(int_agg_final_count);
|
||||
PG_FUNCTION_INFO_V1(int_agg_final_array);
|
||||
PG_FUNCTION_INFO_V1(int_enum);
|
||||
|
||||
/*
|
||||
* Manage the aggregation state of the array
|
||||
* You need to specify the correct memory context, or it will vanish!
|
||||
/*
|
||||
* Manage the aggregation state of the array
|
||||
* You need to specify the correct memory context, or it will vanish!
|
||||
*/
|
||||
static PGARRAY * GetPGArray(int4 state, int fAdd)
|
||||
{
|
||||
@ -129,7 +129,7 @@ static PGARRAY * GetPGArray(int4 state, int fAdd)
|
||||
return p;
|
||||
}
|
||||
|
||||
/* Shrinks the array to its actual size and moves it into the standard
|
||||
/* Shrinks the array to its actual size and moves it into the standard
|
||||
* memory allocation context, frees working memory */
|
||||
static PGARRAY *ShrinkPGArray(PGARRAY *p)
|
||||
{
|
||||
@ -156,7 +156,7 @@ static PGARRAY *ShrinkPGArray(PGARRAY *p)
|
||||
elog(ERROR, "Integer aggregator, can't allocate memory");
|
||||
}
|
||||
pfree(p);
|
||||
}
|
||||
}
|
||||
return pnew;
|
||||
}
|
||||
|
||||
@ -206,14 +206,14 @@ Datum int_enum(PG_FUNCTION_ARGS)
|
||||
|
||||
if(!p)
|
||||
{
|
||||
elog(NOTICE, "No data sent\n");
|
||||
elog(WARNING, "No data sent\n");
|
||||
return 0;
|
||||
}
|
||||
if(!rsi)
|
||||
{
|
||||
elog(ERROR, "No ReturnSetInfo sent! function must be declared returning a 'setof' integer");
|
||||
PG_RETURN_NULL();
|
||||
|
||||
|
||||
}
|
||||
if(!fcinfo->context)
|
||||
{
|
||||
|
Reference in New Issue
Block a user