code cleanup

funbringer · funbringer · commit 2b16fcd4558e · 2016-06-18T19:44:16.000+03:00
diff --git a/src/utils.c b/src/utils.c
@@ -25,7 +25,8 @@
 
 
 static bool clause_contains_params_walker(Node *node, void *context);
-static void change_varnos_in_restrinct_info(RestrictInfo *rinfo, change_varno_context *context);
+static void change_varnos_in_restrinct_info(RestrictInfo *rinfo,
+											change_varno_context *context);
 static bool change_varno_walker(Node *node, change_varno_context *context);
 static List *get_tableoids_list(List *tlist);
 static void lock_rows_visitor(Plan *plan, void *context);
@@ -440,6 +441,43 @@ change_varno_walker(Node *node, change_varno_context *context)
 	return expression_tree_walker(node, change_varno_walker, (void *) context);
 }
 
+static void
+change_varnos_in_restrinct_info(RestrictInfo *rinfo, change_varno_context *context)
+{
+	ListCell *lc;
+
+	change_varno_walker((Node *) rinfo->clause, context);
+	if (rinfo->left_em)
+		change_varno_walker((Node *) rinfo->left_em->em_expr, context);
+
+	if (rinfo->right_em)
+		change_varno_walker((Node *) rinfo->right_em->em_expr, context);
+
+	if (rinfo->orclause)
+		foreach(lc, ((BoolExpr *) rinfo->orclause)->args)
+		{
+			Node *node = (Node *) lfirst(lc);
+			change_varno_walker(node, context);
+		}
+
+	/* TODO: find some elegant way to do this */
+	if (bms_is_member(context->old_varno, rinfo->clause_relids))
+	{
+		rinfo->clause_relids = bms_del_member(rinfo->clause_relids, context->old_varno);
+		rinfo->clause_relids = bms_add_member(rinfo->clause_relids, context->new_varno);
+	}
+	if (bms_is_member(context->old_varno, rinfo->left_relids))
+	{
+		rinfo->left_relids = bms_del_member(rinfo->left_relids, context->old_varno);
+		rinfo->left_relids = bms_add_member(rinfo->left_relids, context->new_varno);
+	}
+	if (bms_is_member(context->old_varno, rinfo->right_relids))
+	{
+		rinfo->right_relids = bms_del_member(rinfo->right_relids, context->old_varno);
+		rinfo->right_relids = bms_add_member(rinfo->right_relids, context->new_varno);
+	}
+}
+
 Oid
 str_to_oid(const char *cstr)
 {
@@ -477,10 +515,6 @@ plan_tree_walker(Plan *plan,
 				plan_tree_walker((Plan *) lfirst(l), visitor, context);
 			break;
 
-		/*
-		 * Add proxy PartitionFilter nodes
-		 * to subplans of ModifyTable node
-		 */
 		case T_ModifyTable:
 			foreach (l, ((ModifyTable *) plan)->plans)
 				plan_tree_walker((Plan *) lfirst(l), visitor, context);
@@ -510,47 +544,10 @@ plan_tree_walker(Plan *plan,
 	plan_tree_walker(plan->lefttree, visitor, context);
 	plan_tree_walker(plan->righttree, visitor, context);
 
+	/* Apply visitor to the current node */
 	visitor(plan, context);
 }
 
-
-static void
-change_varnos_in_restrinct_info(RestrictInfo *rinfo, change_varno_context *context)
-{
-	ListCell *lc;
-
-	change_varno_walker((Node *) rinfo->clause, context);
-	if (rinfo->left_em)
-		change_varno_walker((Node *) rinfo->left_em->em_expr, context);
-
-	if (rinfo->right_em)
-		change_varno_walker((Node *) rinfo->right_em->em_expr, context);
-
-	if (rinfo->orclause)
-		foreach(lc, ((BoolExpr *) rinfo->orclause)->args)
-		{
-			Node *node = (Node *) lfirst(lc);
-			change_varno_walker(node, context);
-		}
-
-	/* TODO: find some elegant way to do this */
-	if (bms_is_member(context->old_varno, rinfo->clause_relids))
-	{
-		rinfo->clause_relids = bms_del_member(rinfo->clause_relids, context->old_varno);
-		rinfo->clause_relids = bms_add_member(rinfo->clause_relids, context->new_varno);
-	}
-	if (bms_is_member(context->old_varno, rinfo->left_relids))
-	{
-		rinfo->left_relids = bms_del_member(rinfo->left_relids, context->old_varno);
-		rinfo->left_relids = bms_add_member(rinfo->left_relids, context->new_varno);
-	}
-	if (bms_is_member(context->old_varno, rinfo->right_relids))
-	{
-		rinfo->right_relids = bms_del_member(rinfo->right_relids, context->old_varno);
-		rinfo->right_relids = bms_add_member(rinfo->right_relids, context->new_varno);
-	}
-}
-
 /*
  * Add missing 'TABLEOID_STR%u' junk attributes for inherited partitions
  *
diff --git a/src/utils.h b/src/utils.h
@@ -19,15 +19,8 @@
 
 typedef struct
 {
-	RelOptInfo *child;
-	RelOptInfo *parent;
-	int			sublevels_up;
-} ReplaceVarsContext;
-
-typedef struct
-{
-	Oid			old_varno;
-	Oid			new_varno;
+	Oid		old_varno;
+	Oid		new_varno;
 } change_varno_context;
 
 
@@ -53,10 +46,10 @@ List * list_reverse(List *l);
 
 void change_varnos(Node *node, Oid old_varno, Oid new_varno);
 
-Oid str_to_oid(const char * cstr);
+Oid str_to_oid(const char *cstr);
 
 void plan_tree_walker(Plan *plan,
-					  void (*visitor)(Plan *, void *),
+					  void (*visitor) (Plan *plan, void *context),
 					  void *context);
 
 void rowmark_add_tableoids(Query *parse);
