Add bms_next_member(), and use it where appropriate.

tglsfdc · tglsfdc · commit f4e031c662a6 · 2014-11-28T13:37:25.000-05:00
This patch adds a way of iterating through the members of a bitmapset
nondestructively, unlike the old way with bms_first_member().  While
bms_next_member() is very slightly slower than bms_first_member()
(at least for typical-size bitmapsets), eliminating the need to palloc
and pfree a temporary copy of the target bitmapset is a significant win.
So this method should be preferred in all cases where a temporary copy
would be necessary.

Tom Lane, with suggestions from Dean Rasheed and David Rowley
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
@@ -1198,15 +1198,17 @@ postgresPlanForeignModify(PlannerInfo *root,
 	}
 	else if (operation == CMD_UPDATE)
 	{
-		Bitmapset  *tmpset = bms_copy(rte->modifiedCols);
-		AttrNumber	col;
+		int			col;
 
-		while ((col = bms_first_member(tmpset)) >= 0)
+		col = -1;
+		while ((col = bms_next_member(rte->modifiedCols, col)) >= 0)
 		{
-			col += FirstLowInvalidHeapAttributeNumber;
-			if (col <= InvalidAttrNumber)		/* shouldn't happen */
+			/* bit numbers are offset by FirstLowInvalidHeapAttributeNumber */
+			AttrNumber	attno = col + FirstLowInvalidHeapAttributeNumber;
+
+			if (attno <= InvalidAttrNumber)		/* shouldn't happen */
 				elog(ERROR, "system-column update is not supported");
-			targetAttrs = lappend_int(targetAttrs, col);
+			targetAttrs = lappend_int(targetAttrs, attno);
 		}
 	}
 
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
@@ -93,10 +93,7 @@ fixup_whole_row_references(Oid relOid, Bitmapset *columns)
 static Bitmapset *
 fixup_inherited_columns(Oid parentId, Oid childId, Bitmapset *columns)
 {
-	AttrNumber	attno;
-	Bitmapset  *tmpset;
 	Bitmapset  *result = NULL;
-	char	   *attname;
 	int			index;
 
 	/*
@@ -105,10 +102,12 @@ fixup_inherited_columns(Oid parentId, Oid childId, Bitmapset *columns)
 	if (parentId == childId)
 		return columns;
 
-	tmpset = bms_copy(columns);
-	while ((index = bms_first_member(tmpset)) > 0)
+	index = -1;
+	while ((index = bms_next_member(columns, index)) >= 0)
 	{
-		attno = index + FirstLowInvalidHeapAttributeNumber;
+		/* bit numbers are offset by FirstLowInvalidHeapAttributeNumber */
+		AttrNumber	attno = index + FirstLowInvalidHeapAttributeNumber;
+		char	   *attname;
 
 		/*
 		 * whole-row-reference shall be fixed-up later
@@ -128,12 +127,11 @@ fixup_inherited_columns(Oid parentId, Oid childId, Bitmapset *columns)
 			elog(ERROR, "cache lookup failed for attribute %s of relation %u",
 				 attname, childId);
 
-		index = attno - FirstLowInvalidHeapAttributeNumber;
-		result = bms_add_member(result, index);
+		result = bms_add_member(result,
+								attno - FirstLowInvalidHeapAttributeNumber);
 
 		pfree(attname);
 	}
-	bms_free(tmpset);
 
 	return result;
 }
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
@@ -547,7 +547,6 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
 	AclMode		remainingPerms;
 	Oid			relOid;
 	Oid			userid;
-	Bitmapset  *tmpset;
 	int			col;
 
 	/*
@@ -614,12 +613,13 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
 					return false;
 			}
 
-			tmpset = bms_copy(rte->selectedCols);
-			while ((col = bms_first_member(tmpset)) >= 0)
+			col = -1;
+			while ((col = bms_next_member(rte->selectedCols, col)) >= 0)
 			{
-				/* remove the column number offset */
-				col += FirstLowInvalidHeapAttributeNumber;
-				if (col == InvalidAttrNumber)
+				/* bit #s are offset by FirstLowInvalidHeapAttributeNumber */
+				AttrNumber	attno = col + FirstLowInvalidHeapAttributeNumber;
+
+				if (attno == InvalidAttrNumber)
 				{
 					/* Whole-row reference, must have priv on all cols */
 					if (pg_attribute_aclcheck_all(relOid, userid, ACL_SELECT,
@@ -628,12 +628,11 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
 				}
 				else
 				{
-					if (pg_attribute_aclcheck(relOid, col, userid,
+					if (pg_attribute_aclcheck(relOid, attno, userid,
 											  ACL_SELECT) != ACLCHECK_OK)
 						return false;
 				}
 			}
-			bms_free(tmpset);
 		}
 
 		/*
@@ -656,24 +655,24 @@ ExecCheckRTEPerms(RangeTblEntry *rte)
 					return false;
 			}
 
-			tmpset = bms_copy(rte->modifiedCols);
-			while ((col = bms_first_member(tmpset)) >= 0)
+			col = -1;
+			while ((col = bms_next_member(rte->modifiedCols, col)) >= 0)
 			{
-				/* remove the column number offset */
-				col += FirstLowInvalidHeapAttributeNumber;
-				if (col == InvalidAttrNumber)
+				/* bit #s are offset by FirstLowInvalidHeapAttributeNumber */
+				AttrNumber	attno = col + FirstLowInvalidHeapAttributeNumber;
+
+				if (attno == InvalidAttrNumber)
 				{
 					/* whole-row reference can't happen here */
 					elog(ERROR, "whole-row update is not implemented");
 				}
 				else
 				{
-					if (pg_attribute_aclcheck(relOid, col, userid,
+					if (pg_attribute_aclcheck(relOid, attno, userid,
 											  remainingPerms) != ACLCHECK_OK)
 						return false;
 				}
 			}
-			bms_free(tmpset);
 		}
 	}
 	return true;
diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c
@@ -793,19 +793,19 @@ bms_join(Bitmapset *a, Bitmapset *b)
 	return result;
 }
 
-/*----------
+/*
  * bms_first_member - find and remove first member of a set
  *
  * Returns -1 if set is empty.  NB: set is destructively modified!
  *
  * This is intended as support for iterating through the members of a set.
  * The typical pattern is
  *
- *			tmpset = bms_copy(inputset);
- *			while ((x = bms_first_member(tmpset)) >= 0)
+ *			while ((x = bms_first_member(inputset)) >= 0)
  *				process member x;
- *			bms_free(tmpset);
- *----------
+ *
+ * CAUTION: this destroys the content of "inputset".  If the set must
+ * not be modified, use bms_next_member instead.
  */
 int
 bms_first_member(Bitmapset *a)
@@ -840,6 +840,64 @@ bms_first_member(Bitmapset *a)
 	return -1;
 }
 
