pathman: critical bugfix related to bitmapset usage

zilder · zilder · commit 3e6cf134de79 · 2016-01-26T00:35:29.000+03:00
diff --git a/contrib/pg_pathman/pg_pathman.c b/contrib/pg_pathman/pg_pathman.c
@@ -552,18 +552,18 @@ change_varnos_in_restrinct_info(RestrictInfo *rinfo, change_varno_context *conte
 	/* TODO: find some elegant way to do this */
 	if (bms_is_member(context->old_varno, rinfo->clause_relids))
 	{
-		bms_del_member(rinfo->clause_relids, context->old_varno);
-		bms_add_member(rinfo->clause_relids, context->new_varno);
+		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))
 	{
-		bms_del_member(rinfo->left_relids, context->old_varno);
-		bms_add_member(rinfo->left_relids, context->new_varno);
+		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))
 	{
-		bms_del_member(rinfo->right_relids, context->old_varno);
-		bms_add_member(rinfo->right_relids, context->new_varno);
+		rinfo->right_relids = bms_del_member(rinfo->right_relids, context->old_varno);
+		rinfo->right_relids = bms_add_member(rinfo->right_relids, context->new_varno);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -552,18 +552,18 @@ change_varnos_in_restrinct_info(RestrictInfo rinfo, change_varno_context conte`
`552`	`552`	`/* TODO: find some elegant way to do this */`
`553`	`553`	`if (bms_is_member(context->old_varno, rinfo->clause_relids))`
`554`	`554`	`{`
`555`		`- bms_del_member(rinfo->clause_relids, context->old_varno);`
`556`		`- bms_add_member(rinfo->clause_relids, context->new_varno);`
	`555`	`+ rinfo->clause_relids = bms_del_member(rinfo->clause_relids, context->old_varno);`
	`556`	`+ rinfo->clause_relids = bms_add_member(rinfo->clause_relids, context->new_varno);`
`557`	`557`	`}`
`558`	`558`	`if (bms_is_member(context->old_varno, rinfo->left_relids))`
`559`	`559`	`{`
`560`		`- bms_del_member(rinfo->left_relids, context->old_varno);`
`561`		`- bms_add_member(rinfo->left_relids, context->new_varno);`
	`560`	`+ rinfo->left_relids = bms_del_member(rinfo->left_relids, context->old_varno);`
	`561`	`+ rinfo->left_relids = bms_add_member(rinfo->left_relids, context->new_varno);`
`562`	`562`	`}`
`563`	`563`	`if (bms_is_member(context->old_varno, rinfo->right_relids))`
`564`	`564`	`{`
`565`		`- bms_del_member(rinfo->right_relids, context->old_varno);`
`566`		`- bms_add_member(rinfo->right_relids, context->new_varno);`
	`565`	`+ rinfo->right_relids = bms_del_member(rinfo->right_relids, context->old_varno);`
	`566`	`+ rinfo->right_relids = bms_add_member(rinfo->right_relids, context->new_varno);`
`567`	`567`	`}`
`568`	`568`	`}`
`569`	`569`