Merge 2b520fdc4a into 662b7248db

src/backend/distributed/executor/adaptive_executor.c

@@ -815,8 +815,11 @@ AdaptiveExecutor(CitusScanState *scanState)
 		 * be part of the same transaction.
 		 */
 		UseCoordinatedTransaction();
+
+		ParamListInfo boundParams = copyParamList(paramListInfo);
+
 		taskList = ExplainAnalyzeTaskList(taskList, defaultTupleDest, tupleDescriptor,
-										  paramListInfo);
+										  boundParams);
 
 		/*
 		 * Multiple queries per task is not supported with local execution. See the Assert in

src/backend/distributed/planner/multi_explain.c

@@ -1031,7 +1031,11 @@ FetchRemoteExplainFromWorkers(Task *task, ExplainState *es, ParamListInfo params
 
 		if (params)
 		{
-			ExtractParametersFromParamList(params, &paramTypes, &paramValues, false);
+			/* force evaluation of bound params */
+			params = copyParamList(params);
+
+			ExtractParametersForRemoteExecution(params, &paramTypes,
+												&paramValues);
 		}
 
 		int sendStatus = SendRemoteCommandParams(connection, explainQuery->data,
@@ -2110,6 +2114,7 @@ FetchPlanQueryForExplainAnalyze(const char *queryString, ParamListInfo params)
 						 ParameterResolutionSubquery(params));
 	}
 
+
 	appendStringInfoString(fetchQuery,
 						   "SELECT explain_analyze_output, execution_duration, "
 						   "execution_ntuples, execution_nloops "
@@ -2134,6 +2139,12 @@ ParameterResolutionSubquery(ParamListInfo params)
 	for (int paramIndex = 0; paramIndex < params->numParams; paramIndex++)
 	{
 		ParamExternData *param = &params->params[paramIndex];
+
+		if (param->ptype == 0)
+		{
+			continue;
+		}
+
 		char *typeName = format_type_extended(param->ptype, -1,
 											  FORMAT_TYPE_FORCE_QUALIFY);
 

src/test/regress/expected/multi_explain.out

@@ -3398,6 +3398,19 @@ SET auto_explain.log_min_duration = 0;
 set auto_explain.log_analyze to true;
 -- the following should not be locally executed since explain analyze is on
 select * from test_ref_table;
+CREATE TABLE test_auto_explain.test_params
+( coll1 int8 NULL,
+  coll2 int4 NOT NULL);
+SELECT create_distributed_table('test_auto_explain.test_params', 'coll1');
+
+CREATE OR REPLACE PROCEDURE test_auto_explain.test_delete_from(p_coll2 int)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+DELETE FROM test_auto_explain.test_params
+WHERE coll2 = p_coll2;
+END;$$;
+CALL test_auto_explain.test_delete_from(20240401);
 DROP SCHEMA test_auto_explain CASCADE;
 SET client_min_messages TO ERROR;
 DROP SCHEMA multi_explain CASCADE;

src/test/regress/expected/multi_explain_0.out

@@ -3387,6 +3387,19 @@ SET auto_explain.log_min_duration = 0;
 set auto_explain.log_analyze to true;
 -- the following should not be locally executed since explain analyze is on
 select * from test_ref_table;
+CREATE TABLE test_auto_explain.test_params
+( coll1 int8 NULL,
+  coll2 int4 NOT NULL);
+SELECT create_distributed_table('test_auto_explain.test_params', 'coll1');
+
+CREATE OR REPLACE PROCEDURE test_auto_explain.test_delete_from(p_coll2 int)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+DELETE FROM test_auto_explain.test_params
+WHERE coll2 = p_coll2;
+END;$$;
+CALL test_auto_explain.test_delete_from(20240401);
 DROP SCHEMA test_auto_explain CASCADE;
 SET client_min_messages TO ERROR;
 DROP SCHEMA multi_explain CASCADE;

src/test/regress/sql/multi_explain.sql

@@ -1212,6 +1212,22 @@ set auto_explain.log_analyze to true;
 -- the following should not be locally executed since explain analyze is on
 select * from test_ref_table;
 
+CREATE TABLE test_auto_explain.test_params
+( coll1 int8 NULL,
+  coll2 int4 NOT NULL);
+
+SELECT create_distributed_table('test_auto_explain.test_params', 'coll1');
+
+CREATE OR REPLACE PROCEDURE test_auto_explain.test_delete_from(p_coll2 int)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+DELETE FROM test_auto_explain.test_params
+WHERE coll2 = p_coll2;
+END;$$;
+
+CALL test_auto_explain.test_delete_from(20240401);
+
 DROP SCHEMA test_auto_explain CASCADE;
 
 SET client_min_messages TO ERROR;