NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit80cadb3

committed

Prevent sorting from requesting a SortTuple array that exceeds MaxAllocSize;

we'll go over to disk-based sort if we reach that limit.This fixes Stefan Kaltenbrunner's observation that sorting can suffer an'invalid memory alloc request size' failure when sort_mem is set largeenough. It's unfortunately not so easy to fix in 8.1 ...

1 parentb3d0442 commit80cadb3Copy full SHA for 80cadb3

File tree

1 file changed

-1

lines changed

src/backend/utils/sort
- tuplesort.c

1 file changed

-1

lines changed

`‎src/backend/utils/sort/tuplesort.c`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`* Portions Copyright (c) 1994, Regents of the University of California`
`92`	`92`	`*`
`93`	`93`	`* IDENTIFICATION`
`94`		`- * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.60 2006/02/26 22:58:12 tgl Exp $`
	`94`	`+ * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.61 2006/03/04 19:05:06 tgl Exp $`
`95`	`95`	`*`
`96`	`96`	`*-------------------------------------------------------------------------`
`97`	`97`	`*/`
`@@ -741,6 +741,13 @@ grow_memtuples(Tuplesortstate *state)`
`741`	`741`	`*/`
`742`	`742`	`if (state->availMem <= (long) (state->memtupsize*sizeof(SortTuple)))`
`743`	`743`	`return false;`
	`744`	`+/*`
	`745`	`+ * On a 64-bit machine, allowedMem could be high enough to get us into`
	`746`	`+ * trouble with MaxAllocSize, too.`
	`747`	`+ */`
	`748`	`+if ((Size) (state->memtupsize*2) >=MaxAllocSize /sizeof(SortTuple))`
	`749`	`+return false;`
	`750`	`+`
`744`	`751`	`FREEMEM(state,GetMemoryChunkSpace(state->memtuples));`
`745`	`752`	`state->memtupsize *=2;`
`746`	`753`	`state->memtuples= (SortTuple*)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit80cadb3

File tree

1 file changed

1 file changed

`‎src/backend/utils/sort/tuplesort.c`

0 commit comments