Optimized pgstat_init_function_usage/pg_newlocale_from_collation

src/backend/utils/activity/pgstat_function.c

@@ -16,7 +16,7 @@
  */
 
 #include "postgres.h"
-
+#include "pgstat.h"
 #include "access/htup_details.h"
 #include "catalog/pg_proc.h"
 #include "fmgr.h"
@@ -40,8 +40,6 @@ int			pgstat_track_functions = TRACK_FUNC_OFF;
  */
 static instr_time total_func_time;
 
-pre_function_call_hook_type pre_function_call_hook = NULL;
-
 /*
  * Ensure that stats are dropped if transaction aborts.
  */
@@ -80,18 +78,6 @@ pgstat_init_function_usage(FunctionCallInfo fcinfo,
 	PgStat_BackendFunctionEntry *pending;
 	bool		created_entry;
 
-	if (pre_function_call_hook && IsTransactionState())
-	{
-		HeapTuple proctup = SearchSysCache1(PROCOID, ObjectIdGetDatum(fcinfo->flinfo->fn_oid));
-		if (HeapTupleIsValid(proctup))
-		{
-			Form_pg_proc proc = (Form_pg_proc) GETSTRUCT(proctup);
-			(*pre_function_call_hook)(NameStr(proc->proname));
-		}
-
-		ReleaseSysCache(proctup);
-	}
-
 	if (pgstat_track_functions <= fcinfo->flinfo->fn_stats)
 	{
 		/* stats not wanted */

src/backend/utils/adt/pg_locale.c

@@ -1517,6 +1517,9 @@ report_newlocale_failure(const char *localename)
  * might only need one of them.  Since this is called only once per session,
  * it shouldn't cost much.
  */
+
+collation_cache_entry *prev_cache = NULL;
+
 pg_locale_t
 pg_newlocale_from_collation(Oid collid)
 {
@@ -1534,6 +1537,11 @@ pg_newlocale_from_collation(Oid collid)
 	}
 
 	cache_entry = lookup_collation_cache(collid, false);
+
+	if (prev_cache && prev_cache->collid == collid)
+    {
+        return prev_cache->locale;
+    }
 
 	if (cache_entry->locale == 0)
 	{
@@ -1676,6 +1684,21 @@ pg_newlocale_from_collation(Oid collid)
 		cache_entry->locale = resultp;
 	}
 
+	if(prev_cache)
+	{
+		pfree(prev_cache);
+	}
+
+	prev_cache = (collation_cache_entry *) MemoryContextAlloc(CacheMemoryContext, sizeof(collation_cache_entry));
+
+	if(prev_cache == NULL)
+	{
+		ereport(ERROR, (errmsg("Memory allocation failed")));
+	}
+
+	prev_cache->collid = cache_entry->collid;
+	prev_cache->locale = cache_entry->locale;
+
 	return cache_entry->locale;
 }
 

src/backend/utils/fmgr/fmgr.c

@@ -44,6 +44,7 @@ PGDLLIMPORT needs_fmgr_hook_type needs_fmgr_hook = NULL;
 PGDLLIMPORT fmgr_hook_type fmgr_hook = NULL;
 PGDLLIMPORT non_tsql_proc_entry_hook_type non_tsql_proc_entry_hook = NULL;
 PGDLLIMPORT get_func_language_oids_hook_type get_func_language_oids_hook = NULL;
+PGDLLIMPORT pgstat_function_wrapper_hook_type pgstat_function_wrapper_hook = NULL;
 
 /*
  * Hashtable for fast lookup of external C functions
@@ -60,7 +61,6 @@ typedef struct
 
 static HTAB *CFuncHash = NULL;
 
-
 static void fmgr_info_cxt_security(Oid functionId, FmgrInfo *finfo, MemoryContext mcxt,
 								   bool ignore_security);
 static void fmgr_info_C_lang(Oid functionId, FmgrInfo *finfo, HeapTuple procedureTuple);
@@ -706,6 +706,7 @@ fmgr_security_definer(PG_FUNCTION_ARGS)
 	int			sys_func_count = 0;
 	int			non_tsql_proc_count = 0;
 	void	   *newextra = NULL;
+	char 	   *cacheTupleProcname = NULL;
 
 	if (!fcinfo->flinfo->fn_extra)
 	{
@@ -729,6 +730,8 @@ fmgr_security_definer(PG_FUNCTION_ARGS)
 				 fcinfo->flinfo->fn_oid);
 		procedureStruct = (Form_pg_proc) GETSTRUCT(tuple);
 
+		cacheTupleProcname = pstrdup(procedureStruct->proname.data);
+
 		if (procedureStruct->prosecdef)
 			fcache->userid = procedureStruct->proowner;
 
@@ -832,8 +835,25 @@ fmgr_security_definer(PG_FUNCTION_ARGS)
 		fcinfo->flinfo = &fcache->flinfo;
 
 		/* See notes in fmgr_info_cxt_security */
+
+		/* 
+		 * The wrapper function hook is called if hook is not null 
+		 * and the dialect is TSQL then we call this func using hook 
+		 * otherwise we will fall back to pgstat_init_function_usage
+		*/
+
+		if(pgstat_function_wrapper_hook && sql_dialect == SQL_DIALECT_TSQL)
+		{
+			(*pgstat_function_wrapper_hook)(fcinfo, &fcusage, cacheTupleProcname);
+		}
+
 		pgstat_init_function_usage(fcinfo, &fcusage);
 
+		if(cacheTupleProcname)
+		{
+			pfree(cacheTupleProcname);
+		}
+
 		result = FunctionCallInvoke(fcinfo);
 
 		/*

src/include/pgstat.h

@@ -491,6 +491,8 @@ extern void pgstat_drop_function(Oid proid);
 struct FunctionCallInfoBaseData;
 extern void pgstat_init_function_usage(struct FunctionCallInfoBaseData *fcinfo,
 									   PgStat_FunctionCallUsage *fcu);
+extern void pgstat_init_function_usage_wrapper(struct FunctionCallInfoBaseData *fcinfo,
+									   PgStat_FunctionCallUsage *fcusageptr, char *proname);
 extern void pgstat_end_function_usage(PgStat_FunctionCallUsage *fcu,
 									  bool finalize);
 
@@ -706,9 +708,6 @@ extern PGDLLIMPORT PgStat_WalStats PendingWalStats;
 extern void pg_stat_write_backend_details_NoAlloc(int outfile, PgBackendStatus *);
 extern void write_structdef_file(void);
 
-typedef void (*pre_function_call_hook_type) (const char *funcName);
-extern PGDLLIMPORT pre_function_call_hook_type pre_function_call_hook;
-
 typedef void (*invalidate_stat_table_hook_type) (void);
 extern PGDLLIMPORT invalidate_stat_table_hook_type invalidate_stat_table_hook;
 
@@ -718,4 +717,7 @@ extern PGDLLIMPORT guc_newval_hook_type guc_newval_hook;
 typedef bool (*tsql_has_pgstat_permissions_hook_type) (Oid role);
 extern PGDLLIMPORT tsql_has_pgstat_permissions_hook_type tsql_has_pgstat_permissions_hook;
 
+typedef void (*pgstat_function_wrapper_hook_type)(FunctionCallInfo, PgStat_FunctionCallUsage *, char *);
+extern PGDLLIMPORT pgstat_function_wrapper_hook_type pgstat_function_wrapper_hook;
+
 #endif							/* PGSTAT_H */