diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/pg_control.h | 4 | ||||
| -rw-r--r-- | src/include/pg_config_manual.h | 24 |
2 files changed, 19 insertions, 9 deletions
diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index 1335546fe0e..83573334fc5 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.19 2004/12/31 22:03:24 pgsql Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.20 2005/03/29 03:01:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -116,7 +116,7 @@ typedef struct ControlFileData uint32 xlog_seg_size; /* size of each WAL segment */ uint32 nameDataLen; /* catalog name field width */ - uint32 funcMaxArgs; /* maximum number of function arguments */ + uint32 indexMaxKeys; /* max number of columns in an index */ /* flag indicating internal format of timestamp, interval, time */ uint32 enableIntTimes; /* int64 storage enabled? */ diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index 040651fcb17..b36714b87bd 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -6,7 +6,7 @@ * for developers. If you edit any of these, be sure to do a *full* * rebuild (and an initdb if noted). * - * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.15 2004/09/10 14:27:37 momjian Exp $ + * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.16 2005/03/29 03:01:32 tgl Exp $ *------------------------------------------------------------------------ */ @@ -52,17 +52,27 @@ #define XLOG_SEG_SIZE (16*1024*1024) /* - * Maximum number of columns in an index and maximum number of - * arguments to a function. They must be the same value. + * Maximum number of arguments to a function. * * The minimum value is 8 (index creation uses 8-argument functions). - * There is no specific upper limit, although large values will waste - * system-table space and processing time. + * The maximum possible value is around 600 (limited by index tuple size in + * pg_proc's index; BLCKSZ larger than 8K would allow more). Values larger + * than needed will waste memory and processing time, but do not directly + * cost disk space. * - * Changing these requires an initdb. + * Changing this does not require an initdb, but it does require a full + * backend recompile (including any user-defined C functions). + */ +#define FUNC_MAX_ARGS 100 + +/* + * Maximum number of columns in an index. There is little point in making + * this anything but a multiple of 32, because the main cost is associated + * with index tuple header size (see access/itup.h). + * + * Changing this requires an initdb. */ #define INDEX_MAX_KEYS 32 -#define FUNC_MAX_ARGS INDEX_MAX_KEYS /* * Define this to make libpgtcl's "pg_result -assign" command process |