From bc98e1ea64627183746ecffcb957db147038134e Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 12 Sep 2019 10:34:50 -0300 Subject: [PATCH] Merge two assertions to make comment clearer Authored by Tom Lane, after a gripe from James Coleman. Discussion: https://postgr.es/m/CAAaqYe9GD__4Crm=ddz+-XXcNhfY_V5gFYdLdmkFNq=2VHO56Q@mail.gmail.com --- src/backend/utils/sort/tuplesort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index d2bd2aee9f..152daa72e1 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -1186,8 +1186,8 @@ void tuplesort_set_bound(Tuplesortstate *state, int64 bound) { /* Assert we're called before loading any tuples */ - Assert(state->status == TSS_INITIAL); - Assert(state->memtupcount == 0); + Assert(state->status == TSS_INITIAL && state->memtupcount == 0); + Assert(!state->bounded); Assert(!WORKER(state));