mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup for func args > 8.

This commit is contained in:
Bruce Momjian 2000-01-10 20:23:31 +00:00
parent 2d920dc717
commit dd8b0e67ec
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/catalog/pg_type.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.45 2000/01/10 17:14:31 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.46 2000/01/10 20:23:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -373,7 +373,7 @@ TypeCreate(char *typeName,
values[i++] = (Datum) GetUserId(); /* 2 */ values[i++] = (Datum) GetUserId(); /* 2 */
values[i++] = (Datum) internalSize; /* 3 */ values[i++] = (Datum) internalSize; /* 3 */
values[i++] = (Datum) externalSize; /* 4 */ values[i++] = (Datum) externalSize; /* 4 */
values[i++] = (Datum) passedByValue; /* 5 */ values[i++] = (Datum) passedByValue;/* 5 */
values[i++] = (Datum) typeType; /* 6 */ values[i++] = (Datum) typeType; /* 6 */
values[i++] = (Datum) (bool) 1; /* 7 */ values[i++] = (Datum) (bool) 1; /* 7 */
values[i++] = (Datum) typDelim; /* 8 */ values[i++] = (Datum) typDelim; /* 8 */

10
src/backend/utils/Gen_fmgrtab.sh.in
View File

@ -8,7 +8,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.16 1999/07/15 23:03:25 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.17 2000/01/10 20:23:29 momjian Exp $
# #
# NOTES # NOTES
# Passes any -D options on to cpp prior to generating the list # Passes any -D options on to cpp prior to generating the list
@ -83,7 +83,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: Gen_fmgrtab.sh.in,v 1.16 1999/07/15 23:03:25 momjian Exp $ * $Id: Gen_fmgrtab.sh.in,v 1.17 2000/01/10 20:23:29 momjian Exp $
* *
* NOTES * NOTES
* ****************************** * ******************************
@ -107,10 +107,8 @@ cat > $HFILE <<FuNkYfMgRsTuFf
* arguments from the user level since the catalogs only * arguments from the user level since the catalogs only
* store 8 argument type values for type-checking ... * store 8 argument type values for type-checking ...
*/ */
#define MAXFMGRARGS 9
typedef struct { typedef struct {
char *data[MAXFMGRARGS]; char *data[FUNC_MAX_ARGS+1]; /* function name is arg0 */
} FmgrValues; } FmgrValues;
typedef struct { typedef struct {
@ -206,7 +204,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.16 1999/07/15 23:03:25 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.17 2000/01/10 20:23:29 momjian Exp $
* *
* NOTES * NOTES
* *

12
src/include/catalog/pg_type.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_type.h,v 1.73 2000/01/10 16:13:21 momjian Exp $ * $Id: pg_type.h,v 1.74 2000/01/10 20:23:31 momjian Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -47,7 +47,6 @@ CATALOG(pg_type) BOOTSTRAP
* is -1. * is -1.
*/ */
int2 typprtlen; int2 typprtlen;
bool typbyval;
/* /*
* typbyval determines whether internal Postgres routines pass a value * typbyval determines whether internal Postgres routines pass a value
@ -59,6 +58,7 @@ CATALOG(pg_type) BOOTSTRAP
* even if the length would allow pass-by-value; this is currently * even if the length would allow pass-by-value; this is currently
* true for type float4, for example. * true for type float4, for example.
*/ */
bool typbyval;
char typtype; char typtype;
/* /*
@ -174,8 +174,8 @@ DATA(insert OID = 21 ( int2 PGUID 2 5 t b t \054 0 0 int2in int2out int2
DESCR("-32 thousand to 32 thousand, 2-byte storage"); DESCR("-32 thousand to 32 thousand, 2-byte storage");
#define INT2OID 21 #define INT2OID 21
DATA(insert OID = 22 ( int2vector PGUID 16 50 f b t \054 0 21 int2vectorin int2vectorout int2vectorin int2vectorout i _null_ )); DATA(insert OID = 22 ( int2vector PGUID 32 113 f b t \054 0 21 int2vectorin int2vectorout int2vectorin int2vectorout i _null_ ));
DESCR("8 int2 integers, used internally"); DESCR("16 int2 integers, used internally");
/* /*
* XXX -- the implementation of int2vector's in postgres is a hack, and will * XXX -- the implementation of int2vector's in postgres is a hack, and will
* go away someday. until that happens, there is a case (in the * 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
DESCR("command identifier type, sequence in transaction id"); DESCR("command identifier type, sequence in transaction id");
#define CIDOID 29 #define CIDOID 29
DATA(insert OID = 30 ( oidvector PGUID 32 89 f b t \054 0 26 oidvectorin oidvectorout oidvectorin oidvectorout i _null_ )); DATA(insert OID = 30 ( oidvector PGUID 64 193 f b t \054 0 26 oidvectorin oidvectorout oidvectorin oidvectorout i _null_ ));
DESCR("array of 8 oids, used in system tables"); DESCR("array of 16 oids, used in system tables");
DATA(insert OID = 32 ( SET PGUID -1 -1 f b t \054 0 0 textin textout textin textout i _null_ )); DATA(insert OID = 32 ( SET PGUID -1 -1 f b t \054 0 0 textin textout textin textout i _null_ ));
DESCR("set of tuples"); DESCR("set of tuples");

2
src/include/config.h.in
View File

@ -101,7 +101,7 @@
* pgsql/src/backend/utils/fmgr/fmgr.c and add additional entries * pgsql/src/backend/utils/fmgr/fmgr.c and add additional entries
* to the 'case' statement for the additional arguments. * to the 'case' statement for the additional arguments.
*/ */
#define INDEX_MAX_KEYS 8 #define INDEX_MAX_KEYS 16
#define FUNC_MAX_ARGS INDEX_MAX_KEYS #define FUNC_MAX_ARGS INDEX_MAX_KEYS
/* /*