database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-12 21:01:52 +03:00
Code Activity

The cstring datatype can now be copied, passed around, etc. The typlen

Browse Source 
value '-2' is used to indicate a variable-width type whose width is
computed as strlen(datum)+1.  Everything that looks at typlen is updated
except for array support, which Joe Conway is working on; at the moment
it wouldn't work to try to create an array of cstring.
This commit is contained in:
Tom Lane
2002-08-24 15:00:47 +00:00
parent cf4d885c67
commit 976246cc7e
23 changed files with 260 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/tcop/fastpath.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.53 2002/06/20 20:29:36 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.54 2002/08/24 15:00:46 tgl Exp $
*
* NOTES
* This cruft is the server side of PQfn.
@ -71,12 +71,12 @@
/* ----------------
* SendFunctionResult
*
* retlen is 0 if returning NULL, else the typlen according to the catalogs
* ----------------
*/
static void
SendFunctionResult(Datum retval, /* actual return value */
bool retbyval,
int retlen) /* the length according to the catalogs */
SendFunctionResult(Datum retval, bool retbyval, int retlen)
{
StringInfoData buf;
@ -93,7 +93,7 @@ SendFunctionResult(Datum retval, /* actual return value */
}
else
{ /* by-reference ... */
if (retlen < 0)
if (retlen == -1)
{ /* ... varlena */
struct varlena *v = (struct varlena *) DatumGetPointer(retval);
@ -177,12 +177,15 @@ fetch_fp_info(Oid func_id, struct fp_info * fip)
for (i = 0; i < pp->pronargs; ++i)
{
if (OidIsValid(argtypes[i]))
get_typlenbyval(argtypes[i], &fip->arglen[i], &fip->argbyval[i]);
get_typlenbyval(argtypes[i], &fip->arglen[i], &fip->argbyval[i]);
/* We don't support cstring in fastpath protocol */
if (fip->arglen[i] == -2)
elog(ERROR, "CSTRING not supported in fastpath protocol");
}
if (OidIsValid(rettype))
get_typlenbyval(rettype, &fip->retlen, &fip->retbyval);
get_typlenbyval(rettype, &fip->retlen, &fip->retbyval);
if (fip->retlen == -2)
elog(ERROR, "CSTRING not supported in fastpath protocol");
ReleaseSysCache(func_htp);
@ -297,7 +300,7 @@ HandleFunctionRequest(void)
}
else
{ /* by-reference ... */
if (fip->arglen[i] < 0)
if (fip->arglen[i] == -1)
{ /* ... varlena */
if (argsize < 0)
elog(ERROR, "HandleFunctionRequest: bogus argsize %d",