Commite3ab0be

committed

make right initialization of firstCall and correct cleanup of sortstate

1 parent1a4070e commite3ab0beCopy full SHA for e3ab0be

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2335,14 +2335,12 @@ reverseScan(IndexScanDesc scan)`
`2335`	`2335`	`{`
`2336`	`2336`	`RumScanKeykey=so->keys[i];`
`2337`	`2337`
`2338`		`-key->isFinished= false;`
`2339`	`2338`	`key->scanDirection=-key->scanDirection;`
`2340`	`2339`
`2341`	`2340`	`for(j=0;j<key->nentries;j++)`
`2342`	`2341`	`{`
`2343`	`2342`	`RumScanEntryentry=key->scanEntry[j];`
`2344`	`2343`
`2345`		`-entry->isFinished= false;`
`2346`	`2344`	`entry->scanDirection=-entry->scanDirection;`
`2347`	`2345`	`}`
`2348`	`2346`	`}`
`@@ -2366,9 +2364,12 @@ rumgettuple(IndexScanDesc scan, ScanDirection direction)`
`2366`	`2364`	`if (RumIsNewKey(scan))`
`2367`	`2365`	`rumNewScanKey(scan);`
`2368`	`2366`
	`2367`	`+so->firstCall= false;`
	`2368`	`+`
`2369`	`2369`	`if (RumIsVoidRes(scan))`
`2370`	`2370`	`PG_RETURN_INT64(0);`
`2371`	`2371`
	`2372`	`+`
`2372`	`2373`	`startScan(scan);`
`2373`	`2374`	`if (so->naturalOrder==NoMovementScanDirection)`
`2374`	`2375`	`{`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,12 @@ freeScanKeys(RumScanOpaque so)`
`299`	`299`	`so->entries=NULL;`
`300`	`300`	`so->sortedEntries=NULL;`
`301`	`301`	`so->totalentries=0;`
	`302`	`+`
	`303`	`+if (so->sortstate)`
	`304`	`+{`
	`305`	`+rum_tuplesort_end(so->sortstate);`
	`306`	`+so->sortstate=NULL;`
	`307`	`+}`
`302`	`308`	`}`
`303`	`309`
`304`	`310`	`staticvoid`
`@@ -516,7 +522,6 @@ rumNewScanKey(IndexScanDesc scan)`
`516`	`522`	`so->secondPass= false;`
`517`	`523`	`so->tbm=NULL;`
`518`	`524`	`so->entriesIncrIndex=-1;`
`519`		`-so->firstCall= false;`
`520`	`525`	`so->norderbys=scan->numberOfOrderBys;`
`521`	`526`
`522`	`527`	`/*`
`@@ -693,12 +698,6 @@ rumrescan(IndexScanDesc scan, ScanKey scankey, int nscankeys,`
`693`	`698`	`if (orderbys&&scan->numberOfOrderBys>0)`
`694`	`699`	`memmove(scan->orderByData,orderbys,`
`695`	`700`	`scan->numberOfOrderBys*sizeof(ScanKeyData));`
`696`		`-`
`697`		`-if (so->sortstate)`
`698`		`-{`
`699`		`-rum_tuplesort_end(so->sortstate);`
`700`		`-so->sortstate=NULL;`
`701`		`-}`
`702`	`701`	`}`
`703`	`702`
`704`	`703`	`void`

Comments

(0)