@@ -612,6 +612,27 @@ end_append_common(CustomScanState *node)
612612hash_destroy (scan_state -> children_table );
613613}
614614
615+ /*
616+ * This function is similar to ChangeVarNodes, but changes only
617+ * varno attributes, but doesn't change varnoold attribute
618+ */
619+ static bool
620+ change_only_varnos (Node * node ,const int * idx )
621+ {
622+ if (node == NULL )
623+ return false;
624+
625+ if (IsA (node ,Var ))
626+ {
627+ Var * var = (Var * )node ;
628+ Assert (var -> varno == 1 );
629+ var -> varno = * idx ;
630+ return false;
631+ }
632+
633+ return expression_tree_walker (node ,change_only_varnos , (void * )idx );
634+ }
635+
615636void
616637rescan_append_common (CustomScanState * node )
617638{
@@ -625,16 +646,14 @@ rescan_append_common(CustomScanState *node)
625646int nparts ;
626647Node * prel_expr ;
627648
649+ const int index_var = INDEX_VAR ;
650+
628651prel = get_pathman_relation_info (scan_state -> relid );
629652Assert (prel );
630653
631654/* Prepare expression */
632- prel_expr = prel -> expr ;
633- if (INDEX_VAR != 1 )
634- {
635- prel_expr = copyObject (prel_expr );
636- ChangeVarNodes (prel_expr ,1 ,INDEX_VAR ,0 );
637- }
655+ prel_expr = copyObject (prel -> expr );
656+ change_only_varnos (prel_expr ,& index_var );
638657
639658/* First we select all available partitions... */
640659ranges = list_make1_irange (make_irange (0 ,PrelLastChild (prel ),IR_COMPLETE ));