NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit98640f9

committed

Fix memory leak in Incremental Sort rescans

The Incremental Sort had a couple issues, resulting in leaking memoryduring rescans, possibly triggering OOM. The code had a couple ofrelated flaws:1. During rescans, the sort states were reset but then also set to NULL (despite the comment saying otherwise). ExecIncrementalSort then sees NULL and initializes a new sort state, leaking the memory used by the old one.2. Initializing the sort state also automatically rebuilt the info about presorted keys, leaking the already initialized info. presorted_keys was also unnecessarily reset to NULL.Patch by James Coleman, based on patches by Laurenz Albe and Tom Lane.Backpatch to 13, where Incremental Sort was introduced.Author: James Coleman, Laurenz Albe, Tom LaneReported-by: Laurenz Albe, Zu-Ming JiangBackpatch-through: 13Discussion:https://postgr.es/m/b2bd02dff61af15e3526293e2771f874cf2a3be7.camel%40cybertec.atDiscussion:https://postgr.es/m/db03c582-086d-e7cd-d4a1-3bc722f81765%40inf.ethz.ch

1 parent0457109 commit98640f9Copy full SHA for 98640f9

File tree

1 file changed

-7

lines changed

src/backend/executor
- nodeIncrementalSort.c

1 file changed

-7

lines changed

`‎src/backend/executor/nodeIncrementalSort.c`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1140,7 +1140,6 @@ ExecReScanIncrementalSort(IncrementalSortState *node)`
`1140`	`1140`	`node->outerNodeDone= false;`
`1141`	`1141`	`node->n_fullsort_remaining=0;`
`1142`	`1142`	`node->bound_Done=0;`
`1143`		`-node->presorted_keys=NULL;`
`1144`	`1143`
`1145`	`1144`	`node->execution_status=INCSORT_LOADFULLSORT;`
`1146`	`1145`
`@@ -1153,15 +1152,9 @@ ExecReScanIncrementalSort(IncrementalSortState *node)`
`1153`	`1152`	`* cause a leak.`
`1154`	`1153`	`*/`
`1155`	`1154`	`if (node->fullsort_state!=NULL)`
`1156`		`-{`
`1157`	`1155`	`tuplesort_reset(node->fullsort_state);`
`1158`		`-node->fullsort_state=NULL;`
`1159`		`-}`
`1160`	`1156`	`if (node->prefixsort_state!=NULL)`
`1161`		`-{`
`1162`	`1157`	`tuplesort_reset(node->prefixsort_state);`
`1163`		`-node->prefixsort_state=NULL;`
`1164`		`-}`
`1165`	`1158`
`1166`	`1159`	`/*`
`1167`	`1160`	`* If chgParam of subnode is not null, then the plan will be re-scanned by`

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!

Commit98640f9

File tree

1 file changed

1 file changed

`‎src/backend/executor/nodeIncrementalSort.c`

0 commit comments