rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 18:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix thinko in safeguard for negative availMem.

Browse Source 
Also, use pass read_buffer_size * numInputTapes rather than just availMem
to USEMEM, to be neat.

Peter Geoghegan.
This commit is contained in:
Heikki Linnakangas 2016-12-08 23:05:21 +02:00
parent 01ae881e1c
commit 64bc26f90d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/utils/sort/tuplesort.c
View File

@ -2669,8 +2669,8 @@ mergeruns(Tuplesortstate *state)
(state->availMem) / 1024, numInputTapes); (state->availMem) / 1024, numInputTapes);
#endif #endif
state->read_buffer_size = Min(state->availMem / numInputTapes, 0); state->read_buffer_size = Max(state->availMem / numInputTapes, 0);
USEMEM(state, state->availMem); USEMEM(state, state->read_buffer_size * numInputTapes);
/* End of step D2: rewind all output tapes to prepare for merging */ /* End of step D2: rewind all output tapes to prepare for merging */
for (tapenum = 0; tapenum < state->tapeRange; tapenum++) for (tapenum = 0; tapenum < state->tapeRange; tapenum++)