Tweak fmgrtab generation so that the F_XXX macros that give OIDs for

tglsfdc · tglsfdc · commit a03011319700 · 2000-05-29T20:18:30.000Z
built-in procedures are named after the prosrc field of pg_proc (ie,
the actual C function name), not the proname field.  This did not use
to make a difference back when the two were always the same, but in the
presence of overloaded proname values we'd best try to use the C name
instead.  AFAICT this change affects no existing code, but it is
necessary to be able to get at some built-in functions that no macro
was being generated for before.
diff --git a/src/backend/utils/Gen_fmgrtab.sh.in b/src/backend/utils/Gen_fmgrtab.sh.in
@@ -9,7 +9,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.22 2000/05/28 17:56:05 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.23 2000/05/29 20:18:30 tgl Exp $
 #
 # NOTES
 #    Passes any -D options on to cpp prior to generating the list
@@ -41,7 +41,7 @@ TABLEFILE=fmgrtab.c
 
 #
 # Generate the file containing raw pg_proc tuple data
-# (but only for "internal" language procedures...).
+# (but only for "internal" and "newinternal" language procedures...).
 #
 # Unlike genbki.sh, which can run through cpp last, we have to
 # deal with preprocessor statements first (before we sort the
@@ -82,7 +82,7 @@ cat > $OIDSFILE <<FuNkYfMgRsTuFf
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: Gen_fmgrtab.sh.in,v 1.22 2000/05/28 17:56:05 tgl Exp $
+ * $Id: Gen_fmgrtab.sh.in,v 1.23 2000/05/29 20:18:30 tgl Exp $
  *
  * NOTES
  *	******************************
@@ -99,16 +99,21 @@ cat > $OIDSFILE <<FuNkYfMgRsTuFf
 
 /*
  *	Constant macros for the OIDs of entries in pg_proc.
- *	NOTE: if the same "proname" is used for more than one
- *	internal-function entry in pg_proc, the equivalent macro
- *	will be defined with the lowest OID among those entries.
+ *
+ *	NOTE: macros are named after the prosrc value, ie the actual C name
+ *	of the implementing function, not the proname which may be overloaded.
+ *	For example, we want to be able to assign different macro names to both
+ *	char_text() and int4_text() even though these both appear with proname
+ *	'text'.  If the same C function appears in more than one pg_proc entry,
+ *	its equivalent macro will be defined with the OID of the entry appearing
+ *	first in pg_proc.h.
  */
 FuNkYfMgRsTuFf
 
 tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' < $RAWFILE | \
 awk '
 BEGIN	{ OFS = ""; }
-	{ if (seenit[$2]++ == 0) print "#define F_", $2, " ", $1; }' >> $OIDSFILE
+	{ if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }' >> $OIDSFILE
 
 cat >> $OIDSFILE <<FuNkYfMgRsTuFf
 
@@ -134,7 +139,7 @@ cat > $TABLEFILE <<FuNkYfMgRtAbStUfF
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.22 2000/05/28 17:56:05 tgl Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.23 2000/05/29 20:18:30 tgl Exp $
  *
  * NOTES
  *

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#`
`10`	`10`	`#`
`11`	`11`	`# IDENTIFICATION`
`12`		`-# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.22 2000/05/28 17:56:05 tgl Exp $`
	`12`	`+# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.23 2000/05/29 20:18:30 tgl Exp $`
`13`	`13`	`#`
`14`	`14`	`# NOTES`
`15`	`15`	`# Passes any -D options on to cpp prior to generating the list`
`@@ -41,7 +41,7 @@ TABLEFILE=fmgrtab.c`
`41`	`41`
`42`	`42`	`#`
`43`	`43`	`# Generate the file containing raw pg_proc tuple data`
`44`		`-# (but only for "internal" language procedures...).`
	`44`	`+# (but only for "internal" and "newinternal" language procedures...).`
`45`	`45`	`#`
`46`	`46`	`# Unlike genbki.sh, which can run through cpp last, we have to`
`47`	`47`	`# deal with preprocessor statements first (before we sort the`
`@@ -82,7 +82,7 @@ cat > $OIDSFILE <<FuNkYfMgRsTuFf`
`82`	`82`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`83`	`83`	`* Portions Copyright (c) 1994, Regents of the University of California`
`84`	`84`	`*`
`85`		`- * $Id: Gen_fmgrtab.sh.in,v 1.22 2000/05/28 17:56:05 tgl Exp $`
	`85`	`+ * $Id: Gen_fmgrtab.sh.in,v 1.23 2000/05/29 20:18:30 tgl Exp $`
`86`	`86`	`*`
`87`	`87`	`* NOTES`
`88`	`88`	`* ******************************`
`@@ -99,16 +99,21 @@ cat > $OIDSFILE <<FuNkYfMgRsTuFf`
`99`	`99`
`100`	`100`	`/*`
`101`	`101`	`* Constant macros for the OIDs of entries in pg_proc.`
`102`		`- * NOTE: if the same "proname" is used for more than one`
`103`		`- * internal-function entry in pg_proc, the equivalent macro`
`104`		`- * will be defined with the lowest OID among those entries.`
	`102`	`+ *`
	`103`	`+ * NOTE: macros are named after the prosrc value, ie the actual C name`
	`104`	`+ * of the implementing function, not the proname which may be overloaded.`
	`105`	`+ * For example, we want to be able to assign different macro names to both`
	`106`	`+ * char_text() and int4_text() even though these both appear with proname`
	`107`	`+ * 'text'. If the same C function appears in more than one pg_proc entry,`
	`108`	`+ * its equivalent macro will be defined with the OID of the entry appearing`
	`109`	`+ * first in pg_proc.h.`
`105`	`110`	`*/`
`106`	`111`	`FuNkYfMgRsTuFf`
`107`	`112`
`108`	`113`	`tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' < $RAWFILE \| \`
`109`	`114`	`awk '`
`110`	`115`	`BEGIN { OFS = ""; }`
`111`		`- { if (seenit[$2]++ == 0) print "#define F_", $2, " ", $1; }' >> $OIDSFILE`
	`116`	`+ { if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }' >> $OIDSFILE`
`112`	`117`
`113`	`118`	`cat >> $OIDSFILE <<FuNkYfMgRsTuFf`
`114`	`119`
`@@ -134,7 +139,7 @@ cat > $TABLEFILE <<FuNkYfMgRtAbStUfF`
`134`	`139`	`* Portions Copyright (c) 1994, Regents of the University of California`
`135`	`140`	`*`
`136`	`141`	`* IDENTIFICATION`
`137`		`- * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.22 2000/05/28 17:56:05 tgl Exp $`
	`142`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.23 2000/05/29 20:18:30 tgl Exp $`
`138`	`143`	`*`
`139`	`144`	`* NOTES`
`140`	`145`	`*`