Commitb360e0f

committed

Make tuplesort_set_bound() assertions more comprehensible, hopefully.

Add the comments that I griped were missing. Also re-order testsso that parallelism-related tests aren't randomly separated fromeach other.Discussion:https://postgr.es/m/CAAaqYe9GD__4Crm=ddz+-XXcNhfY_V5gFYdLdmkFNq=2VHO56Q@mail.gmail.com

1 parentbac2fae commitb360e0fCopy full SHA for b360e0f

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1187,20 +1187,21 @@ tuplesort_set_bound(Tuplesortstate *state, int64 bound)`
`1187`	`1187`	`{`
`1188`	`1188`	`/* Assert we're called before loading any tuples */`
`1189`	`1189`	`Assert(state->status==TSS_INITIAL&&state->memtupcount==0);`
`1190`		`-`
	`1190`	`+/* Can't set the bound twice, either */`
`1191`	`1191`	`Assert(!state->bounded);`
	`1192`	`+/* Also, this shouldn't be called in a parallel worker */`
`1192`	`1193`	`Assert(!WORKER(state));`
`1193`	`1194`
	`1195`	`+/* Parallel leader allows but ignores hint */`
	`1196`	`+if (LEADER(state))`
	`1197`	`+return;`
	`1198`	`+`
`1194`	`1199`	`#ifdefDEBUG_BOUNDED_SORT`
`1195`	`1200`	`/* Honor GUC setting that disables the feature (for easy testing) */`
`1196`	`1201`	`if (!optimize_bounded_sort)`
`1197`	`1202`	`return;`
`1198`	`1203`	`#endif`
`1199`	`1204`
`1200`		`-/* Parallel leader ignores hint */`
`1201`		`-if (LEADER(state))`
`1202`		`-return;`
`1203`		`-`
`1204`	`1205`	`/* We want to be able to compute bound * 2, so limit the setting */`
`1205`	`1206`	`if (bound> (int64) (INT_MAX /2))`
`1206`	`1207`	`return;`

Comments

(0)