Skip to content

Commit 584e646

Browse files
tglsfdctglsfdc
committed
Fix a passel of problems with incorrect calls to typinput and typoutput
functions, which would lead to trouble with datatypes that paid attention to the typelem or typmod parameters to these functions. In particular, incorrect code in pg_aggregate.c explains the platform-specific failures that have been reported in NUMERIC avg().
1 parent 0f4a586 commit 584e646

File tree

11 files changed

+89
-50
lines changed

11 files changed

+89
-50
lines changed

‎src/backend/bootstrap/bootstrap.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.77 2000/01/15 02:59:27 petere Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.78 2000/01/15 22:43:20 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -680,11 +680,10 @@ InsertOneValue(Oid objectid, char *value, int i)
680680
values[i] = fmgr(ap->am_typ.typinput,
681681
value,
682682
ap->am_typ.typelem,
683-
-1); /* shouldn't have char() or varchar()
684-
* types during boostrapping but just to
685-
* be safe */
683+
-1);
686684
prt = fmgr(ap->am_typ.typoutput, values[i],
687-
ap->am_typ.typelem);
685+
ap->am_typ.typelem,
686+
-1);
688687
if (!Quiet)
689688
printf("%s ", prt);
690689
pfree(prt);

‎src/backend/catalog/pg_aggregate.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.27 2000/01/10 17:14:31 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.28 2000/01/15 22:43:21 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -262,7 +262,9 @@ AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull)
262262
HeapTuple tup;
263263
Relation aggRel;
264264
int initValAttno;
265-
Oid transtype;
265+
Oid transtype,
266+
typinput,
267+
typelem;
266268
text *textInitVal;
267269
char *strInitVal,
268270
*initVal;
@@ -320,7 +322,11 @@ AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull)
320322
pfree(strInitVal);
321323
elog(ERROR, "AggNameGetInitVal: cache lookup failed on aggregate transition function return type");
322324
}
323-
initVal = fmgr(((Form_pg_type) GETSTRUCT(tup))->typinput, strInitVal, -1);
325+
typinput = ((Form_pg_type) GETSTRUCT(tup))->typinput;
326+
typelem = ((Form_pg_type) GETSTRUCT(tup))->typelem;
327+
328+
initVal = fmgr(typinput, strInitVal, typelem, -1);
329+
324330
pfree(strInitVal);
325331
return initVal;
326332
}

