Commit64bc26f

committed

Fix thinko in safeguard for negative availMem.

Also, use pass read_buffer_size * numInputTapes rather than just availMemto USEMEM, to be neat.Peter Geoghegan.

1 parent01ae881 commit64bc26fCopy full SHA for 64bc26f

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2669,8 +2669,8 @@ mergeruns(Tuplesortstate *state)`
`2669`	`2669`	`(state->availMem) /1024,numInputTapes);`
`2670`	`2670`	`#endif`
`2671`	`2671`
`2672`		`-state->read_buffer_size=Min(state->availMem /numInputTapes,0);`
`2673`		`-USEMEM(state,state->availMem);`
	`2672`	`+state->read_buffer_size=Max(state->availMem /numInputTapes,0);`
	`2673`	`+USEMEM(state,state->read_buffer_size*numInputTapes);`
`2674`	`2674`
`2675`	`2675`	`/* End of step D2: rewind all output tapes to prepare for merging */`
`2676`	`2676`	`for (tapenum=0;tapenum<state->tapeRange;tapenum++)`

Comments

(0)