aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/access/common')
-rw-r--r--src/backend/access/common/heaptuple.c28
-rw-r--r--src/backend/access/common/indextuple.c12
-rw-r--r--src/backend/access/common/printtup.c6
-rw-r--r--src/backend/access/common/tupdesc.c6
4 files changed, 26 insertions, 26 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 48702bb8e1e..76c2b1d1dba 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.29 1998/01/05 03:28:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.30 1998/01/07 21:00:40 momjian Exp $
*
* NOTES
* The old interface functions have been converted to macros
@@ -93,7 +93,7 @@ ComputeDataSize(TupleDesc tupleDesc,
break;
default:
if (att[i]->attlen < sizeof(int32))
- elog(ABORT, "ComputeDataSize: attribute %d has len %d",
+ elog(ERROR, "ComputeDataSize: attribute %d has len %d",
i, att[i]->attlen);
if (att[i]->attalign == 'd')
data_length = DOUBLEALIGN(data_length) + att[i]->attlen;
@@ -194,7 +194,7 @@ DataFill(char *data,
break;
default:
if (att[i]->attlen < sizeof(int32))
- elog(ABORT, "DataFill: attribute %d has len %d",
+ elog(ERROR, "DataFill: attribute %d has len %d",
i, att[i]->attlen);
if (att[i]->attalign == 'd')
{
@@ -249,10 +249,10 @@ heap_attisnull(HeapTuple tup, int attnum)
break;
case 0:
- elog(ABORT, "heap_attisnull: zero attnum disallowed");
+ elog(ERROR, "heap_attisnull: zero attnum disallowed");
default:
- elog(ABORT, "heap_attisnull: undefined negative attnum");
+ elog(ERROR, "heap_attisnull: undefined negative attnum");
}
return (0);
@@ -290,7 +290,7 @@ heap_sysattrlen(AttrNumber attno)
return sizeof f->t_cmax;
default:
- elog(ABORT, "sysattrlen: System attribute number %d unknown.", attno);
+ elog(ERROR, "sysattrlen: System attribute number %d unknown.", attno);
return 0;
}
}
@@ -328,7 +328,7 @@ heap_sysattrbyval(AttrNumber attno)
break;
default:
byval = true;
- elog(ABORT, "sysattrbyval: System attribute number %d unknown.",
+ elog(ERROR, "sysattrbyval: System attribute number %d unknown.",
attno);
break;
}
@@ -358,7 +358,7 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
case MaxCommandIdAttributeNumber:
return ((Datum) (long) tup->t_cmax);
default:
- elog(ABORT, "heap_getsysattr: undefined attnum %d", attnum);
+ elog(ERROR, "heap_getsysattr: undefined attnum %d", attnum);
}
return ((Datum) NULL);
}
@@ -538,7 +538,7 @@ fastgetattr(HeapTuple tup,
default:
if (att[j]->attlen < sizeof(int32))
{
- elog(ABORT,
+ elog(ERROR,
"fastgetattr: attribute %d has len %d",
j, att[j]->attlen);
}
@@ -598,7 +598,7 @@ fastgetattr(HeapTuple tup,
break;
default:
if (att[i]->attlen < sizeof(int32))
- elog(ABORT,
+ elog(ERROR,
"fastgetattr2: attribute %d has len %d",
i, att[i]->attlen);
if (att[i]->attalign == 'd')
@@ -657,7 +657,7 @@ fastgetattr(HeapTuple tup,
break;
default:
if (att[attnum]->attlen < sizeof(int32))
- elog(ABORT, "fastgetattr3: attribute %d has len %d",
+ elog(ERROR, "fastgetattr3: attribute %d has len %d",
attnum, att[attnum]->attlen);
if (att[attnum]->attalign == 'd')
off = DOUBLEALIGN(off);
@@ -686,7 +686,7 @@ heap_copytuple(HeapTuple tuple)
/* XXX For now, just prevent an undetectable executor related error */
if (tuple->t_len > MAXTUPLEN)
{
- elog(ABORT, "palloctup: cannot handle length %d tuples",
+ elog(ERROR, "palloctup: cannot handle length %d tuples",
tuple->t_len);
}
@@ -773,7 +773,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
}
if (numberOfAttributes > MaxHeapAttributeNumber)
- elog(ABORT, "heap_formtuple: numberOfAttributes of %d > %d",
+ elog(ERROR, "heap_formtuple: numberOfAttributes of %d > %d",
numberOfAttributes, MaxHeapAttributeNumber);
if (hasnull)
@@ -883,7 +883,7 @@ heap_modifytuple(HeapTuple tuple,
}
else if (repl[attoff] != 'r')
{
- elog(ABORT, "heap_modifytuple: repl is \\%3d", repl[attoff]);
+ elog(ERROR, "heap_modifytuple: repl is \\%3d", repl[attoff]);
}
else
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index baa295b91ba..4941a60214d 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.21 1998/01/05 03:28:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.22 1998/01/07 21:00:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -56,7 +56,7 @@ index_formtuple(TupleDesc tupleDescriptor,
int numberOfAttributes = tupleDescriptor->natts;
if (numberOfAttributes > MaxIndexAttributeNumber)
- elog(ABORT, "index_formtuple: numberOfAttributes of %d > %d",
+ elog(ERROR, "index_formtuple: numberOfAttributes of %d > %d",
numberOfAttributes, MaxIndexAttributeNumber);
@@ -103,7 +103,7 @@ index_formtuple(TupleDesc tupleDescriptor,
*/
if (size & 0xE000)
- elog(ABORT, "index_formtuple: data takes %d bytes: too big", size);
+ elog(ERROR, "index_formtuple: data takes %d bytes: too big", size);
infomask |= size;
@@ -314,7 +314,7 @@ fastgetiattr(IndexTuple tup,
off = (att[j]->attalign == 'd') ?
DOUBLEALIGN(off) : LONGALIGN(off);
else
- elog(ABORT, "fastgetiattr: attribute %d has len %d",
+ elog(ERROR, "fastgetiattr: attribute %d has len %d",
j, att[j]->attlen);
break;
@@ -382,7 +382,7 @@ fastgetiattr(IndexTuple tup,
DOUBLEALIGN(off) + att[i]->attlen :
LONGALIGN(off) + att[i]->attlen;
else
- elog(ABORT, "fastgetiattr2: attribute %d has len %d",
+ elog(ERROR, "fastgetiattr2: attribute %d has len %d",
i, att[i]->attlen);
break;
@@ -409,7 +409,7 @@ fastgetiattr(IndexTuple tup,
break;
default:
if (att[attnum]->attlen < sizeof(int32))
- elog(ABORT, "fastgetattr3: attribute %d has len %d",
+ elog(ERROR, "fastgetattr3: attribute %d has len %d",
attnum, att[attnum]->attlen);
if (att[attnum]->attalign == 'd')
off = DOUBLEALIGN(off);
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 23fa7204eff..2a93e221589 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.21 1998/01/05 03:29:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.22 1998/01/07 21:00:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,7 +45,7 @@ typtoout(Oid type)
return ((Oid)
((TypeTupleForm) GETSTRUCT(typeTuple))->typoutput);
- elog(ABORT, "typtoout: Cache lookup of type %d failed", type);
+ elog(ERROR, "typtoout: Cache lookup of type %d failed", type);
return (InvalidOid);
}
@@ -62,7 +62,7 @@ gettypelem(Oid type)
return ((Oid)
((TypeTupleForm) GETSTRUCT(typeTuple))->typelem);
- elog(ABORT, "typtoout: Cache lookup of type %d failed", type);
+ elog(ERROR, "typtoout: Cache lookup of type %d failed", type);
return (InvalidOid);
}
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 9c04bcc98c8..9324a95c768 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.30 1998/01/05 03:29:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.31 1998/01/07 21:00:45 momjian Exp $
*
* NOTES
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -321,7 +321,7 @@ TupleDescInitEntry(TupleDesc desc,
* RelationNameCreateHeapRelation() calls BuildDesc() which
* calls this routine and since EMP does not exist yet, the
* system cache lookup below fails. That's fine, but rather
- * then doing a elog(ABORT) we just leave that information
+ * then doing a elog(ERROR) we just leave that information
* uninitialized, return false, then fix things up later.
* -cim 6/14/90
* ----------------
@@ -508,7 +508,7 @@ BuildDescForRelation(List *schema, char *relname)
TupleDescMakeSelfReference(desc, attnum, relname);
}
else
- elog(ABORT, "DefineRelation: no such type %s",
+ elog(ERROR, "DefineRelation: no such type %s",
typename);
}