Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 92b1ab7

Browse files
bmomjianbmomjian
committed
Update docs for new INFO, NOTICE, WARNING elog() levels.
1 parent 4e15b92 commit 92b1ab7

File tree

5 files changed

+50
-50
lines changed

5 files changed

+50
-50
lines changed

‎doc/src/sgml/maintenance.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/maintenance.sgml,v 1.11 2002/01/20 22:19:56 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/maintenance.sgml,v 1.12 2002/03/06 06:44:31 momjian Exp $
33
-->
44

55
<chapter id="maintenance">
@@ -335,7 +335,7 @@ SELECT datname, age(datfrozenxid) FROM pg_database;
335335
<informalexample>
336336
<programlisting>
337337
play=# vacuum;
338-
NOTICE: Some databases have not been vacuumed in 1613770184 transactions.
338+
WARNING: Some databases have not been vacuumed in 1613770184 transactions.
339339
Better vacuum them within 533713463 transactions,
340340
or you may have a wraparound failure.
341341
VACUUM

‎doc/src/sgml/perform.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.16 2002/01/20 22:19:56 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.17 2002/03/06 06:44:31 momjian Exp $
33
-->
44

55
<chapter id="performance-tips">
@@ -96,7 +96,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.16 2002/01/20 22:19:56 pet
9696

9797
<programlisting>
9898
regression=# EXPLAIN SELECT * FROM tenk1;
99-
NOTICE: QUERY PLAN:
99+
INFO: QUERY PLAN:
100100

101101
Seq Scan on tenk1 (cost=0.00..333.00 rows=10000 width=148)
102102
</programlisting>
@@ -120,7 +120,7 @@ SELECT * FROM pg_class WHERE relname = 'tenk1';
120120

121121
<programlisting>
122122
regression=# EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 1000;
123-
NOTICE: QUERY PLAN:
123+
INFO: QUERY PLAN:
124124

125125
Seq Scan on tenk1 (cost=0.00..358.00 rows=1007 width=148)
126126
</programlisting>
@@ -145,7 +145,7 @@ Seq Scan on tenk1 (cost=0.00..358.00 rows=1007 width=148)
145145

146146
<programlisting>
147147
regression=# EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 50;
148-
NOTICE: QUERY PLAN:
148+
INFO: QUERY PLAN:
149149

150150
Index Scan using tenk1_unique1 on tenk1 (cost=0.00..181.09 rows=49 width=148)
151151
</programlisting>
@@ -164,7 +164,7 @@ Index Scan using tenk1_unique1 on tenk1 (cost=0.00..181.09 rows=49 width=148)
164164
<programlisting>
165165
regression=# EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 50 AND
166166
regression-# stringu1 = 'xxx';
167-
NOTICE: QUERY PLAN:
167+
INFO: QUERY PLAN:
168168

169169
Index Scan using tenk1_unique1 on tenk1 (cost=0.00..181.22 rows=1 width=148)
170170
</programlisting>
@@ -179,7 +179,7 @@ Index Scan using tenk1_unique1 on tenk1 (cost=0.00..181.22 rows=1 width=148)
179179
<programlisting>
180180
regression=# EXPLAIN SELECT * FROM tenk1 t1, tenk2 t2 WHERE t1.unique1 &lt; 50
181181
regression-# AND t1.unique2 = t2.unique2;
182-
NOTICE: QUERY PLAN:
182+
INFO: QUERY PLAN:
183183

184184
Nested Loop (cost=0.00..330.41 rows=49 width=296)
185185
-&gt; Index Scan using tenk1_unique1 on tenk1 t1
@@ -227,7 +227,7 @@ regression=# set enable_nestloop = off;
227227
SET VARIABLE
228228
regression=# EXPLAIN SELECT * FROM tenk1 t1, tenk2 t2 WHERE t1.unique1 &lt; 50
229229
regression-# AND t1.unique2 = t2.unique2;
230-
NOTICE: QUERY PLAN:
230+
INFO: QUERY PLAN:
231231

232232
Hash Join (cost=181.22..564.83 rows=49 width=296)
233233
-&gt; Seq Scan on tenk2 t2
@@ -260,7 +260,7 @@ Hash Join (cost=181.22..564.83 rows=49 width=296)
260260
regression=# EXPLAIN ANALYZE
261261
regression-# SELECT * FROM tenk1 t1, tenk2 t2
262262
regression-# WHERE t1.unique1 &lt; 50 AND t1.unique2 = t2.unique2;
263-
NOTICE: QUERY PLAN:
263+
INFO: QUERY PLAN:
264264

265265
Nested Loop (cost=0.00..330.41 rows=49 width=296) (actual time=1.31..28.90 rows=50 loops=1)
266266
-&gt; Index Scan using tenk1_unique1 on tenk1 t1

