Error message editing in backend/utils (except /adt).

3 files changed, 52 insertions, 35 deletions

diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index e210e42049a..aea4ee09a7e 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.49 2002/12/15 21:01:34 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.50 2003/07/25 20:17:56 tgl Exp $
  *
  * NOTE:
  *	This is a new (Feb. 05, 1999) implementation of the allocation set
@@ -330,8 +330,11 @@ AllocSetContextCreate(MemoryContext parent,
 		if (block == NULL)
 		{
 			MemoryContextStats(TopMemoryContext);
-			elog(ERROR, "Memory exhausted in AllocSetContextCreate(%lu)",
-				 (unsigned long) minContextSize);
+			ereport(ERROR,
+					(errcode(ERRCODE_OUT_OF_MEMORY),
+					 errmsg("out of memory"),
+					 errdetail("Failed while creating memory context \"%s\".",
+							   name)));
 		}
 		block->aset = context;
 		block->freeptr = ((char *) block) + ALLOC_BLOCKHDRSZ;
@@ -493,8 +496,11 @@ AllocSetAlloc(MemoryContext context, Size size)
 		if (block == NULL)
 		{
 			MemoryContextStats(TopMemoryContext);
-			elog(ERROR, "Memory exhausted in AllocSetAlloc(%lu)",
-				 (unsigned long) size);
+			ereport(ERROR,
+					(errcode(ERRCODE_OUT_OF_MEMORY),
+					 errmsg("out of memory"),
+					 errdetail("Failed on request of size %lu.",
+							   (unsigned long) size)));
 		}
 		block->aset = set;
 		block->freeptr = block->endptr = ((char *) block) + blksize;
@@ -690,8 +696,11 @@ AllocSetAlloc(MemoryContext context, Size size)
 		if (block == NULL)
 		{
 			MemoryContextStats(TopMemoryContext);
-			elog(ERROR, "Memory exhausted in AllocSetAlloc(%lu)",
-				 (unsigned long) size);
+			ereport(ERROR,
+					(errcode(ERRCODE_OUT_OF_MEMORY),
+					 errmsg("out of memory"),
+					 errdetail("Failed on request of size %lu.",
+							   (unsigned long) size)));
 		}
 
 		block->aset = set;
@@ -754,7 +763,7 @@ AllocSetFree(MemoryContext context, void *pointer)
 	/* Test for someone scribbling on unused space in chunk */
 	if (chunk->requested_size < chunk->size)
 		if (((char *) pointer)[chunk->requested_size] != 0x7E)
-			elog(WARNING, "AllocSetFree: detected write past chunk end in %s %p",
+			elog(WARNING, "detected write past chunk end in %s %p",
 				 set->header.name, chunk);
 #endif
 
@@ -775,8 +784,7 @@ AllocSetFree(MemoryContext context, void *pointer)
 			block = block->next;
 		}
 		if (block == NULL)
-			elog(ERROR, "AllocSetFree: cannot find block containing chunk %p",
-				 chunk);
+			elog(ERROR, "could not find block containing chunk %p", chunk);
 		/* let's just make sure chunk is the only one in the block */
 		Assert(block->freeptr == ((char *) block) +
 			   (chunk->size + ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ));
@@ -829,7 +837,7 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 	/* Test for someone scribbling on unused space in chunk */
 	if (chunk->requested_size < oldsize)
 		if (((char *) pointer)[chunk->requested_size] != 0x7E)
-			elog(WARNING, "AllocSetRealloc: detected write past chunk end in %s %p",
+			elog(WARNING, "detected write past chunk end in %s %p",
 				 set->header.name, chunk);
 #endif
 
@@ -869,8 +877,7 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 			block = block->next;
 		}
 		if (block == NULL)
-			elog(ERROR, "AllocSetRealloc: cannot find block containing chunk %p",
-				 chunk);
+			elog(ERROR, "could not find block containing chunk %p", chunk);
 		/* let's just make sure chunk is the only one in the block */
 		Assert(block->freeptr == ((char *) block) +
 			   (chunk->size + ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ));
@@ -882,8 +889,11 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 		if (block == NULL)
 		{
 			MemoryContextStats(TopMemoryContext);
-			elog(ERROR, "Memory exhausted in AllocSetReAlloc(%lu)",
-				 (unsigned long) size);
+			ereport(ERROR,
+					(errcode(ERRCODE_OUT_OF_MEMORY),
+					 errmsg("out of memory"),
+					 errdetail("Failed on request of size %lu.",
+							   (unsigned long) size)));
 		}
 		block->freeptr = block->endptr = ((char *) block) + blksize;
 
@@ -1052,7 +1062,7 @@ AllocSetCheck(MemoryContext context)
 		if (!blk_used)
 		{
 			if (set->keeper != block)
-				elog(WARNING, "AllocSetCheck: %s: empty block %p",
+				elog(WARNING, "problem in alloc set %s: empty block %p",
 					 name, block);
 		}
 
@@ -1074,16 +1084,16 @@ AllocSetCheck(MemoryContext context)
 			 * Check chunk size
 			 */
 			if (dsize > chsize)
-				elog(WARNING, "AllocSetCheck: %s: req size > alloc size for chunk %p in block %p",
+				elog(WARNING, "problem in alloc set %s: req size > alloc size for chunk %p in block %p",
 					 name, chunk, block);
 			if (chsize < (1 << ALLOC_MINBITS))
-				elog(WARNING, "AllocSetCheck: %s: bad size %lu for chunk %p in block %p",
+				elog(WARNING, "problem in alloc set %s: bad size %lu for chunk %p in block %p",
 					 name, (unsigned long) chsize, chunk, block);
 
 			/* single-chunk block? */
 			if (chsize > ALLOC_CHUNK_LIMIT &&
 				chsize + ALLOC_CHUNKHDRSZ != blk_used)
-				elog(WARNING, "AllocSetCheck: %s: bad single-chunk %p in block %p",
+				elog(WARNING, "problem in alloc set %s: bad single-chunk %p in block %p",
 					 name, chunk, block);
 
 			/*
@@ -1092,14 +1102,14 @@ AllocSetCheck(MemoryContext context)
 			 * check as easily...)
 			 */
 			if (dsize > 0 && chunk->aset != (void *) set)
-				elog(WARNING, "AllocSetCheck: %s: bogus aset link in block %p, chunk %p",
+				elog(WARNING, "problem in alloc set %s: bogus aset link in block %p, chunk %p",
 					 name, block, chunk);
 
 			/*
 			 * Check for overwrite of "unallocated" space in chunk
 			 */
 			if (dsize > 0 && dsize < chsize && *chdata_end != 0x7E)
-				elog(WARNING, "AllocSetCheck: %s: detected write past chunk end in block %p, chunk %p",
+				elog(WARNING, "problem in alloc set %s: detected write past chunk end in block %p, chunk %p",
 					 name, block, chunk);
 
 			blk_data += chsize;
@@ -1109,7 +1119,7 @@ AllocSetCheck(MemoryContext context)
 		}
 
 		if ((blk_data + (nchunks * ALLOC_CHUNKHDRSZ)) != blk_used)
-			elog(WARNING, "AllocSetCheck: %s: found inconsistent memory block %p",
+			elog(WARNING, "problem in alloc set %s: found inconsistent memory block %p",
 				 name, block);
 	}
 }
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index ba4c48f71ba..6055fe5278e 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.40 2003/05/02 20:54:35 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.41 2003/07/25 20:17:56 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -385,7 +385,7 @@ MemoryContextContains(MemoryContext context, void *pointer)
  *		pointer will ordinarily point to statically allocated data).
  *		The parent and name parameters usually come from the caller.
  *	2.	MemoryContextCreate() attempts to allocate the context node,
- *		plus space for the name.  If this fails we can elog() with no
+ *		plus space for the name.  If this fails we can ereport() with no
  *		damage done.
  *	3.	We fill in all of the type-independent MemoryContext fields.
  *	4.	We call the type-specific init routine (using the methods pointer).
@@ -478,7 +478,7 @@ MemoryContextAlloc(MemoryContext context, Size size)
 	AssertArg(MemoryContextIsValid(context));
 
 	if (!AllocSizeIsValid(size))
-		elog(ERROR, "MemoryContextAlloc: invalid request size %lu",
+		elog(ERROR, "invalid memory alloc request size %lu",
 			 (unsigned long) size);
 
 	return (*context->methods->alloc) (context, size);
@@ -499,7 +499,7 @@ MemoryContextAllocZero(MemoryContext context, Size size)
 	AssertArg(MemoryContextIsValid(context));
 
 	if (!AllocSizeIsValid(size))
-		elog(ERROR, "MemoryContextAlloc: invalid request size %lu",
+		elog(ERROR, "invalid memory alloc request size %lu",
 			 (unsigned long) size);
 
 	ret = (*context->methods->alloc) (context, size);
@@ -524,7 +524,7 @@ MemoryContextAllocZeroAligned(MemoryContext context, Size size)
 	AssertArg(MemoryContextIsValid(context));
 
 	if (!AllocSizeIsValid(size))
-		elog(ERROR, "MemoryContextAlloc: invalid request size %lu",
+		elog(ERROR, "invalid memory alloc request size %lu",
 			 (unsigned long) size);
 
 	ret = (*context->methods->alloc) (context, size);
@@ -588,7 +588,7 @@ repalloc(void *pointer, Size size)
 	AssertArg(MemoryContextIsValid(header->context));
 
 	if (!AllocSizeIsValid(size))
-		elog(ERROR, "repalloc: invalid request size %lu",
+		elog(ERROR, "invalid memory alloc request size %lu",
 			 (unsigned long) size);
 
 	return (*header->context->methods->realloc) (header->context,
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index fc42c0b52c8..918d03fb908 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.58 2003/05/06 20:26:27 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.59 2003/07/25 20:17:56 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -70,9 +70,11 @@ do { \
 	hentry = (PortalHashEnt*)hash_search(PortalHashTable, \
 										 key, HASH_ENTER, &found); \
 	if (hentry == NULL) \
-		elog(ERROR, "out of memory in PortalHashTable"); \
+		ereport(ERROR, \
+				(errcode(ERRCODE_OUT_OF_MEMORY), \
+				 errmsg("out of memory"))); \
 	if (found) \
-		elog(WARNING, "trying to insert a portal name that exists."); \
+		elog(ERROR, "duplicate portal name"); \
 	hentry->portal = PORTAL; \
 	/* To avoid duplicate storage, make PORTAL->name point to htab entry */ \
 	PORTAL->name = hentry->portalname; \
@@ -87,7 +89,7 @@ do { \
 	hentry = (PortalHashEnt*)hash_search(PortalHashTable, \
 										 key, HASH_REMOVE, NULL); \
 	if (hentry == NULL) \
-		elog(WARNING, "trying to delete portal name that does not exist."); \
+		elog(WARNING, "trying to delete portal name that does not exist"); \
 } while(0)
 
 static MemoryContext PortalMemory = NULL;
@@ -163,9 +165,14 @@ CreatePortal(const char *name, bool allowDup, bool dupSilent)
 	if (PortalIsValid(portal))
 	{
 		if (!allowDup)
-			elog(ERROR, "Portal \"%s\" already exists", name);
+			ereport(ERROR,
+					(errcode(ERRCODE_DUPLICATE_CURSOR),
+					 errmsg("portal \"%s\" already exists", name)));
 		if (!dupSilent)
-			elog(WARNING, "Closing pre-existing portal \"%s\"", name);
+			ereport(WARNING,
+					(errcode(ERRCODE_DUPLICATE_CURSOR),
+					 errmsg("closing pre-existing portal \"%s\"",
+							name)));
 		PortalDrop(portal, false);
 	}
 
@@ -295,7 +302,7 @@ PortalDrop(Portal portal, bool isError)
 
 	/* Not sure if this case can validly happen or not... */
 	if (portal->portalActive)
-		elog(ERROR, "PortalDrop: can't drop active portal");
+		elog(ERROR, "cannot drop active portal");
 
 	/*
 	 * Remove portal from hash table.  Because we do this first, we will