First round of changes for new fmgr interface. fmgr itself and the

key call sites are changed, but most called functions are still oldstyle.
An exception is that the PL managers are updated (so, for example, NULL
handling now behaves as expected in plperl and plpgsql functions).
NOTE initdb is forced due to added column in pg_proc.

src/backend/catalog/heap.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.128 2000/05/25 21:25:32 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.129 2000/05/28 17:55:54 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -63,6 +63,7 @@
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 #include "utils/catcache.h"
+#include "utils/fmgroids.h"
 #include "utils/portal.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
@@ -1148,7 +1149,7 @@ RelationTruncateIndexes(Relation heapRelation)
 		/* If a valid where predicate, compute predicate Node */
 		if (VARSIZE(&index->indpred) != 0)
 		{
-			predString = fmgr(F_TEXTOUT, &index->indpred);
+			predString = textout(&index->indpred);
 			oldPred = stringToNode(predString);
 			pfree(predString);
 		}

src/backend/catalog/index.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.110 2000/05/20 23:11:28 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.111 2000/05/28 17:55:54 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -42,6 +42,7 @@
 #include "storage/smgr.h"
 #include "utils/builtins.h"
 #include "utils/catcache.h"
+#include "utils/fmgroids.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 #include "utils/temprel.h"
@@ -688,11 +689,11 @@ UpdateIndexRelation(Oid indexoid,
 	if (predicate != NULL)
 	{
 		predString = nodeToString(predicate);
-		predText = (text *) fmgr(F_TEXTIN, predString);
+		predText = textin(predString);
 		pfree(predString);
 	}
 	else
-		predText = (text *) fmgr(F_TEXTIN, "");
+		predText = textin("");
 
 	predLen = VARSIZE(predText);
 	itupLen = predLen + sizeof(FormData_pg_index);
@@ -832,11 +833,11 @@ UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate)
 	if (newPred != NULL)
 	{
 		predString = nodeToString(newPred);
-		predText = (text *) fmgr(F_TEXTIN, predString);
+		predText = textin(predString);
 		pfree(predString);
 	}
 	else
-		predText = (text *) fmgr(F_TEXTIN, "");
+		predText = textin("");
 
 	/* open the index system catalog relation */
 	pg_index = heap_openr(IndexRelationName, RowExclusiveLock);
@@ -2109,7 +2110,7 @@ reindex_index(Oid indexId, bool force)
 	/* If a valid where predicate, compute predicate Node */
 	if (VARSIZE(&index->indpred) != 0)
 	{
-		predString = fmgr(F_TEXTOUT, &index->indpred);
+		predString = textout(&index->indpred);
 		oldPred = stringToNode(predString);
 		pfree(predString);
 	}

src/backend/catalog/indexing.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.60 2000/04/12 17:14:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.61 2000/05/28 17:55:54 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,7 @@
 #include "catalog/indexing.h"
 #include "catalog/pg_index.h"
 #include "miscadmin.h"
+#include "utils/fmgroids.h"
 #include "utils/syscache.h"
 
 /*

src/backend/catalog/pg_operator.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.49 2000/01/26 05:56:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.50 2000/05/28 17:55:54 tgl Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -26,6 +26,7 @@
 #include "miscadmin.h"
 #include "parser/parse_func.h"
 #include "utils/builtins.h"
+#include "utils/fmgroids.h"
 #include "utils/syscache.h"
 
 

src/backend/catalog/pg_proc.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.42 2000/04/12 17:14:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.43 2000/05/28 17:55:54 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
+#include "catalog/pg_language.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
@@ -24,7 +25,6 @@
 #include "parser/parse_type.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
-#include "utils/fmgrtab.h"
 #include "utils/lsyscache.h"
 #include "utils/sets.h"
 #include "utils/syscache.h"
@@ -41,8 +41,9 @@ ProcedureCreate(char *procedureName,
 				char *languageName,
 				char *prosrc,
 				char *probin,
-				bool canCache,
 				bool trusted,
+				bool canCache,
+				bool isStrict,
 				int32 byte_pct,
 				int32 perbyte_cpu,
 				int32 percall_cpu,
@@ -74,6 +75,15 @@ ProcedureCreate(char *procedureName,
 	Assert(PointerIsValid(prosrc));
 	Assert(PointerIsValid(probin));
 
+	tup = SearchSysCacheTuple(LANGNAME,
+							  PointerGetDatum(languageName),
+							  0, 0, 0);
+
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "ProcedureCreate: no such language '%s'", languageName);
+
+	languageObjectId = tup->t_data->t_oid;
+
 	parameterCount = 0;
 	MemSet(typev, 0, FUNC_MAX_ARGS * sizeof(Oid));
 	foreach(x, argList)
@@ -86,7 +96,7 @@ ProcedureCreate(char *procedureName,
 
 		if (strcmp(strVal(t), "opaque") == 0)
 		{
-			if (strcmp(languageName, "sql") == 0)
+			if (languageObjectId == SQLlanguageId)
 				elog(ERROR, "ProcedureCreate: sql functions cannot take type \"opaque\"");
 			toid = 0;
 		}
@@ -120,7 +130,7 @@ ProcedureCreate(char *procedureName,
 		elog(ERROR, "ProcedureCreate: procedure %s already exists with same arguments",
 			 procedureName);
 
-	if (!strcmp(languageName, "sql"))
+	if (languageObjectId == SQLlanguageId)
 	{
 
 		/*
@@ -129,7 +139,7 @@ ProcedureCreate(char *procedureName,
 		 * matches a function already in pg_proc.  If so just return the
 		 * OID of the existing set.
 		 */
