aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access/common/indextuple.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2003-07-21 20:29:40 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2003-07-21 20:29:40 +0000
commitec7aa4b51545e0c1c69acc0cf135d9c229f61d11 (patch)
treea901aaeecf544061017be45bb1defbb92a1b2b03 /src/backend/access/common/indextuple.c
parentc6106d91e2dba7721d1ace5f30946debe9689b3b (diff)
downloadpostgresql-ec7aa4b51545e0c1c69acc0cf135d9c229f61d11.tar.gz
postgresql-ec7aa4b51545e0c1c69acc0cf135d9c229f61d11.zip
Error message editing in backend/access.
Diffstat (limited to 'src/backend/access/common/indextuple.c')
-rw-r--r--src/backend/access/common/indextuple.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index e6518922cb9..abf25915ab5 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.64 2003/02/23 06:17:12 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.65 2003/07/21 20:29:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -52,8 +52,10 @@ index_formtuple(TupleDesc tupleDescriptor,
#endif
if (numberOfAttributes > INDEX_MAX_KEYS)
- elog(ERROR, "index_formtuple: numberOfAttributes %d > %d",
- numberOfAttributes, INDEX_MAX_KEYS);
+ ereport(ERROR,
+ (errcode(ERRCODE_TOO_MANY_COLUMNS),
+ errmsg("number of index attributes %d exceeds limit, %d",
+ numberOfAttributes, INDEX_MAX_KEYS)));
#ifdef TOAST_INDEX_HACK
for (i = 0; i < numberOfAttributes; i++)
@@ -158,8 +160,11 @@ index_formtuple(TupleDesc tupleDescriptor,
* it in t_info.
*/
if ((size & INDEX_SIZE_MASK) != size)
- elog(ERROR, "index_formtuple: data takes %lu bytes, max is %d",
- (unsigned long) size, INDEX_SIZE_MASK);
+ ereport(ERROR,
+ (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+ errmsg("index tuple requires %lu bytes, maximum size is %lu",
+ (unsigned long) size,
+ (unsigned long) INDEX_SIZE_MASK)));
infomask |= size;