Infrastructure for I/O of composite types: arrange for the I/O routines

of a composite type to get that type's OID as their second parameter,
in place of typelem which is useless.  The actual changes are mostly
centralized in getTypeInputInfo and siblings, but I had to fix a few
places that were fetching pg_type.typelem for themselves instead of
using the lsyscache.c routines.  Also, I renamed all the related variables
from 'typelem' to 'typioparam' to discourage people from assuming that
they necessarily contain array element types.

Author: tglsfdc

doc/src/sgml/ref/create_type.sgml

@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_type.sgml,v 1.50 2004/05/16 23:22:07 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_type.sgml,v 1.51 2004/06/06 00:41:25 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -102,13 +102,15 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> (
    or as taking three arguments of types
    <type>cstring</type>, <type>oid</type>, <type>integer</type>.
    The first argument is the input text as a C string, the second
-   argument is the element type in case this is an array type,
+   argument is the element type's OID in case this is an array type
+   (or the type's own OID for a composite type),
    and the third is the <literal>typmod</> of the destination column, if known.
    The input function should return a value of the data type itself.
    The output function may be
    declared as taking one argument of the new data type,  or as taking
    two arguments of which the second is type <type>oid</type>.
-   The second argument is again the array element type for array types.
+   The second argument is again the array element type OID for array types
+   or the type OID for composite types.
    The output function should return type <type>cstring</type>.
   </para>
 
@@ -128,14 +130,16 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> (
    and <type>oid</type>.  It must return a value of the data type itself.
    (The first argument is a pointer to a <type>StringInfo</type> buffer
    holding the received byte string; the optional second argument is the
-   element type in case this is an array type.)  Similarly, the optional
+   element type OID in case this is an array type, or the type's own OID for a
+   composite type.)  Similarly, the optional
    <replaceable class="parameter">send_function</replaceable> converts
    from the internal representation to the external binary representation.
    If this function is not supplied, the type cannot participate in binary
    output.  The send function may be
    declared as taking one argument of the new data type,  or as taking
    two arguments of which the second is type <type>oid</type>.
-   The second argument is again the array element type for array types.
+   The second argument is again the array element type OID for array types
+   or the type OID for composite types.
    The send function must return type <type>bytea</type>.
   </para>
 

src/backend/access/common/printtup.c

@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/common/printtup.c,v 1.82 2004/06/04 20:35:21 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/common/printtup.c,v 1.83 2004/06/06 00:41:25 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,7 +51,7 @@ typedef struct
 {								/* Per-attribute information */
 	Oid			typoutput;		/* Oid for the type's text output fn */
 	Oid			typsend;		/* Oid for the type's binary output fn */
-	Oid			typelem;		/* typelem value to pass to the output fn */
+	Oid			typioparam;		/* param to pass to the output fn */
 	bool		typisvarlena;	/* is it varlena (ie possibly toastable)? */
 	int16		format;			/* format code for this column */
 	FmgrInfo	finfo;			/* Precomputed call info for output fn */
@@ -278,15 +278,15 @@ printtup_prepare_info(DR_printtup *myState, TupleDesc typeinfo, int numAttrs)
 		{
 			getTypeOutputInfo(typeinfo->attrs[i]->atttypid,
 							  &thisState->typoutput,
-							  &thisState->typelem,
+							  &thisState->typioparam,
 							  &thisState->typisvarlena);
 			fmgr_info(thisState->typoutput, &thisState->finfo);
 		}
 		else if (format == 1)
 		{
 			getTypeBinaryOutputInfo(typeinfo->attrs[i]->atttypid,
 									&thisState->typsend,
-									&thisState->typelem,
+									&thisState->typioparam,
 									&thisState->typisvarlena);
 			fmgr_info(thisState->typsend, &thisState->finfo);
 		}
@@ -356,7 +356,7 @@ printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 
 			outputstr = DatumGetCString(FunctionCall3(&thisState->finfo,
 													  attr,
-									ObjectIdGetDatum(thisState->typelem),
+									ObjectIdGetDatum(thisState->typioparam),
 						  Int32GetDatum(typeinfo->attrs[i]->atttypmod)));
 			pq_sendcountedtext(&buf, outputstr, strlen(outputstr), false);
 			pfree(outputstr);
@@ -368,7 +368,7 @@ printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 
 			outputbytes = DatumGetByteaP(FunctionCall2(&thisState->finfo,
 													   attr,
-								  ObjectIdGetDatum(thisState->typelem)));
+								  ObjectIdGetDatum(thisState->typioparam)));
 			/* We assume the result will not have been toasted */
 			pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4);
 			pq_sendbytes(&buf, VARDATA(outputbytes),
@@ -458,7 +458,7 @@ printtup_20(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 
 		outputstr = DatumGetCString(FunctionCall3(&thisState->finfo,
 												  attr,
-									ObjectIdGetDatum(thisState->typelem),
+									ObjectIdGetDatum(thisState->typioparam),
 						  Int32GetDatum(typeinfo->attrs[i]->atttypmod)));
 		pq_sendcountedtext(&buf, outputstr, strlen(outputstr), true);
 		pfree(outputstr);
@@ -557,7 +557,7 @@ debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 	char	   *value;
 	bool		isnull;
 	Oid			typoutput,
-				typelem;
+				typioparam;
 	bool		typisvarlena;
 
 	for (i = 0; i < natts; ++i)
@@ -566,7 +566,7 @@ debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 		if (isnull)
 			continue;
 		getTypeOutputInfo(typeinfo->attrs[i]->atttypid,
-						  &typoutput, &typelem, &typisvarlena);
+						  &typoutput, &typioparam, &typisvarlena);
 
 		/*
 		 * If we have a toasted datum, forcibly detoast it here to avoid
@@ -579,7 +579,7 @@ debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 
 		value = DatumGetCString(OidFunctionCall3(typoutput,
 												 attr,
-											   ObjectIdGetDatum(typelem),
+											   ObjectIdGetDatum(typioparam),
 						  Int32GetDatum(typeinfo->attrs[i]->atttypmod)));
 
 		printatt((unsigned) i + 1, typeinfo->attrs[i], value);
@@ -672,7 +672,7 @@ printtup_internal_20(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self)
 
 		outputbytes = DatumGetByteaP(FunctionCall2(&thisState->finfo,
 												   attr,
-								  ObjectIdGetDatum(thisState->typelem)));
+								  ObjectIdGetDatum(thisState->typioparam)));
 		/* We assume the result will not have been toasted */
 		pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4);
 		pq_sendbytes(&buf, VARDATA(outputbytes),

src/backend/bootstrap/bootstrap.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.183 2004/06/03 02:08:02 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.184 2004/06/06 00:41:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -803,61 +803,71 @@ InsertOneTuple(Oid objectid)
 void
 InsertOneValue(char *value, int i)
 {
-	int			typeindex;
+	Oid			typoid;
+	Oid			typioparam;
+	Oid			typinput;
+	Oid			typoutput;
 	char	   *prt;
-	struct typmap **app;
 
 	AssertArg(i >= 0 || i < MAXATTR);
 
 	elog(DEBUG4, "inserting column %d value \"%s\"", i, value);
 
 	if (Typ != NULL)
 	{
+		struct typmap **app;
 		struct typmap *ap;
 
-		elog(DEBUG4, "Typ != NULL");
+		elog(DEBUG5, "Typ != NULL");
+		typoid = boot_reldesc->rd_att->attrs[i]->atttypid;
 		app = Typ;
-		while (*app && (*app)->am_oid != boot_reldesc->rd_att->attrs[i]->atttypid)
+		while (*app && (*app)->am_oid != typoid)
 			++app;
 		ap = *app;
 		if (ap == NULL)
-		{
-			elog(FATAL, "could not find atttypid %u in Typ list",
-				 boot_reldesc->rd_att->attrs[i]->atttypid);
-		}
-		values[i] = OidFunctionCall3(ap->am_typ.typinput,
-									 CStringGetDatum(value),
-									 ObjectIdGetDatum(ap->am_typ.typelem),
-									 Int32GetDatum(-1));
-		prt = DatumGetCString(OidFunctionCall3(ap->am_typ.typoutput,
-											   values[i],
-									ObjectIdGetDatum(ap->am_typ.typelem),
-											   Int32GetDatum(-1)));
-		elog(DEBUG4, " -> %s", prt);
-		pfree(prt);
+			elog(ERROR, "could not find atttypid %u in Typ list", typoid);
+
+		/* XXX this should match getTypeIOParam() */
+		if (ap->am_typ.typtype == 'c')
+			typioparam = typoid;
+		else
+			typioparam = ap->am_typ.typelem;
+
+		typinput = ap->am_typ.typinput;
+		typoutput = ap->am_typ.typoutput;
 	}
 	else
 	{
+		int			typeindex;
+
+		/* XXX why is typoid determined differently in this path? */
+		typoid = attrtypes[i]->atttypid;
 		for (typeindex = 0; typeindex < n_types; typeindex++)
 		{
-			if (TypInfo[typeindex].oid == attrtypes[i]->atttypid)
+			if (TypInfo[typeindex].oid == typoid)
 				break;
 		}
 		if (typeindex >= n_types)
-			elog(ERROR, "type oid %u not found", attrtypes[i]->atttypid);
-		elog(DEBUG4, "Typ == NULL, typeindex = %u", typeindex);
-		values[i] = OidFunctionCall3(TypInfo[typeindex].inproc,
-									 CStringGetDatum(value),
-								ObjectIdGetDatum(TypInfo[typeindex].elem),
-									 Int32GetDatum(-1));
-		prt = DatumGetCString(OidFunctionCall3(TypInfo[typeindex].outproc,
-											   values[i],
-								ObjectIdGetDatum(TypInfo[typeindex].elem),
-											   Int32GetDatum(-1)));
-		elog(DEBUG4, " -> %s", prt);
-		pfree(prt);
+			elog(ERROR, "type oid %u not found", typoid);
+		elog(DEBUG5, "Typ == NULL, typeindex = %u", typeindex);
+
+		/* XXX there are no composite types in TypInfo */
+		typioparam = TypInfo[typeindex].elem;
+
+		typinput = TypInfo[typeindex].inproc;
+		typoutput = TypInfo[typeindex].outproc;
 	}
-	elog(DEBUG4, "inserted");
+
+	values[i] = OidFunctionCall3(typinput,
+								 CStringGetDatum(value),
+								 ObjectIdGetDatum(typioparam),
+								 Int32GetDatum(-1));
+	prt = DatumGetCString(OidFunctionCall3(typoutput,
+										   values[i],
+										   ObjectIdGetDatum(typioparam),
+										   Int32GetDatum(-1)));
+	elog(DEBUG4, "inserted -> %s", prt);
+	pfree(prt);
 }
 
 /* ----------------