Commite738227

Artur Zakirov

committed

Fix bug: EXC_BAD_ACCESS in Mac OS X

1 parent13c6abf commite738227Copy full SHA for e738227

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3863,7 +3863,7 @@ copytup_rum(Tuplesortstate state, SortTuple stup, void *tup)`
`3863`	`3863`	`{`
`3864`	`3864`	`RumSortItemitem= (RumSortItem)tup;`
`3865`	`3865`
`3866`		`-stup->datum1=Float8GetDatum(item->data[0]);`
	`3866`	`+stup->datum1=Float8GetDatum(state->nKeys>0 ?item->data[0] :0);`
`3867`	`3867`	`stup->isnull1= false;`
`3868`	`3868`	`stup->tuple=tup;`
`3869`	`3869`	`USEMEM(state,GetMemoryChunkSpace(tup));`
`@@ -3900,7 +3900,7 @@ readtup_rum(Tuplesortstate state, SortTuple stup,`
`3900`	`3900`	`USEMEM(state,GetMemoryChunkSpace(item));`
`3901`	`3901`	`LogicalTapeReadExact(state->tapeset,tapenum,`
`3902`	`3902`	`(void*)item,RumSortItemSize(state->nKeys));`
`3903`		`-stup->datum1=Float8GetDatum(item->data[0]);`
	`3903`	`+stup->datum1=Float8GetDatum(state->nKeys>0 ?item->data[0] :0);`
`3904`	`3904`	`stup->isnull1= false;`
`3905`	`3905`	`stup->tuple=item;`
`3906`	`3906`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ typedef struct`
`62`	`62`	`{`
`63`	`63`	`ItemPointerDataiptr;`
`64`	`64`	`boolrecheck;`
`65`		`-float8data[1];`
	`65`	`+float8data[FLEXIBLE_ARRAY_MEMBER];`
`66`	`66`	`}RumSortItem;`
`67`	`67`
`68`	`68`	`#defineRumSortItemSize(nKeys) (offsetof(RumSortItem,data)+(nKeys)*sizeof(float8))`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ sub test_index_replay`
`23`	`23`	`my$queries =qq(SET enable_seqscan=off;`
`24`	`24`	`SET enable_bitmapscan=on;`
`25`	`25`	`SET enable_indexscan=on;`
`26`		`-SELECT * FROM tst WHERE i = 0;`
`27`		`-SELECT * FROM tst WHERE i = 3;`
`28`	`26`	`SELECT * FROM tst WHERE t\@@ to_tsquery('simple', 'b');`
`29`	`27`	`SELECT * FROM tst WHERE t\@@ to_tsquery('simple', 'f');`
`30`	`28`	`SELECT * FROM tst WHERE i = 3 AND t\@@ to_tsquery('simple', 'c');`

Comments

(0)