Convert oidvector and int2vector into variable-length arrays. This

change saves a great deal of space in pg_proc and its primary index,
and it eliminates the former requirement that INDEX_MAX_KEYS and
FUNC_MAX_ARGS have the same value.  INDEX_MAX_KEYS is still embedded
in the on-disk representation (because it affects index tuple header
size), but FUNC_MAX_ARGS is not.  I believe it would now be possible
to increase FUNC_MAX_ARGS at little cost, but haven't experimented yet.
There are still a lot of vestigial references to FUNC_MAX_ARGS, which
I will clean up in a separate pass.  However, getting rid of it
altogether would require changing the FunctionCallInfoData struct,
and I'm not sure I want to buy into that.

Author: tglsfdc

contrib/dblink/dblink.c

@@ -74,13 +74,13 @@ static HTAB *createConnHash(void);
 static void createNewConnection(const char *name, remoteConn * con);
 static void deleteConnection(const char *name);
 static char **get_pkey_attnames(Oid relid, int16 *numatts);
-static char *get_sql_insert(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals);
-static char *get_sql_delete(Oid relid, int16 *pkattnums, int16 pknumatts, char **tgt_pkattvals);
-static char *get_sql_update(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals);
+static char *get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals);
+static char *get_sql_delete(Oid relid, int2vector *pkattnums, int16 pknumatts, char **tgt_pkattvals);
+static char *get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals);
 static char *quote_literal_cstr(char *rawstr);
 static char *quote_ident_cstr(char *rawstr);
-static int16 get_attnum_pk_pos(int16 *pkattnums, int16 pknumatts, int16 key);
-static HeapTuple get_tuple_of_interest(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals);
+static int16 get_attnum_pk_pos(int2vector *pkattnums, int16 pknumatts, int16 key);
+static HeapTuple get_tuple_of_interest(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals);
 static Oid	get_relid_from_relname(text *relname_text);
 static char *generate_relation_name(Oid relid);
 
@@ -1094,7 +1094,7 @@ dblink_build_sql_insert(PG_FUNCTION_ARGS)
 {
 	Oid			relid;
 	text	   *relname_text;
-	int16	   *pkattnums;
+	int2vector *pkattnums;
 	int			pknumatts_tmp;
 	int16		pknumatts = 0;
 	char	  **src_pkattvals;
@@ -1126,7 +1126,7 @@ dblink_build_sql_insert(PG_FUNCTION_ARGS)
 				 errmsg("relation \"%s\" does not exist",
 						GET_STR(relname_text))));
 
-	pkattnums = (int16 *) PG_GETARG_POINTER(1);
+	pkattnums = (int2vector *) PG_GETARG_POINTER(1);
 	pknumatts_tmp = PG_GETARG_INT32(2);
 	if (pknumatts_tmp <= SHRT_MAX)
 		pknumatts = pknumatts_tmp;
@@ -1246,7 +1246,7 @@ dblink_build_sql_delete(PG_FUNCTION_ARGS)
 {
 	Oid			relid;
 	text	   *relname_text;
-	int16	   *pkattnums;
+	int2vector *pkattnums;
 	int			pknumatts_tmp;
 	int16		pknumatts = 0;
 	char	  **tgt_pkattvals;
@@ -1273,7 +1273,7 @@ dblink_build_sql_delete(PG_FUNCTION_ARGS)
 				 errmsg("relation \"%s\" does not exist",
 						GET_STR(relname_text))));
 
-	pkattnums = (int16 *) PG_GETARG_POINTER(1);
+	pkattnums = (int2vector *) PG_GETARG_POINTER(1);
 	pknumatts_tmp = PG_GETARG_INT32(2);
 	if (pknumatts_tmp <= SHRT_MAX)
 		pknumatts = pknumatts_tmp;
@@ -1363,7 +1363,7 @@ dblink_build_sql_update(PG_FUNCTION_ARGS)
 {
 	Oid			relid;
 	text	   *relname_text;
-	int16	   *pkattnums;
+	int2vector *pkattnums;
 	int			pknumatts_tmp;
 	int16		pknumatts = 0;
 	char	  **src_pkattvals;
@@ -1395,7 +1395,7 @@ dblink_build_sql_update(PG_FUNCTION_ARGS)
 				 errmsg("relation \"%s\" does not exist",
 						GET_STR(relname_text))));
 
