Commite1bc929

committed

Simplify lists for IvfflatScanOpaque [skip ci]

1 parent38285aa commite1bc929Copy full SHA for e1bc929

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ typedef struct IvfflatScanOpaqueData`
`278`	`278`	`pairingheap*listQueue;`
`279`	`279`	`BlockNumber*listPages;`
`280`	`280`	`intlistIndex;`
`281`		`-IvfflatScanListlists[FLEXIBLE_ARRAY_MEMBER];/* must come last */`
	`281`	`+IvfflatScanList*lists;`
`282`	`282`	`}IvfflatScanOpaqueData;`
`283`	`283`
`284`	`284`	`typedefIvfflatScanOpaqueData*IvfflatScanOpaque;`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)`
`280`	`280`	`if (maxProbes>lists)`
`281`	`281`	`maxProbes=lists;`
`282`	`282`
`283`		`-so= (IvfflatScanOpaque)palloc(offsetof(IvfflatScanOpaqueData,lists)+maxProbes*sizeof(IvfflatScanList));`
	`283`	`+so= (IvfflatScanOpaque)palloc(sizeof(IvfflatScanOpaqueData));`
`284`	`284`	`so->typeInfo=IvfflatGetTypeInfo(index);`
`285`	`285`	`so->first= true;`
`286`	`286`	`so->probes=probes;`
`@@ -314,6 +314,7 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)`
`314`	`314`	`so->listQueue=pairingheap_allocate(CompareLists,scan);`
`315`	`315`	`so->listPages=palloc(maxProbes*sizeof(BlockNumber));`
`316`	`316`	`so->listIndex=0;`
	`317`	`+so->lists=palloc(maxProbes*sizeof(IvfflatScanList));`
`317`	`318`
`318`	`319`	`scan->opaque=so;`
`319`	`320`
`@@ -409,6 +410,7 @@ ivfflatendscan(IndexScanDesc scan)`
`409`	`410`	`tuplesort_end(so->sortstate);`
`410`	`411`	`FreeAccessStrategy(so->bas);`
`411`	`412`	`FreeTupleDesc(so->tupdesc);`
	`413`	`+pfree(so->lists);`
`412`	`414`
`413`	`415`	`/* TODO Free vslot and mslot without freeing TupleDesc */`
`414`	`416`

Comments

(0)