‎src/backend/commands/vacuum.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.134 2000/01/10 04:09:50 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.135 2000/01/15 22:43:22 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -516,9 +516,15 @@ vc_vacone(Oid relid, bool analyze, List *va_cols)
516516
ObjectIdGetDatum(stats->attr->atttypid),
517517
0, 0, 0);
518518
if (HeapTupleIsValid(typetuple))
519+
{
519520
stats->outfunc = ((Form_pg_type) GETSTRUCT(typetuple))->typoutput;
521+
stats->typelem = ((Form_pg_type) GETSTRUCT(typetuple))->typelem;
522+
}
520523
else
524+
{
521525
stats->outfunc = InvalidOid;
526+
stats->typelem = InvalidOid;
527+
}
522528
}
523529
vacrelstats->va_natts = attr_cnt;
524530
/* delete existing pg_statistic rows for relation */
@@ -2488,13 +2494,13 @@ vc_updstats(Oid relid, int num_pages, int num_tuples, bool hasindex,
24882494
/* hack: this code knows float4 is pass-by-ref */
24892495
values[i++] = PointerGetDatum(&nullratio); /* stanullfrac */
24902496
values[i++] = PointerGetDatum(&bestratio); /* stacommonfrac */
2491-
out_string = (*fmgr_faddr(&out_function)) (stats->best, stats->attr->atttypid, stats->attr->atttypmod);
2497+
out_string = (*fmgr_faddr(&out_function)) (stats->best, stats->typelem, stats->attr->atttypmod);
24922498
values[i++] = PointerGetDatum(textin(out_string)); /* stacommonval */
24932499
pfree(out_string);
2494-
out_string = (*fmgr_faddr(&out_function)) (stats->min, stats->attr->atttypid, stats->attr->atttypmod);
2500+
out_string = (*fmgr_faddr(&out_function)) (stats->min, stats->typelem, stats->attr->atttypmod);
24952501
values[i++] = PointerGetDatum(textin(out_string)); /* staloval */
24962502
pfree(out_string);
2497-
out_string = (char *) (*fmgr_faddr(&out_function)) (stats->max, stats->attr->atttypid, stats->attr->atttypmod);
2503+
out_string = (char *) (*fmgr_faddr(&out_function)) (stats->max, stats->typelem, stats->attr->atttypmod);
24982504
values[i++] = PointerGetDatum(textin(out_string)); /* stahival */
24992505
pfree(out_string);
25002506

‎src/backend/utils/adt/arrayfuncs.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.50 1999/12/09 15:56:16 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.51 2000/01/15 22:43:24 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -669,21 +669,21 @@ array_out(ArrayType *v, Oid element_type)
669669
switch (typlen)
670670
{
671671
case 1:
672-
values[i] = (*fmgr_faddr(&outputproc)) (*p, typelem);
672+
values[i] = (*fmgr_faddr(&outputproc)) (*p, typelem, -1);
673673
break;
674674
case 2:
675-
values[i] = (*fmgr_faddr(&outputproc)) (*(int16 *) p, typelem);
675+
values[i] = (*fmgr_faddr(&outputproc)) (*(int16 *) p, typelem, -1);
676676
break;
677677
case 3:
678678
case 4:
679-
values[i] = (*fmgr_faddr(&outputproc)) (*(int32 *) p, typelem);
679+
values[i] = (*fmgr_faddr(&outputproc)) (*(int32 *) p, typelem, -1);
680680
break;
681681
}
682682
p += typlen;
683683
}
684684
else
685685
{
686-
values[i] = (*fmgr_faddr(&outputproc)) (p, typelem);
686+
values[i] = (*fmgr_faddr(&outputproc)) (p, typelem, -1);
687687
if (typlen > 0)
688688
p += typlen;
689689
else

‎src/backend/utils/adt/ruleutils.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* out of its tuple
44
*
55
* IDENTIFICATION
6-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.38 2000/01/15 02:59:38 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.39 2000/01/15 22:43:24 tgl Exp $
77
*
88
* This software is copyrighted by Jan Wieck - Hamburg.
99
*
@@ -1604,7 +1604,6 @@ get_const_expr(Const *constval, deparse_context *context)
16041604
FmgrInfo finfo_output;
16051605
char *extval;
16061606
char *valptr;
1607-
bool isnull = FALSE;
16081607

16091608
typetup = SearchSysCacheTuple(TYPEOID,
16101609
ObjectIdGetDatum(constval->consttype),
@@ -1629,7 +1628,8 @@ get_const_expr(Const *constval, deparse_context *context)
16291628

16301629
fmgr_info(typeStruct->typoutput, &finfo_output);
16311630
extval = (char *) (*fmgr_faddr(&finfo_output)) (constval->constvalue,
1632-
&isnull, -1);
1631+
typeStruct->typelem,
1632+
-1);
16331633

16341634
switch (constval->consttype)
16351635
{

‎src/backend/utils/adt/selfuncs.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.47 2000/01/15 02:59:38 petere Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.48 2000/01/15 22:43:24 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -600,6 +600,7 @@ getattstatistics(Oid relid, AttrNumber attnum, Oid opid, Oid typid,
600600
HeapTuple tuple;
601601
HeapTuple typeTuple;
602602
FmgrInfo inputproc;
603+
Oid typelem;
603604

604605
rel = heap_openr(StatisticRelationName, AccessShareLock);
605606

@@ -630,6 +631,7 @@ getattstatistics(Oid relid, AttrNumber attnum, Oid opid, Oid typid,
630631
elog(ERROR, "getattstatistics: Cache lookup failed for type %u",
631632
typid);
632633
fmgr_info(((Form_pg_type) GETSTRUCT(typeTuple))->typinput, &inputproc);
634+
typelem = ((Form_pg_type) GETSTRUCT(typeTuple))->typelem;
633635

634636
/* Values are variable-length fields, so cannot access as struct fields.
635637
* Must do it the hard way with heap_getattr.
@@ -649,7 +651,7 @@ getattstatistics(Oid relid, AttrNumber attnum, Oid opid, Oid typid,
649651
{
650652
char *strval = textout(val);
651653
*commonval = (Datum)
652-
(*fmgr_faddr(&inputproc)) (strval, typid, typmod);
654+
(*fmgr_faddr(&inputproc)) (strval, typelem, typmod);
653655
pfree(strval);
654656
}
655657
}
@@ -669,7 +671,7 @@ getattstatistics(Oid relid, AttrNumber attnum, Oid opid, Oid typid,
669671
{
670672
char *strval = textout(val);
671673
*loval = (Datum)
672-
(*fmgr_faddr(&inputproc)) (strval, typid, typmod);
674+
(*fmgr_faddr(&inputproc)) (strval, typelem, typmod);
673675
pfree(strval);
674676
}
675677
}
@@ -689,7 +691,7 @@ getattstatistics(Oid relid, AttrNumber attnum, Oid opid, Oid typid,
689691
{
690692
char *strval = textout(val);
691693
*hival = (Datum)
692-
(*fmgr_faddr(&inputproc)) (strval, typid, typmod);
694+
(*fmgr_faddr(&inputproc)) (strval, typelem, typmod);
693695
pfree(strval);
694696
}
695697
}

‎src/include/commands/vacuum.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: vacuum.h,v 1.24 1999/08/25 12:18:31 ishii Exp $
9+
* $Id: vacuum.h,v 1.25 2000/01/15 22:43:23 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -86,6 +86,7 @@ typedef struct
8686
f_cmpgt;
8787
Oid op_cmplt;
8888
regproc outfunc;
89+
Oid typelem;
8990
bool initialized;
9091
} VacAttrStats;
9192

‎src/pl/plpgsql/src/pl_comp.c

Lines changed: 7 additions & 1 deletion
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.15 2000/01/10 17:14:45 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.16 2000/01/15 22:43:25 tgl Exp $
77
*
88
* This software is copyrighted by Jan Wieck - Hamburg.
99
*
@@ -191,6 +191,7 @@ plpgsql_compile(Oid fn_oid, int functype)
191191
{
192192
function->fn_retbyval = typeStruct->typbyval;
193193
function->fn_rettyplen = typeStruct->typlen;
194+
function->fn_rettypelem = typeStruct->typelem;
194195
fmgr_info(typeStruct->typinput, &(function->fn_retinput));
195196
}
196197

@@ -259,6 +260,7 @@ plpgsql_compile(Oid fn_oid, int functype)
259260
var->datatype->typname = strdup(nameout(&(typeStruct->typname)));
260261
var->datatype->typoid = procStruct->proargtypes[i];
261262
fmgr_info(typeStruct->typinput, &(var->datatype->typinput));
263+
var->datatype->typelem = typeStruct->typelem;
262264
var->datatype->typbyval = typeStruct->typbyval;
263265
var->datatype->atttypmod = -1;
264266
var->isconst = true;
@@ -621,6 +623,7 @@ plpgsql_parse_word(char *word)
621623
typ->typname = strdup(nameout(&(typeStruct->typname)));
622624
typ->typoid = typeTup->t_data->t_oid;
623625
fmgr_info(typeStruct->typinput, &(typ->typinput));
626+
typ->typelem = typeStruct->typelem;
624627
typ->typbyval = typeStruct->typbyval;
625628
typ->atttypmod = -1;
626629

@@ -944,6 +947,7 @@ plpgsql_parse_wordtype(char *word)
944947
typ->typname = strdup(nameout(&(typeStruct->typname)));
945948
typ->typoid = typeTup->t_data->t_oid;
946949
fmgr_info(typeStruct->typinput, &(typ->typinput));
950+
typ->typelem = typeStruct->typelem;
947951
typ->typbyval = typeStruct->typbyval;
948952
typ->atttypmod = -1;
949953

@@ -1088,6 +1092,7 @@ plpgsql_parse_dblwordtype(char *string)
10881092
typ->typname = strdup(nameout(&(typeStruct->typname)));
10891093
typ->typoid = typetup->t_data->t_oid;
10901094
fmgr_info(typeStruct->typinput, &(typ->typinput));
1095+
typ->typelem = typeStruct->typelem;
10911096
typ->typbyval = typeStruct->typbyval;
10921097
typ->atttypmod = attrStruct->atttypmod;
10931098

@@ -1216,6 +1221,7 @@ plpgsql_parse_wordrowtype(char *string)
12161221
var->datatype->typname = strdup(NameStr(typeStruct->typname));
12171222
var->datatype->typoid = typetup->t_data->t_oid;
12181223
fmgr_info(typeStruct->typinput, &(var->datatype->typinput));
1224+
var->datatype->typelem = typeStruct->typelem;
12191225
var->datatype->typbyval = typeStruct->typbyval;
12201226
var->datatype->atttypmod = attrStruct->atttypmod;
12211227
var->isconst = false;

0 commit comments

Comments
 (0)