NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit92288a1

committed

Change made to elog:

o Change all current CVS messages of NOTICE to WARNING. We were goingto do this just before 7.3 beta but it has to be done now, as you willsee below.o Change current INFO messages that should be controlled byclient_min_messages to NOTICE.o Force remaining INFO messages, like from EXPLAIN, VACUUM VERBOSE, etc.to always go to the client.o Remove INFO from the client_min_messages options and add NOTICE.Seems we do need three non-ERROR elog levels to handle the variousbehaviors we need for these messages.Regression passed.

1 parent22ebad9 commit92288a1Copy full SHA for 92288a1

File tree

110 files changed

+872

-882

lines changed

contrib
- array
  - array_iterator.c
- intagg
  - int_aggregate.c
- intarray
  - _int.c
- miscutil
  - misc_utils.c
- noupdate
  - noup.c
- pgcrypto
  - px.c
- pgstattuple
  - pgstattuple.c
- rserv
  - rserv.c
- spi
  - refint.c
- tsearch
  - query.c
  - txtidx.c
- xml
  - pgxml.c
  - pgxml_dom.c
src
- backend
  - access
    - gist
      - gist.c
    - nbtree
      - nbtinsert.c
      - nbtpage.c
    - transam
      - xact.c
      - xlog.c
  - catalog
  - commands
  - executor
    - execMain.c
    - nodeMergejoin.c
  - libpq
    - be-fsstubs.c
    - pqcomm.c
  - nodes
    - equalfuncs.c
    - outfuncs.c
  - optimizer/path
    - clausesel.c
  - parser
  - port
    - beos
      - support.c
    - dynloader
  - postmaster
    - pgstat.c
  - storage
    - buffer
      - bufmgr.c
    - file
      - fd.c
    - ipc
    - lmgr
      - lock.c
    - page
      - bufpage.c
    - smgr
      - smgr.c
  - tcop
    - postgres.c
    - pquery.c
  - tioga
    - tgRecipe.c
  - utils
    - adt
    - cache
      - catcache.c
      - relcache.c
    - error
      - elog.c
    - init
      - postinit.c
    - mb
      - conv.c
    - misc
      - guc.c
      - postgresql.conf.sample
    - mmgr
      - aset.c
      - portalmem.c
- bin/psql
  - common.c
  - large_obj.c
- include/utils
  - elog.h
- interfaces
  - ecpg
    - include
      - ecpgerrno.h
    - lib
      - connect.c
    - preproc
    - test
      - test_notice.pgc
  - libpq
    - fe-exec.c
    - fe-misc.c
  - odbc
    - connection.c
- pl
  - plpgsql/src
    - pl_comp.c
    - pl_exec.c
  - plpython
    - plpython.c
    - plpython.h
  - tcl
    - pltcl.c
- test/regress
  - expected
  - regress.c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+872

-882

lines changed

`‎contrib/array/array_iterator.c`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`49`	`49`	`/* Sanity checks */`
`50`	`50`	`if (array== (ArrayType*)NULL)`
`51`	`51`	`{`
`52`		`-/* elog(NOTICE, "array_iterator: array is null"); */`
	`52`	`+/* elog(WARNING, "array_iterator: array is null"); */`
`53`	`53`	`return (0);`
`54`	`54`	`}`
`55`	`55`
`@@ -60,10 +60,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`60`	`60`	`dim=ARR_DIMS(array);`
`61`	`61`	`nitems=ArrayGetNItems(ndim,dim);`
`62`	`62`	`if (nitems==0)`
`63`		`-{`
`64`		`-/* elog(NOTICE, "array_iterator: nitems = 0"); */`
`65`	`63`	`return (0);`
`66`		`-}`
`67`	`64`
`68`	`65`	`/* Lookup element type information */`
`69`	`66`	`get_typlenbyval(elemtype,&typlen,&typbyval);`

`‎contrib/intagg/int_aggregate.c`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* Integer array aggregator / enumerator`
`3`	`3`	`*`
`4`		`- * Mark L. Woodward`
	`4`	`+ * Mark L. Woodward`
`5`	`5`	`* DMN Digital Music Network.`
`6`	`6`	`* www.dmn.com`
`7`	`7`	`*`
`@@ -73,9 +73,9 @@ PG_FUNCTION_INFO_V1(int_agg_final_count);`
`73`	`73`	`PG_FUNCTION_INFO_V1(int_agg_final_array);`
`74`	`74`	`PG_FUNCTION_INFO_V1(int_enum);`
`75`	`75`
`76`		`-/*`
`77`		`- * Manage the aggregation state of the array`
`78`		`- * You need to specify the correct memory context, or it will vanish!`
	`76`	`+/*`
	`77`	`+ * Manage the aggregation state of the array`
	`78`	`+ * You need to specify the correct memory context, or it will vanish!`
`79`	`79`	`*/`
`80`	`80`	`staticPGARRAY*GetPGArray(int4state,intfAdd)`
`81`	`81`	`{`
`@@ -129,7 +129,7 @@ static PGARRAY * GetPGArray(int4 state, int fAdd)`
`129`	`129`	`returnp;`
`130`	`130`	`}`
`131`	`131`
`132`		`-/* Shrinks the array to its actual size and moves it into the standard`
	`132`	`+/* Shrinks the array to its actual size and moves it into the standard`
`133`	`133`	`* memory allocation context, frees working memory */`
`134`	`134`	`staticPGARRAYShrinkPGArray(PGARRAYp)`
`135`	`135`	`{`
`@@ -156,7 +156,7 @@ static PGARRAY ShrinkPGArray(PGARRAY p)`
`156`	`156`	`elog(ERROR,"Integer aggregator, can't allocate memory");`
`157`	`157`	`}`
`158`	`158`	`pfree(p);`
`159`		`-}`
	`159`	`+}`
`160`	`160`	`returnpnew;`
`161`	`161`	`}`
`162`	`162`
`@@ -206,14 +206,14 @@ Datum int_enum(PG_FUNCTION_ARGS)`
`206`	`206`
`207`	`207`	`if(!p)`
`208`	`208`	`{`
`209`		`-elog(NOTICE,"No data sent\n");`
	`209`	`+elog(WARNING,"No data sent\n");`
`210`	`210`	`return0;`
`211`	`211`	`}`
`212`	`212`	`if(!rsi)`
`213`	`213`	`{`
`214`	`214`	`elog(ERROR,"No ReturnSetInfo sent! function must be declared returning a 'setof' integer");`
`215`	`215`	`PG_RETURN_NULL();`
`216`		`-`
	`216`	`+`
`217`	`217`	`}`
`218`	`218`	`if(!fcinfo->context)`
`219`	`219`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit92288a1

File tree

110 files changed

Some content is hidden

110 files changed

`‎contrib/array/array_iterator.c`

`‎contrib/intagg/int_aggregate.c`

0 commit comments