rename [pre]consistentFalse = true

feodor · feodor · commit a63255b64a73 · 2016-05-26T18:44:11.000+03:00
diff --git a/rumget.c b/rumget.c
@@ -1530,7 +1530,7 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,
 {
 	RumScanOpaque so = (RumScanOpaque) scan->opaque;
 	int		i, j, k;
-	bool	preConsistentFalse, consistentFalse;
+	bool	preConsistentResult, consistentResult;
 
 	if (so->entriesIncrIndex >= 0)
 	{
@@ -1544,7 +1544,7 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,
 		 * Our entries is ordered by descending of item pointers.
 		 * The first goal is to find border where preConsistent becomes false.
 		 */
-		preConsistentFalse = false;
+		preConsistentResult = true;
 		j = 0;
 		k = 0;
 		for (i = 0; i < so->totalentries; i++)
@@ -1557,11 +1557,8 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,
 				for (; j < i; j++)
 					so->sortedEntries[j]->preValue = false;
 
-				if (!preConsistentCheck(so))
-				{
-					preConsistentFalse = true;
+				if ((preConsistentResult = preConsistentCheck(so)) == false)
 					break;
-				}
 			}
 		}
 
@@ -1572,14 +1569,14 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,
 		if (so->sortedEntries[i - 1]->isFinished == TRUE)
 			return false;
 
-		if (preConsistentFalse)
+		if (preConsistentResult == false)
 		{
 			entryShift(i, so, true);
 			continue;
 		}
 
 		/* Call consistent method */
-		consistentFalse = false;
+		consistentResult = true;
 		for (i = 0; i < so->nkeys; i++)
 		{
 			RumScanKey	key = so->keys + i;
@@ -1607,13 +1604,13 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,
 			}
 			if (!callConsistentFn(&so->rumstate, key))
 			{
-				consistentFalse = true;
+				consistentResult = false;
 				entryShift(k, so, false);
 				continue;
 			}
 		}
 
-		if (consistentFalse)
+		if (consistentResult == false)
 			continue;
 
 		/* Calculate recheck from each key */

Original file line number	Diff line number	Diff line change
`@@ -1530,7 +1530,7 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,`
`1530`	`1530`	`{`
`1531`	`1531`	`RumScanOpaque so = (RumScanOpaque) scan->opaque;`
`1532`	`1532`	`int i, j, k;`
`1533`		`- bool preConsistentFalse, consistentFalse;`
	`1533`	`+ bool preConsistentResult, consistentResult;`
`1534`	`1534`
`1535`	`1535`	`if (so->entriesIncrIndex >= 0)`
`1536`	`1536`	`{`
`@@ -1544,7 +1544,7 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,`
`1544`	`1544`	`* Our entries is ordered by descending of item pointers.`
`1545`	`1545`	`* The first goal is to find border where preConsistent becomes false.`
`1546`	`1546`	`*/`
`1547`		`- preConsistentFalse = false;`
	`1547`	`+ preConsistentResult = true;`
`1548`	`1548`	`j = 0;`
`1549`	`1549`	`k = 0;`
`1550`	`1550`	`for (i = 0; i < so->totalentries; i++)`
`@@ -1557,11 +1557,8 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,`
`1557`	`1557`	`for (; j < i; j++)`
`1558`	`1558`	`so->sortedEntries[j]->preValue = false;`
`1559`	`1559`
`1560`		`- if (!preConsistentCheck(so))`
`1561`		`- {`
`1562`		`- preConsistentFalse = true;`
	`1560`	`+ if ((preConsistentResult = preConsistentCheck(so)) == false)`
`1563`	`1561`	`break;`
`1564`		`- }`
`1565`	`1562`	`}`
`1566`	`1563`	`}`
`1567`	`1564`
`@@ -1572,14 +1569,14 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,`
`1572`	`1569`	`if (so->sortedEntries[i - 1]->isFinished == TRUE)`
`1573`	`1570`	`return false;`
`1574`	`1571`
`1575`		`- if (preConsistentFalse)`
	`1572`	`+ if (preConsistentResult == false)`
`1576`	`1573`	`{`
`1577`	`1574`	`entryShift(i, so, true);`
`1578`	`1575`	`continue;`
`1579`	`1576`	`}`
`1580`	`1577`
`1581`	`1578`	`/* Call consistent method */`
`1582`		`- consistentFalse = false;`
	`1579`	`+ consistentResult = true;`
`1583`	`1580`	`for (i = 0; i < so->nkeys; i++)`
`1584`	`1581`	`{`
`1585`	`1582`	`RumScanKey key = so->keys + i;`
`@@ -1607,13 +1604,13 @@ scanGetItemFast(IndexScanDesc scan, ItemPointer advancePast,`
`1607`	`1604`	`}`
`1608`	`1605`	`if (!callConsistentFn(&so->rumstate, key))`
`1609`	`1606`	`{`
`1610`		`- consistentFalse = true;`
	`1607`	`+ consistentResult = false;`
`1611`	`1608`	`entryShift(k, so, false);`
`1612`	`1609`	`continue;`
`1613`	`1610`	`}`
`1614`	`1611`	`}`
`1615`	`1612`
`1616`		`- if (consistentFalse)`
	`1613`	`+ if (consistentResult == false)`
`1617`	`1614`	`continue;`
`1618`	`1615`
`1619`	`1616`	`/* Calculate recheck from each key */`