Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9f1f2bf

Browse files
committed
Fix various places where global s/NOTICE/WARNING/ was applied with too
much enthusiasm.
1 parent3e40ff5 commit9f1f2bf

File tree

6 files changed

+17
-19
lines changed

6 files changed

+17
-19
lines changed

‎src/backend/commands/vacuum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.245 2002/12/15 16:17:44 tgl Exp $
16+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.246 2003/01/07 22:23:17 tgl Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -2294,7 +2294,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
22942294
* status bits. This is not really necessary, but will save time for
22952295
* future transactions examining these tuples.
22962296
*
2297-
* XXXWARNING that this code fails to clear HEAP_MOVED_OFF tuples from
2297+
* XXXNOTICE that this code fails to clear HEAP_MOVED_OFF tuples from
22982298
* pages that were move source pages but not move dest pages. One
22992299
* also wonders whether it wouldn't be better to skip this step and
23002300
* let the tuple status updates happen someplace that's not holding an

‎src/backend/storage/ipc/shmqueue.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.22 2002/08/27 03:56:35 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.23 2003/01/07 22:23:17 tgl Exp $
1212
*
1313
* NOTES
1414
*
@@ -28,10 +28,8 @@
2828
#include"storage/shmem.h"
2929

3030
/*#define SHMQUEUE_DEBUG*/
31-
#ifdefSHMQUEUE_DEBUG
32-
33-
#defineSHMQUEUE_DEBUG_ELOG WARNING
3431

32+
#ifdefSHMQUEUE_DEBUG
3533
staticvoiddumpQ(SHM_QUEUE*q,char*s);
3634
#endif
3735

@@ -231,7 +229,7 @@ dumpQ(SHM_QUEUE *q, char *s)
231229
}
232230
snprintf(elem,sizeof(elem),"--->%lx",MAKE_OFFSET(q));
233231
strcat(buf,elem);
234-
elog(SHMQUEUE_DEBUG_ELOG,"%s: %s",s,buf);
232+
elog(DEBUG1,"%s: %s",s,buf);
235233

236234
snprintf(buf,sizeof(buf),"q nexts: %lx",MAKE_OFFSET(q));
237235
count=0;
@@ -251,7 +249,7 @@ dumpQ(SHM_QUEUE *q, char *s)
251249
}
252250
snprintf(elem,sizeof(elem),"--->%lx",MAKE_OFFSET(q));
253251
strcat(buf,elem);
254-
elog(SHMQUEUE_DEBUG_ELOG,"%s: %s",s,buf);
252+
elog(DEBUG1,"%s: %s",s,buf);
255253
}
256254

257255
#endif/* SHMQUEUE_DEBUG */

‎src/backend/utils/error/elog.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.105 2002/11/1423:53:27 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.106 2003/01/07 22:23:17 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -747,8 +747,8 @@ send_message_to_frontend(int type, const char *msg)
747747
AssertArg(type <=ERROR);
748748

749749
pq_beginmessage(&buf);
750-
pq_sendbyte(&buf,type!=ERROR ?'N' :'E');/* NisINFO, NOTICE, or
751-
* WARNING */
750+
/* 'N' (Notice) is for nonfatal conditions, 'E'isfor errors */
751+
pq_sendbyte(&buf,type<ERROR ?'N' :'E');
752752
pq_sendstring(&buf,msg);
753753
pq_endmessage(&buf);
754754

‎src/bin/psql/common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.52 2002/11/08 19:12:21 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.53 2003/01/07 22:23:17 tgl Exp $
77
*/
88
#include"postgres_fe.h"
99
#include"common.h"
@@ -153,7 +153,7 @@ psql_error(const char *fmt,...)
153153

154154

155155
/*
156-
* for backend INFO, WARNING,ERROR
156+
* for backendNotice mesages (INFO, WARNING,etc)
157157
*/
158158
void
159159
NoticeProcessor(void*arg,constchar*message)

‎src/interfaces/libpq/fe-exec.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.123 2002/11/10 00:14:22 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.124 2003/01/07 22:23:17 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -813,7 +813,7 @@ PQsendQuery(PGconn *conn, const char *query)
813813
* handleSendFailure: try to clean up after failure to send command.
814814
*
815815
* Primarily, what we want to accomplish here is to process an async
816-
*WARNING message that the backend might have sent just before it died.
816+
*NOTICE message that the backend might have sent just before it died.
817817
*
818818
* NOTE: this routine should only be called in PGASYNC_IDLE state.
819819
*/
@@ -831,7 +831,7 @@ handleSendFailure(PGconn *conn)
831831

832832
/*
833833
* Parse any available input messages.Since we are in PGASYNC_IDLE
834-
* state, onlyWARNING and NOTIFY messages will be eaten.
834+
* state, onlyNOTICE and NOTIFY messages will be eaten.
835835
*/
836836
parseInput(conn);
837837
}
@@ -905,7 +905,7 @@ parseInput(PGconn *conn)
905905
return;
906906

907907
/*
908-
* NOTIFY andWARNING messages can happen in any state besides
908+
* NOTIFY andNOTICE messages can happen in any state besides
909909
* COPY OUT; always process them right away.
910910
*
911911
* Most other messages should only be processed while in BUSY state.

‎src/interfaces/libpq/fe-misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
*
2727
* IDENTIFICATION
28-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.85 2002/10/2423:35:55 tgl Exp $
28+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.86 2003/01/07 22:23:17 tgl Exp $
2929
*
3030
*-------------------------------------------------------------------------
3131
*/
@@ -690,7 +690,7 @@ pqSendSome(PGconn *conn)
690690
/*
691691
* We used to close the socket here, but that's a bad
692692
* idea since there might be unread data waiting
693-
* (typically, aWARNING message from the backend
693+
* (typically, aNOTICE message from the backend
694694
* telling us it's committing hara-kiri...). Leave
695695
* the socket open until pqReadData finds no more data
696696
* can be read.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp