Fix type of iterator variable in SH_START_ITERATE

anarazel · anarazel · commit 9f236198c31d · 2023-07-06T09:57:33.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
@@ -772,15 +772,14 @@ SH_DELETE(SH_TYPE * tb, SH_KEY_TYPE key)
 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];
 
@@ -791,6 +790,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
`@@ -772,15 +772,14 @@ SH_DELETE(SH_TYPE * tb, SH_KEY_TYPE key)`
`772`	`772`	`SH_SCOPE void`
`773`	`773`	`SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)`
`774`	`774`	`{`
`775`		`- int i;`
`776`	`775`	`uint64 startelem = PG_UINT64_MAX;`
`777`	`776`
`778`	`777`	`/*`
`779`	`778`	`* Search for the first empty element. As deletions during iterations are`
`780`	`779`	`* supported, we want to start/end at an element that cannot be affected`
`781`	`780`	`* by elements being shifted.`
`782`	`781`	`*/`
`783`		`- for (i = 0; i < tb->size; i++)`
	`782`	`+ for (uint32 i = 0; i < tb->size; i++)`
`784`	`783`	`{`
`785`	`784`	`SH_ELEMENT_TYPE *entry = &tb->data[i];`
`786`	`785`
`@@ -791,6 +790,7 @@ SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter)`
`791`	`790`	`}`
`792`	`791`	`}`
`793`	`792`
	`793`	`+ /* we should have found an empty element */`
`794`	`794`	`Assert(startelem < SH_MAX_SIZE);`
`795`	`795`
`796`	`796`	`/*`