+/*
+ * bms_next_member - find next member of a set
+ *
+ * Returns smallest member greater than "prevbit", or -2 if there is none.
+ * "prevbit" must NOT be less than -1, or the behavior is unpredictable.
+ *
+ * This is intended as support for iterating through the members of a set.
+ * The typical pattern is
+ *
+ *			x = -1;
+ *			while ((x = bms_next_member(inputset, x)) >= 0)
+ *				process member x;
+ *
+ * Notice that when there are no more members, we return -2, not -1 as you
+ * might expect.  The rationale for that is to allow distinguishing the
+ * loop-not-started state (x == -1) from the loop-completed state (x == -2).
+ * It makes no difference in simple loop usage, but complex iteration logic
+ * might need such an ability.
+ */
+int
+bms_next_member(const Bitmapset *a, int prevbit)
+{
+	int			nwords;
+	int			wordnum;
+	bitmapword	mask;
+
+	if (a == NULL)
+		return -2;
+	nwords = a->nwords;
+	prevbit++;
+	mask = (~(bitmapword) 0) << BITNUM(prevbit);
+	for (wordnum = WORDNUM(prevbit); wordnum < nwords; wordnum++)
+	{
+		bitmapword	w = a->words[wordnum];
+
+		/* ignore bits before prevbit */
+		w &= mask;
+
+		if (w != 0)
+		{
+			int			result;
+
+			result = wordnum * BITS_PER_BITMAPWORD;
+			while ((w & 255) == 0)
+			{
+				w >>= 8;
+				result += 8;
+			}
+			result += rightmost_one_pos[w & 255];
+			return result;
+		}
+
+		/* in subsequent words, consider all bits */
+		mask = (~(bitmapword) 0);
+	}
+	return -2;
+}
+
 /*
  * bms_hash_value - compute a hash key for a Bitmapset
  *
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
@@ -184,15 +184,13 @@ _outList(StringInfo str, const List *node)
 static void
 _outBitmapset(StringInfo str, const Bitmapset *bms)
 {
-	Bitmapset  *tmpset;
 	int			x;
 
 	appendStringInfoChar(str, '(');
 	appendStringInfoChar(str, 'b');
-	tmpset = bms_copy(bms);
-	while ((x = bms_first_member(tmpset)) >= 0)
+	x = -1;
+	while ((x = bms_next_member(bms, x)) >= 0)
 		appendStringInfo(str, " %d", x);
-	bms_free(tmpset);
 	appendStringInfoChar(str, ')');
 }
 
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
@@ -2272,19 +2272,17 @@ remove_unused_subquery_outputs(Query *subquery, RelOptInfo *rel)
 static void
 print_relids(Relids relids)
 {
-	Relids		tmprelids;
 	int			x;
 	bool		first = true;
 
-	tmprelids = bms_copy(relids);
-	while ((x = bms_first_member(tmprelids)) >= 0)
+	x = -1;
+	while ((x = bms_next_member(relids, x)) >= 0)
 	{
 		if (!first)
 			printf(" ");
 		printf("%d", x);
 		first = false;
 	}
-	bms_free(tmprelids);
 }
 
 static void
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
@@ -1875,9 +1875,8 @@ get_loop_count(PlannerInfo *root, Relids outer_relids)
 	{
 		int			relid;
 
-		/* Need a working copy since bms_first_member is destructive */
-		outer_relids = bms_copy(outer_relids);
-		while ((relid = bms_first_member(outer_relids)) >= 0)
+		relid = -1;
+		while ((relid = bms_next_member(outer_relids, relid)) >= 0)
 		{
 			RelOptInfo *outer_rel;
 
@@ -1900,7 +1899,6 @@ get_loop_count(PlannerInfo *root, Relids outer_relids)
 			if (result == 1.0 || result > outer_rel->rows)
 				result = outer_rel->rows;
 		}
-		bms_free(outer_relids);
 	}
 	return result;
 }
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
@@ -96,17 +96,15 @@ add_join_clause_to_rels(PlannerInfo *root,
 						RestrictInfo *restrictinfo,
 						Relids join_relids)
 {
-	Relids		tmprelids;
 	int			cur_relid;
 
-	tmprelids = bms_copy(join_relids);
-	while ((cur_relid = bms_first_member(tmprelids)) >= 0)
+	cur_relid = -1;
+	while ((cur_relid = bms_next_member(join_relids, cur_relid)) >= 0)
 	{
 		RelOptInfo *rel = find_base_rel(root, cur_relid);
 
 		rel->joininfo = lappend(rel->joininfo, restrictinfo);
 	}
-	bms_free(tmprelids);
 }
 
 /*
@@ -125,11 +123,10 @@ remove_join_clause_from_rels(PlannerInfo *root,
 							 RestrictInfo *restrictinfo,
 							 Relids join_relids)
 {
-	Relids		tmprelids;
 	int			cur_relid;
 
-	tmprelids = bms_copy(join_relids);
-	while ((cur_relid = bms_first_member(tmprelids)) >= 0)
+	cur_relid = -1;
+	while ((cur_relid = bms_next_member(join_relids, cur_relid)) >= 0)
 	{
 		RelOptInfo *rel = find_base_rel(root, cur_relid);
 
@@ -140,5 +137,4 @@ remove_join_clause_from_rels(PlannerInfo *root,
 		Assert(list_member_ptr(rel->joininfo, restrictinfo));
 		rel->joininfo = list_delete_ptr(rel->joininfo, restrictinfo);
 	}
-	bms_free(tmprelids);
 }
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
@@ -773,11 +773,10 @@ static Relids
 alias_relid_set(PlannerInfo *root, Relids relids)
 {
 	Relids		result = NULL;
-	Relids		tmprelids;
 	int			rtindex;
 
-	tmprelids = bms_copy(relids);
-	while ((rtindex = bms_first_member(tmprelids)) >= 0)
+	rtindex = -1;
+	while ((rtindex = bms_next_member(relids, rtindex)) >= 0)
 	{
 		RangeTblEntry *rte = rt_fetch(rtindex, root->parse->rtable);
 
@@ -786,6 +785,5 @@ alias_relid_set(PlannerInfo *root, Relids relids)
 		else
 			result = bms_add_member(result, rtindex);
 	}
-	bms_free(tmprelids);
 	return result;
 }
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
@@ -2456,11 +2456,10 @@ static Bitmapset *
 adjust_view_column_set(Bitmapset *cols, List *targetlist)
 {
 	Bitmapset  *result = NULL;
-	Bitmapset  *tmpcols;
-	AttrNumber	col;
+	int			col;
 
-	tmpcols = bms_copy(cols);
-	while ((col = bms_first_member(tmpcols)) >= 0)
+	col = -1;
+	while ((col = bms_next_member(cols, col)) >= 0)
 	{
 		/* bit numbers are offset by FirstLowInvalidHeapAttributeNumber */
 		AttrNumber	attno = col + FirstLowInvalidHeapAttributeNumber;
