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

feodor · feodor · commit 682250736d20 · 2016-05-17T14:38:03.000+03:00
diff --git a/rumget.c b/rumget.c
@@ -396,6 +396,7 @@ collectMatchBitmap(RumBtreeData *btree, RumBtreeStack *stack,
 			tbm_add_tuples(scanEntry->matchBitmap,
 						   ipd, RumGetNPosting(itup), false);
 			scanEntry->predictNumberResult += RumGetNPosting(itup);
+			pfree(ipd);
 		}
 
 		/*
@@ -423,6 +424,8 @@ startScanEntry(RumState *rumstate, RumScanEntry entry)
 	entry->curAddInfoIsNull = true;
 	entry->offset = InvalidOffsetNumber;
 	entry->list = NULL;
+	entry->addInfo = NULL;
+	entry->addInfoIsNull = NULL;
 	entry->gdi = NULL;
 	entry->nlist = 0;
 	entry->matchBitmap = NULL;
diff --git a/rumscan.c b/rumscan.c
@@ -255,6 +255,9 @@ freeScanKeys(RumScanOpaque so)
 		{
 			pfree(key->scanEntry);
 			pfree(key->entryRes);
+			pfree(key->addInfo);
+			pfree(key->addInfoIsNull);
+			pfree(key->queryCategories);
 		}
 	}
 
@@ -278,6 +281,10 @@ freeScanKeys(RumScanOpaque so)
 		}
 		if (entry->list)
 			pfree(entry->list);
+		if (entry->addInfo)
+			pfree(entry->addInfo);
+		if (entry->addInfoIsNull)
+			pfree(entry->addInfoIsNull);
 		if (entry->matchIterator)
 			tbm_end_iterate(entry->matchIterator);
 		if (entry->matchBitmap)
@@ -457,6 +464,9 @@ rumrescan(IndexScanDesc scan, ScanKey scankey, int nscankeys,
 		memmove(scan->orderByData, orderbys,
 				scan->numberOfOrderBys * sizeof(ScanKeyData));
 	}
+
+	if (so->sortstate)
+		rum_tuplesort_end(so->sortstate);
 }
 
 void

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`