Revert "Avoid checking permission of Babelfish temp tables on parallel worker (babelfish-for-postgresql#560)"

This reverts commit 4cd4eb8.

Author: Dipesh Dhameliya

src/backend/executor/execMain.c

@@ -79,9 +79,6 @@ TriggerRecuresiveCheck_hook_type TriggerRecuresiveCheck_hook = NULL;
 /* Hook for plugin to get control in ExecCheckRTPerms() */
 ExecutorCheckPerms_hook_type ExecutorCheckPerms_hook = NULL;
 
-/* Hook for plugin to get control in ExecCheckRTEPerms() */
-ExecCheckRTEPerms_hook_type ExecCheckRTEPerms_hook = NULL;
-
 /* decls for local routines only used within this module */
 static void InitPlan(QueryDesc *queryDesc, int eflags);
 static void CheckValidRowMarkRel(Relation rel, RowMarkType markType);
@@ -621,19 +618,6 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
 
 	relOid = rte->relid;
 
-	/* 
-	 * Babelfish specific logic - Babelfish temp table is implemented
-	 * using ENR which is not shared with parallel worker and parallel
-	 * operations are not allowed for temp table in Postgres. Babelfish
-	 * can skip permission check for such use cases under parallel worker
-	 * using this hook.
-	 * Note - This hook must not be used outside of Babelfish parallel worker
-	 */
-	if (ExecCheckRTEPerms_hook &&
-		IsBabelfishParallelWorker() &&
-		(*ExecCheckRTEPerms_hook)(rte))
-		return true;
-
 	/*
 	 * userid to check as: current user unless we have a setuid indication.
 	 *
@@ -826,9 +810,10 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 	int			i;
 
 	/*
-	 * Do permissions checks
+	 * Do permissions checks if not Babelfish parallel worker
 	 */
-	ExecCheckRTPerms(rangeTable, true);
+	if (!IsBabelfishParallelWorker())
+		ExecCheckRTPerms(rangeTable, true);
 
 	/*
 	 * initialize the node's execution state
@@ -2959,12 +2944,3 @@ EvalPlanQualEnd(EPQState *epqstate)
 	epqstate->relsubs_done = NULL;
 	epqstate->epqExtra->relsubs_blocked = NULL;
 }
-
-/*
- * ExecCheckRTEPerms_wrapper - wrapper around ExecCheckRTEPerms
- */
-bool
-ExecCheckRTEPerms_wrapper(RangeTblEntry *rte)
-{
-	return ExecCheckRTEPerms(rte);
-}

src/backend/executor/execParallel.c

@@ -124,9 +124,6 @@ typedef struct ExecParallelInitializeDSMContext
 	int			nnodes;
 } ExecParallelInitializeDSMContext;
 
-ExecInitParallelPlan_hook_type ExecInitParallelPlan_hook = NULL;
-ParallelQueryMain_hook_type ParallelQueryMain_hook = NULL;
-
 /* Helper functions that run in the parallel leader. */
 static char *ExecSerializePlan(Plan *plan, EState *estate);
 static bool ExecParallelEstimate(PlanState *node,
@@ -687,10 +684,6 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate,
 						   mul_size(PARALLEL_TUPLE_QUEUE_SIZE, pcxt->nworkers));
 	shm_toc_estimate_keys(&pcxt->estimator, 1);
 
-	/* Let extension estimate a dynamic shared memory needed to communicate additional context */
-	if (ExecInitParallelPlan_hook)
-		(*ExecInitParallelPlan_hook)(estate, pcxt, true);
-
 	/*
 	 * Give parallel-aware nodes a chance to add to the estimates, and get a
 	 * count of how many PlanState nodes there are.
@@ -774,12 +767,6 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate,
 	shm_toc_insert(pcxt->toc, PARALLEL_KEY_WAL_USAGE, walusage_space);
 	pei->wal_usage = walusage_space;
 
-	/* Give extension a chance to share additional context */
-	if (ExecInitParallelPlan_hook)
-	{
-		(*ExecInitParallelPlan_hook)(estate, pcxt,false);
-	}
-
 	/* Set up the tuple queues that the workers will write into. */
 	pei->tqueue = ExecParallelSetupTupleQueues(pcxt, false);
 
