Separate memory context for keys.

Alexander Korotkov · Alexander Korotkov · commit 88a4c4ca15a3 · 2016-05-17T22:15:34.000+03:00
diff --git a/rum.h b/rum.h
@@ -632,6 +632,7 @@ typedef struct
 typedef struct RumScanOpaqueData
 {
 	MemoryContext tempCtx;
+	MemoryContext keyCtx;		/* used to hold key and entry data */
 	RumState	rumstate;
 
 	RumScanKey	keys;			/* one per scan qualifier expr */
diff --git a/rumget.c b/rumget.c
@@ -602,15 +602,18 @@ scan_entry_cmp(const void *p1, const void *p2)
 static void
 startScan(IndexScanDesc scan)
 {
+	MemoryContext oldCtx = CurrentMemoryContext;
 	RumScanOpaque so = (RumScanOpaque) scan->opaque;
 	RumState   *rumstate = &so->rumstate;
 	uint32		i;
 	bool		useFastScan = false;
 
+	MemoryContextSwitchTo(so->keyCtx);
 	for (i = 0; i < so->totalentries; i++)
 	{
 		startScanEntry(rumstate, so->entries[i]);
 	}
+	MemoryContextSwitchTo(oldCtx);
 
 	if (RumFuzzySearchLimit > 0)
 	{
diff --git a/rumscan.c b/rumscan.c
@@ -33,11 +33,19 @@ rumbeginscan(Relation rel, int nkeys, int norderbys)
 	so->keys = NULL;
 	so->nkeys = 0;
 	so->firstCall = true;
+	so->totalentries = 0;
+	so->sortedEntries = NULL;
 	so->tempCtx = AllocSetContextCreate(CurrentMemoryContext,
 										"Rum scan temporary context",
 										ALLOCSET_DEFAULT_MINSIZE,
 										ALLOCSET_DEFAULT_INITSIZE,
 										ALLOCSET_DEFAULT_MAXSIZE);
+	so->keyCtx = AllocSetContextCreate(CurrentMemoryContext,
+									   "Gin scan key context",
+									   ALLOCSET_DEFAULT_MINSIZE,
+									   ALLOCSET_DEFAULT_INITSIZE,
+									   ALLOCSET_DEFAULT_MAXSIZE);
+
 	initRumState(&so->rumstate, scan->indexRelation);
 
 	scan->opaque = so;
@@ -249,32 +257,6 @@ freeScanKeys(RumScanOpaque so)
 {
 	uint32		i;
 
-	if (so->keys == NULL)
-		return;
-
-	for (i = 0; i < so->nkeys; i++)
-	{
-		RumScanKey	key = so->keys + i;
-
-		if (key->nentries > 0)
-		{
-			if (key->scanEntry)
-				pfree(key->scanEntry);
-			if (key->entryRes)
-				pfree(key->entryRes);
-			if (key->addInfo)
-				pfree(key->addInfo);
-			if (key->addInfoIsNull)
-				pfree(key->addInfoIsNull);
-			if (key->queryCategories)
-				pfree(key->queryCategories);
-		}
-	}
-
-	pfree(so->keys);
-	so->keys = NULL;
-	so->nkeys = 0;
-
 	for (i = 0; i < so->totalentries; i++)
 	{
 		RumScanEntry entry = so->entries[i];
@@ -302,7 +284,10 @@ freeScanKeys(RumScanOpaque so)
 		pfree(entry);
 	}
 
-	pfree(so->entries);
+	MemoryContextReset(so->keyCtx);
+	so->keys = NULL;
+	so->nkeys = 0;
+
 	if (so->sortedEntries)
 		pfree(so->sortedEntries);
 	so->entries = NULL;
@@ -406,6 +391,14 @@ rumNewScanKey(IndexScanDesc scan)
 	RumScanOpaque so = (RumScanOpaque) scan->opaque;
 	int			i;
 	bool		hasNullQuery = false;
+	MemoryContext oldCtx;
+
+	/*
+	 * Allocate all the scan key information in the key context. (If
+	 * extractQuery leaks anything there, it won't be reset until the end of
+	 * scan or rescan, but that's OK.)
+	 */
+	oldCtx = MemoryContextSwitchTo(so->keyCtx);
 
 	/* if no scan keys provided, allocate extra EVERYTHING RumScanKey */
 	so->keys = (RumScanKey)
@@ -457,6 +450,8 @@ rumNewScanKey(IndexScanDesc scan)
 					   NULL, NULL, NULL, NULL, false);
 	}
 
+	MemoryContextSwitchTo(oldCtx);
+
 	pgstat_count_index_scan(scan->indexRelation);
 }
 
@@ -497,6 +492,7 @@ rumendscan(IndexScanDesc scan)
 		rum_tuplesort_end(so->sortstate);
 
 	MemoryContextDelete(so->tempCtx);
+	MemoryContextDelete(so->keyCtx);
 
 	pfree(so);
 }

Original file line number	Diff line number	Diff line change
`@@ -632,6 +632,7 @@ typedef struct`
`632`	`632`	`typedef struct RumScanOpaqueData`
`633`	`633`	`{`
`634`	`634`	`MemoryContext tempCtx;`
	`635`	`+ MemoryContext keyCtx; /* used to hold key and entry data */`
`635`	`636`	`RumState rumstate;`
`636`	`637`
`637`	`638`	`RumScanKey keys; /* one per scan qualifier expr */`
Original file line number	Diff line number	Diff line change
`@@ -602,15 +602,18 @@ scan_entry_cmp(const void p1, const void p2)`
`602`	`602`	`static void`
`603`	`603`	`startScan(IndexScanDesc scan)`
`604`	`604`	`{`
	`605`	`+ MemoryContext oldCtx = CurrentMemoryContext;`
`605`	`606`	`RumScanOpaque so = (RumScanOpaque) scan->opaque;`
`606`	`607`	`RumState *rumstate = &so->rumstate;`
`607`	`608`	`uint32 i;`
`608`	`609`	`bool useFastScan = false;`
`609`	`610`
	`611`	`+ MemoryContextSwitchTo(so->keyCtx);`
`610`	`612`	`for (i = 0; i < so->totalentries; i++)`
`611`	`613`	`{`
`612`	`614`	`startScanEntry(rumstate, so->entries[i]);`
`613`	`615`	`}`
	`616`	`+ MemoryContextSwitchTo(oldCtx);`
`614`	`617`
`615`	`618`	`if (RumFuzzySearchLimit > 0)`
`616`	`619`	`{`