Skip to content

Commit 375369a

Browse files
tglsfdctglsfdc
committed
Replace TupleTableSlot convention for whole-row variables and function
results with tuples as ordinary varlena Datums. This commit does not in itself do much for us, except eliminate the horrid memory leak associated with evaluation of whole-row variables. However, it lays the groundwork for allowing composite types as table columns, and perhaps some other useful features as well. Per my proposal of a few days ago.
1 parent 8590a62 commit 375369a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1770
-1724
lines changed

‎contrib/dblink/dblink.c

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ dblink_fetch(PG_FUNCTION_ARGS)
447447
TupleDesc tupdesc = NULL;
448448
int call_cntr;
449449
int max_calls;
450-
TupleTableSlot *slot;
451450
AttInMetadata *attinmeta;
452451
char *msg;
453452
PGresult *res = NULL;
@@ -566,9 +565,10 @@ dblink_fetch(PG_FUNCTION_ARGS)
566565

567566
if (functyptype == 'c')
568567
tupdesc = TypeGetTupleDesc(functypeid, NIL);
569-
else if (functyptype == 'p' && functypeid == RECORDOID)
568+
else if (functypeid == RECORDOID)
570569
{
571-
if (!rsinfo || !IsA(rsinfo, ReturnSetInfo))
570+
if (!rsinfo || !IsA(rsinfo, ReturnSetInfo) ||
571+
rsinfo->expectedDesc == NULL)
572572
ereport(ERROR,
573573
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
574574
errmsg("function returning record called in context "
@@ -582,8 +582,6 @@ dblink_fetch(PG_FUNCTION_ARGS)
582582
elog(ERROR, "return type must be a row type");
583583

584584
/* store needed metadata for subsequent calls */
585-
slot = TupleDescGetSlot(tupdesc);
586-
funcctx->slot = slot;
587585
attinmeta = TupleDescGetAttInMetadata(tupdesc);
588586
funcctx->attinmeta = attinmeta;
589587

@@ -599,8 +597,6 @@ dblink_fetch(PG_FUNCTION_ARGS)
599597
call_cntr = funcctx->call_cntr;
600598
max_calls = funcctx->max_calls;
601599

602-
slot = funcctx->slot;
603-
604600
res = (PGresult *) funcctx->user_fctx;
605601
attinmeta = funcctx->attinmeta;
606602
tupdesc = attinmeta->tupdesc;
@@ -626,7 +622,7 @@ dblink_fetch(PG_FUNCTION_ARGS)
626622
tuple = BuildTupleFromCStrings(attinmeta, values);
627623

628624
/* make the tuple into a datum */
629-
result = TupleGetDatum(slot, tuple);
625+
result = HeapTupleGetDatum(tuple);
630626

631627
SRF_RETURN_NEXT(funcctx, result);
632628
}
@@ -649,7 +645,6 @@ dblink_record(PG_FUNCTION_ARGS)
649645
TupleDesc tupdesc = NULL;
650646
int call_cntr;
651647
int max_calls;
652-
TupleTableSlot *slot;
653648
AttInMetadata *attinmeta;
654649
char *msg;
655650
PGresult *res = NULL;
@@ -741,7 +736,7 @@ dblink_record(PG_FUNCTION_ARGS)
741736
/* need a tuple descriptor representing one TEXT column */
742737
tupdesc = CreateTemplateTupleDesc(1, false);
743738
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
744-
TEXTOID, -1, 0, false);
739+
TEXTOID, -1, 0);
745740

746741
/*
747742
* and save a copy of the command status string to return as
@@ -776,9 +771,10 @@ dblink_record(PG_FUNCTION_ARGS)
776771
{
777772
if (functyptype == 'c')
778773
tupdesc = TypeGetTupleDesc(functypeid, NIL);
779-
else if (functyptype == 'p' && functypeid == RECORDOID)
774+
else if (functypeid == RECORDOID)
780775
{
781-
if (!rsinfo || !IsA(rsinfo, ReturnSetInfo))
776+
if (!rsinfo || !IsA(rsinfo, ReturnSetInfo) ||
777+
rsinfo->expectedDesc == NULL)
782778
ereport(ERROR,
783779
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
784780
errmsg("function returning record called in context "
@@ -793,8 +789,6 @@ dblink_record(PG_FUNCTION_ARGS)
793789
}
794790

795791
/* store needed metadata for subsequent calls */
796-
slot = TupleDescGetSlot(tupdesc);
797-
funcctx->slot = slot;
798792
attinmeta = TupleDescGetAttInMetadata(tupdesc);
799793
funcctx->attinmeta = attinmeta;
800794