@@ -2510,7 +2509,6 @@ adjust_view_column_set(Bitmapset *cols, List *targetlist)
 					 attno);
 		}
 	}
-	bms_free(tmpcols);
 
 	return result;
 }
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
@@ -454,13 +454,11 @@ static Relids
 offset_relid_set(Relids relids, int offset)
 {
 	Relids		result = NULL;
-	Relids		tmprelids;
 	int			rtindex;
 
-	tmprelids = bms_copy(relids);
-	while ((rtindex = bms_first_member(tmprelids)) >= 0)
+	rtindex = -1;
+	while ((rtindex = bms_next_member(relids, rtindex)) >= 0)
 		result = bms_add_member(result, rtindex + offset);
-	bms_free(tmprelids);
 	return result;
 }
 
diff --git a/src/include/nodes/bitmapset.h b/src/include/nodes/bitmapset.h
@@ -89,6 +89,7 @@ extern Bitmapset *bms_join(Bitmapset *a, Bitmapset *b);
 
 /* support for iterating through the integer elements of a set: */
 extern int	bms_first_member(Bitmapset *a);
+extern int	bms_next_member(const Bitmapset *a, int prevbit);
 
 /* support for hashtables using Bitmapsets as keys: */
 extern uint32 bms_hash_value(const Bitmapset *a);
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c

Original file line number	Diff line number	Diff line change
`@@ -1198,15 +1198,17 @@ postgresPlanForeignModify(PlannerInfo *root,`
`1198`	`1198`	`}`
`1199`	`1199`	`else if (operation == CMD_UPDATE)`
`1200`	`1200`	`{`
`1201`		`- Bitmapset *tmpset = bms_copy(rte->modifiedCols);`
`1202`		`- AttrNumber col;`
	`1201`	`+ int col;`
`1203`	`1202`
`1204`		`- while ((col = bms_first_member(tmpset)) >= 0)`
	`1203`	`+ col = -1;`
	`1204`	`+ while ((col = bms_next_member(rte->modifiedCols, col)) >= 0)`
