make right initialization of firstCall and correct cleanup of sortstate

feodor · feodor · commit e3ab0be36513 · 2016-08-30T18:07:01.000+03:00
diff --git a/rumget.c b/rumget.c
@@ -2335,14 +2335,12 @@ reverseScan(IndexScanDesc scan)
 	{
 		RumScanKey	key = so->keys[i];
 
-		key->isFinished = false;
 		key->scanDirection = - key->scanDirection;
 
 		for(j=0; j<key->nentries; j++)
 		{
 			RumScanEntry	entry = key->scanEntry[j];
 
-			entry->isFinished = false;
 			entry->scanDirection = - entry->scanDirection;
 		}
 	}
@@ -2366,9 +2364,12 @@ rumgettuple(IndexScanDesc scan, ScanDirection direction)
 		if (RumIsNewKey(scan))
 			rumNewScanKey(scan);
 
+		so->firstCall = false;
+
 		if (RumIsVoidRes(scan))
 			PG_RETURN_INT64(0);
 
+
 		startScan(scan);
 		if (so->naturalOrder == NoMovementScanDirection)
 		{
diff --git a/rumscan.c b/rumscan.c
@@ -299,6 +299,12 @@ freeScanKeys(RumScanOpaque so)
 	so->entries = NULL;
 	so->sortedEntries = NULL;
 	so->totalentries = 0;
+
+	if (so->sortstate)
+	{
+		rum_tuplesort_end(so->sortstate);
+		so->sortstate = NULL;
+	}
 }
 
 static void
@@ -516,7 +522,6 @@ rumNewScanKey(IndexScanDesc scan)
 	so->secondPass = false;
 	so->tbm = NULL;
 	so->entriesIncrIndex = -1;
-	so->firstCall = false;
 	so->norderbys = scan->numberOfOrderBys;
 
 	/*
@@ -693,12 +698,6 @@ rumrescan(IndexScanDesc scan, ScanKey scankey, int nscankeys,
 	if (orderbys && scan->numberOfOrderBys > 0)
 		memmove(scan->orderByData, orderbys,
 				scan->numberOfOrderBys * sizeof(ScanKeyData));
-
-	if (so->sortstate)
-	{
-		rum_tuplesort_end(so->sortstate);
-		so->sortstate = NULL;
-	}
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -2335,14 +2335,12 @@ reverseScan(IndexScanDesc scan)`
`2335`	`2335`	`{`
`2336`	`2336`	`RumScanKey key = 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`	`RumScanEntry entry = 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`	`{`