database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

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

Browse Source 
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.
This commit is contained in:
Tom Lane
2004-06-06 00:41:28 +00:00
parent c3a153afed
commit c541bb86e9
25 changed files with 332 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.418 2004/06/03 02:08:03 tgl Exp $
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.419 2004/06/06 00:41:27 tgl Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@ -1432,11 +1432,11 @@ exec_bind_message(StringInfo input_message)
if (pformat == 0)
{
Oid typInput;
Oid typElem;
Oid typinput;
Oid typioparam;
char *pstring;
getTypeInputInfo(ptype, &typInput, &typElem);
getTypeInputInfo(ptype, &typinput, &typioparam);
/*
* We have to do encoding conversion before
@ -1446,9 +1446,9 @@ exec_bind_message(StringInfo input_message)
pg_client_to_server((unsigned char *) pbuf.data,
plength);
params[i].value =
OidFunctionCall3(typInput,
OidFunctionCall3(typinput,
CStringGetDatum(pstring),
ObjectIdGetDatum(typElem),
ObjectIdGetDatum(typioparam),
Int32GetDatum(-1));
/* Free result of encoding conversion, if any */
if (pstring != pbuf.data)
@ -1456,19 +1456,19 @@ exec_bind_message(StringInfo input_message)
}
else if (pformat == 1)
{
Oid typReceive;
Oid typElem;
Oid typreceive;
Oid typioparam;
/*
* Call the parameter type's binary input
* converter
*/
getTypeBinaryInputInfo(ptype, &typReceive, &typElem);
getTypeBinaryInputInfo(ptype, &typreceive, &typioparam);
params[i].value =
OidFunctionCall2(typReceive,
OidFunctionCall2(typreceive,
PointerGetDatum(&pbuf),
ObjectIdGetDatum(typElem));
ObjectIdGetDatum(typioparam));
/* Trouble if it didn't eat the whole buffer */
if (pbuf.cursor != pbuf.len)