Commit6822507

committed

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

2 parents1138830 +67fb7a8 commit6822507Copy full SHA for 6822507

File tree

+13

-0

lines changed

+13

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -396,6 +396,7 @@ collectMatchBitmap(RumBtreeData btree, RumBtreeStack stack,`
`396`	`396`	`tbm_add_tuples(scanEntry->matchBitmap,`
`397`	`397`	`ipd,RumGetNPosting(itup), false);`
`398`	`398`	`scanEntry->predictNumberResult+=RumGetNPosting(itup);`
	`399`	`+pfree(ipd);`
`399`	`400`	`}`
`400`	`401`
`401`	`402`	`/*`
`@@ -423,6 +424,8 @@ startScanEntry(RumState *rumstate, RumScanEntry entry)`
`423`	`424`	`entry->curAddInfoIsNull= true;`
`424`	`425`	`entry->offset=InvalidOffsetNumber;`
`425`	`426`	`entry->list=NULL;`
	`427`	`+entry->addInfo=NULL;`
	`428`	`+entry->addInfoIsNull=NULL;`
`426`	`429`	`entry->gdi=NULL;`
`427`	`430`	`entry->nlist=0;`
`428`	`431`	`entry->matchBitmap=NULL;`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,9 @@ freeScanKeys(RumScanOpaque so)`
`255`	`255`	`{`
`256`	`256`	`pfree(key->scanEntry);`
`257`	`257`	`pfree(key->entryRes);`
	`258`	`+pfree(key->addInfo);`
	`259`	`+pfree(key->addInfoIsNull);`
	`260`	`+pfree(key->queryCategories);`
`258`	`261`	`}`
`259`	`262`	`}`
`260`	`263`
`@@ -278,6 +281,10 @@ freeScanKeys(RumScanOpaque so)`
`278`	`281`	`}`
`279`	`282`	`if (entry->list)`
`280`	`283`	`pfree(entry->list);`
	`284`	`+if (entry->addInfo)`
	`285`	`+pfree(entry->addInfo);`
	`286`	`+if (entry->addInfoIsNull)`
	`287`	`+pfree(entry->addInfoIsNull);`
`281`	`288`	`if (entry->matchIterator)`
`282`	`289`	`tbm_end_iterate(entry->matchIterator);`
`283`	`290`	`if (entry->matchBitmap)`
`@@ -457,6 +464,9 @@ rumrescan(IndexScanDesc scan, ScanKey scankey, int nscankeys,`
`457`	`464`	`memmove(scan->orderByData,orderbys,`
`458`	`465`	`scan->numberOfOrderBys*sizeof(ScanKeyData));`
`459`	`466`	`}`
	`467`	`+`
	`468`	`+if (so->sortstate)`
	`469`	`+rum_tuplesort_end(so->sortstate);`
`460`	`470`	`}`
`461`	`471`
`462`	`472`	`void`

Comments

(0)