NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit8e2b71d

committed

Reset the binary heap in MergeAppend rescans.

Failing to do so can cause queries to return wrong data, error out or crash.This requires adding a new binaryheap_reset() method to binaryheap.c,but that probably should have been there anyway.Per bug #8410 from Terje Elde. Diagnosis and patch by Andres Freund.

1 parent9381cb5 commit8e2b71dCopy full SHA for 8e2b71d

File tree

3 files changed

+19

-3

lines changed

src
- backend
  - executor
    - nodeMergeAppend.c
  - lib
    - binaryheap.c
- include/lib
  - binaryheap.h

3 files changed

+19

-3

lines changed

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -297,5 +297,6 @@ ExecReScanMergeAppend(MergeAppendState *node)`
`297`	`297`	`if (subnode->chgParam==NULL)`
`298`	`298`	`ExecReScan(subnode);`
`299`	`299`	`}`
	`300`	`+binaryheap_reset(node->ms_heap);`
`300`	`301`	`node->ms_initialized= false;`
`301`	`302`	`}`

`‎src/backend/lib/binaryheap.c`

Lines changed: 17 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,16 +36,30 @@ binaryheap_allocate(int capacity, binaryheap_comparator compare, void *arg)`
`36`	`36`	`binaryheap*heap;`
`37`	`37`
`38`	`38`	`sz= offsetof(binaryheap,bh_nodes)+sizeof(Datum)*capacity;`
`39`		`-heap=palloc(sz);`
`40`		`-heap->bh_size=0;`
	`39`	`+heap= (binaryheap*)palloc(sz);`
`41`	`40`	`heap->bh_space=capacity;`
`42`		`-heap->bh_has_heap_property= true;`
`43`	`41`	`heap->bh_compare=compare;`
`44`	`42`	`heap->bh_arg=arg;`
`45`	`43`
	`44`	`+heap->bh_size=0;`
	`45`	`+heap->bh_has_heap_property= true;`
	`46`	`+`
`46`	`47`	`returnheap;`
`47`	`48`	`}`
`48`	`49`
	`50`	`+/*`
	`51`	`+ * binaryheap_reset`
	`52`	`+ *`
	`53`	`+ * Resets the heap to an empty state, losing its data content but not the`
	`54`	`+ * parameters passed at allocation.`
	`55`	`+ */`
	`56`	`+void`
	`57`	`+binaryheap_reset(binaryheap*heap)`
	`58`	`+{`
	`59`	`+heap->bh_size=0;`
	`60`	`+heap->bh_has_heap_property= true;`
	`61`	`+}`
	`62`	`+`
`49`	`63`	`/*`
`50`	`64`	`* binaryheap_free`
`51`	`65`	`*`

`‎src/include/lib/binaryheap.h`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ typedef struct binaryheap`
`40`	`40`	`externbinaryheap*binaryheap_allocate(intcapacity,`
`41`	`41`	`binaryheap_comparatorcompare,`
`42`	`42`	`void*arg);`
	`43`	`+externvoidbinaryheap_reset(binaryheap*heap);`
`43`	`44`	`externvoidbinaryheap_free(binaryheap*heap);`
`44`	`45`	`externvoidbinaryheap_add_unordered(binaryheap*heap,Datumd);`
`45`	`46`	`externvoidbinaryheap_build(binaryheap*heap);`

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!

Commit8e2b71d

File tree

3 files changed

3 files changed

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

`‎src/backend/lib/binaryheap.c`

`‎src/include/lib/binaryheap.h`

0 commit comments