Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit344d1c0

Browse files
committed
Remove page argument for scanPage - it is called pnly for current entry
1 parent79e4293 commit344d1c0

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

‎rumget.c

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
intRumFuzzySearchLimit=0;
2727

2828
staticboolscanPage(RumState*rumstate,RumScanEntryentry,RumKey*item,
29-
Pagepage,boolequalOk);
29+
boolequalOk);
3030
staticvoidinsertScanItem(RumScanOpaqueso,boolrecheck);
3131
staticintscan_entry_cmp(constvoid*p1,constvoid*p2,void*arg);
3232
staticvoidentryGetItem(RumState*rumstate,RumScanEntryentry,bool*nextEntryList);
@@ -806,9 +806,7 @@ entryGetNextItem(RumState * rumstate, RumScanEntry entry)
806806
LockBuffer(entry->buffer,RUM_SHARE);
807807
page=BufferGetPage(entry->buffer);
808808

809-
if (scanPage(rumstate,entry,&entry->curRumKey,
810-
BufferGetPage(entry->buffer),
811-
false))
809+
if (scanPage(rumstate,entry,&entry->curRumKey, false))
812810
{
813811
LockBuffer(entry->buffer,RUM_UNLOCK);
814812
return;
@@ -1565,7 +1563,7 @@ scanGetItemRegular(IndexScanDesc scan, RumKey *advancePast,
15651563
* of page.
15661564
*/
15671565
staticbool
1568-
scanPage(RumState*rumstate,RumScanEntryentry,RumKey*item,Pagepage,
1566+
scanPage(RumState*rumstate,RumScanEntryentry,RumKey*item,
15691567
boolequalOk)
15701568
{
15711569
intj;
@@ -1577,6 +1575,7 @@ scanPage(RumState * rumstate, RumScanEntry entry, RumKey *item, Page page,
15771575
int16bound=-1;
15781576
boolfound_eq= false;
15791577
intcmp;
1578+
Pagepage=BufferGetPage(entry->buffer);
15801579

15811580
ItemPointerSetMin(&iter_item.iptr);
15821581

@@ -1737,9 +1736,7 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumKey * item)
17371736
/* Check rest of page */
17381737
LockBuffer(entry->buffer,RUM_SHARE);
17391738

1740-
if (scanPage(rumstate,entry,item,
1741-
BufferGetPage(entry->buffer),
1742-
true))
1739+
if (scanPage(rumstate,entry,item, true))
17431740
{
17441741
LockBuffer(entry->buffer,RUM_UNLOCK);
17451742
return;
@@ -1754,9 +1751,7 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumKey * item)
17541751
entry->gdi->stack=rumReFindLeafPage(&entry->gdi->btree,entry->gdi->stack);
17551752
entry->buffer=entry->gdi->stack->buffer;
17561753

1757-
if (scanPage(rumstate,entry,item,
1758-
BufferGetPage(entry->buffer),
1759-
true))
1754+
if (scanPage(rumstate,entry,item, true))
17601755
{
17611756
LockBuffer(entry->buffer,RUM_UNLOCK);
17621757
return;
@@ -1778,9 +1773,7 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumKey * item)
17781773

17791774
entry->gdi->stack->blkno=BufferGetBlockNumber(entry->buffer);
17801775

1781-
if (scanPage(rumstate,entry,item,
1782-
BufferGetPage(entry->buffer),
1783-
true))
1776+
if (scanPage(rumstate,entry,item, true))
17841777
{
17851778
LockBuffer(entry->buffer,RUM_UNLOCK);
17861779
return;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp