Fix type of iterator variable in SH_START_ITERATE

anarazel · anarazel · commit f0a94d81e4f7 · 2023-07-06T09:57:28.000-07:00
Also add comment to make the reasoning behind the Assert() more explicit (per Tom). Reported-by: Ranier Vilela Discussion: https://postgr.es/m/CAEudQAocXNJ6s1VLz+hMamLAQAiewRoW17OJ6-+9GACKfj6iPQ@mail.gmail.com Backpatch: 11-
diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h
@@ -964,15 +964,14 @@ SH_DELETE_ITEM(SH_TYPE * tb, SH_ELEMENT_TYPE * entry)
 SH_SCOPE void
 SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)
 {
-	int			i;
 	uint64		startelem = PG_UINT64_MAX;
 
 	/*
 	 * Search for the first empty element. As deletions during iterations are
 	 * supported, we want to start/end at an element that cannot be affected
 	 * by elements being shifted.
 	 */
-	for (i = 0; i < tb->size; i++)
+	for (uint32 i = 0; i < tb->size; i++)
 	{
 		SH_ELEMENT_TYPE *entry = &tb->data[i];
 
@@ -983,6 +982,7 @@ SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)
 		}
 	}
 
+	/* we should have found an empty element */
 	Assert(startelem < SH_MAX_SIZE);
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -964,15 +964,14 @@ SH_DELETE_ITEM(SH_TYPE * tb, SH_ELEMENT_TYPE * entry)`
`964`	`964`	`SH_SCOPE void`
`965`	`965`	`SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)`
`966`	`966`	`{`
`967`		`- int i;`
`968`	`967`	`uint64 startelem = PG_UINT64_MAX;`
`969`	`968`
`970`	`969`	`/*`
`971`	`970`	`* Search for the first empty element. As deletions during iterations are`
`972`	`971`	`* supported, we want to start/end at an element that cannot be affected`
`973`	`972`	`* by elements being shifted.`
`974`	`973`	`*/`
`975`		`- for (i = 0; i < tb->size; i++)`
	`974`	`+ for (uint32 i = 0; i < tb->size; i++)`
`976`	`975`	`{`
`977`	`976`	`SH_ELEMENT_TYPE *entry = &tb->data[i];`
`978`	`977`
`@@ -983,6 +982,7 @@ SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)`
`983`	`982`	`}`
`984`	`983`	`}`
`985`	`984`
	`985`	`+ /* we should have found an empty element */`
`986`	`986`	`Assert(startelem < SH_MAX_SIZE);`
`987`	`987`
`988`	`988`	`/*`