database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-26 12:21:12 +03:00
Code Activity

Change some ABORTS to ERROR. Add line number when COPY Failure.

Browse Source
This commit is contained in:
Bruce Momjian
1998-01-05 16:40:20 +00:00
parent 3d8820a364
commit deea69b90e
44 changed files with 571 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/backend/utils/adt/float.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.25 1998/01/05 03:34:07 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.26 1998/01/05 16:39:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -161,9 +161,9 @@ CheckFloat4Val(double val)
return;
#else
if (fabs(val) > FLOAT4_MAX)
elog(ABORT, "Bad float4 input format -- overflow");
elog(ERROR, "Bad float4 input format -- overflow");
if (val != 0.0 && fabs(val) < FLOAT4_MIN)
elog(ABORT, "Bad float4 input format -- underflow");
elog(ERROR, "Bad float4 input format -- underflow");
return;
#endif /* UNSAFE_FLOATS */
}
@ -186,9 +186,9 @@ CheckFloat8Val(double val)
return;
#else
if (fabs(val) > FLOAT8_MAX)
elog(ABORT, "Bad float8 input format -- overflow");
elog(ERROR, "Bad float8 input format -- overflow");
if (val != 0.0 && fabs(val) < FLOAT8_MIN)
elog(ABORT, "Bad float8 input format -- underflow");
elog(ERROR, "Bad float8 input format -- underflow");
return;
#endif /* UNSAFE_FLOATS */
}
@ -210,7 +210,7 @@ float4in(char *num)
errno = 0;
val = strtod(num, &endptr);
if (*endptr != '\0' || errno == ERANGE)
elog(ABORT, "Bad float4 input format '%s'", num);
elog(ERROR, "Bad float4 input format '%s'", num);
/*
* if we get here, we have a legal double, still need to check to see
@ -257,7 +257,7 @@ float8in(char *num)
errno = 0;
val = strtod(num, &endptr);
if (*endptr != '\0' || errno == ERANGE)
elog(ABORT, "Bad float8 input format '%s'", num);
elog(ERROR, "Bad float8 input format '%s'", num);
CheckFloat8Val(val);
*result = val;
@ -515,7 +515,7 @@ float4div(float32 arg1, float32 arg2)
return (float32) NULL;
if (*arg2 == 0.0)
elog(ABORT, "float4div: divide by zero error");
elog(ERROR, "float4div: divide by zero error");
val = *arg1 / *arg2;
@ -609,7 +609,7 @@ float8div(float64 arg1, float64 arg2)
result = (float64) palloc(sizeof(float64data));
if (*arg2 == 0.0)
elog(ABORT, "float8div: divide by zero error");
elog(ERROR, "float8div: divide by zero error");
val = *arg1 / *arg2;
CheckFloat8Val(val);
@ -806,10 +806,10 @@ dtoi4(float64 num)
int32 result;
if (!PointerIsValid(num))
elog(ABORT, "dtoi4: unable to convert null", NULL);
elog(ERROR, "dtoi4: unable to convert null", NULL);
if ((*num < INT_MIN) || (*num > INT_MAX))
elog(ABORT, "dtoi4: integer out of range", NULL);
elog(ERROR, "dtoi4: integer out of range", NULL);
result = rint(*num);
return (result);
@ -825,10 +825,10 @@ dtoi2(float64 num)
int16 result;
if (!PointerIsValid(num))
elog(ABORT, "dtoi2: unable to convert null", NULL);
elog(ERROR, "dtoi2: unable to convert null", NULL);
if ((*num < SHRT_MIN) || (*num > SHRT_MAX))
elog(ABORT, "dtoi2: integer out of range", NULL);
elog(ERROR, "dtoi2: integer out of range", NULL);
result = rint(*num);
return (result);
@ -874,10 +874,10 @@ ftoi4(float32 num)
int32 result;
if (!PointerIsValid(num))
elog(ABORT, "ftoi4: unable to convert null", NULL);
elog(ERROR, "ftoi4: unable to convert null", NULL);
if ((*num < INT_MIN) || (*num > INT_MAX))
elog(ABORT, "ftoi4: integer out of range", NULL);
elog(ERROR, "ftoi4: integer out of range", NULL);
result = rint(*num);
return (result);
@ -893,10 +893,10 @@ ftoi2(float32 num)
int16 result;
if (!PointerIsValid(num))
elog(ABORT, "ftoi2: unable to convert null", NULL);
elog(ERROR, "ftoi2: unable to convert null", NULL);
if ((*num < SHRT_MIN) || (*num > SHRT_MAX))
elog(ABORT, "ftoi2: integer out of range", NULL);
elog(ERROR, "ftoi2: integer out of range", NULL);
result = rint(*num);
return (result);
@ -1052,7 +1052,7 @@ dpow(float64 arg1, float64 arg2)
#else
if (!finite(*result))
#endif
elog(ABORT, "pow() result is out of range");
elog(ERROR, "pow() result is out of range");
CheckFloat8Val(*result);
return (result);
@ -1083,7 +1083,7 @@ dexp(float64 arg1)
#else
if (!finite(*result))
#endif
elog(ABORT, "exp() result is out of range");
elog(ERROR, "exp() result is out of range");
CheckFloat8Val(*result);
return (result);
@ -1107,9 +1107,9 @@ dlog1(float64 arg1)
tmp = *arg1;
if (tmp == 0.0)
elog(ABORT, "can't take log of zero");
elog(ERROR, "can't take log of zero");
if (tmp < 0)
elog(ABORT, "can't take log of a negative number");
elog(ERROR, "can't take log of a negative number");
*result = (float64data) log(tmp);
CheckFloat8Val(*result);
@ -1185,7 +1185,7 @@ float48div(float32 arg1, float64 arg2)
result = (float64) palloc(sizeof(float64data));
if (*arg2 == 0.0)
elog(ABORT, "float48div: divide by zero");
elog(ERROR, "float48div: divide by zero");
*result = *arg1 / *arg2;
CheckFloat8Val(*result);
@ -1255,7 +1255,7 @@ float84div(float64 arg1, float32 arg2)
result = (float64) palloc(sizeof(float64data));
if (*arg2 == 0.0)
elog(ABORT, "float48div: divide by zero");
elog(ERROR, "float48div: divide by zero");
*result = *arg1 / *arg2;
CheckFloat8Val(*result);