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

Commitf690920

Browse files
committed
Infrastructure for upgraded error reporting mechanism. elog.c is
rewritten and the protocol is changed, but most elog calls are stillelog calls. Also, we need to contemplate mechanisms for controllingall this functionality --- eg, how much stuff should appear in thepostmaster log? And what API should libpq expose for it?
1 parenta91c5be commitf690920

File tree

33 files changed

+1700
-715
lines changed

33 files changed

+1700
-715
lines changed

‎config/c-compiler.m4

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Macros to detect C compiler features
2-
# $Header: /cvsroot/pgsql/config/c-compiler.m4,v 1.7 2003/04/06 22:45:22 petere Exp $
2+
# $Header: /cvsroot/pgsql/config/c-compiler.m4,v 1.8 2003/04/24 21:16:42 tgl Exp $
33

44

55
# PGAC_C_SIGNED
@@ -94,3 +94,29 @@ AC_DEFINE_UNQUOTED(AS_TR_CPP(alignof_$1),
9494
[$AS_TR_SH([pgac_cv_alignof_$1])],
9595
[The alignment requirement of a `$1'.])
9696
])# PGAC_CHECK_ALIGNOF
97+
98+
99+
# PGAC_C_FUNCNAME_SUPPORT
100+
# -------------
101+
# Check if the C compiler understands __func__ (C99) or __FUNCTION__ (gcc).
102+
# Define HAVE_FUNCNAME__FUNC or HAVE_FUNCNAME__FUNCTION accordingly.
103+
AC_DEFUN([PGAC_C_FUNCNAME_SUPPORT],
104+
[AC_CACHE_CHECK(for__func__,pgac_cv_funcname_func_support,
105+
[AC_TRY_COMPILE([#include <stdio.h>],
106+
[printf("%s\n", __func__);],
107+
[pgac_cv_funcname_func_support=yes],
108+
[pgac_cv_funcname_func_support=no])])
109+
if test x"$pgac_cv_funcname_func_support" = xyes ; then
110+
AC_DEFINE(HAVE_FUNCNAME__FUNC,1,
111+
[Define to 1 if your compiler understands __func__.])
112+
else
113+
AC_CACHE_CHECK(for__FUNCTION__,pgac_cv_funcname_function_support,
114+
[AC_TRY_COMPILE([#include <stdio.h>],
115+
[printf("%s\n", __FUNCTION__);],
116+
[pgac_cv_funcname_function_support=yes],
117+
[pgac_cv_funcname_function_support=no])])
118+
if test x"$pgac_cv_funcname_function_support" = xyes ; then
119+
AC_DEFINE(HAVE_FUNCNAME__FUNCTION,1,
120+
[Define to 1 if your compiler understands __FUNCTION__.])
121+
fi
122+
fi])# PGAC_C_FUNCNAME_SUPPORT

‎configure

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9051,6 +9051,111 @@ _ACEOF
90519051
90529052
fi
90539053
9054+
echo"$as_me:$LINENO: checking for __func__">&5
9055+
echo$ECHO_N"checking for __func__...$ECHO_C">&6
9056+
iftest"${pgac_cv_funcname_func_support+set}" =set;then
9057+
echo$ECHO_N"(cached)$ECHO_C">&6
9058+
else
9059+
cat>conftest.$ac_ext<<_ACEOF
9060+
#line$LINENO "configure"
9061+
#include "confdefs.h"
9062+
#include <stdio.h>
9063+
#ifdef F77_DUMMY_MAIN
9064+
# ifdef __cplusplus
9065+
extern "C"
9066+
# endif
9067+
int F77_DUMMY_MAIN() { return 1; }
9068+
#endif
9069+
int
9070+
main ()
9071+
{
9072+
printf("%s\n", __func__);
9073+
;
9074+
return 0;
9075+
}
9076+
_ACEOF
9077+
rm -f conftest.$ac_objext
9078+
if { (evalecho"$as_me:$LINENO:\"$ac_compile\"")>&5
9079+
(eval$ac_compile)2>&5
9080+
ac_status=$?
9081+
echo"$as_me:$LINENO:\$? =$ac_status">&5
9082+
(exit$ac_status); }&&
9083+
{ ac_try='test -s conftest.$ac_objext'
9084+
{ (evalecho"$as_me:$LINENO:\"$ac_try\"")>&5
9085+
(eval$ac_try)2>&5
9086+
ac_status=$?
9087+
echo"$as_me:$LINENO:\$? =$ac_status">&5
9088+
(exit$ac_status); }; };then
9089+
pgac_cv_funcname_func_support=yes
9090+
else
9091+
echo"$as_me: failed program was:">&5
9092+
cat conftest.$ac_ext>&5
9093+
pgac_cv_funcname_func_support=no
9094+
fi
9095+
rm -f conftest.$ac_objext conftest.$ac_ext
9096+
fi
9097+
echo"$as_me:$LINENO: result:$pgac_cv_funcname_func_support">&5
9098+
echo"${ECHO_T}$pgac_cv_funcname_func_support">&6
9099+
iftest x"$pgac_cv_funcname_func_support" = xyes;then
9100+
9101+
cat>>confdefs.h<<\_ACEOF
9102+
#define HAVE_FUNCNAME__FUNC 1
9103+
_ACEOF
9104+
9105+
else
9106+
echo"$as_me:$LINENO: checking for __FUNCTION__">&5
9107+
echo$ECHO_N"checking for __FUNCTION__...$ECHO_C">&6
9108+
iftest"${pgac_cv_funcname_function_support+set}" =set;then
9109+
echo$ECHO_N"(cached)$ECHO_C">&6
9110+
else
9111+
cat>conftest.$ac_ext<<_ACEOF
9112+
#line$LINENO "configure"
9113+
#include "confdefs.h"
9114+
#include <stdio.h>
9115+
#ifdef F77_DUMMY_MAIN
9116+
# ifdef __cplusplus
9117+
extern "C"
9118+
# endif
9119+
int F77_DUMMY_MAIN() { return 1; }
9120+
#endif
9121+
int
9122+
main ()
9123+
{
9124+
printf("%s\n", __FUNCTION__);
9125+
;
9126+
return 0;
9127+
}
9128+
_ACEOF
9129+
rm -f conftest.$ac_objext
9130+
if { (evalecho"$as_me:$LINENO:\"$ac_compile\"")>&5
9131+
(eval$ac_compile)2>&5
9132+
ac_status=$?
9133+
echo"$as_me:$LINENO:\$? =$ac_status">&5
9134+
(exit$ac_status); }&&
9135+
{ ac_try='test -s conftest.$ac_objext'
9136+
{ (evalecho"$as_me:$LINENO:\"$ac_try\"")>&5
9137+
(eval$ac_try)2>&5
9138+
ac_status=$?
9139+
echo"$as_me:$LINENO:\$? =$ac_status">&5
9140+
(exit$ac_status); }; };then
9141+
pgac_cv_funcname_function_support=yes
9142+
else
9143+
echo"$as_me: failed program was:">&5
9144+
cat conftest.$ac_ext>&5
9145+
pgac_cv_funcname_function_support=no
9146+
fi
9147+
rm -f conftest.$ac_objext conftest.$ac_ext
9148+
fi
9149+
echo"$as_me:$LINENO: result:$pgac_cv_funcname_function_support">&5
9150+
echo"${ECHO_T}$pgac_cv_funcname_function_support">&6
9151+
iftest x"$pgac_cv_funcname_function_support" = xyes;then
9152+
9153+
cat>>confdefs.h<<\_ACEOF
9154+
#define HAVE_FUNCNAME__FUNCTION 1
9155+
_ACEOF
9156+
9157+
fi
9158+
fi
90549159
echo"$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h">&5
90559160
echo$ECHO_N"checking whether struct tm is in sys/time.h or time.h...$ECHO_C">&6
90569161
iftest"${ac_cv_struct_tm+set}" =set;then

‎configure.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.243 2003/04/22 02:18:09 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.244 2003/04/24 21:16:42 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -733,6 +733,7 @@ AC_C_INLINE
733733
AC_C_STRINGIZE
734734
PGAC_C_SIGNED
735735
AC_C_VOLATILE
736+
PGAC_C_FUNCNAME_SUPPORT
736737
AC_STRUCT_TIMEZONE
737738
PGAC_UNION_SEMUN
738739
PGAC_STRUCT_SOCKADDR_UN

‎doc/src/sgml/protocol.sgml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/protocol.sgml,v 1.29 2003/04/22 00:08:06 tgl Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/protocol.sgml,v 1.30 2003/04/24 21:16:42 tgl Exp $ -->
22

33
<chapter id="protocol">
44
<title>Frontend/Backend Protocol</title>
@@ -3862,6 +3862,14 @@ byte (except for startup packets, which have no type byte). Also note that
38623862
PasswordMessage now has a type byte.
38633863
</para>
38643864

3865+
<para>
3866+
ErrorResponse and NoticeResponse ('<literal>E</>' and '<literal>N</>')
3867+
messages now contain multiple fields, from which the client code may
3868+
assemble an error message of the desired level of verbosity. Note that
3869+
individual fields will typically not end with a newline, whereas the single
3870+
string sent in the older protocol always did.
3871+
</para>
3872+
38653873
<para>
38663874
COPY data is now encapsulated into CopyData and CopyDone messages. There
38673875
is a well-defined way to recover from errors during COPY. The special

‎src/backend/catalog/namespace.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Portions Copyright (c) 1994, Regents of the University of California
1414
*
1515
* IDENTIFICATION
16-
* $Header: /cvsroot/pgsql/src/backend/catalog/namespace.c,v 1.49 2003/03/20 03:34:55 momjian Exp $
16+
* $Header: /cvsroot/pgsql/src/backend/catalog/namespace.c,v 1.50 2003/04/24 21:16:42 tgl Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -1280,7 +1280,7 @@ NameListToString(List *names)
12801280
{
12811281
if (l!=names)
12821282
appendStringInfoChar(&string,'.');
1283-
appendStringInfo(&string,"%s",strVal(lfirst(l)));
1283+
appendStringInfoString(&string,strVal(lfirst(l)));
12841284
}
12851285

12861286
returnstring.data;
@@ -1305,7 +1305,7 @@ NameListToQuotedString(List *names)
13051305
{
13061306
if (l!=names)
13071307
appendStringInfoChar(&string,'.');
1308-
appendStringInfo(&string,"%s",quote_identifier(strVal(lfirst(l))));
1308+
appendStringInfoString(&string,quote_identifier(strVal(lfirst(l))));
13091309
}
13101310

13111311
returnstring.data;

‎src/backend/commands/copy.c

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.195 2003/04/22 00:08:06 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.196 2003/04/24 21:16:42 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -100,13 +100,13 @@ static const char BinarySignature[12] = "PGBCOPY\n\377\r\n\0";
100100
* Static communication variables ... pretty grotty, but COPY has
101101
* never been reentrant...
102102
*/
103-
intcopy_lineno=0;/* exported for use by elog() -- dz */
104-
105103
staticCopyDestcopy_dest;
106104
staticFILE*copy_file;/* if copy_dest == COPY_FILE */
107105
staticStringInfocopy_msgbuf;/* if copy_dest == COPY_NEW_FE */
108106
staticboolfe_eof;/* true if detected end of copy data */
109-
staticEolTypeeol_type;
107+
staticEolTypeeol_type;/* EOL type of input */
108+
staticintcopy_lineno;/* line number for error messages */
109+
110110

111111
/*
112112
* These static variables are used to avoid incurring overhead for each
@@ -1000,6 +1000,16 @@ CopyTo(Relation rel, List *attnumlist, bool binary, bool oids,
10001000
}
10011001

10021002

1003+
/*
1004+
* error context callback for COPY FROM
1005+
*/
1006+
staticvoid
1007+
copy_in_error_callback(void*arg)
1008+
{
1009+
errcontext("COPY FROM, line %d",copy_lineno);
1010+
}
1011+
1012+
10031013
/*
10041014
* Copy FROM file to relation.
10051015
*/
@@ -1032,6 +1042,7 @@ CopyFrom(Relation rel, List *attnumlist, bool binary, bool oids,
10321042
ExprState**defexprs;/* array of default att expressions */
10331043
ExprContext*econtext;/* used for ExecEvalExpr for default atts */
10341044
MemoryContextoldcontext=CurrentMemoryContext;
1045+
ErrorContextCallbackerrcontext;
10351046

10361047
tupDesc=RelationGetDescr(rel);
10371048
attr=tupDesc->attrs;
@@ -1188,16 +1199,22 @@ CopyFrom(Relation rel, List *attnumlist, bool binary, bool oids,
11881199
values= (Datum*)palloc(num_phys_attrs*sizeof(Datum));
11891200
nulls= (char*)palloc(num_phys_attrs*sizeof(char));
11901201

1191-
/* Initialize static variables */
1192-
copy_lineno=0;
1193-
eol_type=EOL_UNKNOWN;
1194-
fe_eof= false;
1195-
11961202
/* Make room for a PARAM_EXEC value for domain constraint checks */
11971203
if (hasConstraints)
11981204
econtext->ecxt_param_exec_vals= (ParamExecData*)
11991205
palloc0(sizeof(ParamExecData));
12001206

1207+
/* Initialize static variables */
1208+
fe_eof= false;
1209+
eol_type=EOL_UNKNOWN;
1210+
copy_lineno=0;
1211+
1212+
/* Set up callback to identify error line number */
1213+
errcontext.callback=copy_in_error_callback;
1214+
errcontext.arg=NULL;
1215+
errcontext.previous=error_context_stack;
1216+
error_context_stack=&errcontext;
1217+
12011218
while (!done)
12021219
{
12031220
boolskip_tuple;
@@ -1502,7 +1519,7 @@ CopyFrom(Relation rel, List *attnumlist, bool binary, bool oids,
15021519
/*
15031520
* Done, clean up
15041521
*/
1505-
copy_lineno=0;
1522+
error_context_stack=errcontext.previous;
15061523

15071524
MemoryContextSwitchTo(oldcontext);
15081525

‎src/backend/commands/explain.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994-5, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.105 2003/04/03 22:35:48 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.106 2003/04/24 21:16:42 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -320,7 +320,7 @@ explain_outNode(StringInfo str,
320320

321321
if (plan==NULL)
322322
{
323-
appendStringInfo(str,"\n");
323+
appendStringInfoChar(str,'\n');
324324
return;
325325
}
326326

@@ -476,13 +476,13 @@ explain_outNode(StringInfo str,
476476
break;
477477
}
478478

479-
appendStringInfo(str,pname);
479+
appendStringInfoString(str,pname);
480480
switch (nodeTag(plan))
481481
{
482482
caseT_IndexScan:
483483
if (ScanDirectionIsBackward(((IndexScan*)plan)->indxorderdir))
484-
appendStringInfo(str," Backward");
485-
appendStringInfo(str," using ");
484+
appendStringInfoString(str," Backward");
485+
appendStringInfoString(str," using ");
486486
i=0;
487487
foreach(l, ((IndexScan*)plan)->indxid)
488488
{
@@ -590,7 +590,7 @@ explain_outNode(StringInfo str,
590590
appendStringInfo(str," (never executed)");
591591
}
592592
}
593-
appendStringInfo(str,"\n");
593+
appendStringInfoChar(str,'\n');
594594

595595
/* quals, sort keys, etc */
596596
switch (nodeTag(plan))

‎src/backend/executor/spi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/spi.c,v 1.89 2003/03/2716:51:28 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/spi.c,v 1.90 2003/04/24 21:16:43 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -995,7 +995,7 @@ _SPI_execute(const char *src, int tcount, _SPI_plan *plan)
995995
* Parse the request string into a list of raw parse trees.
996996
*/
997997
initStringInfo(&stri);
998-
appendStringInfo(&stri,"%s",src);
998+
appendStringInfoString(&stri,src);
999999

10001000
raw_parsetree_list=pg_parse_query(&stri,argtypes,nargs);
10011001

0 commit comments

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