summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/utils/excid.h4
-rw-r--r--src/include/utils/memutils.h9
2 files changed, 6 insertions, 7 deletions
diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h
index 88ba06dc2a8..d1bbcbb21bd 100644
--- a/src/include/utils/excid.h
+++ b/src/include/utils/excid.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: excid.h,v 1.8 2001/01/24 19:43:28 momjian Exp $
+ * $Id: excid.h,v 1.9 2001/02/06 01:53:52 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,8 +18,6 @@
extern Exception FailedAssertion;
extern Exception BadState;
extern Exception BadArg;
-extern Exception BadAllocSize;
-extern Exception ExhaustedMemory;
extern Exception Unimplemented;
extern Exception CatalogFailure;/* XXX inconsistent naming style */
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 28cf6b33549..7ba0719dcb5 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -10,7 +10,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: memutils.h,v 1.41 2001/01/24 19:43:28 momjian Exp $
+ * $Id: memutils.h,v 1.42 2001/02/06 01:53:52 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,16 +22,17 @@
/*
* MaxAllocSize
- * Arbitrary limit on size of allocations.
+ * Quasi-arbitrary limit on size of allocations.
*
* Note:
* There is no guarantee that allocations smaller than MaxAllocSize
* will succeed. Allocation requests larger than MaxAllocSize will
* be summarily denied.
*
- * XXX This should be defined in a file of tunable constants.
+ * XXX This is deliberately chosen to correspond to the limiting size
+ * of varlena objects under TOAST. See VARATT_MASK_SIZE in postgres.h.
*/
-#define MaxAllocSize ((Size) 0xfffffff) /* 16G - 1 */
+#define MaxAllocSize ((Size) 0x3fffffff) /* 1 gigabyte - 1 */
#define AllocSizeIsValid(size) (0 < (size) && (size) <= MaxAllocSize)