Skip to content

Commit dd8b0e6

Browse files
bmomjianbmomjian
committed
Cleanup for func args > 8.
1 parent 2d920dc commit dd8b0e6

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

‎src/backend/catalog/pg_type.c

Lines changed: 2 additions & 2 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_type.c,v 1.45 2000/01/10 17:14:31 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.46 2000/01/10 20:23:28 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -373,7 +373,7 @@ TypeCreate(char *typeName,
373373
values[i++] = (Datum) GetUserId(); /* 2 */
374374
values[i++] = (Datum) internalSize; /* 3 */
375375
values[i++] = (Datum) externalSize; /* 4 */
376-
values[i++] = (Datum) passedByValue; /* 5 */
376+
values[i++] = (Datum) passedByValue;/* 5 */
377377
values[i++] = (Datum) typeType; /* 6 */
378378
values[i++] = (Datum) (bool) 1; /* 7 */
379379
values[i++] = (Datum) typDelim; /* 8 */

‎src/backend/utils/Gen_fmgrtab.sh.in

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.16 1999/07/15 23:03:25 momjian Exp $
11+
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.17 2000/01/10 20:23:29 momjian Exp $
1212
#
1313
# NOTES
1414
# Passes any -D options on to cpp prior to generating the list
@@ -83,7 +83,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
8383
*
8484
* Copyright (c) 1994, Regents of the University of California
8585
*
86-
* $Id: Gen_fmgrtab.sh.in,v 1.16 1999/07/15 23:03:25 momjian Exp $
86+
* $Id: Gen_fmgrtab.sh.in,v 1.17 2000/01/10 20:23:29 momjian Exp $
8787
*
8888
* NOTES
8989
* ******************************
@@ -107,10 +107,8 @@ cat > $HFILE <<FuNkYfMgRsTuFf
107107
* arguments from the user level since the catalogs only
108108
* store 8 argument type values for type-checking ...
109109
*/
110-
#define MAXFMGRARGS 9
111-
112110
typedef struct {
113-
char *data[MAXFMGRARGS];
111+
char *data[FUNC_MAX_ARGS+1]; /* function name is arg0 */
114112
} FmgrValues;
115113
116114
typedef struct {
@@ -206,7 +204,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
206204
*
207205
*
208206
* IDENTIFICATION
209-
* $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.16 1999/07/15 23:03:25 momjian Exp $
207+
* $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.17 2000/01/10 20:23:29 momjian Exp $
210208
*
211209
* NOTES
212210
*

‎src/include/catalog/pg_type.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_type.h,v 1.73 2000/01/10 16:13:21 momjian Exp $
10+
* $Id: pg_type.h,v 1.74 2000/01/10 20:23:31 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -47,7 +47,6 @@ CATALOG(pg_type) BOOTSTRAP
4747
* is -1.
4848
*/
4949
int2 typprtlen;
50-
bool typbyval;
5150

5251
/*
5352
* typbyval determines whether internal Postgres routines pass a value
@@ -59,6 +58,7 @@ CATALOG(pg_type) BOOTSTRAP
5958
* even if the length would allow pass-by-value; this is currently
6059
* true for type float4, for example.
6160
*/
61+
bool typbyval;
6262
char typtype;
6363

6464
/*
@@ -174,8 +174,8 @@ DATA(insert OID = 21 ( int2 PGUID 2 5 t b t \054 0 0 int2in int2out int2
174174
DESCR("-32 thousand to 32 thousand, 2-byte storage");
175175
#define INT2OID 21
176176

177-
DATA(insert OID = 22 ( int2vector PGUID 16 50 f b t \054 0 21 int2vectorin int2vectorout int2vectorin int2vectorout i _null_ ));
178-
DESCR("8 int2 integers, used internally");
177+
DATA(insert OID = 22 ( int2vector PGUID 32 113 f b t \054 0 21 int2vectorin int2vectorout int2vectorin int2vectorout i _null_ ));
178+
DESCR("16 int2 integers, used internally");
179179
/*
180180
* XXX -- the implementation of int2vector's in postgres is a hack, and will
181181
* go away someday. until that happens, there is a case (in the
@@ -213,8 +213,8 @@ DATA(insert OID = 29 ( cid PGUID 4 10 t b t \054 0 0 cidin cidout cidin
213213
DESCR("command identifier type, sequence in transaction id");
214214
#define CIDOID 29
215215

216-
DATA(insert OID = 30 ( oidvector PGUID 32 89 f b t \054 0 26 oidvectorin oidvectorout oidvectorin oidvectorout i _null_ ));
217-
DESCR("array of 8 oids, used in system tables");
216+
DATA(insert OID = 30 ( oidvector PGUID 64 193 f b t \054 0 26 oidvectorin oidvectorout oidvectorin oidvectorout i _null_ ));
217+
DESCR("array of 16 oids, used in system tables");
218218
DATA(insert OID = 32 ( SET PGUID -1 -1 f b t \054 0 0 textin textout textin textout i _null_ ));
219219
DESCR("set of tuples");
220220

‎src/include/config.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
* pgsql/src/backend/utils/fmgr/fmgr.c and add additional entries
102102
* to the 'case' statement for the additional arguments.
103103
*/
104-
#define INDEX_MAX_KEYS 8
104+
#define INDEX_MAX_KEYS 16
105105
#define FUNC_MAX_ARGS INDEX_MAX_KEYS
106106

107107
/*

0 commit comments

Comments
 (0)