@@ -810,8 +804,6 @@ dblink_record(PG_FUNCTION_ARGS)
810804
call_cntr = funcctx->call_cntr;
811805
max_calls = funcctx->max_calls;
812806

813-
slot = funcctx->slot;
814-
815807
res = (PGresult *) funcctx->user_fctx;
816808
attinmeta = funcctx->attinmeta;
817809
tupdesc = attinmeta->tupdesc;
@@ -846,7 +838,7 @@ dblink_record(PG_FUNCTION_ARGS)
846838
tuple = BuildTupleFromCStrings(attinmeta, values);
847839

848840
/* make the tuple into a datum */
849-
result = TupleGetDatum(slot, tuple);
841+
result = HeapTupleGetDatum(tuple);
850842

851843
SRF_RETURN_NEXT(funcctx, result);
852844
}
@@ -925,7 +917,7 @@ dblink_exec(PG_FUNCTION_ARGS)
925917
/* need a tuple descriptor representing one TEXT column */
926918
tupdesc = CreateTemplateTupleDesc(1, false);
927919
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
928-
TEXTOID, -1, 0, false);
920+
TEXTOID, -1, 0);
929921

930922
/*
931923
* and save a copy of the command status string to return as our
@@ -939,7 +931,7 @@ dblink_exec(PG_FUNCTION_ARGS)
939931
/* need a tuple descriptor representing one TEXT column */
940932
tupdesc = CreateTemplateTupleDesc(1, false);
941933
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "status",
942-
TEXTOID, -1, 0, false);
934+
TEXTOID, -1, 0);
943935

944936
/*
945937
* and save a copy of the command status string to return as our
@@ -978,7 +970,6 @@ dblink_get_pkey(PG_FUNCTION_ARGS)
978970
FuncCallContext *funcctx;
979971
int32 call_cntr;
980972
int32 max_calls;
981-
TupleTableSlot *slot;
982973
AttInMetadata *attinmeta;
983974
MemoryContext oldcontext;
984975

@@ -1010,15 +1001,9 @@ dblink_get_pkey(PG_FUNCTION_ARGS)
10101001
*/
10111002
tupdesc = CreateTemplateTupleDesc(2, false);
10121003
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "position",
1013-
INT4OID, -1, 0, false);
1004+
INT4OID, -1, 0);
10141005
TupleDescInitEntry(tupdesc, (AttrNumber) 2, "colname",
1015-
TEXTOID, -1, 0, false);
1016-
1017-
/* allocate a slot for a tuple with this tupdesc */
1018-
slot = TupleDescGetSlot(tupdesc);
1019-
1020-
/* assign slot to function context */
1021-
funcctx->slot = slot;
1006+
TEXTOID, -1, 0);
10221007

10231008
/*
10241009
* Generate attribute metadata needed later to produce tuples from
@@ -1053,8 +1038,6 @@ dblink_get_pkey(PG_FUNCTION_ARGS)
10531038
call_cntr = funcctx->call_cntr;
10541039
max_calls = funcctx->max_calls;
10551040

1056-
slot = funcctx->slot;
1057-
10581041
results = (char **) funcctx->user_fctx;
10591042
attinmeta = funcctx->attinmeta;
10601043

@@ -1075,7 +1058,7 @@ dblink_get_pkey(PG_FUNCTION_ARGS)
10751058
tuple = BuildTupleFromCStrings(attinmeta, values);
10761059

10771060
/* make the tuple into a datum */
1078-
result = TupleGetDatum(slot, tuple);
1061+
result = HeapTupleGetDatum(tuple);
10791062

10801063
SRF_RETURN_NEXT(funcctx, result);
10811064
}

‎contrib/intagg/int_aggregate.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "catalog/pg_proc.h"
2626
#include "catalog/pg_type.h"
2727
#include "executor/executor.h"
28-
#include "utils/sets.h"
2928
#include "utils/syscache.h"
3029
#include "access/tupmacs.h"
3130
#include "access/xact.h"