-		if (!strcmp(procedureName, GENERICSETNAME))
+		if (strcmp(procedureName, GENERICSETNAME) == 0)
 		{
 #ifdef SETS_FIXED
 			/* ----------
@@ -138,7 +148,7 @@ ProcedureCreate(char *procedureName,
 			 * have been removed. Instead a sequential heap scan
 			 * or something better must get implemented. The reason
 			 * for removing is that nbtree index crashes if sources
-			 * exceed 2K what's likely for procedural languages.
+			 * exceed 2K --- what's likely for procedural languages.
 			 *
 			 * 1999/09/30 Jan
 			 * ----------
@@ -158,18 +168,9 @@ ProcedureCreate(char *procedureName,
 		}
 	}
 
-	tup = SearchSysCacheTuple(LANGNAME,
-							  PointerGetDatum(languageName),
-							  0, 0, 0);
-
-	if (!HeapTupleIsValid(tup))
-		elog(ERROR, "ProcedureCreate: no such language %s", languageName);
-
-	languageObjectId = tup->t_data->t_oid;
-
 	if (strcmp(returnTypeName, "opaque") == 0)
 	{
-		if (strcmp(languageName, "sql") == 0)
+		if (languageObjectId == SQLlanguageId)
 			elog(ERROR, "ProcedureCreate: sql functions cannot return type \"opaque\"");
 		typeObjectId = 0;
 	}
@@ -181,16 +182,10 @@ ProcedureCreate(char *procedureName,
 		{
 			elog(NOTICE, "ProcedureCreate: type '%s' is not yet defined",
 				 returnTypeName);
-#ifdef NOT_USED
-			elog(NOTICE, "ProcedureCreate: creating a shell for type '%s'",
-				 returnTypeName);
-#endif
 			typeObjectId = TypeShellMake(returnTypeName);
 			if (!OidIsValid(typeObjectId))
-			{
 				elog(ERROR, "ProcedureCreate: could not create type '%s'",
 					 returnTypeName);
-			}
 		}
 		else if (!defined)
 		{
@@ -219,7 +214,7 @@ ProcedureCreate(char *procedureName,
 	 * procedure's text in the prosrc attribute.
 	 */
 
-	if (strcmp(languageName, "sql") == 0)
+	if (languageObjectId == SQLlanguageId)
 	{
 		querytree_list = pg_parse_and_rewrite(prosrc, typev, parameterCount,
 											  FALSE);
@@ -237,16 +232,50 @@ ProcedureCreate(char *procedureName,
 	 * FUNCTION xyz AS '' LANGUAGE 'internal'.	To preserve some modicum
 	 * of backwards compatibility, accept an empty 'prosrc' value as
 	 * meaning the supplied SQL function name.
+	 *
+	 * XXX: we could treat "internal" and "newinternal" language specs
+	 * as equivalent, and take the actual language ID from the table of
+	 * known builtin functions.  Is that a better idea than making the
+	 * user specify the right thing?  Not sure.
 	 */
 
-	if (strcmp(languageName, "internal") == 0)
+	if (languageObjectId == INTERNALlanguageId ||
+		languageObjectId == NEWINTERNALlanguageId)
 	{
+		Oid			actualLangID;
+
 		if (strlen(prosrc) == 0)
 			prosrc = procedureName;
-		if (fmgr_lookupByName(prosrc) == (func_ptr) NULL)
+		actualLangID = fmgr_internal_language(prosrc);
+		if (actualLangID == InvalidOid)
 			elog(ERROR,
-			"ProcedureCreate: there is no builtin function named \"%s\"",
+				 "ProcedureCreate: there is no builtin function named \"%s\"",
 				 prosrc);
+		if (actualLangID != languageObjectId)
+			elog(ERROR,
+				 "ProcedureCreate: \"%s\" is not %s internal function",
+				 prosrc,
+				 ((languageObjectId == INTERNALlanguageId) ?
+				  "an old-style" : "a new-style"));
+	}
+
+	/*
+	 * If this is a dynamically loadable procedure, make sure that the
+	 * library file exists, is loadable, and contains the specified link
+	 * symbol.
+	 *
+	 * We used to perform these checks only when the function was first
+	 * called, but it seems friendlier to verify the library's validity
+	 * at CREATE FUNCTION time.
+	 */
+
+	if (languageObjectId == ClanguageId ||
+		languageObjectId == NEWClanguageId)
+	{
+		/* If link symbol is specified as "-", substitute procedure name */
+		if (strcmp(prosrc, "-") == 0)
+			prosrc = procedureName;
+		(void) load_external_function(probin, prosrc);
 	}
 
 	/*
@@ -265,9 +294,10 @@ ProcedureCreate(char *procedureName,
 	values[i++] = Int32GetDatum(GetUserId());
 	values[i++] = ObjectIdGetDatum(languageObjectId);
 	/* XXX isinherited is always false for now */
-	values[i++] = Int8GetDatum((bool) 0);
+	values[i++] = Int8GetDatum((bool) false);
 	values[i++] = Int8GetDatum(trusted);
 	values[i++] = Int8GetDatum(canCache);
+	values[i++] = Int8GetDatum(isStrict);
 	values[i++] = UInt16GetDatum(parameterCount);
 	values[i++] = Int8GetDatum(returnsSet);
 	values[i++] = ObjectIdGetDatum(typeObjectId);
@@ -276,8 +306,8 @@ ProcedureCreate(char *procedureName,
 	values[i++] = Int32GetDatum(perbyte_cpu);	/* properbyte_cpu */
 	values[i++] = Int32GetDatum(percall_cpu);	/* propercall_cpu */
 	values[i++] = Int32GetDatum(outin_ratio);	/* prooutin_ratio */
-	values[i++] = (Datum) fmgr(F_TEXTIN, prosrc);		/* prosrc */
-	values[i++] = (Datum) fmgr(F_TEXTIN, probin);		/* probin */
+	values[i++] = (Datum) textin(prosrc);		/* prosrc */
+	values[i++] = (Datum) textin(probin);		/* probin */
 
 	rel = heap_openr(ProcedureRelationName, RowExclusiveLock);
 

src/backend/catalog/pg_type.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.50 2000/04/12 17:14:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.51 2000/05/28 17:55:54 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,7 @@
 #include "miscadmin.h"
 #include "parser/parse_func.h"
 #include "utils/builtins.h"
+#include "utils/fmgroids.h"
 #include "utils/syscache.h"
 
 
@@ -190,7 +191,7 @@ TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName)
 	/*
 	 * ... and fill typdefault with a bogus value
 	 */
-	values[i++] = (Datum) fmgr(F_TEXTIN, typeName);		/* 15 */
+	values[i++] = (Datum) textin(typeName);		/* 15 */
 
 	/* ----------------
 	 *	create a new type tuple with FormHeapTuple
@@ -449,10 +450,9 @@ TypeCreate(char *typeName,
 	 *	initialize the default value for this type.
 	 * ----------------
 	 */
-	values[i] = (Datum) fmgr(F_TEXTIN,	/* 16 */
-							 PointerIsValid(defaultTypeValue)
-							 ? defaultTypeValue : "-"); /* XXX default
-														 * typdefault */
+	values[i] = (Datum) textin(PointerIsValid(defaultTypeValue)	/* 16 */
+							   ? defaultTypeValue : "-"); /* XXX default
+														   * typdefault */
 
 	/* ----------------
 	 *	open pg_type and begin a scan for the type name.