‎doc/src/sgml/runtime.sgml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.105 2002/03/02 21:39:15 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.106 2002/03/06 06:44:32 momjian Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -139,13 +139,13 @@ postgres$ <userinput>initdb -D /usr/local/pgsql/data</userinput>
139139
One surprise you might encounter while running <command>initdb</command> is
140140
a notice similar to this one:
141141
<screen>
142-
NOTICE: Initializing database with en_US collation order.
142+
WARNING: Initializing database with en_US collation order.
143143
This locale setting will prevent use of index optimization for
144144
LIKE and regexp searches. If you are concerned about speed of
145145
such queries, you may wish to set LC_COLLATE to "C" and
146146
re-initdb. For more information see the Administrator's Guide.
147147
</screen>
148-
This notice is intended to warn you that the currently selected locale
148+
This is intended to warn you that the currently selected locale
149149
will cause indexes to be sorted in an order that prevents them from
150150
being used for LIKE and regular-expression searches. If you need
151151
good performance of such searches, you should set your current locale
@@ -821,10 +821,10 @@ env PGOPTIONS='-c geqo=off' psql
821821
default is <literal>NOTICE</>. Valid values are <literal>DEBUG5</>,
822822
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
823823
<literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
824-
<literal>ERROR</>, <literal>LOG</>, <literal>FATAL</>,
825-
<literal>PANIC</>. Later values send less detail to the logs.
826-
<literal>LOG</> has a different precedence here than in
827-
<literal>CLIENT_MIN_MESSAGES</>.
824+
<literal>WARNING</>, <literal>ERROR</>, <literal>LOG</>,
825+
<literal>FATAL</>, and <literal>PANIC</>. Later values send less
826+
detail to the logs. <literal>LOG</> has a different precedence
827+
here than in <literal>CLIENT_MIN_MESSAGES</>.
828828
</para>
829829
</listitem>
830830
</varlistentry>
@@ -834,13 +834,13 @@ env PGOPTIONS='-c geqo=off' psql
834834
<listitem>
835835
<para>
836836
This controls how much detail is written to the client. The
837-
default is <literal>INFO</>. Valid values are
837+
default is <literal>NOTICE</>. Valid values are
838838
<literal>DEBUG5</>, <literal>DEBUG4</>, <literal>DEBUG3</>,
839839
<literal>DEBUG2</>, <literal>DEBUG1</>, <literal>LOG</>,
840-
<literal>INFO</>, <literal>NOTICE</>, <literal>ERROR</>,
841-
<literal>FATAL</>, <literal>PANIC</>. Later values send less
842-
information to the user. literal>LOG</> has a different
843-
precedence here than in <literal>SERVER_MIN_MESSAGES</>.
840+
<literal>NOTICE</>, <literal>WARNING</>, and <literal>ERROR</>.
841+
Later values send less information to the user. <literal>LOG</>
842+
has a different precedence here than in
843+
<literal>SERVER_MIN_MESSAGES</>.
844844
</para>
845845
</listitem>
846846
</varlistentry>

‎doc/src/sgml/spi.sgml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/spi.sgml,v 1.20 2001/11/21 06:09:45 thomas Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/spi.sgml,v 1.21 2002/03/06 06:44:33 momjian Exp $
33
-->
44

55
<Chapter id="spi">
@@ -3801,7 +3801,7 @@ execq(text *sql, int cnt)
38013801
proc = SPI_processed;
38023802
/*
38033803
* If this is SELECT and some tuple(s) fetched -
3804-
* returns tuples to the caller via elog (NOTICE).
3804+
* returns tuples to the caller via elog (INFO).
38053805
*/
38063806
if ( ret == SPI_OK_SELECT && SPI_processed > 0 )
38073807
{
@@ -3818,7 +3818,7 @@ execq(text *sql, int cnt)
38183818
sprintf(buf + strlen (buf), " %s%s",
38193819
SPI_getvalue(tuple, tupdesc, i),
38203820
(i == tupdesc->natts) ? " " : " |");
3821-
elog (NOTICE, "EXECQ: %s", buf);
3821+
elog (INFO, "EXECQ: %s", buf);
38223822
}
38233823
}
38243824

@@ -3850,9 +3850,9 @@ execq
38503850
vac=> INSERT INTO a VALUES (execq('INSERT INTO a VALUES (0)',0));
38513851
INSERT 167631 1
38523852
vac=> SELECT execq('SELECT * FROM a',0);
3853-
NOTICE:EXECQ: 0 <<< inserted by execq
3853+
INFO: EXECQ: 0 <<< inserted by execq
38543854

3855-
NOTICE:EXECQ: 1 <<< value returned by execq and inserted by upper INSERT
3855+
INFO: EXECQ: 1 <<< value returned by execq and inserted by upper INSERT
38563856

38573857
execq
38583858
-----
@@ -3866,11 +3866,11 @@ execq
38663866
(1 row)
38673867

38683868
vac=> SELECT execq('SELECT * FROM a', 10);
3869-
NOTICE:EXECQ: 0
3869+
INFO: EXECQ: 0
38703870

3871-
NOTICE:EXECQ: 1
3871+
INFO: EXECQ: 1
38723872

3873-
NOTICE:EXECQ: 2 <<< 0 + 2, only one tuple inserted - as specified
3873+
INFO: EXECQ: 2 <<< 0 + 2, only one tuple inserted - as specified
38743874

38753875
execq
38763876
-----
@@ -3888,7 +3888,7 @@ x
38883888
(1 row)
38893889

