Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 971175f

Browse files
committed
New HeapTuple structure/interface.
1 parent 6beba21 commit 971175f

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

contrib/fulltextindex/fti.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ fti()
154154
tupdesc = rel->rd_att; /* what the tuple looks like (?) */
155155

156156
/* get oid of current tuple, needed by all, so place here */
157-
oid = rettuple->t_oid;
157+
oid = rettuple->t_data->t_oid;
158158
if (!OidIsValid(oid))
159159
elog(ERROR,"Full Text Indexing: oid of current tuple is NULL");
160160

src/pl/plpgsql/src/pl_comp.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* procedural language
44
*
55
* IDENTIFICATION
6-
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.3 1998/09/01 04:40:20 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.4 1998/11/27 20:07:22 vadim Exp $
77
*
88
* This software is copyrighted by Jan Wieck - Hamburg.
99
*
@@ -620,7 +620,7 @@ plpgsql_parse_word(char *word)
620620
typ = (PLpgSQL_type *) malloc(sizeof(PLpgSQL_type));
621621

622622
typ->typname = strdup(nameout(&(typeStruct->typname)));
623-
typ->typoid = typeTup->t_oid;
623+
typ->typoid = typeTup->t_data->t_oid;
624624
fmgr_info(typeStruct->typinput, &(typ->typinput));
625625
typ->typbyval = typeStruct->typbyval;
626626
typ->atttypmod = -1;
@@ -943,7 +943,7 @@ plpgsql_parse_wordtype(char *word)
943943
typ = (PLpgSQL_type *) malloc(sizeof(PLpgSQL_type));
944944

945945
typ->typname = strdup(nameout(&(typeStruct->typname)));
946-
typ->typoid = typeTup->t_oid;
946+
typ->typoid = typeTup->t_data->t_oid;
947947
fmgr_info(typeStruct->typinput, &(typ->typinput));
948948
typ->typbyval = typeStruct->typbyval;
949949
typ->atttypmod = -1;
@@ -1060,7 +1060,7 @@ plpgsql_parse_dblwordtype(char *string)
10601060
* ----------
10611061
*/
10621062
attrtup = SearchSysCacheTuple(ATTNAME,
1063-
ObjectIdGetDatum(classtup->t_oid),
1063+
ObjectIdGetDatum(classtup->t_data->t_oid),
10641064
PointerGetDatum(word2), 0, 0);
10651065
if (!HeapTupleIsValid(attrtup))
10661066
{
@@ -1087,7 +1087,7 @@ plpgsql_parse_dblwordtype(char *string)
10871087
typ = (PLpgSQL_type *) malloc(sizeof(PLpgSQL_type));
10881088

10891089
typ->typname = strdup(nameout(&(typeStruct->typname)));
1090-
typ->typoid = typetup->t_oid;
1090+
typ->typoid = typetup->t_data->t_oid;
10911091
fmgr_info(typeStruct->typinput, &(typ->typinput));
10921092
typ->typbyval = typeStruct->typbyval;
10931093
typ->atttypmod = attrStruct->atttypmod;
@@ -1163,7 +1163,7 @@ plpgsql_parse_wordrowtype(char *string)
11631163

11641164
row->dtype = PLPGSQL_DTYPE_ROW;
11651165
row->nfields = classStruct->relnatts;
1166-
row->rowtypeclass = typetup->t_oid;
1166+
row->rowtypeclass = typetup->t_data->t_oid;
11671167
row->fieldnames = malloc(sizeof(char *) * row->nfields);
11681168
row->varnos = malloc(sizeof(int) * row->nfields);
11691169

@@ -1174,7 +1174,7 @@ plpgsql_parse_wordrowtype(char *string)
11741174
* ----------
11751175
*/
11761176
attrtup = SearchSysCacheTuple(ATTNUM,
1177-
ObjectIdGetDatum(classtup->t_oid),
1177+
ObjectIdGetDatum(classtup->t_data->t_oid),
11781178
(Datum) (i + 1), 0, 0);
11791179
if (!HeapTupleIsValid(attrtup))
11801180
{
@@ -1215,7 +1215,7 @@ plpgsql_parse_wordrowtype(char *string)
12151215
strcat(var->refname, cp);
12161216
var->datatype = malloc(sizeof(PLpgSQL_type));
12171217
var->datatype->typname = strdup(nameout(&(typeStruct->typname)));
1218-
var->datatype->typoid = typetup->t_oid;
1218+
var->datatype->typoid = typetup->t_data->t_oid;
12191219
fmgr_info(typeStruct->typinput, &(var->datatype->typinput));
12201220
var->datatype->typbyval = typeStruct->typbyval;
12211221
var->datatype->atttypmod = attrStruct->atttypmod;

src/pl/tcl/pltcl.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* procedural language (PL)
44
*
55
* IDENTIFICATION
6-
* $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.7 1998/10/09 16:57:10 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.8 1998/11/27 20:05:27 vadim Exp $
77
*
88
* This software is copyrighted by Jan Wieck - Hamburg.
99
*
@@ -1613,7 +1613,7 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp * interp,
16131613
0, 0, 0);
16141614
if (!HeapTupleIsValid(typeTup))
16151615
elog(ERROR, "pltcl: Cache lookup of type %s failed", args[i]);
1616-
qdesc->argtypes[i] = typeTup->t_oid;
1616+
qdesc->argtypes[i] = typeTup->t_data->t_oid;
16171617
fmgr_info(((Form_pg_type) GETSTRUCT(typeTup))->typinput,
16181618
&(qdesc->arginfuncs[i]));
16191619
qdesc->argtypelems[i] = ((Form_pg_type) GETSTRUCT(typeTup))->typelem;

0 commit comments

Comments
 (0)