‎contrib/pgstattuple/pgstattuple.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.13 2003/11/29 19:51:35 pgsql Exp $
2+
* $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.14 2004/04/01 21:28:43 tgl Exp $
33
*
44
* Copyright (c) 2001,2002 Tatsuo Ishii
55
*
@@ -111,7 +111,6 @@ pgstattuple_real(Relation rel)
111111
uint64 free_space = 0; /* free/reusable space in bytes */
112112
double free_percent; /* free/reusable space in % */
113113
TupleDesc tupdesc;
114-
TupleTableSlot *slot;
115114
AttInMetadata *attinmeta;
116115
char **values;
117116
int i;
@@ -122,9 +121,6 @@ pgstattuple_real(Relation rel)
122121
*/
123122
tupdesc = RelationNameGetTupleDesc(DUMMY_TUPLE);
124123

125-
/* allocate a slot for a tuple with this tupdesc */
126-
slot = TupleDescGetSlot(tupdesc);
127-
128124
/*
129125
* Generate attribute metadata needed later to produce tuples from raw
130126
* C strings
@@ -192,7 +188,7 @@ pgstattuple_real(Relation rel)
192188
}
193189

194190
/*
195-
* Prepare a values array for storage in our slot. This should be an
191+
* Prepare a values array for constructing the tuple. This should be an
196192
* array of C strings which will be processed later by the appropriate
197193
* "in" functions.
198194
*/
@@ -214,7 +210,7 @@ pgstattuple_real(Relation rel)
214210
tuple = BuildTupleFromCStrings(attinmeta, values);
215211

216212
/* make the tuple into a datum */
217-
result = TupleGetDatum(slot, tuple);
213+
result = HeapTupleGetDatum(tuple);
218214

219215
/* Clean up */
220216
for (i = 0; i < NCOLUMNS; i++)

‎contrib/tablefunc/tablefunc.c

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@ crosstab(PG_FUNCTION_ARGS)
351351
TupleDesc ret_tupdesc;
352352
int call_cntr;
353353
int max_calls;
354-
TupleTableSlot *slot;
355354
AttInMetadata *attinmeta;
356355
SPITupleTable *spi_tuptable = NULL;
357356
TupleDesc spi_tupdesc;
@@ -429,10 +428,10 @@ crosstab(PG_FUNCTION_ARGS)
429428

430429
if (functyptype == 'c')
431430
{
432-
/* Build a tuple description for a functypeid tuple */
431+
/* Build a tuple description for a named composite type */
433432
tupdesc = TypeGetTupleDesc(functypeid, NIL);
434433
}
435-
else if (functyptype == 'p' && functypeid == RECORDOID)
434+
else if (functypeid == RECORDOID)
436435
{
437436
if (fcinfo->nargs != 2)
438437
ereport(ERROR,
@@ -461,12 +460,6 @@ crosstab(PG_FUNCTION_ARGS)
461460
errmsg("return and sql tuple descriptions are " \
462461
"incompatible")));
463462

464-
/* allocate a slot for a tuple with this tupdesc */
465-
slot = TupleDescGetSlot(tupdesc);
466-
467-
/* assign slot to function context */
468-
funcctx->slot = slot;
469-
470463
/*
471464
* Generate attribute metadata needed later to produce tuples from
472465
* raw C strings
@@ -499,9 +492,6 @@ crosstab(PG_FUNCTION_ARGS)
499492
call_cntr = funcctx->call_cntr;
500493
max_calls = funcctx->max_calls;
501494

502-
/* return slot for our tuple */
503-
slot = funcctx->slot;
504-
505495
/* user context info */
506496
fctx = (crosstab_fctx *) funcctx->user_fctx;
507497
lastrowid = fctx->lastrowid;
@@ -621,7 +611,7 @@ crosstab(PG_FUNCTION_ARGS)
621611
tuple = BuildTupleFromCStrings(attinmeta, values);
622612

623613
/* make the tuple into a datum */
624-
result = TupleGetDatum(slot, tuple);
614+
result = HeapTupleGetDatum(tuple);
625615

626616
/* Clean up */
627617
for (i = 0; i < num_categories + 1; i++)
@@ -1675,7 +1665,7 @@ make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_categories)
16751665
strcpy(attname, "rowname");
16761666

16771667
TupleDescInitEntry(tupdesc, attnum, attname, sql_atttypid,
1678-
-1, 0, false);
1668+
-1, 0);
16791669

