diff options
110 files changed, 788 insertions, 798 deletions
diff --git a/contrib/array/array_iterator.c b/contrib/array/array_iterator.c index 3622cf9819..8a2455b673 100644 --- a/contrib/array/array_iterator.c +++ b/contrib/array/array_iterator.c @@ -49,7 +49,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value) /* Sanity checks */ if (array == (ArrayType *) NULL) { - /* elog(NOTICE, "array_iterator: array is null"); */ + /* elog(WARNING, "array_iterator: array is null"); */ return (0); } @@ -60,10 +60,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value) dim = ARR_DIMS(array); nitems = ArrayGetNItems(ndim, dim); if (nitems == 0) - { - /* elog(NOTICE, "array_iterator: nitems = 0"); */ return (0); - } /* Lookup element type information */ get_typlenbyval(elemtype, &typlen, &typbyval); diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c index b2187fdb0d..6e8d17b747 100644 --- a/contrib/intagg/int_aggregate.c +++ b/contrib/intagg/int_aggregate.c @@ -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) { diff --git a/contrib/intarray/_int.c b/contrib/intarray/_int.c index 35ee7a659e..ba91a0eba4 100644 --- a/contrib/intarray/_int.c +++ b/contrib/intarray/_int.c @@ -33,8 +33,8 @@ /* dimension of array */ #define NDIM 1 -/* - * flags for gist__int_ops, use ArrayType->flags +/* + * flags for gist__int_ops, use ArrayType->flags * which is unused (see array.h) */ #define LEAFKEY (1<<31) @@ -112,7 +112,7 @@ printarr(ArrayType *a, int num) sprintf(cur, "%d ", d[l]); cur = strchr(cur, '\0'); } - elog(NOTICE, "\t\t%s", bbb); + elog(DEBUG3, "\t\t%s", bbb); } static void printbitvec(BITVEC bv) @@ -123,7 +123,7 @@ printbitvec(BITVEC bv) str[SIGLENBIT] = '\0'; LOOPBIT(str[i] = (GETBIT(bv, i)) ? '1' : '0'); - elog(NOTICE, "BV: %s", str); + elog(DEBUG3, "BV: %s", str); } #endif @@ -234,7 +234,7 @@ static void rt__intbig_size(ArrayType *a, float *sz); /***************************************************************************** - * Boolean Search + * Boolean Search *****************************************************************************/ #define BooleanSearchStrategy 20 @@ -261,17 +261,17 @@ typedef struct { PG_FUNCTION_INFO_V1(bqarr_in); PG_FUNCTION_INFO_V1(bqarr_out); -Datum bqarr_in(PG_FUNCTION_ARGS); +Datum bqarr_in(PG_FUNCTION_ARGS); Datum bqarr_out(PG_FUNCTION_ARGS); - + PG_FUNCTION_INFO_V1(boolop); -Datum boolop(PG_FUNCTION_ARGS); +Datum boolop(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(rboolop); -Datum rboolop(PG_FUNCTION_ARGS); +Datum rboolop(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(querytree); -Datum querytree(PG_FUNCTION_ARGS); +Datum querytree(PG_FUNCTION_ARGS); static bool signconsistent( QUERYTYPE *query, BITVEC sign, bool leaf ); static bool execconsistent( QUERYTYPE *query, ArrayType *array, bool leaf ); @@ -294,10 +294,10 @@ g_int_consistent(PG_FUNCTION_ARGS) { bool retval; if ( strategy == BooleanSearchStrategy ) - PG_RETURN_BOOL(execconsistent( (QUERYTYPE*)query, + PG_RETURN_BOOL(execconsistent( (QUERYTYPE*)query, (ArrayType *) DatumGetPointer(entry->key), ISLEAFKEY( (ArrayType *) DatumGetPointer(entry->key) ) ) ); - + /* XXX are we sure it's safe to scribble on the query object here? */ /* XXX what about toasted input? */ /* sort query for fast search, key is already sorted */ @@ -317,10 +317,10 @@ g_int_consistent(PG_FUNCTION_ARGS) { query); break; case RTContainedByStrategyNumber: - if ( GIST_LEAF(entry) ) + if ( GIST_LEAF(entry) ) retval = inner_int_contains(query, (ArrayType *) DatumGetPointer(entry->key) ); - else + else retval = inner_int_overlap((ArrayType *) DatumGetPointer(entry->key), query); break; @@ -334,9 +334,9 @@ Datum g_int_union(PG_FUNCTION_ARGS) { PG_RETURN_POINTER( _int_common_union( - (bytea *) PG_GETARG_POINTER(0), - (int *) PG_GETARG_POINTER(1), - inner_int_union + (bytea *) PG_GETARG_POINTER(0), + (int *) PG_GETARG_POINTER(1), + inner_int_union ) ); } @@ -371,10 +371,10 @@ g_int_compress(PG_FUNCTION_ARGS) if ( r != (ArrayType*)DatumGetPointer(entry->key) ) pfree(r); PG_RETURN_POINTER(entry); - } + } if ( (len=ARRNELEMS(r)) >= 2 * MAXNUMRANGE) { /* compress */ - if ( r == (ArrayType*)DatumGetPointer( entry->key) ) + if ( r == (ArrayType*)DatumGetPointer( entry->key) ) r = (ArrayType *) PG_DETOAST_DATUM_COPY(entry->key); r = resize_intArrayType(r, 2 * (len)); @@ -434,11 +434,11 @@ g_int_decompress(PG_FUNCTION_ARGS) if (lenin < 2 * MAXNUMRANGE || ISLEAFKEY( in ) ) { /* not comressed value */ if ( in != (ArrayType *) DatumGetPointer(entry->key)) { retval = palloc(sizeof(GISTENTRY)); - gistentryinit(*retval, PointerGetDatum(in), + gistentryinit(*retval, PointerGetDatum(in), entry->rel, entry->page, entry->offset, VARSIZE(in), FALSE); PG_RETURN_POINTER(retval); - } + } PG_RETURN_POINTER(entry); } @@ -456,7 +456,7 @@ g_int_decompress(PG_FUNCTION_ARGS) if (in != (ArrayType *) DatumGetPointer(entry->key)) pfree(in); retval = palloc(sizeof(GISTENTRY)); - gistentryinit(*retval, PointerGetDatum(r), + gistentryinit(*retval, PointerGetDatum(r), entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE); PG_RETURN_POINTER(retval); @@ -468,10 +468,10 @@ g_int_decompress(PG_FUNCTION_ARGS) Datum g_int_penalty(PG_FUNCTION_ARGS) { - PG_RETURN_POINTER( _int_common_penalty( - (GISTENTRY *)PG_GETARG_POINTER(0), - (GISTENTRY *)PG_GETARG_POINTER(1), - (float *) PG_GETARG_POINTER(2), + PG_RETURN_POINTER( _int_common_penalty( + (GISTENTRY *)PG_GETARG_POINTER(0), + (GISTENTRY *)PG_GETARG_POINTER(1), + (float *) PG_GETARG_POINTER(2), inner_int_union, rt__int_size ) ); } @@ -481,12 +481,12 @@ Datum g_int_picksplit(PG_FUNCTION_ARGS) { PG_RETURN_POINTER( _int_common_picksplit( - (bytea *)PG_GETARG_POINTER(0), + (bytea *)PG_GETARG_POINTER(0), (GIST_SPLITVEC *)PG_GETARG_POINTER(1), inner_int_union, inner_int_inter, rt__int_size, - 0.01 + 0.01 ) ); } @@ -520,14 +520,14 @@ g_int_same(PG_FUNCTION_ARGS) PG_RETURN_POINTER(result); } -Datum +Datum _int_contained(PG_FUNCTION_ARGS) { - PG_RETURN_BOOL( DatumGetBool( - DirectFunctionCall2( - _int_contains, - PointerGetDatum(PG_GETARG_POINTER(1)), - PointerGetDatum(PG_GETARG_POINTER(0)) + PG_RETURN_BOOL( DatumGetBool( + DirectFunctionCall2( + _int_contains, + PointerGetDatum(PG_GETARG_POINTER(1)), + PointerGetDatum(PG_GETARG_POINTER(0)) ) )); } @@ -570,7 +570,7 @@ inner_int_contains(ArrayType *a, ArrayType *b) db = ARRPTR(b); #ifdef GIST_DEBUG - elog(NOTICE, "contains %d %d", na, nb); + elog(DEBUG3, "contains %d %d", na, nb); #endif i = j = n = 0; @@ -593,14 +593,14 @@ inner_int_contains(ArrayType *a, ArrayType *b) * Operator class for R-tree indexing *****************************************************************************/ -Datum +Datum _int_different(PG_FUNCTION_ARGS) { - PG_RETURN_BOOL( ! DatumGetBool( - DirectFunctionCall2( - _int_same, - PointerGetDatum(PG_GETARG_POINTER(0)), - PointerGetDatum(PG_GETARG_POINTER(1)) + PG_RETURN_BOOL( ! DatumGetBool( + DirectFunctionCall2( + _int_same, + PointerGetDatum(PG_GETARG_POINTER(0)), + PointerGetDatum(PG_GETARG_POINTER(1)) ) )); } @@ -690,7 +690,7 @@ inner_int_overlap(ArrayType *a, ArrayType *b) db = ARRPTR(b); #ifdef GIST_DEBUG - elog(NOTICE, "g_int_overlap"); + elog(DEBUG3, "g_int_overlap"); #endif i = j = 0; @@ -1030,7 +1030,7 @@ rt__intbig_size(ArrayType *a, float *sz) GETBITBYTE(bv,7) ; bv = (BITVECP) ( ((char*)bv) + 1 ); ); - + *sz = (float) len; return; } @@ -1116,19 +1116,19 @@ g_intbig_compress(PG_FUNCTION_ARGS) in = NULL; if (!entry->leafkey) { - LOOPBYTE( + LOOPBYTE( if ( ( ((char*)ARRPTR(in))[i] & 0xff ) != 0xff ) { maycompress = false; break; } - ); + ); if ( maycompress ) { retval = palloc(sizeof(GISTENTRY)); r = new_intArrayType(1); - gistentryinit(*retval, PointerGetDatum(r), + gistentryinit(*retval, PointerGetDatum(r), entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE); PG_RETURN_POINTER( retval ); - } + } PG_RETURN_POINTER( entry ); } @@ -1148,17 +1148,17 @@ g_intbig_compress(PG_FUNCTION_ARGS) ARRPTR(in), ARRNELEMS(in)); - LOOPBYTE( + LOOPBYTE( if( ( ((char*)ARRPTR(in))[i] & 0xff ) != 0xff ) { maycompress = false; break; } - ); + ); if ( maycompress ) { pfree(r); r = new_intArrayType(1); - } + } gistentryinit(*retval, PointerGetDatum(r), entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE); @@ -1182,7 +1182,7 @@ g_intbig_decompress(PG_FUNCTION_ARGS) retval = palloc(sizeof(GISTENTRY)); - gistentryinit(*retval, PointerGetDatum(key), + gistentryinit(*retval, PointerGetDatum(key), entry->rel, entry->page, entry->offset, (key) ? VARSIZE(key) : 0, FALSE); PG_RETURN_POINTER( retval ); } @@ -1192,9 +1192,9 @@ g_intbig_decompress(PG_FUNCTION_ARGS) retval = palloc(sizeof(GISTENTRY)); newkey = new_intArrayType(SIGLENINT); - MemSet( (void*)ARRPTR(newkey), 0xff, SIGLEN ); + MemSet( (void*)ARRPTR(newkey), 0xff, SIGLEN ); - gistentryinit(*retval, PointerGetDatum(newkey), + gistentryinit(*retval, PointerGetDatum(newkey), entry->rel, entry->page, entry->offset, VARSIZE(newkey), FALSE); PG_RETURN_POINTER( retval ); } @@ -1205,7 +1205,7 @@ Datum g_intbig_picksplit(PG_FUNCTION_ARGS) { PG_RETURN_POINTER( _int_common_picksplit( - (bytea *)PG_GETARG_POINTER(0), + (bytea *)PG_GETARG_POINTER(0), (GIST_SPLITVEC *)PG_GETARG_POINTER(1), _intbig_union, _intbig_inter, @@ -1217,37 +1217,37 @@ g_intbig_picksplit(PG_FUNCTION_ARGS) Datum g_intbig_union(PG_FUNCTION_ARGS) { - PG_RETURN_POINTER( _int_common_union( - (bytea *) PG_GETARG_POINTER(0), - (int *) PG_GETARG_POINTER(1), - _intbig_union - ) ); + PG_RETURN_POINTER( _int_common_union( + (bytea *) PG_GETARG_POINTER(0), + (int *) PG_GETARG_POINTER(1), + _intbig_union + ) ); } Datum g_intbig_penalty(PG_FUNCTION_ARGS) { - PG_RETURN_POINTER( _int_common_penalty( - (GISTENTRY *)PG_GETARG_POINTER(0), - (GISTENTRY *)PG_GETARG_POINTER(1), - (float *) PG_GETARG_POINTER(2), + PG_RETURN_POINTER( _int_common_penalty( + (GISTENTRY *)PG_GETARG_POINTER(0), + (GISTENTRY *)PG_GETARG_POINTER(1), + (float *) PG_GETARG_POINTER(2), _intbig_union, rt__intbig_size ) ); } Datum g_intbig_consistent(PG_FUNCTION_ARGS) { - GISTENTRY *entry = (GISTENTRY *)PG_GETARG_POINTER(0); - ArrayType *query = ( ArrayType * )PG_GETARG_POINTER(1); - StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); + GISTENTRY *entry = (GISTENTRY *)PG_GETARG_POINTER(0); + ArrayType *query = ( ArrayType * )PG_GETARG_POINTER(1); + StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); bool retval; ArrayType *q; if ( strategy == BooleanSearchStrategy ) - PG_RETURN_BOOL(signconsistent( (QUERYTYPE*)query, + PG_RETURN_BOOL(signconsistent( (QUERYTYPE*)query, SIGPTR((ArrayType *) DatumGetPointer(entry->key)), false ) ); - + /* XXX what about toasted input? */ if (ARRISVOID(query)) return FALSE; @@ -1293,7 +1293,7 @@ _int_common_union(bytea *entryvec, int *sizep, formarray unionf) ArrayType *tmp; #ifdef GIST_DEBUG - elog(NOTICE, "_int_common_union in"); + elog(DEBUG3, "_int_common_union in"); #endif numranges = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY); @@ -1314,12 +1314,12 @@ _int_common_union(bytea *entryvec, int *sizep, formarray unionf) { pfree(out); #ifdef GIST_DEBUG - elog(NOTICE, "_int_common_union out1"); + elog(DEBUG3, "_int_common_union out1"); #endif return NULL; } #ifdef GIST_DEBUG - elog(NOTICE, "_int_common_union out"); + elog(DEBUG3, "_int_common_union out"); #endif return (out); @@ -1339,7 +1339,7 @@ _int_common_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result, tmp2; #ifdef GIST_DEBUG - elog(NOTICE, "penalty"); + elog(DEBUG3, "penalty"); #endif ud = (*unionf) ((ArrayType *) DatumGetPointer(origentry->key), (ArrayType *) DatumGetPointer(newentry->key)); @@ -1349,7 +1349,7 @@ _int_common_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result, pfree(ud); #ifdef GIST_DEBUG - elog(NOTICE, "--penalty\t%g", *result); + elog(DEBUG3, "--penalty\t%g", *result); #endif return (result); @@ -1360,7 +1360,7 @@ typedef struct { float cost; } SPLITCOST; -static int +static int comparecost( const void *a, const void *b ) { if ( ((SPLITCOST*)a)->cost == ((SPLITCOST*)b)->cost ) return 0; @@ -1408,7 +1408,7 @@ _int_common_picksplit(bytea *entryvec, SPLITCOST *costvector; #ifdef GIST_DEBUG - elog(NOTICE, "--------picksplit %d", (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)); + elog(DEBUG3, "--------picksplit %d", (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)); #endif maxoff = ((VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)) - 2; @@ -1471,7 +1471,7 @@ _int_common_picksplit(bytea *entryvec, maxoff = OffsetNumberNext(maxoff); /* - * sort entries + * sort entries */ costvector=(SPLITCOST*)palloc( sizeof(SPLITCOST)*maxoff ); for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i)) { @@ -1486,7 +1486,7 @@ _int_common_picksplit(bytea *entryvec, costvector[i-1].cost = abs( (size_alpha - size_l) - (size_beta - size_r) ); } qsort( (void*)costvector, maxoff, sizeof(SPLITCOST), comparecost ); - + /* * Now split up the regions between the two seeds. An important * property of this split algorithm is that the split vector v has the @@ -1499,7 +1499,7 @@ _int_common_picksplit(bytea *entryvec, * tuples and i == maxoff + 1. */ - + for (j = 0; j < maxoff; j++) { i = costvector[j].pos; @@ -1562,13 +1562,13 @@ _int_common_picksplit(bytea *entryvec, v->spl_rdatum = PointerGetDatum(datum_r); #ifdef GIST_DEBUG - elog(NOTICE, "--------ENDpicksplit %d %d", v->spl_nleft, v->spl_nright); + elog(DEBUG3, "--------ENDpicksplit %d %d", v->spl_nleft, v->spl_nright); #endif return v; } /***************************************************************************** - * BoolSearch + * BoolSearch *****************************************************************************/ @@ -1607,7 +1607,7 @@ typedef struct { /* * get token from query string */ -static int4 +static int4 gettoken( WORKSTATE* state, int4* val ) { char nnn[16], *curnnn; @@ -1616,7 +1616,7 @@ gettoken( WORKSTATE* state, int4* val ) { switch(state->state) { case WAITOPERAND: curnnn=nnn; - if ( (*(state->buf)>='0' && *(state->buf)<='9') || + if ( (*(state->buf)>='0' && *(state->buf)<='9') || *(state->buf)=='-' ) { state->state = WAITENDOPERAND; *curnnn = *(state->buf); @@ -1629,7 +1629,7 @@ gettoken( WORKSTATE* state, int4* val ) { state->count++; (state->buf)++; return OPEN; - } else if ( *(state->buf) != ' ' ) + } else if ( *(state->buf) != ' ' ) return ERR; break; case WAITENDOPERAND: @@ -1640,7 +1640,7 @@ gettoken( WORKSTATE* state, int4* val ) { *curnnn = '\0'; *val=(int4)atoi( nnn ); state->state = WAITOPERATOR; - return ( state->count && *(state->buf) == '\0' ) + return ( state->count && *(state->buf) == '\0' ) ? ERR : VAL; } break; @@ -1648,7 +1648,7 @@ gettoken( WORKSTATE* state, int4* val ) { if ( *(state->buf) == '&' || *(state->buf) == '|' ) { state->state = WAITOPERAND; *val = (int4) *(state->buf); - (state->buf)++; + (state->buf)++; return OPR; } else if ( *(state->buf) == ')' ) { (state->buf)++; @@ -1659,11 +1659,11 @@ gettoken( WORKSTATE* state, int4* val ) { } else if ( *(state->buf) != ' ' ) return ERR; break; - default: + default: return ERR; break; - } - (state->buf)++; + } + (state->buf)++; } return END; } @@ -1686,7 +1686,7 @@ pushquery( WORKSTATE *state, int4 type, int4 val ) { /* * make polish notaion of query */ -static int4 +static int4 makepol(WORKSTATE *state) { int4 val,type; int4 stack[STACKDEPTH]; @@ -1696,7 +1696,7 @@ makepol(WORKSTATE *state) { switch(type) { case VAL: pushquery(state, type, val); - while ( lenstack && (stack[ lenstack-1 ] == (int4)'&' || + while ( lenstack && (stack[ lenstack-1 ] == (int4)'&' || stack[ lenstack-1 ] == (int4)'!') ) { lenstack--; pushquery(state, OPR, stack[ lenstack ]); @@ -1705,7 +1705,7 @@ makepol(WORKSTATE *state) { case OPR: if ( lenstack && val == (int4) '|' ) { pushquery(state, OPR, val); - } else { + } else { if ( lenstack == STACKDEPTH ) elog(ERROR,"Stack too short"); stack[ lenstack ] = val; @@ -1714,7 +1714,7 @@ makepol(WORKSTATE *state) { break; case OPEN: if ( makepol( state ) == ERR ) return ERR; - if ( lenstack && (stack[ lenstack-1 ] == (int4)'&' || + if ( lenstack && (stack[ lenstack-1 ] == (int4)'&' || stack[ lenstack-1 ] == (int4)'!') ) { lenstack--; pushquery(state, OPR, stack[ lenstack ]); @@ -1731,7 +1731,7 @@ makepol(WORKSTATE *state) { default: elog(ERROR,"Syntax error"); return ERR; - + } } @@ -1772,7 +1772,7 @@ checkcondition_arr( void *checkval, int4 val ) { static bool checkcondition_bit( void *checkval, int4 val ) { - return GETBIT( checkval, HASHVAL( val ) ); + return GETBIT( checkval, HASHVAL( val ) ); } /* @@ -1784,8 +1784,8 @@ execute( ITEM* curitem, void *checkval, bool calcnot, bool (*chkcond)(void *chec if ( curitem->type == VAL ) { return (*chkcond)( checkval, curitem->val ); } else if ( curitem->val == (int4)'!' ) { - return ( calcnot ) ? - ( ( execute(curitem - 1, checkval, calcnot, chkcond) ) ? false : true ) + return ( calcnot ) ? + ( ( execute(curitem - 1, checkval, calcnot, chkcond) ) ? false : true ) : true; } else if ( curitem->val == (int4)'&' ) { if ( execute(curitem + curitem->left, checkval, calcnot, chkcond) ) @@ -1799,35 +1799,35 @@ execute( ITEM* curitem, void *checkval, bool calcnot, bool (*chkcond)(void *chec return execute(curitem - 1, checkval, calcnot, chkcond); } return false; -} +} /* * signconsistent & execconsistent called by *_consistent */ -static bool +static bool signconsistent( QUERYTYPE *query, BITVEC sign, bool calcnot ) { - return execute( - GETQUERY(query) + query->size-1 , - (void*)sign, calcnot, - checkcondition_bit - ); + return execute( + GETQUERY(query) + query->size-1 , + (void*)sign, calcnot, + checkcondition_bit + ); } -static bool +static bool execconsistent( QUERYTYPE *query, ArrayType *array, bool calcnot ) { CHKVAL chkval; chkval.arrb = ARRPTR(array); chkval.arre = chkval.arrb + ARRNELEMS(array); - return execute( - GETQUERY(query) + query->size-1 , - (void*)&chkval, calcnot, - checkcondition_arr + return execute( + GETQUERY(query) + query->size-1 , + (void*)&chkval, calcnot, + checkcondition_arr ); } /* - * boolean operations + * boolean operations */ Datum rboolop(PG_FUNCTION_ARGS) { @@ -1844,7 +1844,7 @@ boolop(PG_FUNCTION_ARGS) { QUERYTYPE *query = ( QUERYTYPE * )PG_DETOAST_DATUM(PG_GETARG_POINTER(1)); CHKVAL chkval; bool result; - + if ( ARRISVOID( val ) ) { pfree(val); PG_FREE_IF_COPY(query,1); @@ -1854,10 +1854,10 @@ boolop(PG_FUNCTION_ARGS) { PREPAREARR(val); chkval.arrb = ARRPTR(val); chkval.arre = chkval.arrb + ARRNELEMS(val); - result = execute( - GETQUERY(query) + query->size-1 , - &chkval, true, - checkcondition_arr + result = execute( + GETQUERY(query) + query->size-1 , + &chkval, true, + checkcondition_arr ); pfree(val); @@ -1868,7 +1868,7 @@ boolop(PG_FUNCTION_ARGS) { static void findoprnd( ITEM *ptr, int4 *pos ) { #ifdef BS_DEBUG - elog(NOTICE, ( ptr[*pos].type == OPR ) ? + elog(DEBUG3, ( ptr[*pos].type == OPR ) ? "%d %c" : "%d %d ", *pos, ptr[*pos].val ); #endif if ( ptr[*pos].type == VAL ) { @@ -1880,7 +1880,7 @@ findoprnd( ITEM *ptr, int4 *pos ) { findoprnd( ptr, pos ); } else { ITEM *curitem = &ptr[*pos]; - int4 tmp = *pos; + int4 tmp = *pos; (*pos)--; findoprnd(ptr,pos); curitem->left = *pos - tmp; @@ -1914,7 +1914,7 @@ bqarr_in(PG_FUNCTION_ARGS) { /* make polish notation (postfix, but in reverse order) */ makepol( &state ); - if (!state.num) + if (!state.num) elog( ERROR,"Empty query"); commonlen = COMPUTESIZE(state.num); @@ -1924,26 +1924,26 @@ bqarr_in(PG_FUNCTION_ARGS) { ptr = GETQUERY(query); for(i=state.num-1; i>=0; i-- ) { - ptr[i].type = state.str->type; + ptr[i].type = state.str->type; ptr[i].val = state.str->val; tmp = state.str->next; pfree( state.str ); state.str = tmp; } - + pos = query->size-1; findoprnd( ptr, &pos ); #ifdef BS_DEBUG cur = pbuf; *cur = '\0'; for( i=0;i<query->size;i++ ) { - if ( ptr[i].type == OPR ) + if ( ptr[i].type == OPR ) sprintf(cur, "%c(%d) ", ptr[i].val, ptr[i].left); - else + else sprintf(cur, "%d ", ptr[i].val ); - cur = strchr(cur,'\0'); + cur = strchr(cur,'\0'); } - elog(NOTICE,"POR: %s", pbuf); + elog(DEBUG3,"POR: %s", pbuf); #endif PG_RETURN_POINTER( query ); @@ -1986,17 +1986,17 @@ infix(INFIX *in, bool first) { RESIZEBUF(in, 2); sprintf(in->cur, "( "); in->cur = strchr( in->cur, '\0' ); - } + } infix( in, isopr ); if ( isopr ) { RESIZEBUF(in, 2); sprintf(in->cur, " )"); in->cur = strchr( in->cur, '\0' ); - } + } } else { int4 op = in->curpol->val; INFIX nrm; - + in->curpol--; if ( op == (int4)'|' && ! first) { RESIZEBUF(in, 2); @@ -2007,10 +2007,10 @@ infix(INFIX *in, bool first) { nrm.curpol = in->curpol; nrm.buflen = 16; nrm.cur = nrm.buf = (char*)palloc( sizeof(char) * nrm.buflen ); - + /* get right operand */ infix( &nrm, false ); - + /* get & print left operand */ in->curpol = nrm.curpol; infix( in, false ); @@ -2036,13 +2036,13 @@ bqarr_out(PG_FUNCTION_ARGS) { INFIX nrm; if ( query->size == 0 ) - elog(ERROR,"Empty"); + elog(ERROR,"Empty"); nrm.curpol = GETQUERY(query) + query->size - 1; nrm.buflen = 32; nrm.cur = nrm.buf = (char*)palloc( sizeof(char) * nrm.buflen ); *(nrm.cur) = '\0'; infix( &nrm, true ); - + PG_FREE_IF_COPY(query,0); PG_RETURN_POINTER( nrm.buf ); } @@ -2054,16 +2054,16 @@ countdroptree( ITEM *q, int4 pos ) { } else if ( q[pos].val == (int4)'!' ) { return 1+countdroptree(q, pos-1); } else { - return 1 + countdroptree(q, pos-1) + countdroptree(q, pos + q[pos].left); - } + return 1 + countdroptree(q, pos-1) + countdroptree(q, pos + q[pos].left); + } } /* * common algorithm: - * result of all '!' will be = 'true', so + * result of all '!' will be = 'true', so * we can modify query tree for clearing */ -static int4 +static int4 shorterquery( ITEM *q, int4 len ) { int4 index,posnot,poscor; bool notisleft = false; @@ -2093,7 +2093,7 @@ shorterquery( ITEM *q, int4 len ) { if ( poscor == posnot+1 ) { notisleft = false; break; - } else if ( q[poscor].left + poscor == posnot ) { + } else if ( q[poscor].left + poscor == posnot ) { notisleft = true; break; } @@ -2104,9 +2104,9 @@ shorterquery( ITEM *q, int4 len ) { q[poscor-1].type=VAL; for(i=poscor+1;i<len;i++) if ( q[i].type == OPR && q[i].left + i <= poscor ) - q[i].left += drop - 2; - memcpy( (void*)&q[poscor-drop+1], - (void*)&q[poscor-1], + q[i].left += drop - 2; + memcpy( (void*)&q[poscor-drop+1], + (void*)&q[poscor-1], sizeof(ITEM) * ( len - (poscor-1) )); len -= drop - 2; } else if ( q[poscor].val == (int4)'|' ) { @@ -2116,16 +2116,16 @@ shorterquery( ITEM *q, int4 len ) { q[poscor].left=-1; for(i=poscor+1;i<len;i++) if ( q[i].type == OPR && q[i].left + i < poscor ) - q[i].left += drop - 2; - memcpy( (void*)&q[poscor-drop+1], - (void*)&q[poscor-1], + q[i].left += drop - 2; + memcpy( (void*)&q[poscor-drop+1], + (void*)&q[poscor-1], sizeof(ITEM) * ( len - (poscor-1) )); len -= drop - 2; } else { /* &-operator */ - if ( - (notisleft && q[poscor-1].type == OPR && + if ( + (notisleft && q[poscor-1].type == OPR && q[poscor-1].val == (int4)'!' ) || - (!notisleft && q[poscor+q[poscor].left].type == OPR && + (!notisleft && q[poscor+q[poscor].left].type == OPR && q[poscor+q[poscor].left].val == (int4)'!' ) ) { /* drop subtree */ drop = countdroptree(q, poscor); @@ -2134,26 +2134,26 @@ shorterquery( ITEM *q, int4 len ) { q[poscor].left=-1; for(i=poscor+1;i<len;i++) if ( q[i].type == OPR && q[i].left + i < poscor ) - q[i].left += drop - 2; - memcpy( (void*)&q[poscor-drop+1], - (void*)&q[poscor-1], + q[i].left += drop - 2; + memcpy( (void*)&q[poscor-drop+1], + (void*)&q[poscor-1], sizeof(ITEM) * ( len - (poscor-1) )); len -= drop - 2; } else { /* drop only operator */ - int4 subtreepos = ( notisleft ) ? + int4 subtreepos = ( notisleft ) ? poscor-1 : poscor+q[poscor].left; int4 subtreelen = countdroptree( q, subtreepos ); drop = countdroptree(q, poscor); for(i=poscor+1;i<len;i++) if ( q[i].type == OPR && q[i].left + i < poscor ) - q[i].left += drop - subtreelen; - memcpy( (void*)&q[ subtreepos+1 ], - (void*)&q[poscor+1], - sizeof(ITEM)*( len - (poscor-1) ) ); - memcpy( (void*)&q[ poscor-drop+1 ], - (void*)&q[subtreepos-subtreelen+1], + q[i].left += drop - subtreelen; + memcpy( (void*)&q[ subtreepos+1 ], + (void*)&q[poscor+1], + sizeof(ITEM)*( len - (poscor-1) ) ); + memcpy( (void*)&q[ poscor-drop+1 ], + (void*)&q[subtreepos-subtreelen+1], sizeof(ITEM)*( len - (drop-subtreelen) ) ); - len -= drop - subtreelen; + len -= drop - subtreelen; } } } while( index ); diff --git a/contrib/miscutil/misc_utils.c b/contrib/miscutil/misc_utils.c index 0779fcc1fc..d313392965 100644 --- a/contrib/miscutil/misc_utils.c +++ b/contrib/miscutil/misc_utils.c @@ -103,10 +103,7 @@ active_listeners(text *relname) d = heap_getattr(lTuple, Anum_pg_listener_pid, tdesc, &isnull); pid = DatumGetInt32(d); if ((pid == ourpid) || (kill(pid, SIGTSTP) == 0)) - { - /* elog(NOTICE, "%d ok", pid); */ count++; - } } heap_endscan(sRel); diff --git a/contrib/noupdate/noup.c b/contrib/noupdate/noup.c index af857c41f6..3fac897742 100644 --- a/contrib/noupdate/noup.c +++ b/contrib/noupdate/noup.c @@ -95,7 +95,7 @@ noup(PG_FUNCTION_ARGS) if (!isnull) { - elog(NOTICE, "%s: update not allowed", args[i]); + elog(WARNING, "%s: update not allowed", args[i]); SPI_finish(); return PointerGetDatum(NULL); } diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c index 2f0dbd9c07..dbea3d7222 100644 --- a/contrib/pgcrypto/px.c +++ b/contrib/pgcrypto/px.c @@ -217,7 +217,7 @@ combo_decrypt(PX_Combo * cx, const uint8 *data, unsigned dlen, /* error reporting should be done in pgcrypto.c */ block_error: - elog(NOTICE, "Data not a multiple of block size"); + elog(WARNING, "Data not a multiple of block size"); return -1; } diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 4db71ac289..b1fe5e54a9 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -123,7 +123,7 @@ pgstattuple(PG_FUNCTION_ARGS) free_percent = (double) free_space *100.0 / table_len; } - elog(NOTICE, "physical length: %.2fMB live tuples: %.0f (%.2fMB, %.2f%%) dead tuples: %.0f (%.2fMB, %.2f%%) free/reusable space: %.2fMB (%.2f%%) overhead: %.2f%%", + elog(DEBUG3, "physical length: %.2fMB live tuples: %.0f (%.2fMB, %.2f%%) dead tuples: %.0f (%.2fMB, %.2f%%) free/reusable space: %.2fMB (%.2f%%) overhead: %.2f%%", table_len / (1024 * 1024), /* physical length in MB */ diff --git a/contrib/rserv/rserv.c b/contrib/rserv/rserv.c index 6faab692d7..401cc5fd9c 100644 --- a/contrib/rserv/rserv.c +++ b/contrib/rserv/rserv.c @@ -132,7 +132,7 @@ _rserv_log_() GetCurrentTransactionId(), deleted, rel->rd_id, okey); if (debug) - elog(NOTICE, sql); + elog(DEBUG3, sql); ret = SPI_exec(sql, 0); @@ -153,7 +153,7 @@ _rserv_log_() deleted, okey); if (debug) - elog(NOTICE, sql); + elog(DEBUG3, sql); ret = SPI_exec(sql, 0); @@ -177,7 +177,7 @@ _rserv_log_() rel->rd_id, GetCurrentTransactionId(), okey); if (debug) - elog(NOTICE, sql); + elog(DEBUG3, sql); ret = SPI_exec(sql, 0); diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c index b4e6845ac6..82a07871fb 100644 --- a/contrib/spi/refint.c +++ b/contrib/spi/refint.c @@ -59,7 +59,7 @@ check_primary_key(PG_FUNCTION_ARGS) int i; #ifdef DEBUG_QUERY - elog(NOTICE, "Check_primary_key Enter Function"); + elog(DEBUG3, "Check_primary_key Enter Function"); #endif /* @@ -249,7 +249,7 @@ check_foreign_key(PG_FUNCTION_ARGS) r; #ifdef DEBUG_QUERY - elog(NOTICE, "Check_foreign_key Enter Function"); + elog(DEBUG3, "Check_foreign_key Enter Function"); #endif /* @@ -453,7 +453,7 @@ check_foreign_key(PG_FUNCTION_ARGS) strcmp(type, "date") && strcmp(type, "datetime")) == 0) is_char_type = 1; #ifdef DEBUG_QUERY - elog(NOTICE, "Check_foreign_key Debug value %s type %s %d", + elog(DEBUG3, "Check_foreign_key Debug value %s type %s %d", nv, type, is_char_type); #endif @@ -519,7 +519,7 @@ check_foreign_key(PG_FUNCTION_ARGS) } plan->nplans = nrefs; #ifdef DEBUG_QUERY - elog(NOTICE, "Check_foreign_key Debug Query is : %s ", sql); + elog(DEBUG3, "Check_foreign_key Debug Query is : %s ", sql); #endif } @@ -563,7 +563,7 @@ check_foreign_key(PG_FUNCTION_ARGS) } #ifdef REFINT_VERBOSE else - elog(NOTICE, "%s: %d tuple(s) of %s are %s", + elog(DEBUG3, "%s: %d tuple(s) of %s are %s", trigger->tgname, SPI_processed, relname, (action == 'c') ? "deleted" : "setted to null"); #endif diff --git a/contrib/tsearch/query.c b/contrib/tsearch/query.c index 46703d70a3..6666720c9b 100644 --- a/contrib/tsearch/query.c +++ b/contrib/tsearch/query.c @@ -449,7 +449,7 @@ static void findoprnd(ITEM * ptr, int4 *pos) { #ifdef BS_DEBUG - elog(NOTICE, (ptr[*pos].type == OPR) ? + elog(DEBUG3, (ptr[*pos].type == OPR) ? "%d %c" : "%d %d ", *pos, ptr[*pos].val); #endif if (ptr[*pos].type == VAL || ptr[*pos].type == VALTRUE) @@ -557,7 +557,7 @@ queryin(char *buf, void (*pushval) (QPRS_STATE *, int, char *, int)) sprintf(cur, "%d(%s) ", ptr[i].val, GETOPERAND(query) + ptr[i].distance); cur = strchr(cur, '\0'); } - elog(NOTICE, "POR: %s", pbuf); + elog(DEBUG3, "POR: %s", pbuf); #endif return query; @@ -609,7 +609,7 @@ mqtxt_in(PG_FUNCTION_ARGS) sprintf(cur, "%d(%s) ", ptr[i].val, GETOPERAND(query) + ptr[i].distance); cur = strchr(cur, '\0'); } - elog(NOTICE, "POR: %s", pbuf); + elog(DEBUG3, "POR: %s", pbuf); #endif pfree(res); PG_RETURN_POINTER(query); diff --git a/contrib/tsearch/txtidx.c b/contrib/tsearch/txtidx.c index 5eeb69b151..14f69913b7 100644 --- a/contrib/tsearch/txtidx.c +++ b/contrib/tsearch/txtidx.c @@ -556,7 +556,7 @@ tsearch(PG_FUNCTION_ARGS) oidtype = SPI_gettypeid(rel->rd_att, numattr); if (numattr < 0 || (!(oidtype == TEXTOID || oidtype == VARCHAROID))) { - elog(NOTICE, "TSearch: can not find field '%s'", trigger->tgargs[i]); + elog(WARNING, "TSearch: can not find field '%s'", trigger->tgargs[i]); continue; } txt_toasted = (text *) DatumGetPointer(SPI_getbinval(rettuple, rel->rd_att, numattr, &isnull)); diff --git a/contrib/xml/pgxml.c b/contrib/xml/pgxml.c index 3939250e25..682e7395b9 100644 --- a/contrib/xml/pgxml.c +++ b/contrib/xml/pgxml.c @@ -75,7 +75,7 @@ pgxml_parse(PG_FUNCTION_ARGS) if (!XML_Parse(p, (char *) VARDATA(t), docsize, 1)) { /* - * elog(NOTICE, "Parse error at line %d:%s", + * elog(WARNING, "Parse error at line %d:%s", * XML_GetCurrentLineNumber(p), * XML_ErrorString(XML_GetErrorCode(p))); */ @@ -158,7 +158,7 @@ build_xpath_results(text *doc, text *pathstr) if (!XML_Parse(p, (char *) VARDATA(doc), docsize, 1)) { /* - * elog(NOTICE, "Parse error at line %d:%s", + * elog(WARNING, "Parse error at line %d:%s", * XML_GetCurrentLineNumber(p), * XML_ErrorString(XML_GetErrorCode(p))); */ @@ -267,7 +267,7 @@ pgxml_starthandler(void *userData, const XML_Char * name, char sepstr[] = "/"; if ((strlen(name) + strlen(UD->currentpath)) > MAXPATHLENGTH - 2) - elog(NOTICE, "Path too long"); + elog(WARNING, "Path too long"); else { strncat(UD->currentpath, sepstr, 1); @@ -302,7 +302,7 @@ pgxml_endhandler(void *userData, const XML_Char * name) } if (strcmp(name, sepptr + 1) != 0) { - elog(NOTICE, "Wanted [%s], got [%s]", sepptr, name); + elog(WARNING, "Wanted [%s], got [%s]", sepptr, name); /* unmatched entry, so do nothing */ } else diff --git a/contrib/xml/pgxml_dom.c b/contrib/xml/pgxml_dom.c index f2f9973b89..0c22aced06 100644 --- a/contrib/xml/pgxml_dom.c +++ b/contrib/xml/pgxml_dom.c @@ -213,7 +213,7 @@ pgxml_xpath(PG_FUNCTION_ARGS) comppath = xmlXPathCompile(xpath); if (comppath == NULL) { - elog(NOTICE, "XPath syntax error"); + elog(WARNING, "XPath syntax error"); xmlFreeDoc(doctree); pfree((void *) xpath); PG_RETURN_NULL(); @@ -242,7 +242,7 @@ pgxml_xpath(PG_FUNCTION_ARGS) xpresstr = xmlStrdup(res->stringval); break; default: - elog(NOTICE, "Unsupported XQuery result: %d", res->type); + elog(WARNING, "Unsupported XQuery result: %d", res->type); xpresstr = xmlStrdup("<unsupported/>"); } diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 39ef44f431..4a1987aa8e 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -1926,7 +1926,7 @@ gist_dumptree(Relation r, int level, BlockNumber blk, OffsetNumber coff) maxoff = PageGetMaxOffsetNumber(page); - elog(NOTICE, "%sPage: %d %s blk: %d maxoff: %d free: %d", pred, + elog(DEBUG3, "%sPage: %d %s blk: %d maxoff: %d free: %d", pred, coff, (opaque->flags & F_LEAF) ? "LEAF" : "INTE", (int) blk, (int) maxoff, PageGetFreeSpace(page)); @@ -1936,7 +1936,7 @@ gist_dumptree(Relation r, int level, BlockNumber blk, OffsetNumber coff) which = (IndexTuple) PageGetItem(page, iid); cblk = ItemPointerGetBlockNumber(&(which->t_tid)); #ifdef PRINTTUPLE - elog(NOTICE, "%s Tuple. blk: %d size: %d", pred, (int) cblk, + elog(DEBUG3, "%s Tuple. blk: %d size: %d", pred, (int) cblk, IndexTupleSize(which)); #endif diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 07f72c60b6..8cf4cce05a 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -520,7 +520,7 @@ _bt_insertonpg(Relation rel, elog(ERROR, "bt_insertonpg[%s]: no root page found", RelationGetRelationName(rel)); _bt_wrtbuf(rel, rbuf); _bt_wrtnorelbuf(rel, buf); - elog(NOTICE, "bt_insertonpg[%s]: root page unfound - fixing upper levels", RelationGetRelationName(rel)); + elog(WARNING, "bt_insertonpg[%s]: root page unfound - fixing upper levels", RelationGetRelationName(rel)); _bt_fixup(rel, buf); goto formres; } @@ -570,7 +570,7 @@ _bt_insertonpg(Relation rel, elog(ERROR, "_bt_getstackbuf: my bits moved right off the end of the world!" "\n\tRecreate index %s.", RelationGetRelationName(rel)); pfree(new_item); - elog(NOTICE, "bt_insertonpg[%s]: parent page unfound - fixing branch", RelationGetRelationName(rel)); + elog(WARNING, "bt_insertonpg[%s]: parent page unfound - fixing branch", RelationGetRelationName(rel)); _bt_fixbranch(rel, bknum, rbknum, stack); goto formres; } @@ -1574,7 +1574,7 @@ _bt_fixtree(Relation rel, BlockNumber blkno) /* Call _bt_fixroot() if there is no upper level */ if (BTreeInvalidParent(opaque)) { - elog(NOTICE, "bt_fixtree[%s]: fixing root page", RelationGetRelationName(rel)); + elog(WARNING, "bt_fixtree[%s]: fixing root page", RelationGetRelationName(rel)); buf = _bt_fixroot(rel, buf, true); _bt_relbuf(rel, buf); return; @@ -1925,7 +1925,7 @@ _bt_fixbranch(Relation rel, BlockNumber lblkno, break; } - elog(NOTICE, "bt_fixbranch[%s]: fixing upper levels", RelationGetRelationName(rel)); + elog(WARNING, "bt_fixbranch[%s]: fixing upper levels", RelationGetRelationName(rel)); _bt_fixup(rel, buf); return; @@ -1956,7 +1956,7 @@ _bt_fixup(Relation rel, Buffer buf) { blkno = opaque->btpo_parent; _bt_relbuf(rel, buf); - elog(NOTICE, "bt_fixup[%s]: checking/fixing upper levels", RelationGetRelationName(rel)); + elog(WARNING, "bt_fixup[%s]: checking/fixing upper levels", RelationGetRelationName(rel)); _bt_fixtree(rel, blkno); return; } @@ -1971,7 +1971,7 @@ _bt_fixup(Relation rel, Buffer buf) * Ok, we are on the leftmost page, it's write locked by us and its * btpo_parent points to meta page - time for _bt_fixroot(). */ - elog(NOTICE, "bt_fixup[%s]: fixing root page", RelationGetRelationName(rel)); + elog(WARNING, "bt_fixup[%s]: fixing root page", RelationGetRelationName(rel)); buf = _bt_fixroot(rel, buf, true); _bt_relbuf(rel, buf); } diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 3c0bcd3379..9145101ae5 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -253,7 +253,7 @@ _bt_getroot(Relation rel, int access) /* handle concurrent fix of root page */ if (BTreeInvalidParent(rootopaque)) /* unupdated! */ { - elog(NOTICE, "bt_getroot[%s]: fixing root page", RelationGetRelationName(rel)); + elog(WARNING, "bt_getroot[%s]: fixing root page", RelationGetRelationName(rel)); newrootbuf = _bt_fixroot(rel, rootbuf, true); LockBuffer(newrootbuf, BUFFER_LOCK_UNLOCK); LockBuffer(newrootbuf, BT_READ); diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 8944ee2501..61a8e03c2f 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -920,7 +920,7 @@ CommitTransaction(void) * check the current transaction state */ if (s->state != TRANS_INPROGRESS) - elog(NOTICE, "CommitTransaction and not in in-progress state"); + elog(WARNING, "CommitTransaction and not in in-progress state"); /* * Tell the trigger manager that this transaction is about to be @@ -1044,7 +1044,7 @@ AbortTransaction(void) * check the current transaction state */ if (s->state != TRANS_INPROGRESS) - elog(NOTICE, "AbortTransaction and not in in-progress state"); + elog(WARNING, "AbortTransaction and not in in-progress state"); /* * set the current transaction state information appropriately during @@ -1163,7 +1163,7 @@ StartTransactionCommand(void) * warning and change to the in-progress state. */ case TBLOCK_BEGIN: - elog(NOTICE, "StartTransactionCommand: unexpected TBLOCK_BEGIN"); + elog(WARNING, "StartTransactionCommand: unexpected TBLOCK_BEGIN"); s->blockState = TBLOCK_INPROGRESS; break; @@ -1184,7 +1184,7 @@ StartTransactionCommand(void) * and change to the default state. */ case TBLOCK_END: - elog(NOTICE, "StartTransactionCommand: unexpected TBLOCK_END"); + elog(WARNING, "StartTransactionCommand: unexpected TBLOCK_END"); s->blockState = TBLOCK_DEFAULT; CommitTransaction(); StartTransaction(); @@ -1207,7 +1207,7 @@ StartTransactionCommand(void) * default. */ case TBLOCK_ENDABORT: - elog(NOTICE, "StartTransactionCommand: unexpected TBLOCK_ENDABORT"); + elog(WARNING, "StartTransactionCommand: unexpected TBLOCK_ENDABORT"); break; } @@ -1387,7 +1387,7 @@ BeginTransactionBlock(void) * check the current transaction state */ if (s->blockState != TBLOCK_DEFAULT) - elog(NOTICE, "BEGIN: already a transaction in progress"); + elog(WARNING, "BEGIN: already a transaction in progress"); /* * set the current transaction block state information appropriately @@ -1444,11 +1444,11 @@ EndTransactionBlock(void) /* * here, the user issued COMMIT when not inside a transaction. Issue a - * notice and go to abort state. The upcoming call to + * WARNING and go to abort state. The upcoming call to * CommitTransactionCommand() will then put us back into the default * state. */ - elog(NOTICE, "COMMIT: no transaction in progress"); + elog(WARNING, "COMMIT: no transaction in progress"); AbortTransaction(); s->blockState = TBLOCK_ENDABORT; } @@ -1481,11 +1481,11 @@ AbortTransactionBlock(void) /* * here, the user issued ABORT when not inside a transaction. Issue a - * notice and go to abort state. The upcoming call to + * WARNING and go to abort state. The upcoming call to * CommitTransactionCommand() will then put us back into the default * state. */ - elog(NOTICE, "ROLLBACK: no transaction in progress"); + elog(WARNING, "ROLLBACK: no transaction in progress"); AbortTransaction(); s->blockState = TBLOCK_ENDABORT; } @@ -1528,11 +1528,11 @@ UserAbortTransactionBlock(void) /* * here, the user issued ABORT when not inside a transaction. Issue a - * notice and go to abort state. The upcoming call to + * WARNING and go to abort state. The upcoming call to * CommitTransactionCommand() will then put us back into the default * state. */ - elog(NOTICE, "ROLLBACK: no transaction in progress"); + elog(WARNING, "ROLLBACK: no transaction in progress"); AbortTransaction(); s->blockState = TBLOCK_ENDABORT; } diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index c02d509b75..a870003de5 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -1284,7 +1284,7 @@ XLogFlush(XLogRecPtr record) * CreateCheckpoint will try to flush it at the end of recovery.) * * The current approach is to ERROR under normal conditions, but only - * NOTICE during recovery, so that the system can be brought up even if + * WARNING 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 * will be promoted to PANIC since xact.c calls this routine inside a * critical section. However, calls from bufmgr.c are not within @@ -1292,7 +1292,7 @@ XLogFlush(XLogRecPtr record) * on a data page. */ if (XLByteLT(LogwrtResult.Flush, record)) - elog(InRecovery ? NOTICE : ERROR, + elog(InRecovery ? WARNING : ERROR, "XLogFlush: request %X/%X is not satisfied --- flushed only to %X/%X", record.xlogid, record.xrecoff, LogwrtResult.Flush.xlogid, LogwrtResult.Flush.xrecoff); @@ -1609,7 +1609,7 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr) { elog(LOG, "archiving transaction log file %s", xlde->d_name); - elog(NOTICE, "archiving log files is not implemented!"); + elog(WARNING, "archiving log files is not implemented!"); } else { @@ -2091,12 +2091,12 @@ WriteControlFile(void) StrNCpy(ControlFile->lc_ctype, localeptr, LOCALE_NAME_BUFLEN); /* - * Issue warning notice if initdb'ing in a locale that will not permit + * Issue warning WARNING if initdb'ing in a locale that will not permit * LIKE index optimization. This is not a clean place to do it, but I * don't see a better place either... */ if (!locale_is_like_safe()) - elog(NOTICE, "Initializing database with %s collation order." + elog(WARNING, "Initializing database with %s collation order." "\n\tThis locale setting will prevent use of index optimization for" "\n\tLIKE and regexp searches. If you are concerned about speed of" "\n\tsuch queries, you may wish to set LC_COLLATE to \"C\" and" diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index c3b0ce5923..9d6067ca21 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -631,7 +631,7 @@ in_group(AclId uid, AclId gid) ReleaseSysCache(tuple); } else - elog(NOTICE, "in_group: group %u not found", gid); + elog(WARNING, "in_group: group %u not found", gid); return result; } diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 4d29d21c5a..2f9dc6cb26 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -378,7 +378,7 @@ CheckAttributeNames(TupleDesc tupdesc, bool relhasoids) elog(ERROR, "name of column \"%s\" conflicts with an existing system column", NameStr(tupdesc->attrs[i]->attname)); if (tupdesc->attrs[i]->atttypid == UNKNOWNOID) - elog(NOTICE, "Attribute '%s' has an unknown type" + elog(WARNING, "Attribute '%s' has an unknown type" "\n\tProceeding with relation creation anyway", NameStr(tupdesc->attrs[i]->attname)); } diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 630bcff754..02fcd34316 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -106,7 +106,7 @@ ProcedureCreate(char *procedureName, elog(ERROR, "argument type %s does not exist", typnam); if (!defined) - elog(NOTICE, "argument type %s is only a shell", + elog(WARNING, "argument type %s is only a shell", typnam); } @@ -166,7 +166,7 @@ ProcedureCreate(char *procedureName, if (!OidIsValid(typeObjectId)) { - elog(NOTICE, "ProcedureCreate: type %s is not yet defined", + elog(WARNING, "ProcedureCreate: type %s is not yet defined", returnTypeName); typeObjectId = TypeShellMake(returnTypeName); if (!OidIsValid(typeObjectId)) @@ -174,7 +174,7 @@ ProcedureCreate(char *procedureName, returnTypeName); } else if (!defined) - elog(NOTICE, "return type %s is only a shell", + elog(WARNING, "return type %s is only a shell", returnTypeName); } diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c index 5ea6e4a7c1..ff575f07d3 100644 --- a/src/backend/commands/_deadcode/recipe.c +++ b/src/backend/commands/_deadcode/recipe.c @@ -39,7 +39,7 @@ extern CommandDest whereToSendOutput; void beginRecipe(RecipeStmt *stmt) { - elog(NOTICE, "You must compile with TIOGA defined in order to use recipes\n"); + elog(WARNING, "You must compile with TIOGA defined in order to use recipes\n"); } #else @@ -175,7 +175,7 @@ beginRecipe(RecipeStmt *stmt) e = r->eyes->val[i]; if (e->inNodes->num > 1) { - elog(NOTICE, + elog(WARNING, "beginRecipe: Currently eyes cannot have more than one input"); } if (e->inNodes->num == 0) @@ -185,7 +185,7 @@ beginRecipe(RecipeStmt *stmt) } #ifdef DEBUG_RECIPE - elog(NOTICE, "beginRecipe: eyes[%d] = %s\n", i, e->nodeName); + elog(WARNING, "beginRecipe: eyes[%d] = %s\n", i, e->nodeName); #endif /* DEBUG_RECIPE */ qList = tg_parseSubQuery(r, e->inNodes->val[0], teeInfo); @@ -237,7 +237,7 @@ beginRecipe(RecipeStmt *stmt) tplan = planner(teeInfo->val[t].tpi_parsetree); /* now add a tee node to the root of the plan */ - elog(NOTICE, "adding tee plan node to the root of the %s\n", + elog(WARNING, "adding tee plan node to the root of the %s\n", teeInfo->val[t].tpi_relName); newplan = (Tee *) makeNode(Tee); newplan->plan.targetlist = tplan->targetlist; @@ -285,7 +285,7 @@ beginRecipe(RecipeStmt *stmt) plan, attinfo, whereToSendOutput); - elog(NOTICE, "beginRecipe: cursor named %s is now available", portalName); + elog(WARNING, "beginRecipe: cursor named %s is now available", portalName); } } @@ -499,7 +499,7 @@ tg_replaceNumberedParam(Node *expression, } } else - elog(NOTICE, "tg_replaceNumberedParam: unexpected paramkind value of %d", p->paramkind); + elog(WARNING, "tg_replaceNumberedParam: unexpected paramkind value of %d", p->paramkind); } break; case T_Expr: @@ -624,7 +624,7 @@ tg_rewriteParamsInExpr(Node *expression, QueryTreeList * inputQlist) } } else - elog(NOTICE, "tg_rewriteParamsInExpr: unexpected paramkind value of %d", p->paramkind); + elog(WARNING, "tg_rewriteParamsInExpr: unexpected paramkind value of %d", p->paramkind); } break; case T_Expr: @@ -709,7 +709,7 @@ getParamTypes(TgElement * elem, Oid *typev) if (!OidIsValid(toid)) elog(ERROR, "getParamTypes: arg type '%s' is not defined", t); if (!defined) - elog(NOTICE, "getParamTypes: arg type '%s' is only a shell", t); + elog(WARNING, "getParamTypes: arg type '%s' is only a shell", t); } typev[parameterCount++] = toid; } @@ -834,7 +834,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) */ #ifdef DEBUG_RECIPE - elog(NOTICE, "calling parser with %s", elem->src); + elog(WARNING, "calling parser with %s", elem->src); #endif /* DEBUG_RECIPE */ parameterCount = getParamTypes(elem, typev); @@ -843,7 +843,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) if (qList->len > 1) { - elog(NOTICE, + elog(WARNING, "tg_parseSubQuery: parser produced > 1 query tree"); } } @@ -877,25 +877,25 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) snprintf(newquery, 1000, "select %s()", funcName); #ifdef DEBUG_RECIPE - elog(NOTICE, "calling parser with %s", newquery); + elog(WARNING, "calling parser with %s", newquery); #endif /* DEBUG_RECIPE */ qList = parser(newquery, typev, parameterCount); if (qList->len > 1) { - elog(NOTICE, + elog(WARNING, "tg_parseSubQuery: parser produced > 1 query tree"); } } break; case TG_RECIPE_GRAPH: - elog(NOTICE, "tg_parseSubQuery: can't parse recipe graph ingredients yet!"); + elog(WARNING, "tg_parseSubQuery: can't parse recipe graph ingredients yet!"); break; case TG_COMPILED: - elog(NOTICE, "tg_parseSubQuery: can't parse compiled ingredients yet!"); + elog(WARNING, "tg_parseSubQuery: can't parse compiled ingredients yet!"); break; default: - elog(NOTICE, "tg_parseSubQuery: unknown srcLang: %d", elem->srcLang); + elog(WARNING, "tg_parseSubQuery: unknown srcLang: %d", elem->srcLang); } /* parse each of the subrecipes that are input to this node */ @@ -937,7 +937,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) * if we hit an eye, we need to stop and make what we have into a * subrecipe query block */ - elog(NOTICE, "tg_parseSubQuery: can't handle eye nodes yet"); + elog(WARNING, "tg_parseSubQuery: can't handle eye nodes yet"); } else if (n->nodeType == TG_TEE_NODE) { @@ -1031,7 +1031,7 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) "result", InvalidOid, -1, 0, false)) - elog(NOTICE, "tg_parseSubQuery: unexpected result from TupleDescInitEntry"); + elog(WARNING, "tg_parseSubQuery: unexpected result from TupleDescInitEntry"); else { relid = heap_create_with_catalog( @@ -1042,9 +1042,9 @@ tg_parseSubQuery(TgRecipe * r, TgNode * n, TeeInfo * teeInfo) } } else if (n->nodeType == TG_RECIPE_NODE) - elog(NOTICE, "tg_parseSubQuery: can't handle embedded recipes yet!"); + elog(WARNING, "tg_parseSubQuery: can't handle embedded recipes yet!"); else - elog(NOTICE, "unknown nodeType: %d", n->nodeType); + elog(WARNING, "unknown nodeType: %d", n->nodeType); return qList; } @@ -1155,7 +1155,7 @@ appendTeeQuery(TeeInfo * teeInfo, QueryTreeList * q, char *teeNodeName) return; } } - elog(NOTICE, "appendTeeQuery: teeNodeName '%s' not found in teeInfo"); + elog(WARNING, "appendTeeQuery: teeNodeName '%s' not found in teeInfo"); } @@ -1301,7 +1301,7 @@ replaceTeeScans(Plan *plan, Query *parsetree, TeeInfo * teeInfo) tplan = teeInfo->val[i].tpi_plan; } if (tplan == NULL) - elog(NOTICE, "replaceTeeScans didn't find the corresponding tee plan"); + elog(WARNING, "replaceTeeScans didn't find the corresponding tee plan"); /* * replace the sequential scan node with that var number with diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index e8db94963d..6a68d2def4 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -153,7 +153,7 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt) elevel = INFO; else elevel = DEBUG1; - + /* * Begin a transaction for analyzing this relation. * @@ -165,7 +165,7 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt) /* * Check for user-requested abort. Note we want this to be inside a - * transaction, so xact.c doesn't issue useless NOTICE. + * transaction, so xact.c doesn't issue useless WARNING. */ CHECK_FOR_INTERRUPTS(); @@ -204,9 +204,9 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt) RELNAME) || (is_dbadmin(MyDatabaseId) && !onerel->rd_rel->relisshared))) { - /* No need for a notice if we already complained during VACUUM */ + /* No need for a WARNING if we already complained during VACUUM */ if (!vacstmt->vacuum) - elog(NOTICE, "Skipping \"%s\" --- only table or database owner can ANALYZE it", + elog(WARNING, "Skipping \"%s\" --- only table or database owner can ANALYZE it", RelationGetRelationName(onerel)); heap_close(onerel, NoLock); CommitTransactionCommand(); diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 035b91379b..f7aaebcfc1 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -221,7 +221,7 @@ Async_Listen(char *relname, int pid) if (alreadyListener) { heap_close(lRel, AccessExclusiveLock); - elog(NOTICE, "Async_Listen: We are already listening on %s", relname); + elog(WARNING, "Async_Listen: We are already listening on %s", relname); return; } diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index f3473c5aea..8eb84edb2c 100644 --- a/src/backend/commands/command.c +++ b/src/backend/commands/command.c @@ -126,7 +126,7 @@ PerformPortalFetch(char *name, */ if (name == NULL) { - elog(NOTICE, "PerformPortalFetch: missing portal name"); + elog(WARNING, "PerformPortalFetch: missing portal name"); return; } @@ -136,7 +136,7 @@ PerformPortalFetch(char *name, portal = GetPortalByName(name); if (!PortalIsValid(portal)) { - elog(NOTICE, "PerformPortalFetch: portal \"%s\" not found", + elog(WARNING, "PerformPortalFetch: portal \"%s\" not found", name); return; } @@ -253,7 +253,7 @@ PerformPortalClose(char *name, CommandDest dest) */ if (name == NULL) { - elog(NOTICE, "PerformPortalClose: missing portal name"); + elog(WARNING, "PerformPortalClose: missing portal name"); return; } @@ -263,7 +263,7 @@ PerformPortalClose(char *name, CommandDest dest) portal = GetPortalByName(name); if (!PortalIsValid(portal)) { - elog(NOTICE, "PerformPortalClose: portal \"%s\" not found", + elog(WARNING, "PerformPortalClose: portal \"%s\" not found", name); return; } @@ -749,7 +749,7 @@ AlterTableAlterColumnFlags(const char *relationName, myrelid = RelationGetRelid(rel); heap_close(rel, NoLock); /* close rel, but keep lock! */ - + /* * Check the supplied parameters before anything else */ @@ -759,7 +759,7 @@ AlterTableAlterColumnFlags(const char *relationName, { Assert(IsA(flagValue, Integer)); newtarget = intVal(flagValue); - + /* * Limit target to sane range (should we raise an error instead?) */ @@ -773,7 +773,7 @@ AlterTableAlterColumnFlags(const char *relationName, */ { Assert(IsA(flagValue, Value)); - + storagemode = strVal(flagValue); if (strcasecmp(storagemode, "plain") == 0) newstorage = 'p'; @@ -1556,7 +1556,7 @@ AlterTableDropConstraint(const char *relationName, constrName); /* Otherwise if more than one constraint deleted, notify */ else if (deleted > 1) - elog(INFO, "Multiple constraints dropped"); + elog(NOTICE, "Multiple constraints dropped"); } diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 57bf76e067..59cca1c4b2 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -1019,7 +1019,7 @@ CopyReadNewline(FILE *fp, int *newline) { if (!*newline) { - elog(NOTICE, "CopyReadNewline: extra fields ignored"); + elog(WARNING, "CopyReadNewline: extra fields ignored"); while (!CopyGetEof(fp) && (CopyGetChar(fp) != '\n')); } *newline = 0; diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c index c41b589613..58a09d21e6 100644 --- a/src/backend/commands/creatinh.c +++ b/src/backend/commands/creatinh.c @@ -425,7 +425,7 @@ MergeAttributes(List *schema, List *supers, bool istemp, * Yes, try to merge the two column definitions. They must * have the same type and typmod. */ - elog(INFO, "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\"", + elog(NOTICE, "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\"", attributeName); def = (ColumnDef *) nth(exist_attno - 1, inhSchema); 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 * have the same type and typmod. */ - elog(INFO, "CREATE TABLE: merging attribute \"%s\" with inherited definition", + elog(NOTICE, "CREATE TABLE: merging attribute \"%s\" with inherited definition", attributeName); def = (ColumnDef *) nth(exist_attno - 1, inhSchema); if (strcmp(def->typename->name, attributeType) != 0 || diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index f82b923a48..4a210c49cc 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -689,7 +689,7 @@ remove_dbdirs(const char *nominal_loc, const char *alt_loc) /* remove symlink */ if (unlink(nominal_loc) != 0) { - elog(NOTICE, "could not remove '%s': %m", nominal_loc); + elog(WARNING, "could not remove '%s': %m", nominal_loc); success = false; } } @@ -698,7 +698,7 @@ remove_dbdirs(const char *nominal_loc, const char *alt_loc) if (system(buf) != 0) { - elog(NOTICE, "database directory '%s' could not be removed", + elog(WARNING, "database directory '%s' could not be removed", target_dir); success = false; } diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index 8c716a5f7f..3fedb6328b 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -154,7 +154,7 @@ compute_full_attributes(List *parameters, else if (strcasecmp(param->defname, "outin_ratio") == 0) *outin_ratio_p = (int) defGetNumeric(param); else - elog(NOTICE, "Unrecognized function attribute '%s' ignored", + elog(WARNING, "Unrecognized function attribute '%s' ignored", param->defname); } } @@ -348,12 +348,12 @@ DefineOperator(char *oprName, else if (strcasecmp(defel->defname, "precedence") == 0) { /* NOT IMPLEMENTED (never worked in v4.2) */ - elog(INFO, "CREATE OPERATOR: precedence not implemented"); + elog(NOTICE, "CREATE OPERATOR: precedence not implemented"); } else if (strcasecmp(defel->defname, "associativity") == 0) { /* NOT IMPLEMENTED (never worked in v4.2) */ - elog(INFO, "CREATE OPERATOR: associativity not implemented"); + elog(NOTICE, "CREATE OPERATOR: associativity not implemented"); } else if (strcasecmp(defel->defname, "commutator") == 0) commutatorName = defGetString(defel); @@ -379,7 +379,7 @@ DefineOperator(char *oprName, sortName2 = defGetString(defel); else { - elog(NOTICE, "DefineOperator: attribute \"%s\" not recognized", + elog(WARNING, "DefineOperator: attribute \"%s\" not recognized", defel->defname); } } @@ -450,7 +450,7 @@ DefineAggregate(char *aggName, List *parameters) else if (strcasecmp(defel->defname, "initcond1") == 0) initval = defGetString(defel); else - elog(NOTICE, "DefineAggregate: attribute \"%s\" not recognized", + elog(WARNING, "DefineAggregate: attribute \"%s\" not recognized", defel->defname); } @@ -578,7 +578,7 @@ DefineType(char *typeName, List *parameters) } else { - elog(NOTICE, "DefineType: attribute \"%s\" not recognized", + elog(WARNING, "DefineType: attribute \"%s\" not recognized", defel->defname); } } diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 2d1bffce17..e28f9fdc63 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -51,7 +51,7 @@ ExplainQuery(Query *query, bool verbose, bool analyze, CommandDest dest) /* rewriter and planner may not work in aborted state? */ if (IsAbortedTransactionBlockState()) { - elog(NOTICE, "(transaction aborted): %s", + elog(WARNING, "(transaction aborted): %s", "queries ignored until END"); return; } @@ -59,7 +59,7 @@ ExplainQuery(Query *query, bool verbose, bool analyze, CommandDest dest) /* rewriter will not cope with utility statements */ if (query->commandType == CMD_UTILITY) { - elog(INFO, "Utility statements have no plan structure"); + elog(NOTICE, "Utility statements have no plan structure"); 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 */ if (rewritten == NIL) { - elog(INFO, "Query rewrites to nothing"); + elog(NOTICE, "Query rewrites to nothing"); return; } diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 4deaf4b3d8..09bc03c64b 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -556,7 +556,7 @@ ReindexIndex(const char *name, bool force /* currently unused */ ) if (IsIgnoringSystemIndexes()) overwrite = true; if (!reindex_index(tuple->t_data->t_oid, force, overwrite)) - elog(NOTICE, "index \"%s\" wasn't reindexed", name); + elog(WARNING, "index \"%s\" wasn't reindexed", name); ReleaseSysCache(tuple); } @@ -593,7 +593,7 @@ ReindexTable(const char *name, bool force) name, ((Form_pg_class) GETSTRUCT(tuple))->relkind); if (!reindex_relation(tuple->t_data->t_oid, force)) - elog(NOTICE, "table \"%s\" wasn't reindexed", name); + elog(WARNING, "table \"%s\" wasn't reindexed", name); ReleaseSysCache(tuple); } @@ -688,7 +688,7 @@ ReindexDatabase(const char *dbname, bool force, bool all) { StartTransactionCommand(); if (reindex_relation(relids[i], force)) - elog(NOTICE, "relation %u was reindexed", relids[i]); + elog(WARNING, "relation %u was reindexed", relids[i]); CommitTransactionCommand(); } StartTransactionCommand(); diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c index 0cefea4891..da2feff94c 100644 --- a/src/backend/commands/remove.c +++ b/src/backend/commands/remove.c @@ -336,8 +336,8 @@ RemoveFunction(char *functionName, /* function name to be removed */ if (((Form_pg_proc) GETSTRUCT(tup))->prolang == INTERNALlanguageId) { - /* "Helpful" notice when removing a builtin function ... */ - elog(NOTICE, "Removing built-in function \"%s\"", functionName); + /* "Helpful" WARNING when removing a builtin function ... */ + elog(WARNING, "Removing built-in function \"%s\"", functionName); } /* Delete any comments associated with this function */ diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 35d26cb0f3..865db543fb 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -699,7 +699,7 @@ init_sequence(char *caller, char *name) elm->rel = seqrel; if (RelationGetRelid(seqrel) != elm->relid) { - elog(NOTICE, "%s.%s: sequence was re-created", + elog(WARNING, "%s.%s: sequence was re-created", name, caller); elm->relid = RelationGetRelid(seqrel); elm->cached = elm->last = elm->increment = 0; diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 27a1313753..2657ddfed0 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -368,7 +368,7 @@ DropTrigger(DropTrigStmt *stmt) elog(ERROR, "DropTrigger: there is no trigger %s on relation %s", stmt->trigname, stmt->relname); if (tgfound > 1) - elog(INFO, "DropTrigger: found (and deleted) %d triggers %s on relation %s", + elog(NOTICE, "DropTrigger: found (and deleted) %d triggers %s on relation %s", tgfound, stmt->trigname, stmt->relname); /* @@ -489,7 +489,7 @@ RelationRemoveTriggers(Relation rel) stmt.relname = pstrdup(RelationGetRelationName(refrel)); heap_close(refrel, NoLock); - elog(INFO, "DROP TABLE implicitly drops referential integrity trigger from table \"%s\"", stmt.relname); + elog(NOTICE, "DROP TABLE implicitly drops referential integrity trigger from table \"%s\"", stmt.relname); DropTrigger(&stmt); @@ -1419,8 +1419,8 @@ deferredTriggerInvokeEvents(bool immediate_only) * deferred-to-end-of-transaction triggers, it could get annoying * to rescan all the deferred triggers at each command end. * To speed this up, we could remember the actual end of the queue at - * EndQuery and examine only events that are newer. On state changes - * we simply reset the saved position to the beginning of the queue + * EndQuery and examine only events that are newer. On state changes + * we simply reset the saved position to the beginning of the queue * and process all events once with the new states. */ diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 08e1a59f1b..eed73493eb 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -547,7 +547,7 @@ AlterUser(AlterUserStmt *stmt) /* changes to the flat password file cannot be rolled back */ if (IsTransactionBlock() && password) - elog(INFO, "ALTER USER: password changes cannot be rolled back"); + elog(NOTICE, "ALTER USER: password changes cannot be rolled back"); /* * 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"); if (IsTransactionBlock()) - elog(INFO, "DROP USER cannot be rolled back completely"); + elog(NOTICE, "DROP USER cannot be rolled back completely"); /* * Scan the pg_shadow relation to find the usesysid of the user to be @@ -1212,12 +1212,11 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag) if (!member(v, newlist)) newlist = lappend(newlist, v); else - /* * we silently assume here that this error will only come * up in a ALTER GROUP statement */ - elog(NOTICE, "%s: user \"%s\" is already in group \"%s\"", + elog(WARNING, "%s: user \"%s\" is already in group \"%s\"", tag, strVal(lfirst(item)), stmt->name); } @@ -1269,7 +1268,7 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag) if (null) { if (!is_dropuser) - elog(NOTICE, "ALTER GROUP: group \"%s\" does not have any members", stmt->name); + elog(WARNING, "ALTER GROUP: group \"%s\" does not have any members", stmt->name); } else { @@ -1322,7 +1321,7 @@ AlterGroup(AlterGroupStmt *stmt, const char *tag) if (member(v, newlist)) newlist = LispRemove(v, newlist); else if (!is_dropuser) - elog(NOTICE, "ALTER GROUP: user \"%s\" is not in group \"%s\"", strVal(lfirst(item)), stmt->name); + elog(WARNING, "ALTER GROUP: user \"%s\" is not in group \"%s\"", strVal(lfirst(item)), stmt->name); } newarray = palloc(ARR_OVERHEAD(1) + length(newlist) * sizeof(int32)); diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index d755f6b348..d43703715b 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -195,7 +195,7 @@ vacuum(VacuumStmt *vacstmt) elevel = INFO; else elevel = DEBUG1; - + /* * Create special memory context for cross-transaction storage. * @@ -386,7 +386,7 @@ getrels(Name VacRelP, const char *stmttype) if (rkind != RELKIND_RELATION) { - elog(NOTICE, "%s: can not process indexes, views or special system tables", + elog(WARNING, "%s: can not process indexes, views or special system tables", stmttype); continue; } @@ -410,7 +410,7 @@ getrels(Name VacRelP, const char *stmttype) heap_close(rel, AccessShareLock); if (vrl == NULL) - elog(NOTICE, "%s: table not found", stmttype); + elog(WARNING, "%s: table not found", stmttype); return vrl; } @@ -454,7 +454,7 @@ vacuum_set_xid_limits(VacuumStmt *vacstmt, bool sharedRel, */ if (TransactionIdFollows(limit, *oldestXmin)) { - elog(NOTICE, "oldest Xmin is far in the past --- close open transactions soon to avoid wraparound problems"); + elog(WARNING, "oldest Xmin is far in the past --- close open transactions soon to avoid wraparound problems"); limit = *oldestXmin; } @@ -645,7 +645,7 @@ vac_truncate_clog(TransactionId vacuumXID, TransactionId frozenXID) /* Give warning about impending wraparound problems */ age = (int32) (GetCurrentTransactionId() - frozenXID); if (age > (int32) ((MaxTransactionId >> 3) * 3)) - elog(NOTICE, "Some databases have not been vacuumed in %d transactions." + elog(WARNING, "Some databases have not been vacuumed in %d transactions." "\n\tBetter vacuum them within %d transactions," "\n\tor you may have a wraparound failure.", age, (int32) (MaxTransactionId >> 1) - age); @@ -684,7 +684,7 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt) /* * Check for user-requested abort. Note we want this to be inside a - * transaction, so xact.c doesn't issue useless NOTICE. + * transaction, so xact.c doesn't issue useless WARNING. */ CHECK_FOR_INTERRUPTS(); @@ -716,7 +716,7 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt) * owner, or the database owner (but in the latter case, only if it's * not a shared relation). pg_ownercheck includes the superuser case. * - * Note we choose to treat permissions failure as a NOTICE and keep + * Note we choose to treat permissions failure as a WARNING and keep * trying to vacuum the rest of the DB --- is this appropriate? */ onerel = heap_open(relid, lmode); @@ -725,7 +725,7 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt) RELNAME) || (is_dbadmin(MyDatabaseId) && !onerel->rd_rel->relisshared))) { - elog(NOTICE, "Skipping \"%s\" --- only table or database owner can VACUUM it", + elog(WARNING, "Skipping \"%s\" --- only table or database owner can VACUUM it", RelationGetRelationName(onerel)); heap_close(onerel, lmode); CommitTransactionCommand(); @@ -996,7 +996,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel, if (PageIsNew(page)) { - elog(NOTICE, "Rel %s: Uninitialized page %u - fixing", + elog(WARNING, "Rel %s: Uninitialized page %u - fixing", relname, blkno); PageInit(page, BufferGetPageSize(buf), 0); vacpage->free = ((PageHeader) page)->pd_upper - ((PageHeader) page)->pd_lower; @@ -1110,7 +1110,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel, * This should not happen, since we hold exclusive * lock on the relation; shouldn't we raise an error? */ - elog(NOTICE, "Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation", + elog(WARNING, "Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation", relname, blkno, offnum, tuple.t_data->t_xmin); do_shrinking = false; break; @@ -1120,7 +1120,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel, * This should not happen, since we hold exclusive * lock on the relation; shouldn't we raise an error? */ - elog(NOTICE, "Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation", + elog(WARNING, "Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation", relname, blkno, offnum, tuple.t_data->t_xmax); do_shrinking = false; break; @@ -1138,7 +1138,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel, */ if (!OidIsValid(tuple.t_data->t_oid) && onerel->rd_rel->relhasoids) - elog(NOTICE, "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d.", + elog(WARNING, "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d.", relname, blkno, offnum, (int) tupgone); if (tupgone) @@ -1601,7 +1601,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, ReleaseBuffer(Cbuf); pfree(vtmove); vtmove = NULL; - elog(NOTICE, "Child itemid in update-chain marked as unused - can't continue repair_frag"); + elog(WARNING, "Child itemid in update-chain marked as unused - can't continue repair_frag"); break; } tp.t_datamcxt = NULL; @@ -1720,7 +1720,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, (vtmove[i].vacpage->offsets_used)--; } num_vtmove = 0; - elog(NOTICE, "Too old parent tuple found - can't continue repair_frag"); + elog(WARNING, "Too old parent tuple found - can't continue repair_frag"); break; } #ifdef NOT_USED /* I'm not sure that this will wotk @@ -2155,7 +2155,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, * status bits. This is not really necessary, but will save time for * future transactions examining these tuples. * - * XXX Notice that this code fails to clear HEAP_MOVED_OFF tuples from + * XXX WARNING that this code fails to clear HEAP_MOVED_OFF tuples from * pages that were move source pages but not move dest pages. One * also wonders whether it wouldn't be better to skip this step and * let the tuple status updates happen someplace that's not holding an @@ -2467,7 +2467,7 @@ scan_index(Relation indrel, double num_tuples) { if (stats->num_index_tuples > num_tuples || !vac_is_partial_index(indrel)) - elog(NOTICE, "Index %s: NUMBER OF INDEX' TUPLES (%.0f) IS NOT THE SAME AS HEAP' (%.0f).\ + elog(WARNING, "Index %s: NUMBER OF INDEX' TUPLES (%.0f) IS NOT THE SAME AS HEAP' (%.0f).\ \n\tRecreate the index.", RelationGetRelationName(indrel), stats->num_index_tuples, num_tuples); @@ -2521,7 +2521,7 @@ vacuum_index(VacPageList vacpagelist, Relation indrel, { if (stats->num_index_tuples > num_tuples + keep_tuples || !vac_is_partial_index(indrel)) - elog(NOTICE, "Index %s: NUMBER OF INDEX' TUPLES (%.0f) IS NOT THE SAME AS HEAP' (%.0f).\ + elog(WARNING, "Index %s: NUMBER OF INDEX' TUPLES (%.0f) IS NOT THE SAME AS HEAP' (%.0f).\ \n\tRecreate the index.", RelationGetRelationName(indrel), stats->num_index_tuples, num_tuples); diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index f6cbbe9305..c4064b0d36 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -142,7 +142,7 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt) elevel = INFO; else elevel = DEBUG1; - + vacuum_set_xid_limits(vacstmt, onerel->rd_rel->relisshared, &OldestXmin, &FreezeLimit); @@ -263,7 +263,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats, LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE); if (PageIsNew(page)) { - elog(NOTICE, "Rel %s: Uninitialized page %u - fixing", + elog(WARNING, "Rel %s: Uninitialized page %u - fixing", relname, blkno); PageInit(page, BufferGetPageSize(buf), 0); lazy_record_free_space(vacrelstats, blkno, @@ -367,7 +367,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats, */ if (!OidIsValid(tuple.t_data->t_oid) && onerel->rd_rel->relhasoids) - elog(NOTICE, "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d.", + elog(WARNING, "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d.", relname, blkno, offnum, (int) tupgone); if (tupgone) diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 79f2e060a4..f13df67854 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -250,7 +250,7 @@ parse_datestyle_internal(char *value) } if (dcnt > 1 || ecnt > 1) - elog(NOTICE, "Conflicting settings for date"); + elog(WARNING, "Conflicting settings for date"); return TRUE; } diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index d62e53c2a0..77976633c6 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -1359,7 +1359,7 @@ ExecReplace(TupleTableSlot *slot, */ if (IsBootstrapProcessingMode()) { - elog(NOTICE, "ExecReplace: replace can't run without transactions"); + elog(WARNING, "ExecReplace: replace can't run without transactions"); return; } diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 946526d4aa..047c7074f6 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -1376,7 +1376,7 @@ ExecMergeJoin(MergeJoin *node) * just end the join prematurely. */ default: - elog(NOTICE, "ExecMergeJoin: invalid join state %d, aborting", + elog(WARNING, "ExecMergeJoin: invalid join state %d, aborting", mergestate->mj_JoinState); return NULL; } diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index 0eaab62941..18f1a674e5 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -82,7 +82,7 @@ lo_open(PG_FUNCTION_ARGS) MemoryContext currentContext; #if FSDB - elog(NOTICE, "lo_open(%u,%d)", lobjId, mode); + elog(DEBUG3, "lo_open(%u,%d)", lobjId, mode); #endif if (fscxt == NULL) @@ -100,7 +100,7 @@ lo_open(PG_FUNCTION_ARGS) { /* lookup failed */ MemoryContextSwitchTo(currentContext); #if FSDB - elog(NOTICE, "cannot open large object %u", lobjId); + elog(DEBUG3, "cannot open large object %u", lobjId); #endif PG_RETURN_INT32(-1); } @@ -124,7 +124,7 @@ lo_close(PG_FUNCTION_ARGS) PG_RETURN_INT32(-1); } #if FSDB - elog(NOTICE, "lo_close(%d)", fd); + elog(DEBUG3, "lo_close(%d)", fd); #endif Assert(fscxt != NULL); diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index a45e79a802..910c36fe87 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -716,7 +716,7 @@ pq_eof(void) * If msgtype is '\0', then the buffer already includes the type code. * * All normal messages are suppressed while COPY OUT is in progress. - * (In practice only NOTICE messages might get emitted then; dropping + * (In practice only a few messages might get emitted then; dropping * them is annoying, but at least they will still appear in the * postmaster log.) * diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index e17bcbc5ad..17b8edf0b1 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -2171,7 +2171,7 @@ equal(void *a, void *b) break; default: - elog(NOTICE, "equal: don't know whether nodes of type %d are equal", + elog(WARNING, "equal: don't know whether nodes of type %d are equal", nodeTag(a)); break; } diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index ffad3e4692..da434ada1e 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -1291,7 +1291,7 @@ _outValue(StringInfo str, Value *value) appendStringInfo(str, " %s ", value->val.str); break; default: - elog(NOTICE, "_outValue: don't know how to print type %d ", + elog(WARNING, "_outValue: don't know how to print type %d ", value->type); break; } @@ -1693,7 +1693,7 @@ _outNode(StringInfo str, void *obj) break; default: - elog(NOTICE, "_outNode: don't know how to print type %d ", + elog(WARNING, "_outNode: don't know how to print type %d ", nodeTag(obj)); break; } diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index 8396110343..88aca07601 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -519,7 +519,7 @@ clause_selectivity(Query *root, } #ifdef SELECTIVITY_DEBUG - elog(NOTICE, "clause_selectivity: s1 %f", s1); + elog(DEBUG3, "clause_selectivity: s1 %f", s1); #endif /* SELECTIVITY_DEBUG */ return s1; diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 62ebea95d7..19c348fba7 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -425,7 +425,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt, /* * Note: we are not expecting that extras_before and extras_after * are going to be used by the transformation of the SELECT statement. - */ + */ selectQuery = transformStmt(sub_pstate, stmt->selectStmt, extras_before, extras_after); @@ -849,7 +849,7 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt, sequence->istemp = cxt->istemp; sequence->options = NIL; - elog(INFO, "%s will create implicit sequence '%s' for SERIAL column '%s.%s'", + elog(NOTICE, "%s will create implicit sequence '%s' for SERIAL column '%s.%s'", cxt->stmtType, sequence->seqname, cxt->relname, column->colname); cxt->blist = lappend(cxt->blist, sequence); @@ -1125,7 +1125,7 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt) * later. That would likely be cleaner, but * too much work to contemplate right now. * Instead, raise an error if the inherited - * column won't be NOT NULL. (Would a NOTICE + * column won't be NOT NULL. (Would a WARNING * be more reasonable?) */ if (constraint->contype == CONSTR_PRIMARY && @@ -1245,7 +1245,7 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt) /* * Finally, select unique names for all not-previously-named indices, - * and display notice messages. + * and display WARNING messages. * * XXX in ALTER TABLE case, we fail to consider name collisions against * pre-existing indexes. @@ -1264,7 +1264,7 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt) elog(ERROR, "%s: failed to make implicit index name", cxt->stmtType); - elog(INFO, "%s / %s%s will create implicit index '%s' for table '%s'", + elog(NOTICE, "%s / %s%s will create implicit index '%s' for table '%s'", cxt->stmtType, (strcmp(cxt->stmtType, "ALTER TABLE") == 0) ? "ADD " : "", (index->primary ? "PRIMARY KEY" : "UNIQUE"), @@ -1288,7 +1288,7 @@ transformFKConstraints(ParseState *pstate, CreateStmtContext *cxt) if (cxt->fkconstraints == NIL) return; - elog(INFO, "%s will create implicit trigger(s) for FOREIGN KEY check(s)", + elog(NOTICE, "%s will create implicit trigger(s) for FOREIGN KEY check(s)", cxt->stmtType); foreach(fkclist, cxt->fkconstraints) @@ -2710,7 +2710,7 @@ transformTypeRef(ParseState *pstate, TypeName *tn) elog(ERROR, "unsupported expression in %%TYPE"); v = (Var *) n; tyn = typeidTypeName(v->vartype); - elog(INFO, "%s.%s%%TYPE converted to %s", tn->name, tn->attrname, tyn); + elog(NOTICE, "%s.%s%%TYPE converted to %s", tn->name, tn->attrname, tyn); tn->name = tyn; tn->typmod = v->vartypmod; tn->attrname = NULL; diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 69a8b9cc87..c45d37c282 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -1349,7 +1349,7 @@ columnDef: ColId Typename ColQualList opt_collate n->constraints = $3; if ($4 != NULL) - elog(INFO,"CREATE TABLE / COLLATE %s not yet implemented" + elog(NOTICE,"CREATE TABLE / COLLATE %s not yet implemented" "; clause ignored", $4); $$ = (Node *)n; @@ -2347,7 +2347,7 @@ direction: FORWARD { $$ = FORWARD; } | RELATIVE { $$ = RELATIVE; } | ABSOLUTE { - elog(INFO,"FETCH / ABSOLUTE not supported, using RELATIVE"); + elog(NOTICE,"FETCH / ABSOLUTE not supported, using RELATIVE"); $$ = RELATIVE; } ; diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index 5189f39375..79daf88eb2 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -483,7 +483,7 @@ make_const(Value *value) break; default: - elog(NOTICE, "make_const: unknown type %d", nodeTag(value)); + elog(WARNING, "make_const: unknown type %d", nodeTag(value)); /* FALLTHROUGH */ case T_Null: diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index 0fae6b38aa..d0477a209e 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -1041,7 +1041,7 @@ warnAutoRange(ParseState *pstate, char *refname) } } if (foundInFromCl) - elog(INFO, "Adding missing FROM-clause entry%s for table \"%s\"", + elog(NOTICE, "Adding missing FROM-clause entry%s for table \"%s\"", pstate->parentParseState != NULL ? " in subquery" : "", refname); } diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index 1569024a22..eb97b8e81b 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -362,11 +362,11 @@ other . #ifdef MULTIBYTE int len; len = pg_mbcliplen(literalbuf,strlen(literalbuf),NAMEDATALEN-1); - elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"", + elog(WARNING, "identifier \"%s\" will be truncated to \"%.*s\"", literalbuf, len, literalbuf); literalbuf[len] = '\0'; #else - elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"", + elog(WARNING, "identifier \"%s\" will be truncated to \"%.*s\"", literalbuf, NAMEDATALEN-1, literalbuf); literalbuf[NAMEDATALEN-1] = '\0'; #endif @@ -517,11 +517,11 @@ other . #ifdef MULTIBYTE int len; len = pg_mbcliplen(yytext,i,NAMEDATALEN-1); - elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"", + elog(WARNING, "identifier \"%s\" will be truncated to \"%.*s\"", yytext, len, yytext); yytext[len] = '\0'; #else - elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"", + elog(WARNING, "identifier \"%s\" will be truncated to \"%.*s\"", yytext, NAMEDATALEN-1, yytext); yytext[NAMEDATALEN-1] = '\0'; #endif diff --git a/src/backend/port/beos/support.c b/src/backend/port/beos/support.c index 996615e6fa..fbc431021d 100644 --- a/src/backend/port/beos/support.c +++ b/src/backend/port/beos/support.c @@ -42,7 +42,7 @@ beos_dl_open(char *filename) if ((beos_dl_port_in <= 0) || (beos_dl_port_out <= 0)) { - elog(NOTICE, "Error loading BeOS support server : can't create communication ports"); + elog(WARNING, "Error loading BeOS support server : can't create communication ports"); return B_ERROR; } else @@ -68,7 +68,7 @@ beos_dl_open(char *filename) /* Checking integrity */ if (im < 0) { - elog(NOTICE, "Can't load this add-on "); + elog(WARNING, "Can't load this add-on "); return B_ERROR; } else @@ -92,7 +92,7 @@ beos_dl_open(char *filename) /* Remap */ resu = clone_area(datas, &add, B_EXACT_ADDRESS, B_READ_AREA | B_WRITE_AREA, area); if (resu < 0) - elog(NOTICE, "Can't load this add-on : map text error"); + elog(WARNING, "Can't load this add-on : map text error"); } /* read text segment id and address */ @@ -108,7 +108,7 @@ beos_dl_open(char *filename) /* Remap */ resu = clone_area(datas, &add, B_EXACT_ADDRESS, B_READ_AREA | B_WRITE_AREA, area); if (resu < 0) - elog(NOTICE, "Can't load this add-on : map data error"); + elog(WARNING, "Can't load this add-on : map data error"); } return im; @@ -126,7 +126,7 @@ beos_dl_sym(image_id im, char *symname, void **fptr) read_port(beos_dl_port_out, (int32 *) (fptr), NULL, 0); if (fptr == NULL) - elog(NOTICE, "loading symbol '%s' failed ", symname); + elog(WARNING, "loading symbol '%s' failed ", symname); } status_t diff --git a/src/backend/port/dynloader/beos.c b/src/backend/port/dynloader/beos.c index c822b5be58..f91ef13c3e 100644 --- a/src/backend/port/dynloader/beos.c +++ b/src/backend/port/dynloader/beos.c @@ -52,7 +52,7 @@ pg_dlsym(void *handle, char *funcname) beos_dl_sym(*((int *) (handle)), funcname, (void **) &fpt); return fpt; } - elog(NOTICE, "add-on not loaded correctly"); + elog(WARNING, "add-on not loaded correctly"); return NULL; } @@ -63,7 +63,7 @@ pg_dlclose(void *handle) if ((handle) && ((*(int *) (handle)) >= 0)) { if (beos_dl_close(*(image_id *) handle) != B_OK) - elog(NOTICE, "error while unloading add-on"); + elog(WARNING, "error while unloading add-on"); free(handle); } } diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c index dd30cf1f1e..5e8b36db30 100644 --- a/src/backend/port/dynloader/bsdi.c +++ b/src/backend/port/dynloader/bsdi.c @@ -56,14 +56,14 @@ pg_dlopen(char *filename) { if (dld_link("/usr/lib/libc.a")) { - elog(NOTICE, "dld: Cannot link C library!"); + elog(WARNING, "dld: Cannot link C library!"); return NULL; } if (dld_undefined_sym_count > 0) { if (dld_link("/usr/lib/libm.a")) { - elog(NOTICE, "dld: Cannot link math library!"); + elog(WARNING, "dld: Cannot link math library!"); return NULL; } if (dld_undefined_sym_count > 0) @@ -72,10 +72,10 @@ pg_dlopen(char *filename) char **list = dld_list_undefined_sym(); /* list the undefined symbols, if any */ - elog(NOTICE, "dld: Undefined:"); + elog(WARNING, "dld: Undefined:"); do { - elog(NOTICE, " %s", *list); + elog(WARNING, " %s", *list); list++; count--; } while (count > 0); diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c index d32a434824..c3f605ca73 100644 --- a/src/backend/port/dynloader/linux.c +++ b/src/backend/port/dynloader/linux.c @@ -64,14 +64,14 @@ pg_dlopen(char *filename) { if (dld_link("/usr/lib/libc.a")) { - elog(NOTICE, "dld: Cannot link C library!"); + elog(WARNING, "dld: Cannot link C library!"); return NULL; } if (dld_undefined_sym_count > 0) { if (dld_link("/usr/lib/libm.a")) { - elog(NOTICE, "dld: Cannot link math library!"); + elog(WARNING, "dld: Cannot link math library!"); return NULL; } if (dld_undefined_sym_count > 0) @@ -80,10 +80,10 @@ pg_dlopen(char *filename) char **list = dld_list_undefined_sym(); /* list the undefined symbols, if any */ - elog(NOTICE, "dld: Undefined:"); + elog(WARNING, "dld: Undefined:"); do { - elog(NOTICE, " %s", *list); + elog(WARNING, " %s", *list); list++; count--; } while (count > 0); diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c index 3d9f25ca28..4331532884 100644 --- a/src/backend/port/dynloader/ultrix4.c +++ b/src/backend/port/dynloader/ultrix4.c @@ -55,10 +55,10 @@ pg_dlopen(char *filename) /* list the undefined symbols, if any */ if (count) { - elog(NOTICE, "dl: Undefined:"); + elog(WARNING, "dl: Undefined:"); while (*list) { - elog(NOTICE, " %s", *list); + elog(WARNING, " %s", *list); list++; } } diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 26b0104247..61c9a9c1ad 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -2150,7 +2150,7 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb, } else { - elog(NOTICE, + elog(WARNING, "PGSTAT: corrupted pgstat.stat file"); fclose(fpin); return; @@ -2187,7 +2187,7 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb, } else { - elog(NOTICE, + elog(WARNING, "PGSTAT: corrupted pgstat.stat file"); fclose(fpin); return; @@ -2260,7 +2260,7 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb, } else { - elog(NOTICE, + elog(WARNING, "PGSTAT: corrupted pgstat.stat file"); fclose(fpin); return; @@ -2301,7 +2301,7 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb, } else { - elog(NOTICE, + elog(WARNING, "PGSTAT: corrupted pgstat.stat file"); fclose(fpin); return; @@ -2332,7 +2332,7 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb, } else { - elog(NOTICE, + elog(WARNING, "PGSTAT: corrupted pgstat.stat file"); fclose(fpin); return; @@ -2388,7 +2388,7 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb, } else { - elog(NOTICE, + elog(WARNING, "PGSTAT: corrupted pgstat.stat file"); fclose(fpin); return; @@ -2430,7 +2430,7 @@ pgstat_read_statsfile(HTAB **dbhash, Oid onlydb, } else { - elog(NOTICE, "PGSTAT: corrupted pgstat.stat file"); + elog(WARNING, "PGSTAT: corrupted pgstat.stat file"); fclose(fpin); return; } diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 805e9b46a5..3f99f38e9e 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -425,7 +425,7 @@ BufferAlloc(Relation reln, if (smok == FALSE) { - elog(NOTICE, "BufferAlloc: cannot write block %u for %u/%u", + elog(WARNING, "BufferAlloc: cannot write block %u for %u/%u", buf->tag.blockNum, buf->tag.rnode.tblNode, buf->tag.rnode.relNode); inProgress = FALSE; @@ -974,7 +974,7 @@ BufferPoolCheckLeak(void) { BufferDesc *buf = &(BufferDescriptors[i]); - elog(NOTICE, + elog(WARNING, "Buffer Leak: [%03d] (freeNext=%d, freePrev=%d, \ rel=%u/%u, blockNum=%u, flags=0x%x, refcount=%d %ld)", i, buf->freeNext, buf->freePrev, @@ -1403,7 +1403,7 @@ PrintPinnedBufs() for (i = 0; i < NBuffers; ++i, ++buf) { if (PrivateRefCount[i] > 0) - elog(NOTICE, "[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, \ + elog(WARNING, "[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, \ blockNum=%u, flags=0x%x, refcount=%d %ld)", i, buf->freeNext, buf->freePrev, buf->tag.rnode.tblNode, buf->tag.rnode.relNode, @@ -1504,7 +1504,7 @@ FlushRelationBuffers(Relation rel, BlockNumber firstDelBlock) (char *) MAKE_PTR(bufHdr->data)); if (status == SM_FAIL) { - elog(NOTICE, "FlushRelationBuffers(%s (local), %u): block %u is dirty, could not flush it", + elog(WARNING, "FlushRelationBuffers(%s (local), %u): block %u is dirty, could not flush it", RelationGetRelationName(rel), firstDelBlock, bufHdr->tag.blockNum); return (-1); @@ -1514,7 +1514,7 @@ FlushRelationBuffers(Relation rel, BlockNumber firstDelBlock) } if (LocalRefCount[i] > 0) { - elog(NOTICE, "FlushRelationBuffers(%s (local), %u): block %u is referenced (%ld)", + elog(WARNING, "FlushRelationBuffers(%s (local), %u): block %u is referenced (%ld)", RelationGetRelationName(rel), firstDelBlock, bufHdr->tag.blockNum, LocalRefCount[i]); return (-2); @@ -1592,7 +1592,7 @@ FlushRelationBuffers(Relation rel, BlockNumber firstDelBlock) if (!(bufHdr->flags & BM_FREE)) { LWLockRelease(BufMgrLock); - elog(NOTICE, "FlushRelationBuffers(%s, %u): block %u is referenced (private %ld, global %d)", + elog(WARNING, "FlushRelationBuffers(%s, %u): block %u is referenced (private %ld, global %d)", RelationGetRelationName(rel), firstDelBlock, bufHdr->tag.blockNum, PrivateRefCount[i], bufHdr->refcount); @@ -2198,7 +2198,7 @@ AbortBufferIO(void) /* Issue notice if this is not the first failure... */ if (buf->flags & BM_IO_ERROR) { - elog(NOTICE, "write error may be permanent: cannot write block %u for %u/%u", + elog(WARNING, "write error may be permanent: cannot write block %u for %u/%u", buf->tag.blockNum, buf->tag.rnode.tblNode, buf->tag.rnode.relNode); } diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 1a6a5af96c..9acbc32301 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -1193,7 +1193,7 @@ FreeFile(FILE *file) } } if (i < 0) - elog(NOTICE, "FreeFile: file was not obtained from AllocateFile"); + elog(WARNING, "FreeFile: file was not obtained from AllocateFile"); fclose(file); } diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index 11a3ece031..4dde2a19af 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -350,7 +350,7 @@ IpcSemaphoreKill(IpcSemaphoreId semId) semId, strerror(errno)); /* - * We used to report a failure via elog(NOTICE), but that's pretty + * We used to report a failure via elog(WARNING), but that's pretty * pointless considering any client has long since disconnected ... */ } @@ -663,7 +663,7 @@ IpcMemoryDetach(int status, Datum shmaddr) DatumGetPointer(shmaddr), strerror(errno)); /* - * We used to report a failure via elog(NOTICE), but that's pretty + * We used to report a failure via elog(WARNING), but that's pretty * pointless considering any client has long since disconnected ... */ } @@ -680,7 +680,7 @@ IpcMemoryDelete(int status, Datum shmId) DatumGetInt32(shmId), IPC_RMID, strerror(errno)); /* - * We used to report a failure via elog(NOTICE), but that's pretty + * We used to report a failure via elog(WARNING), but that's pretty * pointless considering any client has long since disconnected ... */ } diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index eead906b06..e9ca889ee3 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -156,7 +156,7 @@ ShmemAlloc(Size size) SpinLockRelease(ShmemLock); if (!newSpace) - elog(NOTICE, "ShmemAlloc: out of memory"); + elog(WARNING, "ShmemAlloc: out of memory"); return newSpace; } @@ -346,7 +346,7 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr) { LWLockRelease(ShmemIndexLock); - elog(NOTICE, "ShmemInitStruct: ShmemIndex entry size is wrong"); + elog(WARNING, "ShmemInitStruct: ShmemIndex entry size is wrong"); /* let caller print its message too */ return NULL; } @@ -363,7 +363,7 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr) hash_search(ShmemIndex, (void *) &item, HASH_REMOVE, NULL); LWLockRelease(ShmemIndexLock); - elog(NOTICE, "ShmemInitStruct: cannot allocate '%s'", + elog(WARNING, "ShmemInitStruct: cannot allocate '%s'", name); *foundPtr = FALSE; return NULL; diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c index 106521023e..34017aa620 100644 --- a/src/backend/storage/ipc/shmqueue.c +++ b/src/backend/storage/ipc/shmqueue.c @@ -30,7 +30,7 @@ /*#define SHMQUEUE_DEBUG*/ #ifdef SHMQUEUE_DEBUG -#define SHMQUEUE_DEBUG_ELOG NOTICE +#define SHMQUEUE_DEBUG_ELOG WARNING static void dumpQ(SHM_QUEUE *q, char *s); #endif diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index e20af3b2fd..cf551b8e8d 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -248,7 +248,7 @@ LockMethodTableInit(char *tabName, if (numModes >= MAX_LOCKMODES) { - elog(NOTICE, "LockMethodTableInit: too many lock types %d greater than %d", + elog(WARNING, "LockMethodTableInit: too many lock types %d greater than %d", numModes, MAX_LOCKMODES); return INVALID_LOCKMETHOD; } @@ -472,7 +472,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, lockMethodTable = LockMethodTable[lockmethod]; if (!lockMethodTable) { - elog(NOTICE, "LockAcquire: bad lock table %d", lockmethod); + elog(WARNING, "LockAcquire: bad lock table %d", lockmethod); return FALSE; } @@ -662,7 +662,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, (void *) holder, HASH_REMOVE, NULL); if (!holder) - elog(NOTICE, "LockAcquire: remove holder, table corrupted"); + elog(WARNING, "LockAcquire: remove holder, table corrupted"); } else HOLDER_PRINT("LockAcquire: NHOLDING", holder); @@ -1010,7 +1010,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, lockMethodTable = LockMethodTable[lockmethod]; if (!lockMethodTable) { - elog(NOTICE, "lockMethodTable is null in LockRelease"); + elog(WARNING, "lockMethodTable is null in LockRelease"); return FALSE; } @@ -1032,7 +1032,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, if (!lock) { LWLockRelease(masterLock); - elog(NOTICE, "LockRelease: no such lock"); + elog(WARNING, "LockRelease: no such lock"); return FALSE; } LOCK_PRINT("LockRelease: found", lock, lockmode); @@ -1055,10 +1055,10 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, LWLockRelease(masterLock); #ifdef USER_LOCKS if (lockmethod == USER_LOCKMETHOD) - elog(NOTICE, "LockRelease: no lock with this tag"); + elog(WARNING, "LockRelease: no lock with this tag"); else #endif - elog(NOTICE, "LockRelease: holder table corrupted"); + elog(WARNING, "LockRelease: holder table corrupted"); return FALSE; } HOLDER_PRINT("LockRelease: found", holder); @@ -1072,7 +1072,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, HOLDER_PRINT("LockRelease: WRONGTYPE", holder); Assert(holder->holding[lockmode] >= 0); LWLockRelease(masterLock); - elog(NOTICE, "LockRelease: you don't own a lock of type %s", + elog(WARNING, "LockRelease: you don't own a lock of type %s", lock_mode_names[lockmode]); return FALSE; } @@ -1126,7 +1126,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, if (!lock) { LWLockRelease(masterLock); - elog(NOTICE, "LockRelease: remove lock, table corrupted"); + elog(WARNING, "LockRelease: remove lock, table corrupted"); return FALSE; } wakeupNeeded = false; /* should be false, but make sure */ @@ -1155,7 +1155,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, if (!holder) { LWLockRelease(masterLock); - elog(NOTICE, "LockRelease: remove holder, table corrupted"); + elog(WARNING, "LockRelease: remove holder, table corrupted"); return FALSE; } } @@ -1204,7 +1204,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, PROC *proc, lockMethodTable = LockMethodTable[lockmethod]; if (!lockMethodTable) { - elog(NOTICE, "LockReleaseAll: bad lockmethod %d", lockmethod); + elog(WARNING, "LockReleaseAll: bad lockmethod %d", lockmethod); return FALSE; } @@ -1308,7 +1308,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, PROC *proc, if (!holder) { LWLockRelease(masterLock); - elog(NOTICE, "LockReleaseAll: holder table corrupted"); + elog(WARNING, "LockReleaseAll: holder table corrupted"); return FALSE; } @@ -1326,7 +1326,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, PROC *proc, if (!lock) { LWLockRelease(masterLock); - elog(NOTICE, "LockReleaseAll: cannot remove lock from HTAB"); + elog(WARNING, "LockReleaseAll: cannot remove lock from HTAB"); return FALSE; } } diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index 3432a1ffab..f1a3dbf35b 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -107,7 +107,7 @@ PageAddItem(Page page, { if (offsetNumber > limit) { - elog(NOTICE, "PageAddItem: tried overwrite after maxoff"); + elog(WARNING, "PageAddItem: tried overwrite after maxoff"); return InvalidOffsetNumber; } if (offsetNumber < limit) @@ -116,7 +116,7 @@ PageAddItem(Page page, if (((*itemId).lp_flags & LP_USED) || ((*itemId).lp_len != 0)) { - elog(NOTICE, "PageAddItem: tried overwrite of used ItemId"); + elog(WARNING, "PageAddItem: tried overwrite of used ItemId"); return InvalidOffsetNumber; } } diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index 9bf934d97c..2c3714e75c 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -516,12 +516,12 @@ smgrDoPendingDeletes(bool isCommit) /* * And delete the physical files. * - * Note: we treat deletion failure as a NOTICE, not an error, + * Note: we treat deletion failure as a WARNING, not an error, * because we've already decided to commit or abort the * current xact. */ if ((*(smgrsw[pending->which].smgr_unlink)) (pending->relnode) == SM_FAIL) - elog(NOTICE, "cannot unlink %u/%u: %m", + elog(WARNING, "cannot unlink %u/%u: %m", pending->relnode.tblNode, pending->relnode.relNode); } pfree(pending); diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index d2704461e0..1cdf75ed6c 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -464,7 +464,7 @@ pg_analyze_and_rewrite(Node *parsetree) new_list = (List *) copyObject(querytree_list); /* This checks both copyObject() and the equal() routines... */ if (!equal(new_list, querytree_list)) - elog(NOTICE, "pg_analyze_and_rewrite: copyObject failed on parse tree"); + elog(WARNING, "pg_analyze_and_rewrite: copyObject failed on parse tree"); else querytree_list = new_list; #endif @@ -527,7 +527,7 @@ pg_plan_query(Query *querytree) #ifdef NOT_USED /* This checks both copyObject() and the equal() routines... */ if (!equal(new_plan, plan)) - elog(NOTICE, "pg_plan_query: copyObject failed on plan tree"); + elog(WARNING, "pg_plan_query: copyObject failed on plan tree"); else #endif plan = new_plan; @@ -686,7 +686,7 @@ pg_exec_query_string(char *query_string, /* string to execute */ if (!allowit) { - elog(NOTICE, "current transaction is aborted, " + elog(WARNING, "current transaction is aborted, " "queries ignored until end of transaction block"); /* @@ -952,7 +952,7 @@ void quickdie(SIGNAL_ARGS) { PG_SETMASK(&BlockSig); - elog(NOTICE, "Message from PostgreSQL backend:" + elog(WARNING, "Message from PostgreSQL backend:" "\n\tThe Postmaster has informed me that some other backend" "\n\tdied abnormally and possibly corrupted shared memory." "\n\tI have rolled back the current transaction and am" @@ -1251,7 +1251,7 @@ PostgresMain(int argc, char *argv[], const char *username) #ifdef USE_ASSERT_CHECKING SetConfigOption("debug_assertions", optarg, ctx, gucsource); #else - elog(NOTICE, "Assert checking is not compiled in"); + elog(WARNING, "Assert checking is not compiled in"); #endif break; @@ -1493,7 +1493,7 @@ PostgresMain(int argc, char *argv[], const char *username) */ if (XfuncMode != 0) { - elog(NOTICE, "only one -x flag is allowed"); + elog(WARNING, "only one -x flag is allowed"); errs++; break; } @@ -1511,7 +1511,7 @@ PostgresMain(int argc, char *argv[], const char *username) XfuncMode = XFUNC_WAIT; else { - elog(NOTICE, "use -x {off,nor,nopull,nopm,pullall,wait}"); + elog(WARNING, "use -x {off,nor,nopull,nopm,pullall,wait}"); errs++; } #endif @@ -1550,7 +1550,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (Show_query_stats && (Show_parser_stats || Show_planner_stats || Show_executor_stats)) { - elog(NOTICE, "Query statistics are disabled because parser, planner, or executor statistics are on."); + elog(WARNING, "Query statistics are disabled because parser, planner, or executor statistics are on."); SetConfigOption("show_query_stats", "false", ctx, gucsource); } @@ -1627,7 +1627,7 @@ PostgresMain(int argc, char *argv[], const char *username) /* noninteractive case: nothing should be left after switches */ if (errs || argc != optind || DBName == NULL) { - elog(NOTICE, "%s: invalid command line arguments\nTry -? for help.", + elog(WARNING, "%s: invalid command line arguments\nTry -? for help.", argv[0]); proc_exit(0); /* not 1, that causes system-wide * restart... */ @@ -1639,7 +1639,7 @@ PostgresMain(int argc, char *argv[], const char *username) /* interactive case: database name can be last arg on command line */ if (errs || argc - optind > 1) { - elog(NOTICE, "%s: invalid command line arguments\nTry -? for help.", + elog(WARNING, "%s: invalid command line arguments\nTry -? for help.", argv[0]); proc_exit(1); } @@ -1647,7 +1647,7 @@ PostgresMain(int argc, char *argv[], const char *username) DBName = argv[optind]; else if ((DBName = username) == NULL) { - elog(NOTICE, "%s: user name undefined and no database specified", + elog(WARNING, "%s: user name undefined and no database specified", argv[0]); proc_exit(1); } @@ -1722,7 +1722,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.253 $ $Date: 2002/03/04 01:46:03 $\n"); + puts("$Revision: 1.254 $ $Date: 2002/03/06 06:10:09 $\n"); } /* @@ -2134,10 +2134,10 @@ assertTest(int val) if (assert_enabled) { /* val != 0 should be trapped by previous Assert */ - elog(INFO, "Assert test successful (val = %d)", val); + elog(DEBUG3, "Assert test successful (val = %d)", val); } else - elog(INFO, "Assert checking is disabled (val = %d)", val); + elog(DEBUG3, "Assert checking is disabled (val = %d)", val); return val; } diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 21e8bdd88b..5a10be3772 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -109,7 +109,7 @@ PreparePortal(char *portalName) * XXX Should we raise an error rather than closing the old * portal? */ - elog(NOTICE, "Closing pre-existing portal \"%s\"", + elog(WARNING, "Closing pre-existing portal \"%s\"", portalName); PortalDrop(portal); } diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c index fb4937a9b1..1e44a39644 100644 --- a/src/backend/tioga/tgRecipe.c +++ b/src/backend/tioga/tgRecipe.c @@ -78,7 +78,7 @@ TextArray2ArrTgString(char *str) if (*str != ARRAY_LEFT_DELIM) { - elog(NOTICE, "TextArray2ArrTgString: badly formed string, must have %c as \ + elog(WARNING, "TextArray2ArrTgString: badly formed string, must have %c as \ first character\n", ARRAY_LEFT_DELIM); return result; } @@ -88,18 +88,18 @@ first character\n", ARRAY_LEFT_DELIM); { if (*str == '\0') { - elog(NOTICE, "TextArray2ArrTgString: text string ended prematurely\n"); + elog(WARNING, "TextArray2ArrTgString: text string ended prematurely\n"); return result; } if ((beginQuote = strchr(str, ARRAY_ELEM_LEFT)) == NULL) { - elog(NOTICE, "textArray2ArrTgString: missing a begin quote\n"); + elog(WARNING, "textArray2ArrTgString: missing a begin quote\n"); return result; } if ((endQuote = strchr(beginQuote + 1, '"')) == NULL) { - elog(NOTICE, "textArray2ArrTgString: missing an end quote\n"); + elog(WARNING, "textArray2ArrTgString: missing an end quote\n"); return result; } nextlen = endQuote - beginQuote; /* don't subtract one here @@ -135,7 +135,7 @@ findElemInRecipe(TgRecipe * r, char *elemName) if (strcmp(e->elemName, elemName) == 0) return e; } - elog(NOTICE, "Element named %s not found in recipe named %s", elemName, r->elmValue.elemName); + elog(WARNING, "Element named %s not found in recipe named %s", elemName, r->elmValue.elemName); return NULL; } @@ -159,7 +159,7 @@ findNodeInRecipe(TgRecipe * r, char *nodeName) if (strcmp(n->nodeName, nodeName) == 0) return n; } - elog(NOTICE, "Node named %s not found in recipe named %s", nodeName, r->elmValue.elemName); + elog(WARNING, "Node named %s not found in recipe named %s", nodeName, r->elmValue.elemName); return NULL; } @@ -245,7 +245,7 @@ fillTgNode(TgRecipe * r, TgNode * node, PortalBuffer * pbuf, int tupno) else if (strcmp(nodeType, "Recipe") == 0) node->nodeType = TG_RECIPE_NODE; else - elog(NOTICE, "fillTgNode: unknown nodeType field value : %s\n", nodeType); + elog(WARNING, "fillTgNode: unknown nodeType field value : %s\n", nodeType); } @@ -323,7 +323,7 @@ fillTgElement(TgElement * elem, PortalBuffer * pbuf, int tupno) else if (strcmp(srcLang, "Compiled") == 0) elem->srcLang = TG_COMPILED; else - elog(NOTICE, "fillTgElement(): unknown srcLang field value : %s\n", srcLang); + elog(WARNING, "fillTgElement(): unknown srcLang field value : %s\n", srcLang); elemType = PQgetvalue(pbuf, tupno, elemType_attnum); if (strcmp(elemType, "Ingred") == 0) @@ -333,7 +333,7 @@ fillTgElement(TgElement * elem, PortalBuffer * pbuf, int tupno) else if (strcmp(elemType, "Recipe") == 0) elem->elemType = TG_RECIPE; else - elog(NOTICE, "fillTgElement(): unknown elemType field value : %s\n", elemType); + elog(WARNING, "fillTgElement(): unknown elemType field value : %s\n", elemType); } @@ -373,8 +373,8 @@ lookupEdges(TgRecipe * r, char *name) pqres = PQexec(qbuf); if (*pqres == 'R' || *pqres == 'E') { - elog(NOTICE, "lookupEdges(): Error while executing query : %s\n", qbuf); - elog(NOTICE, "result = %s, error is %s\n", pqres, PQerrormsg); + elog(WARNING, "lookupEdges(): Error while executing query : %s\n", qbuf); + elog(WARNING, "result = %s, error is %s\n", pqres, PQerrormsg); return; } pbufname = ++pqres; @@ -399,12 +399,12 @@ lookupEdges(TgRecipe * r, char *name) if (!fromPortStr || fromPortStr[0] == '\0') { - elog(NOTICE, "lookupEdges(): SANITY CHECK failed. Edge with invalid fromPort value!"); + elog(WARNING, "lookupEdges(): SANITY CHECK failed. Edge with invalid fromPort value!"); return; } if (!toPortStr || toPortStr[0] == '\0') { - elog(NOTICE, "lookupEdges(): SANITY CHECK failed. Edge with invalid toPort value!!"); + elog(WARNING, "lookupEdges(): SANITY CHECK failed. Edge with invalid toPort value!!"); return; } fromPort = atoi(fromPortStr); @@ -413,13 +413,13 @@ lookupEdges(TgRecipe * r, char *name) fromNodePtr = findNodeInRecipe(r, fromNode); if (!fromNodePtr) { - elog(NOTICE, "lookupEdges(): SANITY CHECK failed. Edge with bad fromNode value!"); + elog(WARNING, "lookupEdges(): SANITY CHECK failed. Edge with bad fromNode value!"); return; } toNodePtr = findNodeInRecipe(r, toNode); if (!toNodePtr) { - elog(NOTICE, "lookupEdges(): SANITY CHECK failed. Edge with bad toNode value!"); + elog(WARNING, "lookupEdges(): SANITY CHECK failed. Edge with bad toNode value!"); return; } @@ -466,7 +466,7 @@ connectTee(TgRecipe * r, TgNodePtr fromNode, TgNodePtr toNode, if (origToNode == NULL) { - elog(NOTICE, "Internal Error: connectTee() called with a null origToNode"); + elog(WARNING, "Internal Error: connectTee() called with a null origToNode"); return; } @@ -536,8 +536,8 @@ fillAllNodes(TgRecipe * r, char *name) pqres = PQexec(qbuf); if (*pqres == 'R' || *pqres == 'E') { - elog(NOTICE, "fillAllNodes(): Error while executing query : %s\n", qbuf); - elog(NOTICE, "result = %s, error is %s\n", pqres, PQerrormsg); + elog(WARNING, "fillAllNodes(): Error while executing query : %s\n", qbuf); + elog(WARNING, "result = %s, error is %s\n", pqres, PQerrormsg); return; } pbufname = ++pqres; @@ -555,8 +555,8 @@ fillAllNodes(TgRecipe * r, char *name) pqres = PQexec(qbuf); if (*pqres == 'R' || *pqres == 'E') { - elog(NOTICE, "fillAllNodes(): Error while executing query : %s\n", qbuf); - elog(NOTICE, "result = %s, error is %s\n", pqres, PQerrormsg); + elog(WARNING, "fillAllNodes(): Error while executing query : %s\n", qbuf); + elog(WARNING, "result = %s, error is %s\n", pqres, PQerrormsg); return; } pbufname = ++pqres; @@ -592,8 +592,8 @@ fillAllElements(TgRecipe * r, char *name) pqres = PQexec(qbuf); if (*pqres == 'R' || *pqres == 'E') { - elog(NOTICE, "fillAllElements(): Error while executing query : %s\n", qbuf); - elog(NOTICE, "result = %s, error is %s\n", pqres, PQerrormsg); + elog(WARNING, "fillAllElements(): Error while executing query : %s\n", qbuf); + elog(WARNING, "result = %s, error is %s\n", pqres, PQerrormsg); return; } pbufname = ++pqres; @@ -703,8 +703,8 @@ retrieveRecipe(char *name) pqres = PQexec(qbuf); if (*pqres == 'R' || *pqres == 'E') { - elog(NOTICE, "retrieveRecipe: Error while executing query : %s\n", qbuf); - elog(NOTICE, "result = %s, error is %s\n", pqres, PQerrormsg); + elog(WARNING, "retrieveRecipe: Error while executing query : %s\n", qbuf); + elog(WARNING, "result = %s, error is %s\n", pqres, PQerrormsg); return NULL; } pbufname = ++pqres; @@ -712,12 +712,12 @@ retrieveRecipe(char *name) ntups = PQntuplesGroup(pbuf, 0); if (ntups == 0) { - elog(NOTICE, "retrieveRecipe(): No recipe named %s exists\n", name); + elog(WARNING, "retrieveRecipe(): No recipe named %s exists\n", name); return NULL; } if (ntups != 1) { - elog(NOTICE, "retrieveRecipe(): Multiple (%d) recipes named %s exists\n", ntups, name); + elog(WARNING, "retrieveRecipe(): Multiple (%d) recipes named %s exists\n", ntups, name); return NULL; } diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index e4cad176ab..15e92b5f7f 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -64,7 +64,7 @@ */ /*** #define DEBUG_TO_FROM_CHAR -#define DEBUG_elog_output NOTICE +#define DEBUG_elog_output DEBUG3 ***/ #include "postgres.h" @@ -1867,7 +1867,7 @@ dch_time(int arg, char *inout, int suf, int flag, FormatNode *node, void *data) x == 2 ? 10 : 1; /* - * elog(NOTICE, "X: %d, MS: %d, LEN: %d", x, tmfc->ms, + * elog(DEBUG3, "X: %d, MS: %d, LEN: %d", x, tmfc->ms, * len); */ return len - 1 + SKIP_THth(suf); @@ -1908,7 +1908,7 @@ dch_time(int arg, char *inout, int suf, int flag, FormatNode *node, void *data) x == 5 ? 10 : 1; /* - * elog(NOTICE, "X: %d, US: %d, LEN: %d", x, tmfc->us, + * elog(DEBUG3, "X: %d, US: %d, LEN: %d", x, tmfc->us, * len); */ return len - 1 + SKIP_THth(suf); @@ -2430,7 +2430,7 @@ dch_date(int arg, char *inout, int suf, int flag, FormatNode *node, void *data) else if (flag == FROM_CHAR) { sscanf(inout, "%03d", &tmfc->year); - + /* * 3-digit year: * '100' ... '999' = 1100 ... 1999 @@ -2466,7 +2466,7 @@ dch_date(int arg, char *inout, int suf, int flag, FormatNode *node, void *data) * 2-digit year: * '00' ... '69' = 2000 ... 2069 * '70' ... '99' = 1970 ... 1999 - */ + */ if (tmfc->year < 70) tmfc->year += 2000; else @@ -2492,7 +2492,7 @@ dch_date(int arg, char *inout, int suf, int flag, FormatNode *node, void *data) else if (flag == FROM_CHAR) { sscanf(inout, "%1d", &tmfc->year); - + /* * 1-digit year: always +2000 */ diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 0c2637aa3e..11c13c6c57 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -367,7 +367,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) */ StrNCpy(*tzn, tm->tm_zone, MAXTZLEN + 1); if (strlen(tm->tm_zone) > MAXTZLEN) - elog(NOTICE, "Invalid timezone \'%s\'", tm->tm_zone); + elog(WARNING, "Invalid timezone \'%s\'", tm->tm_zone); } } } @@ -400,7 +400,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) */ StrNCpy(*tzn, tzname[tm->tm_isdst], MAXTZLEN + 1); if (strlen(tzname[tm->tm_isdst]) > MAXTZLEN) - elog(NOTICE, "Invalid timezone \'%s\'", tzname[tm->tm_isdst]); + elog(WARNING, "Invalid timezone \'%s\'", tzname[tm->tm_isdst]); } } } diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 6c927a21f1..878899556c 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -119,28 +119,28 @@ static void PGLC_setlocale(PG_LocaleCategories *lc) { if (!setlocale(LC_COLLATE, lc->lc_collate)) - elog(NOTICE, "pg_setlocale(): 'LC_COLLATE=%s' cannot be honored.", + elog(WARNING, "pg_setlocale(): 'LC_COLLATE=%s' cannot be honored.", lc->lc_collate); if (!setlocale(LC_CTYPE, lc->lc_ctype)) - elog(NOTICE, "pg_setlocale(): 'LC_CTYPE=%s' cannot be honored.", + elog(WARNING, "pg_setlocale(): 'LC_CTYPE=%s' cannot be honored.", lc->lc_ctype); if (!setlocale(LC_NUMERIC, lc->lc_numeric)) - elog(NOTICE, "pg_setlocale(): 'LC_NUMERIC=%s' cannot be honored.", + elog(WARNING, "pg_setlocale(): 'LC_NUMERIC=%s' cannot be honored.", lc->lc_numeric); if (!setlocale(LC_TIME, lc->lc_time)) - elog(NOTICE, "pg_setlocale(): 'LC_TIME=%s' cannot be honored.", + elog(WARNING, "pg_setlocale(): 'LC_TIME=%s' cannot be honored.", lc->lc_time); if (!setlocale(LC_MONETARY, lc->lc_monetary)) - elog(NOTICE, "pg_setlocale(): 'LC_MONETARY=%s' cannot be honored.", + elog(WARNING, "pg_setlocale(): 'LC_MONETARY=%s' cannot be honored.", lc->lc_monetary); #ifdef LC_MESSAGES if (!setlocale(LC_MESSAGES, lc->lc_messages)) - elog(NOTICE, "pg_setlocale(): 'LC_MESSAGES=%s' cannot be honored.", + elog(WARNING, "pg_setlocale(): 'LC_MESSAGES=%s' cannot be honored.", lc->lc_messages); #endif } diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 44571a42a7..965655491b 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -251,7 +251,7 @@ RI_FKey_check(PG_FUNCTION_ARGS) * Execute the plan */ if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_check()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_check()"); SetUserId(RelationGetForm(pk_rel)->relowner); /* pk_rel is no longer neede OK ? */ @@ -269,7 +269,7 @@ RI_FKey_check(PG_FUNCTION_ARGS) tgargs[RI_PK_RELNAME_ARGNO]); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_check()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_check()"); return PointerGetDatum(NULL); @@ -362,7 +362,7 @@ RI_FKey_check(PG_FUNCTION_ARGS) * to see it). */ if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_check()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_check()"); /* * Fetch or prepare a saved plan for the real check @@ -452,7 +452,7 @@ RI_FKey_check(PG_FUNCTION_ARGS) tgargs[RI_PK_RELNAME_ARGNO]); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_check()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_check()"); return PointerGetDatum(NULL); @@ -594,7 +594,7 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS) heap_close(fk_rel, NoLock); if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_noaction_del()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_noaction_del()"); /* * Fetch or prepare a saved plan for the restrict delete @@ -675,7 +675,7 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS) tgargs[RI_FK_RELNAME_ARGNO]); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_noaction_del()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_noaction_del()"); return PointerGetDatum(NULL); @@ -808,7 +808,7 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS) return PointerGetDatum(NULL); if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_noaction_upd()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_noaction_upd()"); /* * Fetch or prepare a saved plan for the noaction update @@ -889,7 +889,7 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS) tgargs[RI_FK_RELNAME_ARGNO]); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_noaction_upd()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_noaction_upd()"); return PointerGetDatum(NULL); @@ -1011,7 +1011,7 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS) heap_close(fk_rel, NoLock); if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_cascade_del()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_cascade_del()"); /* * Fetch or prepare a saved plan for the cascaded delete @@ -1082,7 +1082,7 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS) SetUserId(save_uid); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_cascade_del()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_cascade_del()"); return PointerGetDatum(NULL); @@ -1214,7 +1214,7 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS) return PointerGetDatum(NULL); if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_cascade_upd()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_cascade_upd()"); /* * Fetch or prepare a saved plan for the cascaded update of @@ -1306,7 +1306,7 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS) SetUserId(save_uid); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_cascade_upd()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_cascade_upd()"); return PointerGetDatum(NULL); @@ -1435,7 +1435,7 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS) heap_close(fk_rel, NoLock); if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_restrict_del()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_restrict_del()"); /* * Fetch or prepare a saved plan for the restrict delete @@ -1517,7 +1517,7 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS) tgargs[RI_FK_RELNAME_ARGNO]); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_restrict_del()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_restrict_del()"); return PointerGetDatum(NULL); @@ -1655,7 +1655,7 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS) return PointerGetDatum(NULL); if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_restrict_upd()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_restrict_upd()"); /* * Fetch or prepare a saved plan for the restrict update @@ -1739,7 +1739,7 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS) tgargs[RI_FK_RELNAME_ARGNO]); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_restrict_upd()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_restrict_upd()"); return PointerGetDatum(NULL); @@ -1861,7 +1861,7 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS) heap_close(fk_rel, NoLock); if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_setnull_del()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_setnull_del()"); /* * Fetch or prepare a saved plan for the set null delete @@ -1943,7 +1943,7 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS) SetUserId(save_uid); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_setnull_del()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_setnull_del()"); return PointerGetDatum(NULL); @@ -2078,7 +2078,7 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS) return PointerGetDatum(NULL); if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_setnull_upd()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_setnull_upd()"); /* * "MATCH <unspecified>" only changes columns corresponding to @@ -2196,7 +2196,7 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS) SetUserId(save_uid); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_setnull_upd()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_setnull_upd()"); return PointerGetDatum(NULL); @@ -2317,7 +2317,7 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS) } if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_setdefault_del()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_setdefault_del()"); /* * Prepare a plan for the set defalt delete operation. @@ -2445,7 +2445,7 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS) SetUserId(save_uid); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_setdefault_del()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_setdefault_del()"); return PointerGetDatum(NULL); @@ -2578,7 +2578,7 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS) return PointerGetDatum(NULL); if (SPI_connect() != SPI_OK_CONNECT) - elog(NOTICE, "SPI_connect() failed in RI_FKey_setdefault_upd()"); + elog(WARNING, "SPI_connect() failed in RI_FKey_setdefault_upd()"); /* * Prepare a plan for the set defalt delete operation. @@ -2721,7 +2721,7 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS) SetUserId(save_uid); if (SPI_finish() != SPI_OK_FINISH) - elog(NOTICE, "SPI_finish() failed in RI_FKey_setdefault_upd()"); + elog(WARNING, "SPI_finish() failed in RI_FKey_setdefault_upd()"); return PointerGetDatum(NULL); diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 0b098bd5f8..3cbabe429d 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -2631,7 +2631,7 @@ tleIsArrayAssign(TargetEntry *tle) */ if (aref->refexpr == NULL || !IsA(aref->refexpr, Var) || ((Var *) aref->refexpr)->varattno != tle->resdom->resno) - elog(NOTICE, "tleIsArrayAssign: I'm confused ..."); + elog(WARNING, "tleIsArrayAssign: I'm confused ..."); return true; } diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 47db575c94..4abf654852 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -2270,7 +2270,7 @@ interval_trunc(PG_FUNCTION_ARGS) } else { - elog(NOTICE, "Unable to decode INTERVAL; internal coding error"); + elog(WARNING, "Unable to decode INTERVAL; internal coding error"); *result = *interval; } } @@ -2771,7 +2771,7 @@ interval_part(PG_FUNCTION_ARGS) } else { - elog(NOTICE, "Unable to decode INTERVAL" + elog(WARNING, "Unable to decode INTERVAL" "\n\tinterval_part() internal coding error"); result = 0; } diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index eeb20a1dac..f7164c82af 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -1197,7 +1197,7 @@ bitposition(PG_FUNCTION_ARGS) mask2 = end_mask << (BITS_PER_BYTE - is); is_match = mask2 == 0; #if 0 - elog(NOTICE, "S. %d %d em=%2x sm=%2x r=%d", + elog(DEBUG3, "S. %d %d em=%2x sm=%2x r=%d", i, is, end_mask, mask2, is_match); #endif break; diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 6f92f61710..fb95344a65 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -463,7 +463,7 @@ AtEOXact_CatCache(bool isCommit) if (ct->refcount != 0) { if (isCommit) - elog(NOTICE, "Cache reference leak: cache %s (%d), tuple %u has count %d", + elog(WARNING, "Cache reference leak: cache %s (%d), tuple %u has count %d", ct->my_cache->cc_relname, ct->my_cache->id, ct->tuple.t_data->t_oid, ct->refcount); diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 909f0bd000..f1f030b314 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -236,17 +236,17 @@ do { \ relname, \ HASH_REMOVE, NULL); \ if (namehentry == NULL) \ - elog(NOTICE, "trying to delete a reldesc that does not exist."); \ + elog(WARNING, "trying to delete a reldesc that does not exist."); \ idhentry = (RelIdCacheEnt*)hash_search(RelationIdCache, \ (void *)&(RELATION->rd_id), \ HASH_REMOVE, NULL); \ if (idhentry == NULL) \ - elog(NOTICE, "trying to delete a reldesc that does not exist."); \ + elog(WARNING, "trying to delete a reldesc that does not exist."); \ nodentry = (RelNodeCacheEnt*)hash_search(RelationNodeCache, \ (void *)&(RELATION->rd_node), \ HASH_REMOVE, NULL); \ if (nodentry == NULL) \ - elog(NOTICE, "trying to delete a reldesc that does not exist."); \ + elog(WARNING, "trying to delete a reldesc that does not exist."); \ } while(0) @@ -2471,7 +2471,7 @@ AttrDefaultFetch(Relation relation) if (adform->adnum != attrdef[i].adnum) continue; if (attrdef[i].adbin != NULL) - elog(NOTICE, "AttrDefaultFetch: second record found for attr %s in rel %s", + elog(WARNING, "AttrDefaultFetch: second record found for attr %s in rel %s", NameStr(relation->rd_att->attrs[adform->adnum - 1]->attname), RelationGetRelationName(relation)); @@ -2479,7 +2479,7 @@ AttrDefaultFetch(Relation relation) Anum_pg_attrdef_adbin, adrel->rd_att, &isnull); if (isnull) - elog(NOTICE, "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s", + elog(WARNING, "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s", NameStr(relation->rd_att->attrs[adform->adnum - 1]->attname), RelationGetRelationName(relation)); else @@ -2490,7 +2490,7 @@ AttrDefaultFetch(Relation relation) } if (i >= ndef) - elog(NOTICE, "AttrDefaultFetch: unexpected record found for attr %d in rel %s", + elog(WARNING, "AttrDefaultFetch: unexpected record found for attr %d in rel %s", adform->adnum, RelationGetRelationName(relation)); } @@ -2499,7 +2499,7 @@ AttrDefaultFetch(Relation relation) heap_close(adrel, AccessShareLock); if (found != ndef) - elog(NOTICE, "AttrDefaultFetch: %d record(s) not found for rel %s", + elog(WARNING, "AttrDefaultFetch: %d record(s) not found for rel %s", ndef - found, RelationGetRelationName(relation)); } @@ -3020,7 +3020,7 @@ write_relcache_init_file(void) * We used to consider this a fatal error, but we might as well * continue with backend startup ... */ - elog(NOTICE, "Cannot create init file %s: %m\n\tContinuing anyway, but there's something wrong.", tempfilename); + elog(WARNING, "Cannot create init file %s: %m\n\tContinuing anyway, but there's something wrong.", tempfilename); return; } @@ -3168,7 +3168,7 @@ write_relcache_init_file(void) */ if (rename(tempfilename, finalfilename) < 0) { - elog(NOTICE, "Cannot rename init file %s to %s: %m\n\tContinuing anyway, but there's something wrong.", tempfilename, finalfilename); + elog(WARNING, "Cannot rename init file %s to %s: %m\n\tContinuing anyway, but there's something wrong.", tempfilename, finalfilename); /* * If we fail, try to clean up the useless temp file; don't bother * to complain if this fails too. diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 3219c4f9eb..46e87ea1c7 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -44,7 +44,7 @@ const char server_min_messages_str_default[] = "notice"; int client_min_messages; char *client_min_messages_str = NULL; -const char client_min_messages_str_default[] = "info"; +const char client_min_messages_str_default[] = "notice"; #ifdef ENABLE_SYSLOG /* @@ -75,10 +75,6 @@ static void send_message_to_frontend(int type, const char *msg); static const char *useful_strerror(int errnum); static const char *elog_message_prefix(int lev); -#define send_notice_to_frontend(msg) send_message_to_frontend(NOTICE, msg) -#define send_error_to_frontend(msg) send_message_to_frontend(ERROR, msg) - - static int Debugfile = -1; @@ -190,7 +186,7 @@ elog(int lev, const char *fmt,...) if (ClientAuthInProgress) output_to_client = (lev >= ERROR); else - output_to_client = (lev >= client_min_messages); + output_to_client = (lev >= client_min_messages || lev == INFO); } /* Skip formatting effort if non-error message will not be output */ @@ -376,6 +372,7 @@ elog(int lev, const char *fmt,...) syslog_level = LOG_INFO; break; case NOTICE: + case WARNING: syslog_level = LOG_NOTICE; break; case ERROR: @@ -415,9 +412,9 @@ elog(int lev, const char *fmt,...) */ oldcxt = MemoryContextSwitchTo(ErrorContext); - if (lev <= NOTICE) + if (lev <= WARNING) /* exclude the timestamp from msg sent to frontend */ - send_notice_to_frontend(msg_buf + timestamp_size); + send_message_to_frontend(lev, msg_buf + timestamp_size); else { /* @@ -426,7 +423,7 @@ elog(int lev, const char *fmt,...) * protocol. */ pq_endcopyout(true); - send_error_to_frontend(msg_buf + timestamp_size); + send_message_to_frontend(ERROR, msg_buf + timestamp_size); } MemoryContextSwitchTo(oldcxt); @@ -509,7 +506,7 @@ elog(int lev, const char *fmt,...) proc_exit(2); } - /* We reach here if lev <= NOTICE. OK to return to caller. */ + /* We reach here if lev <= WARNING. OK to return to caller. */ } @@ -747,7 +744,8 @@ send_message_to_frontend(int type, const char *msg) AssertArg(type <= ERROR); pq_beginmessage(&buf); - pq_sendbyte(&buf, type != ERROR ? 'N' : 'E'); /* N is INFO or NOTICE */ + pq_sendbyte(&buf, type != ERROR ? 'N' : 'E'); /* N is INFO, NOTICE, + * or WARNING */ pq_sendstring(&buf, msg); pq_endmessage(&buf); @@ -820,6 +818,9 @@ elog_message_prefix(int lev) case NOTICE: prefix = gettext("NOTICE: "); break; + case WARNING: + prefix = gettext("WARNING: "); + break; case ERROR: prefix = gettext("ERROR: "); break; @@ -852,6 +853,7 @@ check_server_min_messages(const char *lev) strcasecmp(lev, "log") == 0 || strcasecmp(lev, "info") == 0 || strcasecmp(lev, "notice") == 0 || + strcasecmp(lev, "warning") == 0 || strcasecmp(lev, "error") == 0 || strcasecmp(lev, "fatal") == 0 || strcasecmp(lev, "panic") == 0) @@ -880,6 +882,8 @@ assign_server_min_messages(const char *lev) server_min_messages = INFO; else if (strcasecmp(lev, "notice") == 0) server_min_messages = NOTICE; + else if (strcasecmp(lev, "warning") == 0) + server_min_messages = WARNING; else if (strcasecmp(lev, "error") == 0) server_min_messages = ERROR; else if (strcasecmp(lev, "fatal") == 0) @@ -901,8 +905,8 @@ check_client_min_messages(const char *lev) strcasecmp(lev, "debug4") == 0 || strcasecmp(lev, "debug5") == 0 || strcasecmp(lev, "log") == 0 || - strcasecmp(lev, "info") == 0 || strcasecmp(lev, "notice") == 0 || + strcasecmp(lev, "warning") == 0 || strcasecmp(lev, "error") == 0) return true; return false; @@ -925,10 +929,10 @@ assign_client_min_messages(const char *lev) 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, "warning") == 0) + client_min_messages = WARNING; else if (strcasecmp(lev, "error") == 0) client_min_messages = ERROR; else diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index d6e014f152..ae0cb55de5 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -354,8 +354,8 @@ InitPostgres(const char *dbname, const char *username) InitializeSessionUserIdStandalone(); if (!ThereIsAtLeastOneUser()) { - elog(NOTICE, "There are currently no users defined in this database system."); - elog(NOTICE, "You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'.", + elog(WARNING, "There are currently no users defined in this database system."); + elog(WARNING, "You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'.", username, BOOTSTRAP_USESYSID); } } diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c index ddbc689837..679c6f214e 100644 --- a/src/backend/utils/mb/conv.c +++ b/src/backend/utils/mb/conv.c @@ -1311,7 +1311,7 @@ utf_to_local(unsigned char *utf, unsigned char *iso, sizeof(pg_utf_to_local), compare1); if (p == NULL) { - elog(NOTICE, "utf_to_local: could not convert UTF-8 (0x%04x). Ignored", iutf); + elog(WARNING, "utf_to_local: could not convert UTF-8 (0x%04x). Ignored", iutf); continue; } if (p->code & 0xff000000) @@ -1447,7 +1447,7 @@ local_to_utf(unsigned char *iso, unsigned char *utf, sizeof(pg_local_to_utf), compare2); if (p == NULL) { - elog(NOTICE, "local_to_utf: could not convert (0x%04x) %s to UTF-8. Ignored", + elog(WARNING, "local_to_utf: could not convert (0x%04x) %s to UTF-8. Ignored", iiso, (&pg_enc2name_tbl[encoding])->name); continue; } @@ -1750,8 +1750,8 @@ static void utf_to_win1250(unsigned char *utf, unsigned char *euc, int len) { - utf_to_local(utf, euc, ULmapWIN1250, - sizeof(ULmapWIN1250) / sizeof(pg_utf_to_local), len); + utf_to_local(utf, euc, ULmapWIN1250, + sizeof(ULmapWIN1250) / sizeof(pg_utf_to_local), len); } /* @@ -1760,8 +1760,8 @@ utf_to_win1250(unsigned char *utf, unsigned char *euc, int len) static void win1250_to_utf(unsigned char *euc, unsigned char *utf, int len) { - local_to_utf(euc, utf, LUmapWIN1250, - sizeof(LUmapWIN1250) / sizeof(pg_local_to_utf), PG_WIN1250, len); + local_to_utf(euc, utf, LUmapWIN1250, + sizeof(LUmapWIN1250) / sizeof(pg_local_to_utf), PG_WIN1250, len); } /* @@ -1771,8 +1771,8 @@ static void utf_to_win1256(unsigned char *utf, unsigned char *euc, int len) { - utf_to_local(utf, euc, ULmapWIN1256, - sizeof(ULmapWIN1256) / sizeof(pg_utf_to_local), len); + utf_to_local(utf, euc, ULmapWIN1256, + sizeof(ULmapWIN1256) / sizeof(pg_utf_to_local), len); } /* diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index f3f8fb8af1..d1eb810b4e 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -896,7 +896,7 @@ set_config_option(const char *name, const char *value, if (context == PGC_SIGHUP) elevel = DEBUG1; else if (guc_session_init) - elevel = NOTICE; + elevel = INFO; else elevel = ERROR; @@ -1259,7 +1259,7 @@ _ShowOption(enum config_type opttype, struct config_generic * record) default: val = "???"; } - elog(NOTICE, "%s is %s", record->name, val); + elog(INFO, "%s is %s", record->name, val); } void @@ -1408,13 +1408,13 @@ ProcessGUCArray(ArrayType *array, GucSource source) ParseLongOption(s, &name, &value); if (!value) { - elog(NOTICE, "cannot to parse setting \"%s\"", name); - continue; + elog(WARNING, "cannot to parse setting \"%s\"", name); + continue; } /* prevent errors from incorrect options */ guc_session_init = true; - + SetConfigOption(name, value, PGC_SUSET, source); guc_session_init = false; @@ -1441,7 +1441,7 @@ GUCArrayAdd(ArrayType *array, const char *name, const char *value) newval = palloc(strlen(name) + 1 + strlen(value) + 1); sprintf(newval, "%s=%s", name, value); datum = DirectFunctionCall1(textin, CStringGetDatum(newval)); - + if (array) { int index; diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index f1b7676b4f..3b59cbec63 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -113,10 +113,11 @@ #server_min_messages = notice # 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: + # info, notice, warning, error, log, fatal, + # panic +#client_min_messages = notice # Values, in order of decreasing detail: # debug5, debug4, debug3, debug2, debug1, - # log, info, notice, error + # log, notice, warning, error #silent_mode = false #log_connections = false diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index 9361c69e44..944bec630d 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -736,7 +736,7 @@ AllocSetFree(MemoryContext context, void *pointer) /* Test for someone scribbling on unused space in chunk */ if (chunk->requested_size < chunk->size) if (((char *) pointer)[chunk->requested_size] != 0x7E) - elog(NOTICE, "AllocSetFree: detected write past chunk end in %s %p", + elog(WARNING, "AllocSetFree: detected write past chunk end in %s %p", set->header.name, chunk); #endif @@ -811,7 +811,7 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size) /* Test for someone scribbling on unused space in chunk */ if (chunk->requested_size < oldsize) if (((char *) pointer)[chunk->requested_size] != 0x7E) - elog(NOTICE, "AllocSetRealloc: detected write past chunk end in %s %p", + elog(WARNING, "AllocSetRealloc: detected write past chunk end in %s %p", set->header.name, chunk); #endif @@ -997,7 +997,7 @@ AllocSetStats(MemoryContext context) * AllocSetCheck * Walk through chunks and check consistency of memory. * - * NOTE: report errors as NOTICE, *not* ERROR or FATAL. Otherwise you'll + * NOTE: report errors as WARNING, *not* ERROR or FATAL. Otherwise you'll * find yourself in an infinite loop when trouble occurs, because this * routine will be entered again when elog cleanup tries to release memory! */ @@ -1021,7 +1021,7 @@ AllocSetCheck(MemoryContext context) if (!blk_used) { if (set->keeper != block) - elog(NOTICE, "AllocSetCheck: %s: empty block %p", + elog(WARNING, "AllocSetCheck: %s: empty block %p", name, block); } @@ -1043,16 +1043,16 @@ AllocSetCheck(MemoryContext context) * Check chunk size */ if (dsize > chsize) - elog(NOTICE, "AllocSetCheck: %s: req size > alloc size for chunk %p in block %p", + elog(WARNING, "AllocSetCheck: %s: req size > alloc size for chunk %p in block %p", name, chunk, block); if (chsize < (1 << ALLOC_MINBITS)) - elog(NOTICE, "AllocSetCheck: %s: bad size %lu for chunk %p in block %p", + elog(WARNING, "AllocSetCheck: %s: bad size %lu for chunk %p in block %p", name, (unsigned long) chsize, chunk, block); /* single-chunk block? */ if (chsize > ALLOC_CHUNK_LIMIT && chsize + ALLOC_CHUNKHDRSZ != blk_used) - elog(NOTICE, "AllocSetCheck: %s: bad single-chunk %p in block %p", + elog(WARNING, "AllocSetCheck: %s: bad single-chunk %p in block %p", name, chunk, block); /* @@ -1061,14 +1061,14 @@ AllocSetCheck(MemoryContext context) * check as easily...) */ if (dsize > 0 && chunk->aset != (void *) set) - elog(NOTICE, "AllocSetCheck: %s: bogus aset link in block %p, chunk %p", + elog(WARNING, "AllocSetCheck: %s: bogus aset link in block %p, chunk %p", name, block, chunk); /* * Check for overwrite of "unallocated" space in chunk */ if (dsize > 0 && dsize < chsize && *chdata_end != 0x7E) - elog(NOTICE, "AllocSetCheck: %s: detected write past chunk end in block %p, chunk %p", + elog(WARNING, "AllocSetCheck: %s: detected write past chunk end in block %p, chunk %p", name, block, chunk); blk_data += chsize; @@ -1078,7 +1078,7 @@ AllocSetCheck(MemoryContext context) } if ((blk_data + (nchunks * ALLOC_CHUNKHDRSZ)) != blk_used) - elog(NOTICE, "AllocSetCheck: %s: found inconsistent memory block %p", + elog(WARNING, "AllocSetCheck: %s: found inconsistent memory block %p", name, block); } } diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index c26b639bf5..aff665c257 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -77,7 +77,7 @@ do { \ if (hentry == NULL) \ elog(ERROR, "out of memory in PortalHashTable"); \ if (found) \ - elog(NOTICE, "trying to insert a portal name that exists."); \ + elog(WARNING, "trying to insert a portal name that exists."); \ hentry->portal = PORTAL; \ } while(0) @@ -90,7 +90,7 @@ do { \ hentry = (PortalHashEnt*)hash_search(PortalHashTable, \ key, HASH_REMOVE, NULL); \ if (hentry == NULL) \ - elog(NOTICE, "trying to delete portal name that does not exist."); \ + elog(WARNING, "trying to delete portal name that does not exist."); \ } while(0) static MemoryContext PortalMemory = NULL; @@ -182,7 +182,7 @@ PortalSetQuery(Portal portal, * Exceptions: * BadState if called when disabled. * BadArg if portal name is invalid. - * "NOTICE" if portal name is in use (existing portal is returned!) + * "WARNING" if portal name is in use (existing portal is returned!) */ Portal CreatePortal(char *name) @@ -194,7 +194,7 @@ CreatePortal(char *name) portal = GetPortalByName(name); if (PortalIsValid(portal)) { - elog(NOTICE, "CreatePortal: portal \"%s\" already exists", name); + elog(WARNING, "CreatePortal: portal \"%s\" already exists", name); return portal; } diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index c3a101a1ea..eae83ea57b 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -147,7 +147,7 @@ psql_error(const char *fmt,...) /* - * for backend NOTICES + * for backend INFO, WARNING, ERROR */ void NoticeProcessor(void *arg, const char *message) @@ -574,14 +574,11 @@ SendQuery(const char *query) if (results) PQclear(results); - } + } /* Possible microtiming output */ - if (pset.timing && success) - { - ! printf(gettext("Total time: %.3fs\n"), ((after.tv_sec-before.tv_sec)*1000000 + after.tv_usec - before.tv_usec) / 1000000.0); - } + printf(gettext("Total time: %.3fs\n"), ((after.tv_sec-before.tv_sec)*1000000 + after.tv_usec - before.tv_usec) / 1000000.0); return success; } diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c index d525a93ae3..552de69c0c 100644 --- a/src/bin/psql/large_obj.c +++ b/src/bin/psql/large_obj.c @@ -59,8 +59,8 @@ handle_transaction(void) if (notice[0]) { - if ((!commit && strcmp(notice, "NOTICE: ROLLBACK: no transaction in progress\n") != 0) || - (commit && strcmp(notice, "NOTICE: COMMIT: no transaction in progress\n") != 0)) + if ((!commit && strcmp(notice, "WARNING: ROLLBACK: no transaction in progress\n") != 0) || + (commit && strcmp(notice, "WARNING: COMMIT: no transaction in progress\n") != 0)) fputs(notice, stderr); } else if (!QUIET()) diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 4d0e03fe83..f684bad002 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -26,14 +26,13 @@ #define COMMERROR 16 /* Client communication problems; same as * LOG for server reporting, but never ever * try to send to client. */ -#define INFO 17 /* Informative messages that are part of - * normal query operation; sent only to - * client by default. */ -#define INFOALWAYS 18 /* Like INFO, but always prints to client */ -#define NOTICE 19 /* Important messages, for unusual cases that - * should be reported but are not serious +#define INFO 17 /* Informative messages that always sent to the + * clent; is not affected by client_min_messages */ +#define NOTICE 18 /* Important messages, for unusual cases that + * should be reported but are not serious * enough to abort the query. Sent to client * and server log by default. */ +#define WARNING 19 /* Important warnings */ #define ERROR 20 /* user error - return to known state */ #define FATAL 21 /* fatal error - abort process */ #define PANIC 22 /* take down the other backends with me */ diff --git a/src/interfaces/ecpg/include/ecpgerrno.h b/src/interfaces/ecpg/include/ecpgerrno.h index 189f1db910..545782e2a6 100644 --- a/src/interfaces/ecpg/include/ecpgerrno.h +++ b/src/interfaces/ecpg/include/ecpgerrno.h @@ -44,23 +44,23 @@ #define ECPG_TRANS -401 #define ECPG_CONNECT -402 -/* backend notices, starting at 600 */ -#define ECPG_NOTICE_UNRECOGNIZED -600 - /* NOTICE: (transaction aborted): queries ignored until END */ +/* backend WARNINGs, starting at 600 */ +#define ECPG_WARNING_UNRECOGNIZED -600 + /* WARNING: (transaction aborted): queries ignored until END */ /* - * NOTICE: current transaction is aborted, queries ignored until end of + * WARNING: current transaction is aborted, queries ignored until end of * transaction block */ -#define ECPG_NOTICE_QUERY_IGNORED -601 - /* NOTICE: PerformPortalClose: portal "*" not found */ -#define ECPG_NOTICE_UNKNOWN_PORTAL -602 - /* NOTICE: BEGIN: already a transaction in progress */ -#define ECPG_NOTICE_IN_TRANSACTION -603 - /* NOTICE: AbortTransaction and not in in-progress state */ - /* NOTICE: COMMIT: no transaction in progress */ -#define ECPG_NOTICE_NO_TRANSACTION -604 - /* NOTICE: BlankPortalAssignName: portal * already exists */ -#define ECPG_NOTICE_PORTAL_EXISTS -605 +#define ECPG_WARNING_QUERY_IGNORED -601 + /* WARNING: PerformPortalClose: portal "*" not found */ +#define ECPG_WARNING_UNKNOWN_PORTAL -602 + /* WARNING: BEGIN: already a transaction in progress */ +#define ECPG_WARNING_IN_TRANSACTION -603 + /* WARNING: AbortTransaction and not in in-progress state */ + /* WARNING: COMMIT: no transaction in progress */ +#define ECPG_WARNING_NO_TRANSACTION -604 + /* WARNING: BlankPortalAssignName: portal * already exists */ +#define ECPG_WARNING_PORTAL_EXISTS -605 #endif /* !_ECPG_ERROR_H */ diff --git a/src/interfaces/ecpg/lib/connect.c b/src/interfaces/ecpg/lib/connect.c index 9e4373e445..ea792c6680 100644 --- a/src/interfaces/ecpg/lib/connect.c +++ b/src/interfaces/ecpg/lib/connect.c @@ -142,117 +142,117 @@ static void ECPGnoticeProcessor(void *arg, const char *message) { /* these notices raise an error */ - if (strncmp(message, "NOTICE: ", 8)) + if (strncmp(message, "WARNING: ", 9)) { - ECPGlog("ECPGnoticeProcessor: strange notice '%s'\n", message); - ECPGnoticeProcessor_raise(ECPG_NOTICE_UNRECOGNIZED, message); + ECPGlog("ECPGnoticeProcessor: strange warning '%s'\n", message); + ECPGnoticeProcessor_raise(ECPG_WARNING_UNRECOGNIZED, message); return; } message += 8; while (*message == ' ') message++; - ECPGlog("NOTICE: %s", message); + ECPGlog("WARNING: %s", message); - /* NOTICE: (transaction aborted): queries ignored until END */ + /* WARNING: (transaction aborted): queries ignored until END */ /* - * NOTICE: current transaction is aborted, queries ignored until end + * WARNING: current transaction is aborted, queries ignored until end * of transaction block */ if (strstr(message, "queries ignored") && strstr(message, "transaction") && strstr(message, "aborted")) { - ECPGnoticeProcessor_raise(ECPG_NOTICE_QUERY_IGNORED, message); + ECPGnoticeProcessor_raise(ECPG_WARNING_QUERY_IGNORED, message); return; } - /* NOTICE: PerformPortalClose: portal "*" not found */ + /* WARNING: PerformPortalClose: portal "*" not found */ if ((!strncmp(message, "PerformPortalClose: portal", 26) || !strncmp(message, "PerformPortalFetch: portal", 26)) && strstr(message + 26, "not found")) { - ECPGnoticeProcessor_raise(ECPG_NOTICE_UNKNOWN_PORTAL, message); + ECPGnoticeProcessor_raise(ECPG_WARNING_UNKNOWN_PORTAL, message); return; } - /* NOTICE: BEGIN: already a transaction in progress */ + /* WARNING: BEGIN: already a transaction in progress */ if (!strncmp(message, "BEGIN: already a transaction in progress", 40)) { - ECPGnoticeProcessor_raise(ECPG_NOTICE_IN_TRANSACTION, message); + ECPGnoticeProcessor_raise(ECPG_WARNING_IN_TRANSACTION, message); return; } - /* NOTICE: AbortTransaction and not in in-progress state */ - /* NOTICE: COMMIT: no transaction in progress */ - /* NOTICE: ROLLBACK: no transaction in progress */ + /* WARNING: AbortTransaction and not in in-progress state */ + /* WARNING: COMMIT: no transaction in progress */ + /* WARNING: ROLLBACK: no transaction in progress */ if (!strncmp(message, "AbortTransaction and not in in-progress state", 45) || !strncmp(message, "COMMIT: no transaction in progress", 34) || !strncmp(message, "ROLLBACK: no transaction in progress", 36)) { - ECPGnoticeProcessor_raise(ECPG_NOTICE_NO_TRANSACTION, message); + ECPGnoticeProcessor_raise(ECPG_WARNING_NO_TRANSACTION, message); return; } - /* NOTICE: BlankPortalAssignName: portal * already exists */ + /* WARNING: BlankPortalAssignName: portal * already exists */ if (!strncmp(message, "BlankPortalAssignName: portal", 29) && strstr(message + 29, "already exists")) { - ECPGnoticeProcessor_raise(ECPG_NOTICE_PORTAL_EXISTS, message); + ECPGnoticeProcessor_raise(ECPG_WARNING_PORTAL_EXISTS, message); return; } /* these are harmless - do nothing */ /* - * NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index '*' + * WARNING: CREATE TABLE / PRIMARY KEY will create implicit index '*' * for table '*' */ /* - * NOTICE: ALTER TABLE ... ADD CONSTRAINT will create implicit + * WARNING: ALTER TABLE ... ADD CONSTRAINT will create implicit * trigger(s) for FOREIGN KEY check(s) */ /* - * NOTICE: CREATE TABLE will create implicit sequence '*' for SERIAL + * WARNING: CREATE TABLE will create implicit sequence '*' for SERIAL * column '*.*' */ /* - * NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN + * WARNING: CREATE TABLE will create implicit trigger(s) for FOREIGN * KEY check(s) */ if ((!strncmp(message, "CREATE TABLE", 12) || !strncmp(message, "ALTER TABLE", 11)) && strstr(message + 11, "will create implicit")) return; - /* NOTICE: QUERY PLAN: */ + /* WARNING: QUERY PLAN: */ if (!strncmp(message, "QUERY PLAN:", 11)) /* do we really see these? */ return; /* - * NOTICE: DROP TABLE implicitly drops referential integrity trigger + * WARNING: DROP TABLE implicitly drops referential integrity trigger * from table "*" */ if (!strncmp(message, "DROP TABLE implicitly drops", 27)) return; /* - * NOTICE: Caution: DROP INDEX cannot be rolled back, so don't abort + * WARNING: Caution: DROP INDEX cannot be rolled back, so don't abort * now */ if (strstr(message, "cannot be rolled back")) return; /* these and other unmentioned should set sqlca.sqlwarn[2] */ - /* NOTICE: The ':' operator is deprecated. Use exp(x) instead. */ - /* NOTICE: Rel *: Uninitialized page 0 - fixing */ - /* NOTICE: PortalHeapMemoryFree: * not in alloc set! */ - /* NOTICE: Too old parent tuple found - can't continue vc_repair_frag */ - /* NOTICE: identifier "*" will be truncated to "*" */ - /* NOTICE: InvalidateSharedInvalid: cache state reset */ - /* NOTICE: RegisterSharedInvalid: SI buffer overflow */ + /* WARNING: The ':' operator is deprecated. Use exp(x) instead. */ + /* WARNING: Rel *: Uninitialized page 0 - fixing */ + /* WARNING: PortalHeapMemoryFree: * not in alloc set! */ + /* WARNING: Too old parent tuple found - can't continue vc_repair_frag */ + /* WARNING: identifier "*" will be truncated to "*" */ + /* WARNING: InvalidateSharedInvalid: cache state reset */ + /* WARNING: RegisterSharedInvalid: SI buffer overflow */ sqlca.sqlwarn[2] = 'W'; sqlca.sqlwarn[0] = 'W'; } diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c index e542bcece0..c6bfa01c2f 100644 --- a/src/interfaces/ecpg/preproc/descriptor.c +++ b/src/interfaces/ecpg/preproc/descriptor.c @@ -121,7 +121,7 @@ drop_descriptor(char *name, char *connection) } } snprintf(errortext, sizeof errortext, "unknown descriptor %s", name); - mmerror(PARSE_ERROR, ET_NOTICE, errortext); + mmerror(PARSE_ERROR, ET_WARNING, errortext); } struct descriptor @@ -144,7 +144,7 @@ lookup_descriptor(char *name, char *connection) } } snprintf(errortext, sizeof errortext, "unknown descriptor %s", name); - mmerror(PARSE_ERROR, ET_NOTICE, errortext); + mmerror(PARSE_ERROR, ET_WARNING, errortext); return NULL; } @@ -161,7 +161,7 @@ output_get_descr_header(char *desc_name) else { snprintf(errortext, sizeof errortext, "unknown descriptor header item '%d'", results->value); - mmerror(PARSE_ERROR, ET_NOTICE, errortext); + mmerror(PARSE_ERROR, ET_WARNING, errortext); } } @@ -183,10 +183,10 @@ output_get_descr(char *desc_name, char *index) switch (results->value) { case ECPGd_nullable: - mmerror(PARSE_ERROR, ET_NOTICE, "nullable is always 1"); + mmerror(PARSE_ERROR, ET_WARNING, "nullable is always 1"); break; case ECPGd_key_member: - mmerror(PARSE_ERROR, ET_NOTICE, "key_member is always 0"); + mmerror(PARSE_ERROR, ET_WARNING, "key_member is always 0"); break; default: break; diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index a18fa6ba7d..a7fa32dc22 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -394,7 +394,7 @@ cppline {space}*#(.*\\{space})*.* literalbuf, NAMEDATALEN-1, literalbuf); literalbuf[NAMEDATALEN-1] = '\0'; #endif - mmerror(PARSE_ERROR, ET_NOTICE, errortext); + mmerror(PARSE_ERROR, ET_WARNING, errortext); } yylval.str = mm_strdup(literalbuf); diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index d94f2a78c5..550d15ca12 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -38,7 +38,7 @@ mmerror(int error_code, enum errortype type, char * error) { switch(type) { - case ET_NOTICE: + case ET_WARNING: fprintf(stderr, "%s:%d: WARNING: %s\n", input_filename, yylineno, error); break; case ET_ERROR: @@ -1101,11 +1101,11 @@ OptTemp: TEMPORARY { $$ = make_str("temporary"); } | LOCAL TEMPORARY { $$ = make_str("local temporary"); } | LOCAL TEMP { $$ = make_str("local temp"); } | GLOBAL TEMPORARY { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported CREATE TABLE / GLOBAL TEMPORARY will be passed to backend"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported CREATE TABLE / GLOBAL TEMPORARY will be passed to backend"); $$ = make_str("global temporary"); } | GLOBAL TEMP { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported CREATE TABLE / GLOBAL TEMP will be passed to backend"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported CREATE TABLE / GLOBAL TEMP will be passed to backend"); $$ = make_str("global temp"); } | /*EMPTY*/ { $$ = EMPTY; } @@ -1131,7 +1131,7 @@ columnDef: ColId Typename ColQualList opt_collate if (strlen($4) > 0) { sprintf(errortext, "Currently unsupported CREATE TABLE / COLLATE %s will be passed to backend", $4); - mmerror(PARSE_ERROR, ET_NOTICE, errortext); + mmerror(PARSE_ERROR, ET_WARNING, errortext); } $$ = cat_str(4, $1, $2, $3, $4); } @@ -1246,7 +1246,7 @@ key_match: MATCH FULL } | MATCH PARTIAL { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported FOREIGN KEY/MATCH PARTIAL will be passed to backend"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported FOREIGN KEY/MATCH PARTIAL will be passed to backend"); $$ = make_str("match partial"); } | /*EMPTY*/ @@ -1641,7 +1641,7 @@ direction: FORWARD { $$ = make_str("forward"); } | BACKWARD { $$ = make_str("backward"); } | RELATIVE { $$ = make_str("relative"); } | ABSOLUTE { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported FETCH/ABSOLUTE will be passed to backend, backend will use RELATIVE"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported FETCH/ABSOLUTE will be passed to backend, backend will use RELATIVE"); $$ = make_str("absolute"); } ; @@ -1798,7 +1798,7 @@ grantee_list: grantee { $$ = $1; } opt_with_grant: WITH GRANT OPTION { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported GRANT/WITH GRANT OPTION will be passed to backend"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported GRANT/WITH GRANT OPTION will be passed to backend"); $$ = make_str("with grant option"); } | /*EMPTY*/ { $$ = EMPTY; } @@ -1950,12 +1950,12 @@ func_arg: opt_arg func_type opt_arg: IN { $$ = make_str("in"); } | OUT { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported CREATE FUNCTION/OUT will be passed to backend"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported CREATE FUNCTION/OUT will be passed to backend"); $$ = make_str("out"); } | INOUT { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported CREATE FUNCTION/INOUT will be passed to backend"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported CREATE FUNCTION/INOUT will be passed to backend"); $$ = make_str("inout"); } @@ -2195,7 +2195,7 @@ opt_trans: WORK { $$ = ""; } opt_chain: AND NO CHAIN { $$ = make_str("and no chain"); } | AND CHAIN { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported COMMIT/CHAIN will be passed to backend"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported COMMIT/CHAIN will be passed to backend"); $$ = make_str("and chain"); } @@ -2640,12 +2640,12 @@ OptTempTableName: TEMPORARY opt_table relation_name } | GLOBAL TEMPORARY opt_table relation_name { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported CREATE TABLE / GLOBAL TEMPORARY will be passed to backend"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported CREATE TABLE / GLOBAL TEMPORARY will be passed to backend"); $$ = cat_str(3, make_str("global temporary"), $3, $4); } | GLOBAL TEMP opt_table relation_name { - mmerror(PARSE_ERROR, ET_NOTICE, "Currently unsupported CREATE TABLE / GLOBAL TEMP will be passed to backend"); + mmerror(PARSE_ERROR, ET_WARNING, "Currently unsupported CREATE TABLE / GLOBAL TEMP will be passed to backend"); $$ = cat_str(3, make_str("global temp"), $3, $4); } | TABLE relation_name @@ -2704,7 +2704,7 @@ select_limit: LIMIT select_limit_value OFFSET select_offset_value | LIMIT select_limit_value ',' select_offset_value { $$ = cat_str(4, make_str("limit"), $2, make_str(","), $4); } /* enable this in 7.3, bjm 2001-10-22 - { mmerror(PARSE_ERROR, ET_NOTICE, "No longer supported LIMIT #,# syntax passed to backend."); } + { mmerror(PARSE_ERROR, ET_WARNING, "No longer supported LIMIT #,# syntax passed to backend."); } */ ; diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h index e07dfc54f3..d86f08b64d 100644 --- a/src/interfaces/ecpg/preproc/type.h +++ b/src/interfaces/ecpg/preproc/type.h @@ -156,7 +156,7 @@ struct assignment enum errortype { - ET_NOTICE, ET_ERROR, ET_FATAL + ET_WARNING, ET_ERROR, ET_FATAL }; struct fetch_desc diff --git a/src/interfaces/ecpg/test/test_notice.pgc b/src/interfaces/ecpg/test/test_notice.pgc index f8e044a63c..a2184f3226 100644 --- a/src/interfaces/ecpg/test/test_notice.pgc +++ b/src/interfaces/ecpg/test/test_notice.pgc @@ -43,16 +43,16 @@ int main(int argc, char **argv) if (sqlca.sqlcode) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql begin work; - if (sqlca.sqlcode!=ECPG_NOTICE_IN_TRANSACTION) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + if (sqlca.sqlcode!=ECPG_WARNING_IN_TRANSACTION) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql commit; if (sqlca.sqlcode) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql commit; - if (sqlca.sqlcode!=ECPG_NOTICE_NO_TRANSACTION) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + if (sqlca.sqlcode!=ECPG_WARNING_NO_TRANSACTION) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql rollback; - if (sqlca.sqlcode!=ECPG_NOTICE_NO_TRANSACTION) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + if (sqlca.sqlcode!=ECPG_WARNING_NO_TRANSACTION) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); sqlca.sqlcode=0; exec sql declare x cursor for select * from test; @@ -62,19 +62,19 @@ int main(int argc, char **argv) if (sqlca.sqlcode) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql open x; - if (sqlca.sqlcode!=ECPG_NOTICE_PORTAL_EXISTS) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + if (sqlca.sqlcode!=ECPG_WARNING_PORTAL_EXISTS) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql close x; if (sqlca.sqlcode) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql close x; - if (sqlca.sqlcode!=ECPG_NOTICE_UNKNOWN_PORTAL) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + if (sqlca.sqlcode!=ECPG_WARNING_UNKNOWN_PORTAL) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql update test set nonexistent=2; if (sqlca.sqlcode!=ECPG_PGSQL) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql select payload into :payload from test where index=1; - if (sqlca.sqlcode!=ECPG_NOTICE_QUERY_IGNORED) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); + if (sqlca.sqlcode!=ECPG_WARNING_QUERY_IGNORED) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql rollback; if (sqlca.sqlcode) printf("%d %ld:%s\n",__LINE__,sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 2692d45fe3..1cead36696 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -202,16 +202,16 @@ PQescapeBytea(unsigned char *bintext, size_t binlen, size_t *bytealen) * 6 \\ */ unsigned char * -PQunescapeBytea(unsigned char *strtext, size_t *retbuflen) +PQunescapeBytea(unsigned char *strtext, size_t *retbuflen) { size_t buflen; unsigned char *buffer, *sp, *bp; unsigned int state=0; - if(strtext == NULL)return NULL; + if(strtext == NULL)return NULL; buflen = strlen(strtext); /* will shrink, also we discover if strtext */ buffer = (unsigned char *) malloc(buflen); /* isn't NULL terminated */ - if(buffer == NULL)return NULL; + if(buffer == NULL)return NULL; for(bp = buffer, sp = strtext; *sp != '\0'; bp++, sp++) { switch(state) @@ -798,7 +798,7 @@ PQsendQuery(PGconn *conn, const char *query) * handleSendFailure: try to clean up after failure to send command. * * Primarily, what we want to accomplish here is to process an async - * NOTICE message that the backend might have sent just before it died. + * WARNING message that the backend might have sent just before it died. * * NOTE: this routine should only be called in PGASYNC_IDLE state. */ @@ -816,7 +816,7 @@ handleSendFailure(PGconn *conn) /* * Parse any available input messages. Since we are in PGASYNC_IDLE - * state, only NOTICE and NOTIFY messages will be eaten. + * state, only WARNING and NOTIFY messages will be eaten. */ parseInput(conn); } @@ -890,7 +890,7 @@ parseInput(PGconn *conn) return; /* - * NOTIFY and NOTICE messages can happen in any state besides COPY + * NOTIFY and WARNING messages can happen in any state besides COPY * OUT; always process them right away. * * Most other messages should only be processed while in BUSY state. diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 90a873edca..1673d94480 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -122,7 +122,7 @@ pqPutBytes(const char *s, size_t nbytes, PGconn *conn) while (nbytes) { size_t avail, remaining; - + /* fill the output buffer */ avail = Max(conn->outBufSize - conn->outCount, 0); remaining = Min(avail, nbytes); @@ -703,7 +703,7 @@ pqSendSome(PGconn *conn) /* * We used to close the socket here, but that's a bad * idea since there might be unread data waiting - * (typically, a NOTICE message from the backend + * (typically, a WARNING message from the backend * telling us it's committing hara-kiri...). Leave * the socket open until pqReadData finds no more data * can be read. diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c index 389da5698a..3d07474a56 100644 --- a/src/interfaces/odbc/connection.c +++ b/src/interfaces/odbc/connection.c @@ -578,12 +578,12 @@ md5_auth_send(ConnectionClass *self, const char *salt) { free(pwd1); return 1; - } + } if (!(pwd2 = malloc(MD5_PASSWD_LEN + 1))) { free(pwd1); return 1; - } + } if (!EncryptMD5(pwd1 + strlen("md5"), salt, 4, pwd2)) { free(pwd2); @@ -595,7 +595,7 @@ md5_auth_send(ConnectionClass *self, const char *salt) SOCK_put_n_char(sock, pwd2, strlen(pwd2) + 1); SOCK_flush_output(sock); free(pwd2); - return 0; + return 0; } char @@ -1199,7 +1199,7 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi) { mylog("send_query: ok - 'C' - %s\n", cmdbuffer); - if (res == NULL) /* allow for "show" style notices */ + if (res == NULL) /* allow for "show" style info */ res = QR_Constructor(); mylog("send_query: setting cmdbuffer = '%s'\n", cmdbuffer); @@ -1243,7 +1243,7 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi) ReadyToReturn = FALSE; } break; - case 'N': /* NOTICE: */ + case 'N': /* INFO, NOTICE, WARNING */ msg_truncated = SOCK_get_string(sock, cmdbuffer, ERROR_MSG_LENGTH); if (!res) res = QR_Constructor(); @@ -1257,19 +1257,19 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi) strcpy(PG_CCSS, cmdbuffer + 36);
if (strstr(cmdbuffer,"Current server encoding is"))
strcpy(PG_SCSS, cmdbuffer + 36);
- mylog("~~~ NOTICE: '%s'\n", cmdbuffer);
- qlog("NOTICE from backend during send_query: '%s'\n ClientEncoding = %s\n ServerEncoding = %s\n", cmdbuffer, PG_CCSS, PG_SCSS);
+ mylog("~~~ WARNING: '%s'\n", cmdbuffer);
+ qlog("WARNING from backend during send_query: '%s'\n ClientEncoding = %s\n ServerEncoding = %s\n", cmdbuffer, PG_CCSS, PG_SCSS);
}
else
{
- mylog("~~~ NOTICE: '%s'\n", cmdbuffer);
- qlog("NOTICE from backend during send_query: '%s'\n", cmdbuffer);
+ mylog("~~~ WARNING: '%s'\n", cmdbuffer);
+ qlog("WARNING from backend during send_query: '%s'\n", cmdbuffer);
}
#else
- mylog("~~~ NOTICE: '%s'\n", cmdbuffer);
- qlog("NOTICE from backend during send_query: '%s'\n", cmdbuffer);
+ mylog("~~~ WARNING: '%s'\n", cmdbuffer);
+ qlog("WARNING from backend during send_query: '%s'\n", cmdbuffer);
#endif while (msg_truncated) msg_truncated = SOCK_get_string(sock, cmdbuffer, ERROR_MSG_LENGTH); @@ -1591,7 +1591,7 @@ CC_send_function(ConnectionClass *self, int fnid, void *result_buf, int *actual_ SOCK_get_string(sock, msgbuffer, ERROR_MSG_LENGTH); mylog("send_function(G): 'N' - %s\n", msgbuffer); - qlog("NOTICE from backend during send_function: '%s'\n", msgbuffer); + qlog("WARNING from backend during send_function: '%s'\n", msgbuffer); continue; /* dont return a result -- continue * reading */ diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index e8a90d1f86..dba420df22 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -156,7 +156,7 @@ plpgsql_compile(Oid fn_oid, int functype) */ if (plpgsql_error_funcname != NULL) { - elog(NOTICE, "plpgsql: ERROR during compile of %s near line %d", + elog(WARNING, "plpgsql: ERROR during compile of %s near line %d", plpgsql_error_funcname, plpgsql_error_lineno); plpgsql_error_funcname = NULL; diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index d52dbb1a58..024f403981 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -189,15 +189,15 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo) */ if (error_info_func != NULL) { - elog(NOTICE, "Error occurred while executing PL/pgSQL function %s", + elog(WARNING, "Error occurred while executing PL/pgSQL function %s", error_info_func->fn_name); if (error_info_stmt != NULL) - elog(NOTICE, "line %d at %s", error_info_stmt->lineno, + elog(WARNING, "line %d at %s", error_info_stmt->lineno, plpgsql_stmt_typename(error_info_stmt)); else if (error_info_text != NULL) - elog(NOTICE, "%s", error_info_text); + elog(WARNING, "%s", error_info_text); else - elog(NOTICE, "no more error information available"); + elog(WARNING, "no more error information available"); error_info_func = NULL; error_info_stmt = NULL; @@ -437,15 +437,15 @@ plpgsql_exec_trigger(PLpgSQL_function * func, */ if (error_info_func != NULL) { - elog(NOTICE, "Error occurred while executing PL/pgSQL function %s", + elog(WARNING, "Error occurred while executing PL/pgSQL function %s", error_info_func->fn_name); if (error_info_stmt != NULL) - elog(NOTICE, "line %d at %s", error_info_stmt->lineno, + elog(WARNING, "line %d at %s", error_info_stmt->lineno, plpgsql_stmt_typename(error_info_stmt)); else if (error_info_text != NULL) - elog(NOTICE, "%s", error_info_text); + elog(WARNING, "%s", error_info_text); else - elog(NOTICE, "no more error information available"); + elog(WARNING, "no more error information available"); error_info_func = NULL; error_info_stmt = NULL; diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 2d8d2464ff..bf9de11c84 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -415,7 +415,7 @@ plpython_call_handler(PG_FUNCTION_ARGS) } /* - * elog(NOTICE, "PLy_restart_in_progress is %d", + * elog(DEBUG3, "PLy_restart_in_progress is %d", * PLy_restart_in_progress); */ @@ -506,7 +506,7 @@ PLy_trigger_handler(FunctionCallInfo fcinfo, PLyProcedure * proc) (TRIGGER_FIRED_BY_UPDATE(tdata->tg_event))) rv = PLy_modify_tuple(proc, plargs, tdata, rv); else - elog(NOTICE, "plpython: Ignoring modified tuple in DELETE trigger"); + elog(WARNING, "plpython: Ignoring modified tuple in DELETE trigger"); } else if (strcasecmp(srv, "OK")) { @@ -2037,7 +2037,7 @@ PLy_spi_prepare(PyObject * self, PyObject * args) if (!PyErr_Occurred()) PyErr_SetString(PLy_exc_spi_error, "Unknown error in PLy_spi_prepare."); - PLy_elog(NOTICE,"in function %s:",PLy_procedure_name(PLy_last_procedure)); + PLy_elog(WARNING,"in function %s:",PLy_procedure_name(PLy_last_procedure)); RERAISE_EXC(); } @@ -2234,7 +2234,7 @@ PLy_spi_execute_plan(PyObject * ob, PyObject * list, int limit) if (!PyErr_Occurred()) PyErr_SetString(PLy_exc_error, "Unknown error in PLy_spi_execute_plan"); - PLy_elog(NOTICE,"in function %s:",PLy_procedure_name(PLy_last_procedure)); + PLy_elog(WARNING,"in function %s:",PLy_procedure_name(PLy_last_procedure)); RERAISE_EXC(); } @@ -2300,7 +2300,7 @@ PLy_spi_execute_query(char *query, int limit) if ((!PLy_restart_in_progress) && (!PyErr_Occurred())) PyErr_SetString(PLy_exc_spi_error, "Unknown error in PLy_spi_execute_query."); - PLy_elog(NOTICE,"in function %s:",PLy_procedure_name(PLy_last_procedure)); + PLy_elog(WARNING,"in function %s:",PLy_procedure_name(PLy_last_procedure)); RERAISE_EXC(); } @@ -2664,7 +2664,7 @@ PLy_log(volatile int level, PyObject * self, PyObject * args) enter(); if (args == NULL) - elog(NOTICE, "plpython, args is NULL in %s", __FUNCTION__); + elog(WARNING, "plpython, args is NULL in %s", __FUNCTION__); so = PyObject_Str(args); if ((so == NULL) || ((sv = PyString_AsString(so)) == NULL)) @@ -2690,7 +2690,7 @@ PLy_log(volatile int level, PyObject * self, PyObject * args) } /* - * ok, this is a NOTICE, or LOG message + * ok, this is a WARNING, or LOG message * * but just in case DON'T long jump out of the interpreter! */ @@ -2828,7 +2828,7 @@ PLy_traceback(int *xlevel) */ if (e == NULL) { - *xlevel = NOTICE; + *xlevel = WARNING; return NULL; } diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h index f1892f78f6..16b8c05b5e 100644 --- a/src/pl/plpython/plpython.h +++ b/src/pl/plpython/plpython.h @@ -16,21 +16,21 @@ #define RAISE_EXC(V) siglongjmp(Warn_restart, (V)) #else #define RESTORE_N_EXC(N) do { \ - elog(NOTICE, "exception (%d,%d) restore at %s:%d",\ + elog(WARNING, "exception (%d,%d) restore at %s:%d",\ PLy_call_level, exc_save_calls, __FUNCTION__, (__LINE__));\ exc_save_calls -= 1; \ memcpy(&Warn_restart, &(buf_##N), sizeof(sigjmp_buf)); } while (0) #define SAVE_N_EXC(N) do { \ exc_save_calls += 1; \ - elog(NOTICE, "exception (%d,%d) save at %s:%d", \ + elog(WARNING, "exception (%d,%d) save at %s:%d", \ PLy_call_level, exc_save_calls, __FUNCTION__, (__LINE__)); \ memcpy(&(buf_##N), &Warn_restart, sizeof(sigjmp_buf)); } while (0) #define RERAISE_N_EXC(N) do { \ - elog(NOTICE, "exception (%d,%d) reraise at %s:%d", \ + elog(WARNING, "exception (%d,%d) reraise at %s:%d", \ PLy_call_level, exc_save_calls, __FUNCTION__, (__LINE__)); \ siglongjmp(Warn_restart, rv_##N); } while (0) #define RAISE_EXC(V) do { \ - elog(NOTICE, "exception (%d,%d) raise at %s:%d", \ + elog(WARNING, "exception (%d,%d) raise at %s:%d", \ PLy_call_level, exc_save_calls, __FUNCTION__, (__LINE__)); \ siglongjmp(Warn_restart, (V)); } while (0) #endif @@ -43,8 +43,8 @@ #if DEBUG_LEVEL #define CALL_LEVEL_INC() do { PLy_call_level += 1; \ - elog(NOTICE, "Level: %d", PLy_call_level); } while (0) -#define CALL_LEVEL_DEC() do { elog(NOTICE, "Level: %d", PLy_call_level); \ + elog(DEBUG3, "Level: %d", PLy_call_level); } while (0) +#define CALL_LEVEL_DEC() do { elog(DEBUG3, "Level: %d", PLy_call_level); \ PLy_call_level -= 1; } while (0) #else #define CALL_LEVEL_INC() do { PLy_call_level += 1; } while (0) @@ -54,10 +54,10 @@ /* temporary debugging macros */ #if DEBUG_LEVEL -#define enter() elog(NOTICE, "Enter(%d): %s", func_enter_calls++,__FUNCTION__) -#define leave() elog(NOTICE, "Leave(%d): %s", func_leave_calls++,__FUNCTION__) -#define mark() elog(NOTICE, "Mark: %s:%d", __FUNCTION__, __LINE__); -#define refc(O) elog(NOTICE, "Ref<%p>:<%d>:%s:%d", (O), (((O) == NULL) ? -1 : (O)->ob_refcnt), __FUNCTION__, __LINE__) +#define enter() elog(DEBUG3, "Enter(%d): %s", func_enter_calls++,__FUNCTION__) +#define leave() elog(DEBUG3, "Leave(%d): %s", func_leave_calls++,__FUNCTION__) +#define mark() elog(DEBUG3, "Mark: %s:%d", __FUNCTION__, __LINE__); +#define refc(O) elog(DEBUG3, "Ref<%p>:<%d>:%s:%d", (O), (((O) == NULL) ? -1 : (O)->ob_refcnt), __FUNCTION__, __LINE__) #else #define enter() #define leave() diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 2ffc37351d..2be4701c30 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -345,7 +345,7 @@ pltcl_init_load_unknown(Tcl_Interp *interp) if (SPI_processed == 0) { Tcl_DStringFree(&unknown_src); - elog(NOTICE, "pltcl: Module unknown not found in pltcl_modules"); + elog(WARNING, "pltcl: Module unknown not found in pltcl_modules"); return; } @@ -826,7 +826,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS) if (Tcl_SplitList(interp, interp->result, &ret_numvals, &ret_values) != TCL_OK) { - elog(NOTICE, "pltcl: cannot split return value from trigger"); + elog(WARNING, "pltcl: cannot split return value from trigger"); elog(ERROR, "pltcl: %s", interp->result); } @@ -1259,9 +1259,11 @@ pltcl_elog(ClientData cdata, Tcl_Interp *interp, return TCL_ERROR; } - if (strcmp(argv[1], "NOTICE") == 0) + if (strcmp(argv[1], "INFO") == 0) + level = INFO; + else if (strcmp(argv[1], "NOTICE") == 0) level = NOTICE; - else if (strcmp(argv[1], "WARN") == 0) + else if (strcmp(argv[1], "WARNING") == 0) level = ERROR; else if (strcmp(argv[1], "ERROR") == 0) level = ERROR; diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index d7ad2b6c2a..7d6209c3e8 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -269,10 +269,10 @@ SELECT unique1 FROM tenk1 WHERE unique1 < 5; -- FOREIGN KEY CONSTRAINT adding TEST CREATE TABLE tmp2 (a int primary key); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'tmp2_pkey' for table 'tmp2' +NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'tmp2_pkey' for table 'tmp2' CREATE TABLE tmp3 (a int, b int); CREATE TABLE tmp4 (a int, b int, unique(a,b)); -INFO: CREATE TABLE / UNIQUE will create implicit index 'tmp4_a_key' for table 'tmp4' +NOTICE: CREATE TABLE / UNIQUE will create implicit index 'tmp4_a_key' for table 'tmp4' CREATE TABLE tmp5 (a int, b int); -- Insert rows into tmp2 (pktable) INSERT INTO tmp2 values (1); @@ -285,47 +285,47 @@ INSERT INTO tmp3 values (1,20); INSERT INTO tmp3 values (5,50); -- Try (and fail) to add constraint due to invalid source columns ALTER TABLE tmp3 add constraint tmpconstr foreign key(c) references tmp2 match full; -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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 -- 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; -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: UNIQUE constraint matching given keys for referenced table "tmp2" not found -- Try (and fail) to add constraint due to invalid data ALTER TABLE tmp3 add constraint tmpconstr foreign key (a) references tmp2 match full; -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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 -- Delete failing row DELETE FROM tmp3 where a=5; -- Try (and succeed) ALTER TABLE tmp3 add constraint tmpconstr foreign key (a) references tmp2 match full; -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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 -- tmp4 is a,b ALTER TABLE tmp5 add constraint tmpconstr foreign key(a) references tmp4(a) match full; -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: UNIQUE constraint matching given keys for referenced table "tmp4" not found DROP TABLE tmp5; DROP TABLE tmp4; DROP TABLE tmp3; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "tmp2" DROP TABLE tmp2; -- Foreign key adding test with mixed types -- Note: these tables are TEMP to avoid name conflicts when this test -- is run in parallel with foreign_key.sql. CREATE TEMP TABLE PKTABLE (ptest1 int PRIMARY KEY); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' CREATE TEMP TABLE FKTABLE (ftest1 text); -- This next should fail, because text=int does not exist ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable; -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' You will have to retype this query using an explicit cast -- This should also fail for the same reason, but here we -- give the column name ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable(ptest1); -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' You will have to retype this query using an explicit cast -- This should succeed, even though they are different types @@ -333,21 +333,21 @@ ERROR: Unable to identify an operator '=' for types 'text' and 'integer' DROP TABLE FKTABLE; CREATE TEMP TABLE FKTABLE (ftest1 varchar); ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable; -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- As should this ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable(ptest1); -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) DROP TABLE pktable; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" DROP TABLE fktable; CREATE TEMP TABLE PKTABLE (ptest1 int, ptest2 text, PRIMARY KEY(ptest1, ptest2)); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -- This should fail, because we just chose really odd types CREATE TEMP TABLE FKTABLE (ftest1 cidr, ftest2 datetime); ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) references pktable; -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' You will have to retype this query using an explicit cast -- Again, so should this... @@ -355,7 +355,7 @@ DROP TABLE FKTABLE; CREATE TEMP TABLE FKTABLE (ftest1 cidr, ftest2 datetime); ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) references pktable(ptest1, ptest2); -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' You will have to retype this query using an explicit cast -- This fails because we mixed up the column ordering @@ -363,13 +363,13 @@ DROP TABLE FKTABLE; CREATE TEMP TABLE FKTABLE (ftest1 int, ftest2 text); ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) references pktable(ptest2, ptest1); -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'integer' and 'text' You will have to retype this query using an explicit cast -- As does this... ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest2, ftest1) references pktable(ptest1, ptest2); -INFO: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: ALTER TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' You will have to retype this query using an explicit cast -- temp tables should go away by themselves, need not drop them. @@ -450,7 +450,7 @@ drop table atacc1; create table atacc1 ( test int ); -- add a unique constraint alter table atacc1 add constraint atacc_test1 unique (test); -INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' +NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' -- insert first value insert into atacc1 (test) values (2); -- should fail @@ -460,7 +460,7 @@ ERROR: Cannot insert a duplicate key into unique index atacc_test1 insert into atacc1 (test) values (4); -- try adding a unique oid constraint alter table atacc1 add constraint atacc_oid1 unique(oid); -INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_oid1' for table 'atacc1' +NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_oid1' for table 'atacc1' drop table atacc1; -- let's do one where the unique constraint fails when added create table atacc1 ( test int ); @@ -469,7 +469,7 @@ insert into atacc1 (test) values (2); insert into atacc1 (test) values (2); -- add a unique constraint (fails) alter table atacc1 add constraint atacc_test1 unique (test); -INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' +NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' ERROR: Cannot create unique index. Table contains non-unique values insert into atacc1 (test) values (3); drop table atacc1; @@ -484,7 +484,7 @@ drop table atacc1; create table atacc1 ( test int, test2 int); -- add a unique constraint alter table atacc1 add constraint atacc_test1 unique (test, test2); -INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' +NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' -- insert initial value insert into atacc1 (test,test2) values (4,4); -- should fail @@ -497,9 +497,9 @@ insert into atacc1 (test,test2) values (5,5); drop table atacc1; -- lets do some naming tests create table atacc1 (test int, test2 int, unique(test)); -INFO: CREATE TABLE / UNIQUE will create implicit index 'atacc1_test_key' for table 'atacc1' +NOTICE: CREATE TABLE / UNIQUE will create implicit index 'atacc1_test_key' for table 'atacc1' alter table atacc1 add unique (test2); -INFO: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc1_test2_key' for table 'atacc1' +NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc1_test2_key' for table 'atacc1' -- should fail for @@ second one @@ insert into atacc1 (test2, test) values (3, 3); insert into atacc1 (test2, test) values (2, 3); diff --git a/src/test/regress/expected/create_misc.out b/src/test/regress/expected/create_misc.out index e4ac6553a9..1842314ce9 100644 --- a/src/test/regress/expected/create_misc.out +++ b/src/test/regress/expected/create_misc.out @@ -136,8 +136,8 @@ INSERT INTO iportaltest (i, d, p) --- test creation of SERIAL column --- CREATE TABLE serialTest (f1 text, f2 serial); -INFO: CREATE TABLE will create implicit sequence 'serialtest_f2_seq' for SERIAL column 'serialtest.f2' -INFO: CREATE TABLE / UNIQUE will create implicit index 'serialtest_f2_key' for table 'serialtest' +NOTICE: 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' INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('force', 100); diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index 7d41ae40ab..3734960691 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -81,9 +81,9 @@ CREATE TABLE student ( CREATE TABLE stud_emp ( percent int4 ) INHERITS (emp, student); -INFO: CREATE TABLE: merging multiple inherited definitions of attribute "name" -INFO: CREATE TABLE: merging multiple inherited definitions of attribute "age" -INFO: CREATE TABLE: merging multiple inherited definitions of attribute "location" +NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "name" +NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "age" +NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "location" CREATE TABLE city ( name name, location box, @@ -135,8 +135,8 @@ CREATE TABLE c_star ( CREATE TABLE d_star ( d float8 ) INHERITS (b_star, c_star); -INFO: CREATE TABLE: merging multiple inherited definitions of attribute "class" -INFO: CREATE TABLE: merging multiple inherited definitions of attribute "a" +NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "class" +NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "a" CREATE TABLE e_star ( e int2 ) INHERITS (c_star); diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out index 8a4344fe1e..f767c875a9 100644 --- a/src/test/regress/expected/errors.out +++ b/src/test/regress/expected/errors.out @@ -93,10 +93,10 @@ ERROR: renameatt: attribute "oid" exists -- not in a xact abort; -NOTICE: ROLLBACK: no transaction in progress +WARNING: ROLLBACK: no transaction in progress -- not in a xact end; -NOTICE: COMMIT: no transaction in progress +WARNING: COMMIT: no transaction in progress -- -- DEFINE AGGREGATE -- sfunc/finalfunc type disagreement diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out index ac6b7d3dc6..fb59fe233c 100644 --- a/src/test/regress/expected/foreign_key.out +++ b/src/test/regress/expected/foreign_key.out @@ -6,9 +6,9 @@ -- First test, check and cascade -- CREATE TABLE PKTABLE ( ptest1 int PRIMARY KEY, ptest2 text ); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: 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 ); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- Insert test data into PKTABLE INSERT INTO PKTABLE VALUES (1, 'Test1'); INSERT INTO PKTABLE VALUES (2, 'Test2'); @@ -56,16 +56,16 @@ SELECT * FROM FKTABLE; (3 rows) DROP TABLE PKTABLE; -INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" DROP TABLE FKTABLE; -- -- check set NULL and table constraint on multiple columns -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: 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) REFERENCES PKTABLE MATCH FULL ON DELETE SET NULL ON UPDATE SET NULL); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- Insert test data into PKTABLE INSERT INTO PKTABLE VALUES (1, 2, 'Test1'); INSERT INTO PKTABLE VALUES (1, 3, 'Test1-2'); @@ -139,16 +139,16 @@ SELECT * FROM FKTABLE; (5 rows) DROP TABLE PKTABLE; -INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" DROP TABLE FKTABLE; -- -- check set default and table constraint on multiple columns -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: 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) REFERENCES PKTABLE MATCH FULL ON DELETE SET DEFAULT ON UPDATE SET DEFAULT); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- Insert a value in PKTABLE for default INSERT INTO PKTABLE VALUES (-1, -2, 'The Default!'); -- Insert test data into PKTABLE @@ -224,15 +224,15 @@ SELECT * FROM FKTABLE; (5 rows) DROP TABLE PKTABLE; -INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" DROP TABLE FKTABLE; -- -- First test, check with no on delete or on update -- CREATE TABLE PKTABLE ( ptest1 int PRIMARY KEY, ptest2 text ); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' CREATE TABLE FKTABLE ( ftest1 int REFERENCES PKTABLE MATCH FULL, ftest2 int ); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- Insert test data into PKTABLE INSERT INTO PKTABLE VALUES (1, 'Test1'); INSERT INTO PKTABLE VALUES (2, 'Test2'); @@ -299,15 +299,15 @@ SELECT * FROM PKTABLE; (4 rows) DROP TABLE PKTABLE; -INFO: DROP TABLE implicitly drops referential integrity trigger from table "fktable" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "fktable" DROP TABLE FKTABLE; -- MATCH unspecified -- Base test restricting update/delete CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) ); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: 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 FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- Insert Primary Key values INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1'); INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); @@ -363,16 +363,16 @@ SELECT * from FKTABLE; (5 rows) DROP TABLE FKTABLE; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" DROP TABLE PKTABLE; -- cascade update/delete CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) ); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: 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 FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE ON DELETE CASCADE ON UPDATE CASCADE); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- Insert Primary Key values INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1'); INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); @@ -462,16 +462,16 @@ SELECT * from FKTABLE; (4 rows) DROP TABLE FKTABLE; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" DROP TABLE PKTABLE; -- set null update / set default delete CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) ); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: 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 FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE ON DELETE SET DEFAULT ON UPDATE SET NULL); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- Insert Primary Key values INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1'); INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); @@ -568,16 +568,16 @@ SELECT * from FKTABLE; (6 rows) DROP TABLE FKTABLE; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" DROP TABLE PKTABLE; -- set default update / set null delete CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2, ptest3) ); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: 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 FOREIGN KEY(ftest1, ftest2, ftest3) REFERENCES PKTABLE ON DELETE SET NULL ON UPDATE SET DEFAULT); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- Insert Primary Key values INSERT INTO PKTABLE VALUES (1, 2, 3, 'test1'); INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); @@ -687,16 +687,16 @@ SELECT * from FKTABLE; (7 rows) DROP TABLE FKTABLE; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" DROP TABLE PKTABLE; CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: 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); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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 CREATE TABLE FKTABLE_FAIL2 ( ftest1 int, CONSTRAINT fkfail1 FOREIGN KEY (ftest1) REFERENCES PKTABLE(ptest2)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: UNIQUE constraint matching given keys for referenced table "pktable" not found DROP TABLE FKTABLE_FAIL1; ERROR: table "fktable_fail1" does not exist @@ -705,9 +705,9 @@ ERROR: table "fktable_fail2" does not exist DROP TABLE PKTABLE; -- Test for referencing column number smaller than referenced constraint CREATE TABLE PKTABLE (ptest1 int, ptest2 int, UNIQUE(ptest1, ptest2)); -INFO: CREATE TABLE / UNIQUE will create implicit index 'pktable_ptest1_key' for table 'pktable' +NOTICE: CREATE TABLE / UNIQUE will create implicit index 'pktable_ptest1_key' for table 'pktable' CREATE TABLE FKTABLE_FAIL1 (ftest1 int REFERENCES pktable(ptest1)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: UNIQUE constraint matching given keys for referenced table "pktable" not found DROP TABLE FKTABLE_FAIL1; ERROR: table "fktable_fail1" does not exist @@ -717,105 +717,105 @@ DROP TABLE PKTABLE; -- -- Basic one column, two table setup CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -- This next should fail, because text=int does not exist CREATE TABLE FKTABLE (ftest1 text REFERENCES pktable); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' You will have to retype this query using an explicit cast -- This should also fail for the same reason, but here we -- give the column name CREATE TABLE FKTABLE (ftest1 text REFERENCES pktable(ptest1)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' You will have to retype this query using an explicit cast -- This should succeed, even though they are different types -- because varchar=int does exist CREATE TABLE FKTABLE (ftest1 varchar REFERENCES pktable); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) DROP TABLE FKTABLE; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" -- As should this CREATE TABLE FKTABLE (ftest1 varchar REFERENCES pktable(ptest1)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) DROP TABLE FKTABLE; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" DROP TABLE PKTABLE; -- Two columns, two tables CREATE TABLE PKTABLE (ptest1 int, ptest2 text, PRIMARY KEY(ptest1, ptest2)); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -- This should fail, because we just chose really odd types CREATE TABLE FKTABLE (ftest1 cidr, ftest2 datetime, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' You will have to retype this query using an explicit cast -- Again, so should this... CREATE TABLE FKTABLE (ftest1 cidr, ftest2 datetime, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable(ptest1, ptest2)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' You will have to retype this query using an explicit cast -- This fails because we mixed up the column ordering CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest2, ftest1) REFERENCES pktable); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' You will have to retype this query using an explicit cast -- As does this... CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest2, ftest1) REFERENCES pktable(ptest1, ptest2)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' You will have to retype this query using an explicit cast -- And again.. CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable(ptest2, ptest1)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'integer' and 'text' You will have to retype this query using an explicit cast -- This works... CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest2, ftest1) REFERENCES pktable(ptest2, ptest1)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) DROP TABLE FKTABLE; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" -- As does this CREATE TABLE FKTABLE (ftest1 int, ftest2 text, FOREIGN KEY(ftest1, ftest2) REFERENCES pktable(ptest1, ptest2)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) DROP TABLE FKTABLE; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" DROP TABLE PKTABLE; -- Two columns, same table -- Make sure this still works... CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, ptest4) REFERENCES pktable(ptest1, ptest2)); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) DROP TABLE PKTABLE; -- And this, CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, ptest4) REFERENCES pktable); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) DROP TABLE PKTABLE; -- This shouldn't (mixed up columns) CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, ptest4) REFERENCES pktable(ptest2, ptest1)); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) ERROR: Unable to identify an operator '=' for types 'integer' and 'text' 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 CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest4, ptest3) REFERENCES pktable(ptest1, ptest2)); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' 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. CREATE TABLE PKTABLE (ptest1 int, ptest2 text, ptest3 int, ptest4 text, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest4, ptest3) REFERENCES pktable); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' 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. create table pktable_base (base1 int not null); create table pktable (ptest1 int, primary key(base1), unique(base1, ptest1)) inherits (pktable_base); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE / UNIQUE will create implicit index 'pktable_base1_key' for table 'pktable' +NOTICE: 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' create table fktable (ftest1 int references pktable(base1)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- now some ins, upd, del insert into pktable(base1) values (1); 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; -- cleanup drop table fktable; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" delete from pktable; -- Now 2 columns 2 tables, matching types create table fktable (ftest1 int, ftest2 int, foreign key(ftest1, ftest2) references pktable(base1, ptest1)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) -- now some ins, upd, del insert into pktable(base1, ptest1) values (1, 1); 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; -- cleanup drop table fktable; -INFO: 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" +NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "pktable" drop table pktable; drop table pktable_base; -- 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(ptest1 int, ptest2 int, primary key(base1, ptest1), foreign key(base2, ptest2) references pktable(base1, ptest1)) inherits (pktable_base); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) 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, 2, 2, 1); @@ -908,27 +908,27 @@ drop table pktable_base; -- 2 columns (2 tables), mismatched types create table pktable_base(base1 int not null); create table pktable(ptest1 text, primary key(base1, ptest1)) inherits (pktable_base); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' +NOTICE: 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) create table fktable(ftest1 cidr, ftest2 int[], foreign key (ftest1, ftest2) references pktable); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' 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)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'cidr' and 'integer' You will have to retype this query using an explicit cast -- let's mix up which columns reference which create table fktable(ftest1 int, ftest2 text, foreign key(ftest2, ftest1) references pktable); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' 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)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' 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)); -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) ERROR: Unable to identify an operator '=' for types 'integer' and 'text' You will have to retype this query using an explicit cast drop table pktable; @@ -937,26 +937,26 @@ drop table pktable_base; 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 pktable(base1, ptest1)) inherits (pktable_base); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) ERROR: Unable to identify an operator '=' for types 'text[]' and 'text' 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 pktable(ptest1, base1)) inherits (pktable_base); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) ERROR: Unable to identify an operator '=' for types 'integer' and 'text' 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 pktable(base1, ptest1)) inherits (pktable_base); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' 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 pktable(base1, ptest1)) inherits (pktable_base); -INFO: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' -INFO: CREATE TABLE will create implicit trigger(s) for FOREIGN KEY check(s) +NOTICE: 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) ERROR: Unable to identify an operator '=' for types 'text' and 'integer' You will have to retype this query using an explicit cast drop table pktable; diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out index 3e1fb6718d..b56798124f 100644 --- a/src/test/regress/expected/inherit.out +++ b/src/test/regress/expected/inherit.out @@ -5,8 +5,8 @@ CREATE TABLE a (aa TEXT); CREATE TABLE b (bb TEXT) INHERITS (a); CREATE TABLE c (cc TEXT) INHERITS (a); CREATE TABLE d (dd TEXT) INHERITS (b,c,a); -INFO: 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" +NOTICE: CREATE TABLE: merging multiple inherited definitions of attribute "aa" INSERT INTO a(aa) VALUES('aaa'); INSERT INTO a(aa) VALUES('aaaa'); INSERT INTO a(aa) VALUES('aaaaa'); diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out index 82021b7941..0bf560a949 100644 --- a/src/test/regress/expected/privileges.out +++ b/src/test/regress/expected/privileges.out @@ -11,7 +11,7 @@ CREATE GROUP regressgroup1; CREATE GROUP regressgroup2 WITH USER regressuser1, regressuser2; ALTER GROUP regressgroup1 ADD USER regressuser4; ALTER GROUP regressgroup2 ADD USER regressuser2; -- duplicate -NOTICE: ALTER GROUP: user "regressuser2" is already in group "regressgroup2" +WARNING: ALTER GROUP: user "regressuser2" is already in group "regressgroup2" ALTER GROUP regressgroup2 DROP USER regressuser2; ALTER GROUP regressgroup2 ADD USER regressuser4; -- test owner privileges diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out index b5a62dace1..9bc8fdf383 100644 --- a/src/test/regress/expected/triggers.out +++ b/src/test/regress/expected/triggers.out @@ -75,17 +75,11 @@ ERROR: check_fkeys_pkey_exist: tuple references non-existing key in pkeys insert into fkeys values (60, '6', 4); ERROR: check_fkeys_pkey2_exist: tuple references non-existing key in fkeys2 delete from pkeys where pkey1 = 30 and pkey2 = '3'; -NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys delete from pkeys where pkey1 = 40 and pkey2 = '4'; -NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted -NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 50 and pkey2 = '5'; -NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 10 and pkey2 = '1'; -NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted -NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted DROP TABLE pkeys; DROP TABLE fkeys; DROP TABLE fkeys2; diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index df301e2c5c..551ee446eb 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -436,7 +436,7 @@ funny_dup17(PG_FUNCTION_ARGS) )))); } - elog(NOTICE, "funny_dup17 (fired %s) on level %3d: %d/%d tuples inserted/selected", + elog(DEBUG3, "funny_dup17 (fired %s) on level %3d: %d/%d tuples inserted/selected", when, *level, inserted, selected); SPI_finish(); |