small fixes regarding the custom_private

funbringer · funbringer · commit 1d11885ec242 · 2016-05-04T18:19:25.000+03:00
diff --git a/nodes_common.c b/nodes_common.c
@@ -150,7 +150,7 @@ pack_runtimeappend_private(CustomScan *cscan, RuntimeAppendPath *path)
 		pfree(children[i]);
 	}
 
-	/* Save main table and partition relids */
+	/* Save main table and partition relids as first element of 'custom_private' */
 	custom_private = lappend(custom_private,
 							 list_make2(list_make1_oid(path->relid),
 										custom_oids));
@@ -197,9 +197,6 @@ unpack_runtimeappend_private(RuntimeAppendState *scan_state, CustomScan *cscan)
 
 	scan_state->children_table = children_table;
 	scan_state->relid = linitial_oid(linitial(runtimeappend_private));
-
-	/* Delete items that belong to RuntimeAppend */
-	cscan->custom_private = list_delete_first(cscan->custom_private);
 }
 
 Path *
diff --git a/runtime_merge_append.c b/runtime_merge_append.c
@@ -123,6 +123,7 @@ pack_runtimemergeappend_private(CustomScan *cscan, MergeAppendGuts *mag)
 													   collations,
 													   nullsFirst));
 
+	/* Append RuntimeMergeAppend's data to the 'custom_private' */
 	cscan->custom_private = lappend(cscan->custom_private,
 									runtimemergeappend_private);
 }
@@ -149,7 +150,12 @@ unpack_runtimemergeappend_private(RuntimeMergeAppendState *scan_state,
 		   *collations,
 		   *nullsFirst;
 
-	runtimemergeappend_private = linitial(cscan->custom_private);
+	/*
+	 * RuntimeMergeAppend node's private data is stored in
+	 * second element of the 'custom_private' list, right after
+	 * the RuntimeAppend node's private data
+	 */
+	runtimemergeappend_private = lsecond(cscan->custom_private);
 	scan_state->numCols = intVal(linitial(runtimemergeappend_private));
 
 	sortColIdx    = linitial(lsecond(runtimemergeappend_private));