38903890
vac=> INSERT INTO a VALUES (execq('SELECT * FROM a', 0) + 1);
3891-
NOTICE:EXECQ: 0
3891+
INFO: EXECQ: 0
38923892
INSERT 167713 1
38933893
vac=> SELECT * FROM a;
38943894
x
@@ -3900,11 +3900,11 @@ x
39003900
-- This demonstrates data changes visibility rule:
39013901

39023902
vac=> INSERT INTO a SELECT execq('SELECT * FROM a', 0) * x FROM a;
3903-
NOTICE:EXECQ: 1
3904-
NOTICE:EXECQ: 2
3905-
NOTICE:EXECQ: 1
3906-
NOTICE:EXECQ: 2
3907-
NOTICE:EXECQ: 2
3903+
INFO: EXECQ: 1
3904+
INFO: EXECQ: 2
3905+
INFO: EXECQ: 1
3906+
INFO: EXECQ: 2
3907+
INFO: EXECQ: 2
39083908
INSERT 0 2
39093909
vac=> SELECT * FROM a;
39103910
x

‎doc/src/sgml/trigger.sgml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/trigger.sgml,v 1.19 2001/12/04 02:07:11 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/trigger.sgml,v 1.20 2002/03/06 06:44:33 momjian Exp $
33
-->
44

55
<chapter id="triggers">
@@ -487,7 +487,7 @@ trigf(PG_FUNCTION_ARGS)
487487

488488
/* Connect to SPI manager */
489489
if ((ret = SPI_connect()) < 0)
490-
elog(NOTICE, "trigf (fired %s): SPI_connect returned %d", when, ret);
490+
elog(INFO, "trigf (fired %s): SPI_connect returned %d", when, ret);
491491

492492
/* Get number of tuples in relation */
493493
ret = SPI_exec("SELECT count(*) FROM ttest", 0);
@@ -535,7 +535,7 @@ vac=> CREATE TRIGGER tafter AFTER INSERT OR UPDATE OR DELETE ON ttest
535535
FOR EACH ROW EXECUTE PROCEDURE trigf();
536536
CREATE
537537
vac=> INSERT INTO ttest VALUES (NULL);
538-
NOTICE:trigf (fired before): there are 0 tuples in ttest
538+
WARNING: trigf (fired before): there are 0 tuples in ttest
539539
INSERT 0 0
540540

541541
-- Insertion skipped and AFTER trigger is not fired
@@ -546,8 +546,8 @@ x
546546
(0 rows)
547547

548548
vac=> INSERT INTO ttest VALUES (1);
549-
NOTICE:trigf (fired before): there are 0 tuples in ttest
550-
NOTICE:trigf (fired after ): there are 1 tuples in ttest
549+
INFO: trigf (fired before): there are 0 tuples in ttest
550+
INFO: trigf (fired after ): there are 1 tuples in ttest
551551
^^^^^^^^
552552
remember what we said about visibility.
553553
INSERT 167793 1
@@ -558,8 +558,8 @@ x
558558
(1 row)
559559

560560
vac=> INSERT INTO ttest SELECT x * 2 FROM ttest;
561-
NOTICE:trigf (fired before): there are 1 tuples in ttest
562-
NOTICE:trigf (fired after ): there are 2 tuples in ttest
561+
INFO: trigf (fired before): there are 1 tuples in ttest
562+
INFO: trigf (fired after ): there are 2 tuples in ttest
563563
^^^^^^^^
564564
remember what we said about visibility.
565565
INSERT 167794 1
@@ -571,11 +571,11 @@ x
571571
(2 rows)
572572

573573
vac=> UPDATE ttest SET x = null WHERE x = 2;
574-
NOTICE:trigf (fired before): there are 2 tuples in ttest
574+
INFO: trigf (fired before): there are 2 tuples in ttest
575575
UPDATE 0
576576
vac=> UPDATE ttest SET x = 4 WHERE x = 2;
577-
NOTICE:trigf (fired before): there are 2 tuples in ttest
578-
NOTICE:trigf (fired after ): there are 2 tuples in ttest
577+
INFO: trigf (fired before): there are 2 tuples in ttest
578+
INFO: trigf (fired after ): there are 2 tuples in ttest
579579
UPDATE 1
580580
vac=> SELECT * FROM ttest;
581581
x
@@ -585,10 +585,10 @@ x
585585
(2 rows)
586586

587587
vac=> DELETE FROM ttest;
588-
NOTICE:trigf (fired before): there are 2 tuples in ttest
589-
NOTICE:trigf (fired after ): there are 1 tuples in ttest
590-
NOTICE:trigf (fired before): there are 1 tuples in ttest
591-
NOTICE:trigf (fired after ): there are 0 tuples in ttest
588+
INFO: trigf (fired before): there are 2 tuples in ttest
589+
INFO: trigf (fired after ): there are 1 tuples in ttest
590+
INFO: trigf (fired before): there are 1 tuples in ttest
591+
INFO: trigf (fired after ): there are 0 tuples in ttest
592592
^^^^^^^^
593593
remember what we said about visibility.
594594
DELETE 2

0 commit comments

Comments
 (0)