Add a direct function call mechanism using the caller's context.

The current DirectFunctionCall functions use NULL as the flinfo in
initializing the FunctionCallInfoData for the call. That means the
called function has no fn_mcxt or fn_extra to work with, and attempting
to do so will result in an access violation. These functions instead use
the provided flinfo, which will usually be the caller's own flinfo. The
caller needs to ensure that it doesn't use the fn_extra in way that is
incompatible with the way the called function will use it. The called
function should not rely on anything else in the provided context, as it
will be relevant to the caller, not the callee.

Original code from Tom Lane.

Discussion: https://postgr.es/m/db2b70a4-78d7-294a-a315-8e7f506c5978@2ndQuadrant.com

diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 8c00da6c6d6993c8e62831fc0976e7722098bbd3..9fb695279bb87dbc27ff03ca60c8adb6f7c71bd1 100644 (file)
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -1276,6 +1276,56 @@ DirectFunctionCall9Coll(PGFunction func, Oid collation, Datum arg1, Datum arg2,
    return result;
 }
 
+/*
+ * These functions work like the DirectFunctionCall functions except that
+ * they use the flinfo parameter to initialise the fcinfo for the call.
+ * It's recommended that the callee only use the fn_extra and fn_mcxt
+ * fields, as other fields will typically describe the calling function
+ * not the callee.  Conversely, the calling function should not have
+ * used fn_extra, unless its use is known to be compatible with the callee's.
+ */
+
+Datum
+CallerFInfoFunctionCall1(PGFunction func, FmgrInfo *flinfo, Oid collation, Datum arg1)
+{
+   FunctionCallInfoData fcinfo;
+   Datum       result;
+
+   InitFunctionCallInfoData(fcinfo, flinfo, 1, collation, NULL, NULL);
+
+   fcinfo.arg[0] = arg1;
+   fcinfo.argnull[0] = false;
+
+   result = (*func) (&fcinfo);
+
+   /* Check for null result, since caller is clearly not expecting one */
+   if (fcinfo.isnull)
+       elog(ERROR, "function %p returned NULL", (void *) func);
+
+   return result;
+}
+
+Datum
+CallerFInfoFunctionCall2(PGFunction func, FmgrInfo *flinfo, Oid collation, Datum arg1, Datum arg2)
+{
+   FunctionCallInfoData fcinfo;
+   Datum       result;
+
+   InitFunctionCallInfoData(fcinfo, flinfo, 2, collation, NULL, NULL);
+
+   fcinfo.arg[0] = arg1;
+   fcinfo.arg[1] = arg2;
+   fcinfo.argnull[0] = false;
+   fcinfo.argnull[1] = false;
+
+   result = (*func) (&fcinfo);
+
+   /* Check for null result, since caller is clearly not expecting one */
+   if (fcinfo.isnull)
+       elog(ERROR, "function %p returned NULL", (void *) func);
+
+   return result;
+}
 
 /*
  * These are for invocation of a previously-looked-up function with a

diff --git a/src/include/fmgr.h b/src/include/fmgr.h
index 4d400d292487d58bb020e814238c6ab225fe7252..0a155acee6290a1bcfc936b70e01beba35637be2 100644 (file)
--- a/src/include/fmgr.h
+++ b/src/include/fmgr.h
@@ -483,6 +483,19 @@ extern Datum DirectFunctionCall9Coll(PGFunction func, Oid collation,
                        Datum arg6, Datum arg7, Datum arg8,
                        Datum arg9);
 
+/*
+ * These functions work like the DirectFunctionCall functions except that
+ * they use the flinfo parameter to initialise the fcinfo for the call.
+ * It's recommended that the callee only use the fn_extra and fn_mcxt
+ * fields, as other fields will typically describe the calling function
+ * not the callee.  Conversely, the calling function should not have
+ * used fn_extra, unless its use is known to be compatible with the callee's.
+ */
+extern Datum CallerFInfoFunctionCall1(PGFunction func, FmgrInfo *flinfo,
+                        Oid collation, Datum arg1);
+extern Datum CallerFInfoFunctionCall2(PGFunction func, FmgrInfo *flinfo,
+                        Oid collation, Datum arg1, Datum arg2);
+
 /* These are for invocation of a previously-looked-up function with a
  * directly-computed parameter list.  Note that neither arguments nor result
  * are allowed to be NULL.