26
26
int RumFuzzySearchLimit = 0 ;
27
27
28
28
static bool scanPage (RumState * rumstate ,RumScanEntry entry ,RumKey * item ,
29
- Page page , bool equalOk );
29
+ bool equalOk );
30
30
static void insertScanItem (RumScanOpaque so ,bool recheck );
31
31
static int scan_entry_cmp (const void * p1 ,const void * p2 ,void * arg );
32
32
static void entryGetItem (RumState * rumstate ,RumScanEntry entry ,bool * nextEntryList );
@@ -806,9 +806,7 @@ entryGetNextItem(RumState * rumstate, RumScanEntry entry)
806
806
LockBuffer (entry -> buffer ,RUM_SHARE );
807
807
page = BufferGetPage (entry -> buffer );
808
808
809
- if (scanPage (rumstate ,entry ,& entry -> curRumKey ,
810
- BufferGetPage (entry -> buffer ),
811
- false))
809
+ if (scanPage (rumstate ,entry ,& entry -> curRumKey , false))
812
810
{
813
811
LockBuffer (entry -> buffer ,RUM_UNLOCK );
814
812
return ;
@@ -1565,7 +1563,7 @@ scanGetItemRegular(IndexScanDesc scan, RumKey *advancePast,
1565
1563
* of page.
1566
1564
*/
1567
1565
static bool
1568
- scanPage (RumState * rumstate ,RumScanEntry entry ,RumKey * item ,Page page ,
1566
+ scanPage (RumState * rumstate ,RumScanEntry entry ,RumKey * item ,
1569
1567
bool equalOk )
1570
1568
{
1571
1569
int j ;
@@ -1577,6 +1575,7 @@ scanPage(RumState * rumstate, RumScanEntry entry, RumKey *item, Page page,
1577
1575
int16 bound = -1 ;
1578
1576
bool found_eq = false;
1579
1577
int cmp ;
1578
+ Page page = BufferGetPage (entry -> buffer );
1580
1579
1581
1580
ItemPointerSetMin (& iter_item .iptr );
1582
1581
@@ -1737,9 +1736,7 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumKey * item)
1737
1736
/* Check rest of page */
1738
1737
LockBuffer (entry -> buffer ,RUM_SHARE );
1739
1738
1740
- if (scanPage (rumstate ,entry ,item ,
1741
- BufferGetPage (entry -> buffer ),
1742
- true))
1739
+ if (scanPage (rumstate ,entry ,item , true))
1743
1740
{
1744
1741
LockBuffer (entry -> buffer ,RUM_UNLOCK );
1745
1742
return ;
@@ -1754,9 +1751,7 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumKey * item)
1754
1751
entry -> gdi -> stack = rumReFindLeafPage (& entry -> gdi -> btree ,entry -> gdi -> stack );
1755
1752
entry -> buffer = entry -> gdi -> stack -> buffer ;
1756
1753
1757
- if (scanPage (rumstate ,entry ,item ,
1758
- BufferGetPage (entry -> buffer ),
1759
- true))
1754
+ if (scanPage (rumstate ,entry ,item , true))
1760
1755
{
1761
1756
LockBuffer (entry -> buffer ,RUM_UNLOCK );
1762
1757
return ;
@@ -1778,9 +1773,7 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumKey * item)
1778
1773
1779
1774
entry -> gdi -> stack -> blkno = BufferGetBlockNumber (entry -> buffer );
1780
1775
1781
- if (scanPage (rumstate ,entry ,item ,
1782
- BufferGetPage (entry -> buffer ),
1783
- true))
1776
+ if (scanPage (rumstate ,entry ,item , true))
1784
1777
{
1785
1778
LockBuffer (entry -> buffer ,RUM_UNLOCK );
1786
1779
return ;