16801670
/* now the category values columns */
16811671
sql_attr = spi_tupdesc->attrs[2];
@@ -1687,7 +1677,7 @@ make_crosstab_tupledesc(TupleDesc spi_tupdesc, int num_categories)
16871677

16881678
sprintf(attname, "category_%d", i + 1);
16891679
TupleDescInitEntry(tupdesc, attnum, attname, sql_atttypid,
1690-
-1, 0, false);
1680+
-1, 0);
16911681
}
16921682

16931683
return tupdesc;

‎contrib/tsearch2/ts_stat.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ ts_setup_firstcall(FuncCallContext *funcctx, tsstat * stat)
303303
memcpy(st->stat, stat, stat->len);
304304
funcctx->user_fctx = (void *) st;
305305
tupdesc = RelationNameGetTupleDesc("statinfo");
306-
funcctx->slot = TupleDescGetSlot(tupdesc);
307306
funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
308307
MemoryContextSwitchTo(oldcontext);
309308
}
@@ -334,7 +333,7 @@ ts_process_call(FuncCallContext *funcctx)
334333
(values[0])[entry->len] = '\0';
335334

336335
tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
337-
result = TupleGetDatum(funcctx->slot, tuple);
336+
result = HeapTupleGetDatum(tuple);
338337

339338
pfree(values[0]);
340339
st->cur++;

‎contrib/tsearch2/wparser.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ setup_firstcall(FuncCallContext *funcctx, Oid prsid)
187187
);
188188
funcctx->user_fctx = (void *) st;
189189
tupdesc = RelationNameGetTupleDesc("tokentype");
190-
funcctx->slot = TupleDescGetSlot(tupdesc);
191190
funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
192191
MemoryContextSwitchTo(oldcontext);
193192
}
@@ -211,7 +210,7 @@ process_call(FuncCallContext *funcctx)
211210
values[2] = st->list[st->cur].descr;
212211

213212
tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
214-
result = TupleGetDatum(funcctx->slot, tuple);
213+
result = HeapTupleGetDatum(tuple);
215214

216215
pfree(values[1]);
217216
pfree(values[2]);
@@ -391,7 +390,6 @@ prs_setup_firstcall(FuncCallContext *funcctx, int prsid, text *txt)
391390

392391
funcctx->user_fctx = (void *) st;
393392
tupdesc = RelationNameGetTupleDesc("tokenout");
394-
funcctx->slot = TupleDescGetSlot(tupdesc);
395393
funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
396394
MemoryContextSwitchTo(oldcontext);
397395
}
@@ -413,7 +411,7 @@ prs_process_call(FuncCallContext *funcctx)
413411
sprintf(tid, "%d", st->list[st->cur].type);
414412
values[1] = st->list[st->cur].lexem;
415413
tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
416-
result = TupleGetDatum(funcctx->slot, tuple);
414+
result = HeapTupleGetDatum(tuple);
417415

418416
pfree(values[1]);
419417
st->cur++;

‎doc/src/sgml/catalogs.sgml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Documentation of the system catalogs, directed toward PostgreSQL developers
3-
$PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.84 2004/02/15 21:01:38 tgl Exp $
3+
$PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.85 2004/04/01 21:28:43 tgl Exp $
44
-->
55

66
<chapter id="catalogs">
@@ -809,24 +809,6 @@
809809
</entry>
810810
</row>
811811

812-
<row>
813-
<entry><structfield>attisset</structfield></entry>
814-
<entry><type>bool</type></entry>
815-
<entry></entry>
816-
<entry>
817-
If true, this attribute is a set. In that case, what is really
818-
stored in the attribute is the OID of a row in the
819-
<structname>pg_proc</structname> catalog. The
820-
<structname>pg_proc</structname> row contains the query
821-
string that defines this set, i.e., the query to run to get
822-
the set. So the <structfield>atttypid</structfield> (see
823-
above) refers to the type returned by this query, but the
824-
actual length of this attribute is the length (size) of an
825-
<type>oid</type>. --- At least this is the theory. All this
826-
is probably quite broken these days.
827-
</entry>
828-
</row>
829-
830812
<row>
831813
<entry><structfield>attalign</structfield></entry>
832814
<entry><type>char</type></entry>

0 commit comments

Comments
 (0)