aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2019-09-12 10:34:50 -0300
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2019-09-12 10:37:04 -0300
commitbc98e1ea64627183746ecffcb957db147038134e (patch)
tree02ee412320952b8e59b0d1a79ca4a62af2cd0131 /src
parent9b3c8f07ff3f7938696723405dc9c7b43dde4252 (diff)
downloadpostgresql-bc98e1ea64627183746ecffcb957db147038134e.tar.gz
postgresql-bc98e1ea64627183746ecffcb957db147038134e.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/sort/tuplesort.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index d2bd2aee9f0..152daa72e1c 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));