This fixes coordinator planner to geenrate operator to go to

datanodes.

Submitted by Abbas But.

Author: koichi-szk

src/backend/nodes/copyfuncs.c

@@ -1048,7 +1048,8 @@ _copyRemoteQuery(const RemoteQuery *from)
 	COPY_SCALAR_FIELD(has_row_marks);
 	COPY_SCALAR_FIELD(rq_save_command_id);
 	COPY_SCALAR_FIELD(rq_params_internal);
-	COPY_SCALAR_FIELD(rq_save_command_id);
+	COPY_SCALAR_FIELD(rq_use_pk_for_rep_change);
+	COPY_SCALAR_FIELD(rq_max_param_num);
 
 	return newnode;
 }

src/backend/nodes/outfuncs.c

@@ -492,7 +492,8 @@ _outRemoteQuery(StringInfo str, const RemoteQuery *node)
 	WRITE_NODE_FIELD(query_var_tlist);
 	WRITE_BOOL_FIELD(rq_save_command_id);
 	WRITE_BOOL_FIELD(rq_params_internal);
-	WRITE_BOOL_FIELD(rq_save_command_id);
+	WRITE_BOOL_FIELD(rq_use_pk_for_rep_change);
+	WRITE_BOOL_FIELD(rq_max_param_num);
 }
 
 static void

src/backend/optimizer/plan/pgxcplan.c

@@ -1334,6 +1334,18 @@ pgxc_build_dml_statement(PlannerInfo *root, CmdType cmdtype,
 				pgxc_dml_add_qual_to_query(query_to_deparse, col_att,
 							pkattno, resultRelationIndex);
 			}
+
+			/*
+			 * Save the maximum number of parameters that should be sent down
+			 * to the datanode while executing this delete. Sending extra
+			 * parametrs causes problems in case those extra contain composite
+			 * types, because input of annon composite types is not implemented
+			 * For example see the delete query in JDBC regression
+			 * File : XC_02_AbsenteesTest.java
+			 * Function : testDeletePersonnel_3
+			 */
+			if (cmdtype == CMD_DELETE)
+				rqplan->rq_max_param_num = col_att;
 		}
 		query_to_deparse->jointree->quals = (Node *)make_andclause(
 						(List *)query_to_deparse->jointree->quals);

src/backend/pgxc/pool/execRemote.c

@@ -4967,11 +4967,14 @@ SetDataRowForIntParams(JunkFilter *junkfilter,
 {
 	StringInfoData	buf;
 	uint16			numparams = 0;
+	RemoteQuery		*step = (RemoteQuery *) rq_state->ss.ps.plan;
 
 	Assert(sourceSlot);
 
 	/* Calculate the total number of parameters */
-	if (dataSlot)
+	if (step->rq_max_param_num > 0)
+		numparams = step->rq_max_param_num;
+	else if (dataSlot)
 		numparams = dataSlot->tts_tupleDescriptor->natts;
 	/* Add number of junk attributes */
 	if (junkfilter)
@@ -5009,6 +5012,10 @@ SetDataRowForIntParams(JunkFilter *junkfilter,
 		{
 			TupleDesc tdesc = dataSlot->tts_tupleDescriptor;
 			int numatts = tdesc->natts;
+
+			if (step->rq_max_param_num > 0)
+				numatts = step->rq_max_param_num;
+
 			for (attindex = 0; attindex < numatts; attindex++)
 			{
 				rq_state->rqs_param_types[attindex] =
@@ -5057,12 +5064,16 @@ SetDataRowForIntParams(JunkFilter *junkfilter,
 	{
 		TupleDesc	 	tdesc = dataSlot->tts_tupleDescriptor;
 		int				attindex;
+		int				numatts = tdesc->natts;
 
 		/* Append the data attributes */
 
+		if (step->rq_max_param_num > 0)
+			numatts = step->rq_max_param_num;
+
 		/* ensure we have all values */
 		slot_getallattrs(dataSlot);
-		for (attindex = 0; attindex < tdesc->natts; attindex++)
+		for (attindex = 0; attindex < numatts; attindex++)
 		{
 			uint32 n32;
 			Assert(attindex < numparams);

src/include/optimizer/pgxcplan.h

@@ -126,6 +126,18 @@ typedef struct
 												 * the replicated table to
 												 * perform update/delete?
 												 */
+	int				rq_max_param_num;	/* Upto which number are parameters
+										 * added in an delete on a replicated
+										 * tablke. This is required to make
+										 * sure that extra parameters are not
+										 * sent to the datanode while
+										 * executing. The problem in sending
+										 * extra parameters is that those extra
+										 * parameters may contain a composite
+										 * type which makes the query fail
+										 * because input of annon. composite
+										 * types is not implemented.
+										 */
 } RemoteQuery;
 
 extern PlannedStmt *pgxc_planner(Query *query, int cursorOptions,