Commit4e9c501

committed

Merge branch 'CORE-241-rum' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into CORE-241-rum

2 parents13ab195 +a63521e commit4e9c501Copy full SHA for 4e9c501

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2261,6 +2261,7 @@ insertScanItem(RumScanOpaque so, bool recheck)`
`2261`	`2261`	`j++;`
`2262`	`2262`	`}`
`2263`	`2263`	`rum_tuplesort_putrum(so->sortstate,item);`
	`2264`	`+pfree(item);`
`2264`	`2265`	`}`
`2265`	`2266`
`2266`	`2267`	`bool`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,10 @@ freeScanKeys(RumScanOpaque so)`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`pfree(so->entries);`
	`306`	`+if (so->sortedEntries)`
	`307`	`+pfree(so->sortedEntries);`
`306`	`308`	`so->entries=NULL;`
	`309`	`+so->sortedEntries=NULL;`
`307`	`310`	`so->totalentries=0;`
`308`	`311`	`}`
`309`	`312`
`@@ -415,6 +418,7 @@ rumNewScanKey(IndexScanDesc scan)`
`415`	`418`	`so->allocentries=32;`
`416`	`419`	`so->entries= (RumScanEntry*)`
`417`	`420`	`palloc0(so->allocentries*sizeof(RumScanEntry));`
	`421`	`+so->sortedEntries=NULL;`
`418`	`422`
`419`	`423`	`so->isVoidRes= false;`
`420`	`424`
`@@ -476,7 +480,10 @@ rumrescan(IndexScanDesc scan, ScanKey scankey, int nscankeys,`
`476`	`480`	`}`
`477`	`481`
`478`	`482`	`if (so->sortstate)`
	`483`	`+{`
`479`	`484`	`rum_tuplesort_end(so->sortstate);`
	`485`	`+so->sortstate=NULL;`
	`486`	`+}`
`480`	`487`	`}`
`481`	`488`
`482`	`489`	`void`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1536,12 +1536,15 @@ rum_tuplesort_putrum(Tuplesortstate state, RumSortItem item)`
`1536`	`1536`	`{`
`1537`	`1537`	`MemoryContextoldcontext=MemoryContextSwitchTo(state->sortcontext);`
`1538`	`1538`	`SortTuplestup;`
	`1539`	`+RumSortItem*itemCopy=palloc(RumSortItemSize(state->nKeys));`
	`1540`	`+`
	`1541`	`+memcpy(itemCopy,item,RumSortItemSize(state->nKeys));`
`1539`	`1542`
`1540`	`1543`	`/*`
`1541`	`1544`	`* Copy the given tuple into memory we control, and decrease availMem.`
`1542`	`1545`	`* Then call the common code.`
`1543`	`1546`	`*/`
`1544`		`-COPYTUP(state,&stup, (void*)item);`
	`1547`	`+COPYTUP(state,&stup, (void*)itemCopy);`
`1545`	`1548`
`1546`	`1549`	`puttuple_common(state,&stup);`
`1547`	`1550`

Comments

(0)