@@ -1440,12 +1427,6 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
 	area_space = shm_toc_lookup(toc, PARALLEL_KEY_DSA, false);
 	area = dsa_attach_in_place(area_space, seg);
 
-	/* Give extension chance to retrieve additional context shared by leader node */
-	if (ParallelQueryMain_hook)
-	{
-		(*ParallelQueryMain_hook)(toc);
-	}
-
 	/* Start up the executor */
 	queryDesc->plannedstmt->jitFlags = fpes->jit_flags;
 	ExecutorStart(queryDesc, fpes->eflags);

src/include/access/parallel.h

@@ -82,11 +82,15 @@ extern void ParallelWorkerMain(Datum main_arg);
 /* Below helpers are added to support parallel workers in Babelfish context */
 extern bool IsBabelfishParallelWorker(void);
 
+/* Key for BabelfishFixedParallelState */
+#define BABELFISH_PARALLEL_KEY_FIXED        UINT64CONST(0xBBF0000000000001)
+
 /* Hooks for communicating babelfish related information to parallel worker */
 typedef void (*bbf_InitializeParallelDSM_hook_type)(ParallelContext *pcxt, bool estimate);
 extern PGDLLIMPORT bbf_InitializeParallelDSM_hook_type bbf_InitializeParallelDSM_hook;
 
 typedef void (*bbf_ParallelWorkerMain_hook_type)(shm_toc *toc);
 extern PGDLLIMPORT bbf_ParallelWorkerMain_hook_type bbf_ParallelWorkerMain_hook;
 
+
 #endif							/* PARALLEL_H */

src/include/executor/execParallel.h

@@ -48,15 +48,4 @@ extern void ExecParallelReinitialize(PlanState *planstate,
 
 extern void ParallelQueryMain(dsm_segment *seg, shm_toc *toc);
 
-typedef void (*ParallelQueryMain_hook_type)(shm_toc *toc);
-extern PGDLLIMPORT ParallelQueryMain_hook_type ParallelQueryMain_hook;
-
-/*
- * When estimate = true passed then caller wants extension to estimate a dynamic shared memory (DSM)
- * needed by that extension to communicate additional context with Parallel worker.
- * When estimate = false then caller wants to insert additional context to DSM.
- */
-typedef void (*ExecInitParallelPlan_hook_type)(EState *estate, ParallelContext *pcxt, bool estimate);
-extern PGDLLIMPORT ExecInitParallelPlan_hook_type ExecInitParallelPlan_hook;
-
 #endif							/* EXECPARALLEL_H */

src/include/executor/executor.h

@@ -87,9 +87,6 @@ extern PGDLLIMPORT ExecutorCheckPerms_hook_type ExecutorCheckPerms_hook;
 typedef bool (*TriggerRecuresiveCheck_hook_type) (ResultRelInfo *resultRelInfo);
 extern PGDLLIMPORT TriggerRecuresiveCheck_hook_type TriggerRecuresiveCheck_hook;
 
-typedef bool (*ExecCheckRTEPerms_hook_type) (RangeTblEntry *rte);
-extern PGDLLEXPORT ExecCheckRTEPerms_hook_type ExecCheckRTEPerms_hook;
-
 /*
  * prototypes from functions in execAmi.c
  */
@@ -203,7 +200,6 @@ extern void standard_ExecutorEnd(QueryDesc *queryDesc);
 extern void ExecutorRewind(QueryDesc *queryDesc);
 extern bool ExecCheckRTPerms(List *rangeTable, bool ereport_on_violation);
 extern void CheckValidResultRel(ResultRelInfo *resultRelInfo, CmdType operation);
-extern bool ExecCheckRTEPerms_wrapper(RangeTblEntry *rte);
 extern void InitResultRelInfo(ResultRelInfo *resultRelInfo,
 							  Relation resultRelationDesc,
 							  Index resultRelationIndex,