database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-12 05:01:15 +03:00
Code Activity

Goodbye ABORT. Hello ERROR for all errors.

Browse Source
This commit is contained in:
Bruce Momjian
1998-01-07 21:07:04 +00:00
parent e6c6146eb8
commit 679d39b9c8
99 changed files with 493 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/tcop/fastpath.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.9 1998/01/05 03:33:44 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.10 1998/01/07 21:05:54 momjian Exp $
*
* NOTES
* This cruft is the server side of PQfn.
@@ -199,7 +199,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
* Since the validity of this structure is determined by whether the
* funcid is OK, we clear the funcid here. It must not be set to the
* correct value until we are about to return with a good struct
* fp_info, since we can be interrupted (i.e., with an elog(ABORT,
* fp_info, since we can be interrupted (i.e., with an elog(ERROR,
* ...)) at any time.
*/
MemSet((char *) fip, 0, (int) sizeof(struct fp_info));
@@ -209,7 +209,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
0, 0, 0);
if (!HeapTupleIsValid(func_htp))
{
elog(ABORT, "update_fp_info: cache lookup for function %d failed",
elog(ERROR, "update_fp_info: cache lookup for function %d failed",
func_id);
}
pp = (Form_pg_proc) GETSTRUCT(func_htp);
@@ -226,7 +226,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
0, 0, 0);
if (!HeapTupleIsValid(type_htp))
{
elog(ABORT, "update_fp_info: bad argument type %d for %d",
elog(ERROR, "update_fp_info: bad argument type %d for %d",
argtypes[i], func_id);
}
tp = (TypeTupleForm) GETSTRUCT(type_htp);
@@ -241,7 +241,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
0, 0, 0);
if (!HeapTupleIsValid(type_htp))
{
elog(ABORT, "update_fp_info: bad return type %d for %d",
elog(ERROR, "update_fp_info: bad return type %d for %d",
rettype, func_id);
}
tp = (TypeTupleForm) GETSTRUCT(type_htp);
@@ -267,7 +267,7 @@ update_fp_info(Oid func_id, struct fp_info * fip)
*
* RETURNS:
* nothing of significance.
* All errors result in elog(ABORT,...).
* All errors result in elog(ERROR,...).
*/
int
HandleFunctionRequest()
@@ -297,7 +297,7 @@ HandleFunctionRequest()
if (fip->nargs != nargs)
{
elog(ABORT, "HandleFunctionRequest: actual arguments (%d) != registered arguments (%d)",
elog(ERROR, "HandleFunctionRequest: actual arguments (%d) != registered arguments (%d)",
nargs, fip->nargs);
}
@@ -328,7 +328,7 @@ HandleFunctionRequest()
{ /* ... varlena */
if (!(p = palloc(argsize + VARHDRSZ)))
{
elog(ABORT, "HandleFunctionRequest: palloc failed");
elog(ERROR, "HandleFunctionRequest: palloc failed");
}
VARSIZE(p) = argsize + VARHDRSZ;
pq_getnchar(VARDATA(p), 0, argsize);
@@ -338,7 +338,7 @@ HandleFunctionRequest()
/* XXX cross our fingers and trust "argsize" */
if (!(p = palloc(argsize)))
{
elog(ABORT, "HandleFunctionRequest: palloc failed");
elog(ERROR, "HandleFunctionRequest: palloc failed");
}
pq_getnchar(p, 0, argsize);
}

18
src/backend/tcop/postgres.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.58 1998/01/05 03:33:46 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.59 1998/01/07 21:06:00 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -125,7 +125,7 @@ jmp_buf Warn_restart;
sigjmp_buf Warn_restart;
#endif /* defined(nextstep) */
int InErrorOrAbort;
int InError;
extern int NBuffers;
@@ -728,7 +728,7 @@ pg_exec_query_dest(char *query_string,/* string to execute */
* signal handler routines used in PostgresMain()
*
* handle_warn() is used to catch kill(getpid(),1) which
* occurs when elog(ABORT) is called.
* occurs when elog(ERROR) is called.
*
* quickdie() occurs when signalled by the postmaster.
* Some backend has bought the farm,
@@ -774,7 +774,7 @@ die(SIGNAL_ARGS)
static void
FloatExceptionHandler(SIGNAL_ARGS)
{
elog(ABORT, "floating point exception!"
elog(ERROR, "floating point exception!"
" The last floating point operation either exceeded legal ranges"
" or was a divide by zero");
}
@@ -1343,7 +1343,7 @@ PostgresMain(int argc, char *argv[])
* so that the slaves signal the master to abort the transaction
* rather than calling AbortCurrentTransaction() themselves.
*
* Note: elog(ABORT) causes a kill(getpid(),1) to occur sending
* Note: elog(ERROR) causes a kill(getpid(),1) to occur sending
* us back here.
* ----------------
*/
@@ -1352,7 +1352,7 @@ PostgresMain(int argc, char *argv[])
if (sigsetjmp(Warn_restart, 1) != 0)
{
InErrorOrAbort = 1;
InError = 1;
time(&tim);
@@ -1363,7 +1363,7 @@ PostgresMain(int argc, char *argv[])
AbortCurrentTransaction();
}
InErrorOrAbort = 0;
InError = 0;
/* ----------------
* POSTGRES main processing loop begins here
@@ -1372,7 +1372,7 @@ PostgresMain(int argc, char *argv[])
if (IsUnderPostmaster == false)
{
puts("\nPOSTGRES backend interactive interface");
puts("$Revision: 1.58 $ $Date: 1998/01/05 03:33:46 $");
puts("$Revision: 1.59 $ $Date: 1998/01/07 21:06:00 $");
}
/* ----------------
@@ -1565,7 +1565,7 @@ PostgresMain(int argc, char *argv[])
break;
default:
elog(ABORT, "unknown frontend message was recieved");
elog(ERROR, "unknown frontend message was recieved");
}
/* ----------------

4
src/backend/tcop/pquery.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.12 1998/01/05 03:33:48 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.13 1998/01/07 21:06:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -166,7 +166,7 @@ ProcessPortal(char *portalName,
*/
if (PortalNameIsSpecial(portalName))
elog(ABORT,
elog(ERROR,
"The portal name %s is reserved for internal use",
portalName);