Improved cleanup for IVFFlat index scans [skip ci]

ankane · ankane · commit da7d3959a31d · 2024-08-24T21:59:44.000-07:00
diff --git a/src/ivfscan.c b/src/ivfscan.c
@@ -170,6 +170,7 @@ GetScanItems(IndexScanDesc scan, Datum value)
 		}
 	}
 
+	ExecDropSingleTupleTableSlot(slot);
 	FreeAccessStrategy(bas);
 
 	if (tuples < 100)
@@ -372,7 +373,9 @@ ivfflatendscan(IndexScanDesc scan)
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
 
 	pairingheap_free(so->listQueue);
+	FreeTupleDesc(so->tupdesc);
 	tuplesort_end(so->sortstate);
+	ExecDropSingleTupleTableSlot(so->slot);
 
 	pfree(so);
 	scan->opaque = NULL;

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ GetScanItems(IndexScanDesc scan, Datum value)`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
	`173`	`+ ExecDropSingleTupleTableSlot(slot);`
`173`	`174`	`FreeAccessStrategy(bas);`
`174`	`175`
`175`	`176`	`if (tuples < 100)`
`@@ -372,7 +373,9 @@ ivfflatendscan(IndexScanDesc scan)`
`372`	`373`	`IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;`
`373`	`374`
`374`	`375`	`pairingheap_free(so->listQueue);`
	`376`	`+ FreeTupleDesc(so->tupdesc);`
`375`	`377`	`tuplesort_end(so->sortstate);`
	`378`	`+ ExecDropSingleTupleTableSlot(so->slot);`
`376`	`379`
`377`	`380`	`pfree(so);`
`378`	`381`	`scan->opaque = NULL;`