Add ParallelSlotSetIdle().

nathan-bossart · nathan-bossart · commit 750816971b35 · 2025-12-09T13:34:22.000-06:00
This commit refactors the code for marking a ParallelSlot as idle to a new static inline function. This can be used to mark a slot that was obtained via ParallelSlotGetIdle() but that we don't intend to actually use for a query as idle again. This is preparatory work for a follow-up commit that will add a --dry-run option to vacuumdb. Reviewed-by: Corey Huinker <corey.huinker@gmail.com> Reviewed-by: Kirill Reshke <reshkekirill@gmail.com> Reviewed-by: Chao Li <li.evan.chao@gmail.com Discussion: https://postgr.es/m/CADkLM%3DckHkX7Of5SrK7g0LokPUwJ%3Dkk8JU1GXGF5pZ1eBVr0%3DQ%40mail.gmail.com
diff --git a/src/fe_utils/parallel_slot.c b/src/fe_utils/parallel_slot.c
@@ -269,8 +269,7 @@ wait_on_slots(ParallelSlotArray *sa)
 			else
 			{
 				/* This connection has become idle */
-				sa->slots[i].inUse = false;
-				ParallelSlotClearHandler(&sa->slots[i]);
+				ParallelSlotSetIdle(&sa->slots[i]);
 				break;
 			}
 		}
@@ -509,8 +508,7 @@ ParallelSlotsWaitCompletion(ParallelSlotArray *sa)
 		if (!consumeQueryResult(&sa->slots[i]))
 			return false;
 		/* Mark connection as idle */
-		sa->slots[i].inUse = false;
-		ParallelSlotClearHandler(&sa->slots[i]);
+		ParallelSlotSetIdle(&sa->slots[i]);
 	}
 
 	return true;
diff --git a/src/include/fe_utils/parallel_slot.h b/src/include/fe_utils/parallel_slot.h
@@ -58,6 +58,13 @@ ParallelSlotClearHandler(ParallelSlot *slot)
 	slot->handler_context = NULL;
 }
 
+static inline void
+ParallelSlotSetIdle(ParallelSlot *slot)
+{
+	slot->inUse = false;
+	ParallelSlotClearHandler(slot);
+}
+
 extern ParallelSlot *ParallelSlotsGetIdle(ParallelSlotArray *sa,
 										  const char *dbname);
 

Original file line number	Diff line number	Diff line change
`@@ -269,8 +269,7 @@ wait_on_slots(ParallelSlotArray *sa)`
`269`	`269`	`else`
`270`	`270`	`{`
`271`	`271`	`/* This connection has become idle */`
`272`		`- sa->slots[i].inUse = false;`
`273`		`- ParallelSlotClearHandler(&sa->slots[i]);`
	`272`	`+ ParallelSlotSetIdle(&sa->slots[i]);`
`274`	`273`	`break;`
`275`	`274`	`}`
`276`	`275`	`}`
`@@ -509,8 +508,7 @@ ParallelSlotsWaitCompletion(ParallelSlotArray *sa)`
`509`	`508`	`if (!consumeQueryResult(&sa->slots[i]))`
`510`	`509`	`return false;`
`511`	`510`	`/* Mark connection as idle */`
`512`		`- sa->slots[i].inUse = false;`
`513`		`- ParallelSlotClearHandler(&sa->slots[i]);`
	`511`	`+ ParallelSlotSetIdle(&sa->slots[i]);`
`514`	`512`	`}`
`515`	`513`
`516`	`514`	`return true;`