-	pkattnums = (int16 *) PG_GETARG_POINTER(1);
+	pkattnums = (int2vector *) PG_GETARG_POINTER(1);
 	pknumatts_tmp = PG_GETARG_INT32(2);
 	if (pknumatts_tmp <= SHRT_MAX)
 		pknumatts = pknumatts_tmp;
@@ -1552,16 +1552,13 @@ get_pkey_attnames(Oid relid, int16 *numatts)
 		/* we're only interested if it is the primary key */
 		if (index->indisprimary == TRUE)
 		{
-			i = 0;
-			while (index->indkey[i++] != 0)
-				(*numatts)++;
-
+			*numatts = index->indnatts;
 			if (*numatts > 0)
 			{
 				result = (char **) palloc(*numatts * sizeof(char *));
 
 				for (i = 0; i < *numatts; i++)
-					result[i] = SPI_fname(tupdesc, index->indkey[i]);
+					result[i] = SPI_fname(tupdesc, index->indkey.values[i]);
 			}
 			break;
 		}
@@ -1574,7 +1571,7 @@ get_pkey_attnames(Oid relid, int16 *numatts)
 }
 
 static char *
-get_sql_insert(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals)
+get_sql_insert(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals)
 {
 	Relation	rel;
 	char	   *relname;
@@ -1664,7 +1661,7 @@ get_sql_insert(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattval
 }
 
 static char *
-get_sql_delete(Oid relid, int16 *pkattnums, int16 pknumatts, char **tgt_pkattvals)
+get_sql_delete(Oid relid, int2vector *pkattnums, int16 pknumatts, char **tgt_pkattvals)
 {
 	Relation	rel;
 	char	   *relname;
@@ -1688,7 +1685,7 @@ get_sql_delete(Oid relid, int16 *pkattnums, int16 pknumatts, char **tgt_pkattval
 	appendStringInfo(str, "DELETE FROM %s WHERE ", relname);
 	for (i = 0; i < pknumatts; i++)
 	{
-		int16		pkattnum = pkattnums[i];
+		int16		pkattnum = pkattnums->values[i];
 
 		if (i > 0)
 			appendStringInfo(str, " AND ");
@@ -1720,7 +1717,7 @@ get_sql_delete(Oid relid, int16 *pkattnums, int16 pknumatts, char **tgt_pkattval
 }
 
 static char *
-get_sql_update(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals)
+get_sql_update(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals)
 {
 	Relation	rel;
 	char	   *relname;
@@ -1788,7 +1785,7 @@ get_sql_update(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattval
 
 	for (i = 0; i < pknumatts; i++)
 	{
-		int16		pkattnum = pkattnums[i];
+		int16		pkattnum = pkattnums->values[i];
 
 		if (i > 0)
 			appendStringInfo(str, " AND ");
@@ -1855,22 +1852,22 @@ quote_ident_cstr(char *rawstr)
 }
 
 static int16
-get_attnum_pk_pos(int16 *pkattnums, int16 pknumatts, int16 key)
+get_attnum_pk_pos(int2vector *pkattnums, int16 pknumatts, int16 key)
 {
 	int			i;
 
 	/*
 	 * Not likely a long list anyway, so just scan for the value
 	 */
 	for (i = 0; i < pknumatts; i++)
-		if (key == pkattnums[i])
+		if (key == pkattnums->values[i])
 			return i;
 
 	return -1;
 }
 
 static HeapTuple
-get_tuple_of_interest(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals)
+get_tuple_of_interest(Oid relid, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals)
 {
 	Relation	rel;
 	char	   *relname;
@@ -1907,7 +1904,7 @@ get_tuple_of_interest(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_p
 
 	for (i = 0; i < pknumatts; i++)
 	{
-		int16		pkattnum = pkattnums[i];
+		int16		pkattnum = pkattnums->values[i];
 
 		if (i > 0)
 			appendStringInfo(str, " AND ");

contrib/dbmirror/pending.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * pending.c
- * $Id: pending.c,v 1.20 2004/09/10 04:31:06 neilc Exp $
- * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.20 2004/09/10 04:31:06 neilc Exp $
+ * $Id: pending.c,v 1.21 2005/03/29 00:16:48 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.21 2005/03/29 00:16:48 tgl Exp $
  *
  * This file contains a trigger for Postgresql-7.x to record changes to tables
  * to a pending table for mirroring.
@@ -349,8 +349,8 @@ getPrimaryKey(Oid tblOid)
 	resDatum = SPI_getbinval(resTuple, SPI_tuptable->tupdesc, 1, &isNull);
 
 	tpResultKey = (int2vector *) DatumGetPointer(resDatum);
-	resultKey = SPI_palloc(sizeof(int2vector));
-	memcpy(resultKey, tpResultKey, sizeof(int2vector));
+	resultKey = SPI_palloc(VARSIZE(tpResultKey));
+	memcpy(resultKey, tpResultKey, VARSIZE(tpResultKey));
 
 	return resultKey;
 }
@@ -438,11 +438,8 @@ packageData(HeapTuple tTupleData, TupleDesc tTupleDesc, Oid tableOid,
 	}
 
 	if (tpPKeys != NULL)
-	{
 		debug_msg("dbmirror:packageData have primary keys");
 
-	}
-
 	cpDataBlock = SPI_palloc(BUFFER_SIZE);
 	iDataBlockSize = BUFFER_SIZE;
 	iUsedDataBlock = 0;			/* To account for the null */
@@ -462,11 +459,10 @@ packageData(HeapTuple tTupleData, TupleDesc tTupleDesc, Oid tableOid,
 			/* Determine if this is a primary key or not. */
 			iIsPrimaryKey = 0;
 			for (iPrimaryKeyIndex = 0;
-				 (*tpPKeys)[iPrimaryKeyIndex] != 0;
+				 iPrimaryKeyIndex < tpPKeys->dim1;
 				 iPrimaryKeyIndex++)
 			{
-				if ((*tpPKeys)[iPrimaryKeyIndex]
-					== iColumnCounter)
+				if (tpPKeys->values[iPrimaryKeyIndex] == iColumnCounter)
 				{
 					iIsPrimaryKey = 1;
 					break;

doc/src/sgml/catalogs.sgml

@@ -1,6 +1,6 @@
 <!--
  Documentation of the system catalogs, directed toward PostgreSQL developers
- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.97 2005/03/27 23:52:51 tgl Exp $
+ $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.98 2005/03/29 00:16:49 tgl Exp $
  -->
 
 <chapter id="catalogs">
@@ -2007,32 +2007,6 @@
       <entry>The OID of the <structname>pg_class</> entry for the table this index is for</entry>
      </row>
 
-     <row>
-      <entry><structfield>indkey</structfield></entry>
-      <entry><type>int2vector</type></entry>
-      <entry><literal><link linkend="catalog-pg-attribute"><structname>pg_attribute</structname></link>.attnum</literal></entry>
-      <entry>
-       This is an array of <structfield>indnatts</structfield> (up to
-       <symbol>INDEX_MAX_KEYS</symbol>) values that indicate which
-       table columns this index indexes.  For example a value of
-       <literal>1 3</literal> would mean that the first and the third table
-       columns make up the index key.  A zero in this array indicates that the
-       corresponding index attribute is an expression over the table columns,
-       rather than a simple column reference.
-      </entry>
-     </row>
-
-     <row>
-      <entry><structfield>indclass</structfield></entry>
-      <entry><type>oidvector</type></entry>
-      <entry><literal><link linkend="catalog-pg-opclass"><structname>pg_opclass</structname></link>.oid</literal></entry>
-      <entry>
-       For each column in the index key this contains the OID of
-       the operator class to use.  See
-       <structname>pg_opclass</structname> for details.
-      </entry>
-     </row>
-
      <row>
       <entry><structfield>indnatts</structfield></entry>
       <entry><type>int2</type></entry>
@@ -2063,6 +2037,31 @@
       <entry>If true, the table was last clustered on this index.</entry>
      </row>
 
+     <row>
+      <entry><structfield>indkey</structfield></entry>
+      <entry><type>int2vector</type></entry>
+      <entry><literal><link linkend="catalog-pg-attribute"><structname>pg_attribute</structname></link>.attnum</literal></entry>
+      <entry>
+       This is an array of <structfield>indnatts</structfield> values that
+       indicate which table columns this index indexes.  For example a value
+       of <literal>1 3</literal> would mean that the first and the third table
+       columns make up the index key.  A zero in this array indicates that the
+       corresponding index attribute is an expression over the table columns,
+       rather than a simple column reference.
+      </entry>
+     </row>
+
+     <row>
+      <entry><structfield>indclass</structfield></entry>
+      <entry><type>oidvector</type></entry>
+      <entry><literal><link linkend="catalog-pg-opclass"><structname>pg_opclass</structname></link>.oid</literal></entry>
+      <entry>
+       For each column in the index key this contains the OID of
+       the operator class to use.  See
+       <structname>pg_opclass</structname> for details.
+      </entry>
+     </row>
+
      <row>
       <entry><structfield>indexprs</structfield></entry>
       <entry><type>text</type></entry>
@@ -3637,7 +3636,7 @@
        (<structfield>typlen</structfield> = -1),
        but some fixed-length (<structfield>typlen</structfield> &gt; 0) types
        also have nonzero <structfield>typelem</structfield>, for example
-       <type>name</type> and <type>oidvector</type>.
+       <type>name</type> and <type>point</type>.
        If a fixed-length type has a <structfield>typelem</structfield> then
        its internal representation must be some number of values of the
        <structfield>typelem</structfield> data type with no other data.

doc/src/sgml/trigger.sgml

@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.41 2005/01/22 22:56:36 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.42 2005/03/29 00:16:49 tgl Exp $
 -->
 
  <chapter id="triggers">
@@ -453,7 +453,8 @@ typedef struct Trigger
     bool        tgdeferrable;
     bool        tginitdeferred;
     int16       tgnargs;
-    int16       tgattr[FUNC_MAX_ARGS];
+    int16       tgnattr;
+    int16      *tgattr;
     char      **tgargs;
 } Trigger;
 </programlisting>

src/backend/access/hash/hashfunc.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hashfunc.c,v 1.42 2004/12/31 21:59:13 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hashfunc.c,v 1.43 2005/03/29 00:16:50 tgl Exp $
  *
  * NOTES
  *	  These functions are stored in pg_amproc.	For each operator class
@@ -107,17 +107,17 @@ hashfloat8(PG_FUNCTION_ARGS)
 Datum
 hashoidvector(PG_FUNCTION_ARGS)
 {
-	Oid		   *key = (Oid *) PG_GETARG_POINTER(0);
+	oidvector  *key = (oidvector *) PG_GETARG_POINTER(0);
 
-	return hash_any((unsigned char *) key, INDEX_MAX_KEYS * sizeof(Oid));
+	return hash_any((unsigned char *) key->values, key->dim1 * sizeof(Oid));
 }
 
 Datum
 hashint2vector(PG_FUNCTION_ARGS)
 {
-	int16	   *key = (int16 *) PG_GETARG_POINTER(0);
+	int2vector *key = (int2vector *) PG_GETARG_POINTER(0);
 
-	return hash_any((unsigned char *) key, INDEX_MAX_KEYS * sizeof(int16));
+	return hash_any((unsigned char *) key->values, key->dim1 * sizeof(int2));
 }
 
 Datum

src/backend/access/index/genam.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.45 2005/03/27 23:52:59 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.46 2005/03/29 00:16:51 tgl Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -219,7 +219,7 @@ systable_beginscan(Relation heapRelation,
 		 */
 		for (i = 0; i < nkeys; i++)
 		{
-			Assert(key[i].sk_attno == irel->rd_index->indkey[i]);
+			Assert(key[i].sk_attno == irel->rd_index->indkey.values[i]);
 			key[i].sk_attno = i + 1;
 		}