`1205`	`1205`	`{`
`1206`		`- col += FirstLowInvalidHeapAttributeNumber;`
`1207`		`- if (col <= InvalidAttrNumber) /* shouldn't happen */`
	`1206`	`+ /* bit numbers are offset by FirstLowInvalidHeapAttributeNumber */`
	`1207`	`+ AttrNumber attno = col + FirstLowInvalidHeapAttributeNumber;`
	`1208`	`+`
	`1209`	`+ if (attno <= InvalidAttrNumber) /* shouldn't happen */`
`1208`	`1210`	`elog(ERROR, "system-column update is not supported");`
`1209`		`- targetAttrs = lappend_int(targetAttrs, col);`
	`1211`	`+ targetAttrs = lappend_int(targetAttrs, attno);`
`1210`	`1212`	`}`
`1211`	`1213`	`}`
`1212`	`1214`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,6 @@ ExecCheckRTEPerms(RangeTblEntry *rte)`
`547`	`547`	`AclMode remainingPerms;`
`548`	`548`	`Oid relOid;`
`549`	`549`	`Oid userid;`
`550`		`- Bitmapset *tmpset;`
`551`	`550`	`int col;`
`552`	`551`
`553`	`552`	`/*`
`@@ -614,12 +613,13 @@ ExecCheckRTEPerms(RangeTblEntry *rte)`
`614`	`613`	`return false;`
`615`	`614`	`}`
`616`	`615`
`617`		`- tmpset = bms_copy(rte->selectedCols);`
`618`		`- while ((col = bms_first_member(tmpset)) >= 0)`
	`616`	`+ col = -1;`
	`617`	`+ while ((col = bms_next_member(rte->selectedCols, col)) >= 0)`
`619`	`618`	`{`
`620`		`- /* remove the column number offset */`
`621`		`- col += FirstLowInvalidHeapAttributeNumber;`
`622`		`- if (col == InvalidAttrNumber)`
	`619`	`+ /* bit #s are offset by FirstLowInvalidHeapAttributeNumber */`
	`620`	`+ AttrNumber attno = col + FirstLowInvalidHeapAttributeNumber;`
	`621`	`+`
	`622`	`+ if (attno == InvalidAttrNumber)`
`623`	`623`	`{`
`624`	`624`	`/* Whole-row reference, must have priv on all cols */`
`625`	`625`	`if (pg_attribute_aclcheck_all(relOid, userid, ACL_SELECT,`
`@@ -628,12 +628,11 @@ ExecCheckRTEPerms(RangeTblEntry *rte)`
`628`	`628`	`}`
`629`	`629`	`else`
`630`	`630`	`{`
`631`		`- if (pg_attribute_aclcheck(relOid, col, userid,`
	`631`	`+ if (pg_attribute_aclcheck(relOid, attno, userid,`
`632`	`632`	`ACL_SELECT) != ACLCHECK_OK)`
`633`	`633`	`return false;`
`634`	`634`	`}`
`635`	`635`	`}`
`636`		`- bms_free(tmpset);`
`637`	`636`	`}`
`638`	`637`
`639`	`638`	`/*`
`@@ -656,24 +655,24 @@ ExecCheckRTEPerms(RangeTblEntry *rte)`
`656`	`655`	`return false;`
`657`	`656`	`}`
`658`	`657`
`659`		`- tmpset = bms_copy(rte->modifiedCols);`
`660`		`- while ((col = bms_first_member(tmpset)) >= 0)`
	`658`	`+ col = -1;`
	`659`	`+ while ((col = bms_next_member(rte->modifiedCols, col)) >= 0)`
`661`	`660`	`{`
`662`		`- /* remove the column number offset */`
`663`		`- col += FirstLowInvalidHeapAttributeNumber;`
`664`		`- if (col == InvalidAttrNumber)`
	`661`	`+ /* bit #s are offset by FirstLowInvalidHeapAttributeNumber */`
	`662`	`+ AttrNumber attno = col + FirstLowInvalidHeapAttributeNumber;`
	`663`	`+`
	`664`	`+ if (attno == InvalidAttrNumber)`
`665`	`665`	`{`
`666`	`666`	`/* whole-row reference can't happen here */`
`667`	`667`	`elog(ERROR, "whole-row update is not implemented");`
`668`	`668`	`}`
`669`	`669`	`else`
`670`	`670`	`{`
`671`		`- if (pg_attribute_aclcheck(relOid, col, userid,`
	`671`	`+ if (pg_attribute_aclcheck(relOid, attno, userid,`
`672`	`672`	`remainingPerms) != ACLCHECK_OK)`
`673`	`673`	`return false;`
`674`	`674`	`}`
`675`	`675`	`}`
`676`		`- bms_free(tmpset);`
`677`	`676`	`}`
`678`	`677`	`}`
`679`	`678`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -2272,19 +2272,17 @@ remove_unused_subquery_outputs(Query subquery, RelOptInfo rel)`
`2272`	`2272`	`static void`
`2273`	`2273`	`print_relids(Relids relids)`
`2274`	`2274`	`{`
`2275`		`- Relids tmprelids;`
`2276`	`2275`	`int x;`
`2277`	`2276`	`bool first = true;`
`2278`	`2277`
`2279`		`- tmprelids = bms_copy(relids);`
`2280`		`- while ((x = bms_first_member(tmprelids)) >= 0)`
	`2278`	`+ x = -1;`
	`2279`	`+ while ((x = bms_next_member(relids, x)) >= 0)`
`2281`	`2280`	`{`
`2282`	`2281`	`if (!first)`
`2283`	`2282`	`printf(" ");`
`2284`	`2283`	`printf("%d", x);`
`2285`	`2284`	`first = false;`
`2286`	`2285`	`}`
`2287`		`- bms_free(tmprelids);`
`2288`	`2286`	`}`
`2289`	`2287`
`2290`	`2288`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -1875,9 +1875,8 @@ get_loop_count(PlannerInfo *root, Relids outer_relids)`
`1875`	`1875`	`{`
`1876`	`1876`	`int relid;`
`1877`	`1877`
`1878`		`- /* Need a working copy since bms_first_member is destructive */`
`1879`		`- outer_relids = bms_copy(outer_relids);`
`1880`		`- while ((relid = bms_first_member(outer_relids)) >= 0)`
	`1878`	`+ relid = -1;`
	`1879`	`+ while ((relid = bms_next_member(outer_relids, relid)) >= 0)`
`1881`	`1880`	`{`
`1882`	`1881`	`RelOptInfo *outer_rel;`
`1883`	`1882`
`@@ -1900,7 +1899,6 @@ get_loop_count(PlannerInfo *root, Relids outer_relids)`
`1900`	`1899`	`if (result == 1.0 \|\| result > outer_rel->rows)`
`1901`	`1900`	`result = outer_rel->rows;`
`1902`	`1901`	`}`
`1903`		`- bms_free(outer_relids);`
`1904`	`1902`	`}`
`1905`	`1903`	`return result;`
`1906`	`1904`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,17 +96,15 @@ add_join_clause_to_rels(PlannerInfo *root,`
`96`	`96`	`RestrictInfo *restrictinfo,`
`97`	`97`	`Relids join_relids)`
`98`	`98`	`{`
`99`		`- Relids tmprelids;`
`100`	`99`	`int cur_relid;`
`101`	`100`
`102`		`- tmprelids = bms_copy(join_relids);`
`103`		`- while ((cur_relid = bms_first_member(tmprelids)) >= 0)`
	`101`	`+ cur_relid = -1;`
	`102`	`+ while ((cur_relid = bms_next_member(join_relids, cur_relid)) >= 0)`
`104`	`103`	`{`
`105`	`104`	`RelOptInfo *rel = find_base_rel(root, cur_relid);`
`106`	`105`
`107`	`106`	`rel->joininfo = lappend(rel->joininfo, restrictinfo);`
`108`	`107`	`}`
`109`		`- bms_free(tmprelids);`
`110`	`108`	`}`
`111`	`109`
`112`	`110`	`/*`
`@@ -125,11 +123,10 @@ remove_join_clause_from_rels(PlannerInfo *root,`
`125`	`123`	`RestrictInfo *restrictinfo,`
`126`	`124`	`Relids join_relids)`
`127`	`125`	`{`
`128`		`- Relids tmprelids;`
`129`	`126`	`int cur_relid;`
`130`	`127`
`131`		`- tmprelids = bms_copy(join_relids);`
`132`		`- while ((cur_relid = bms_first_member(tmprelids)) >= 0)`
	`128`	`+ cur_relid = -1;`
	`129`	`+ while ((cur_relid = bms_next_member(join_relids, cur_relid)) >= 0)`
`133`	`130`	`{`
`134`	`131`	`RelOptInfo *rel = find_base_rel(root, cur_relid);`
`135`	`132`
`@@ -140,5 +137,4 @@ remove_join_clause_from_rels(PlannerInfo *root,`
`140`	`137`	`Assert(list_member_ptr(rel->joininfo, restrictinfo));`
`141`	`138`	`rel->joininfo = list_delete_ptr(rel->joininfo, restrictinfo);`
`142`	`139`	`}`
`143`		`- bms_free(tmprelids);`
`144`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -773,11 +773,10 @@ static Relids`
`773`	`773`	`alias_relid_set(PlannerInfo *root, Relids relids)`
`774`	`774`	`{`
`775`	`775`	`Relids result = NULL;`
`776`		`- Relids tmprelids;`
`777`	`776`	`int rtindex;`
`778`	`777`
`779`		`- tmprelids = bms_copy(relids);`
`780`		`- while ((rtindex = bms_first_member(tmprelids)) >= 0)`
	`778`	`+ rtindex = -1;`
	`779`	`+ while ((rtindex = bms_next_member(relids, rtindex)) >= 0)`
`781`	`780`	`{`
`782`	`781`	`RangeTblEntry *rte = rt_fetch(rtindex, root->parse->rtable);`
`783`	`782`
`@@ -786,6 +785,5 @@ alias_relid_set(PlannerInfo *root, Relids relids)`
`786`	`785`	`else`
`787`	`786`	`result = bms_add_member(result, rtindex);`
`788`	`787`	`}`
`789`		`- bms_free(tmprelids);`
`790`	`788`	`return result;`
`791`	`789`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2456,11 +2456,10 @@ static Bitmapset *`
`2456`	`2456`	`adjust_view_column_set(Bitmapset cols, List targetlist)`
`2457`	`2457`	`{`
`2458`	`2458`	`Bitmapset *result = NULL;`
`2459`		`- Bitmapset *tmpcols;`
`2460`		`- AttrNumber col;`
	`2459`	`+ int col;`
`2461`	`2460`
`2462`		`- tmpcols = bms_copy(cols);`
`2463`		`- while ((col = bms_first_member(tmpcols)) >= 0)`
	`2461`	`+ col = -1;`
	`2462`	`+ while ((col = bms_next_member(cols, col)) >= 0)`
`2464`	`2463`	`{`
`2465`	`2464`	`/* bit numbers are offset by FirstLowInvalidHeapAttributeNumber */`
`2466`	`2465`	`AttrNumber attno = col + FirstLowInvalidHeapAttributeNumber;`
`@@ -2510,7 +2509,6 @@ adjust_view_column_set(Bitmapset cols, List targetlist)`
`2510`	`2509`	`attno);`
`2511`	`2510`	`}`
`2512`	`2511`	`}`
`2513`		`- bms_free(tmpcols);`
`2514`	`2512`
`2515`	`2513`	`return result;`
`2516`	`2514`	`}`