diff options
Diffstat (limited to 'src/backend/access/gist')
-rw-r--r-- | src/backend/access/gist/gist.c | 4 | ||||
-rw-r--r-- | src/backend/access/gist/gistget.c | 28 | ||||
-rw-r--r-- | src/backend/access/gist/gistscan.c | 8 |
3 files changed, 0 insertions, 40 deletions
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index a510dc8b203..dc2b57d4df2 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -632,9 +632,7 @@ gistAdjustKeys(Relation r, pfree(datum); } else - { ReleaseBuffer(b); - } pfree(evec); } @@ -834,9 +832,7 @@ gistSplit(Relation r, } if ((bufblock = BufferGetBlockNumber(buffer)) != GISTP_ROOT) - { PageRestoreTempPage(left, p); - } WriteBuffer(leftbuf); WriteBuffer(rightbuf); diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index de250987755..3832254af0b 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -52,13 +52,9 @@ gistgettuple(IndexScanDesc s, ScanDirection dir) /* not cached, so we'll have to do some work */ if (ItemPointerIsValid(&(s->currentItemData))) - { res = gistnext(s, dir); - } else - { res = gistfirst(s, dir); - } return (res); } @@ -103,13 +99,9 @@ gistfirst(IndexScanDesc s, ScanDirection dir) maxoff = PageGetMaxOffsetNumber(p); if (ScanDirectionIsBackward(dir)) - { n = OffsetNumberPrev(stk->gs_child); - } else - { n = OffsetNumberNext(stk->gs_child); - } so->s_stack = stk->gs_parent; pfree(stk); @@ -163,13 +155,9 @@ gistnext(IndexScanDesc s, ScanDirection dir) n = ItemPointerGetOffsetNumber(&(s->currentItemData)); if (ScanDirectionIsForward(dir)) - { n = OffsetNumberNext(n); - } else - { n = OffsetNumberPrev(n); - } b = ReadBuffer(s->relation, blk); p = BufferGetPage(b); @@ -195,13 +183,9 @@ gistnext(IndexScanDesc s, ScanDirection dir) po = (GISTPageOpaque) PageGetSpecialPointer(p); if (ScanDirectionIsBackward(dir)) - { n = OffsetNumberPrev(stk->gs_child); - } else - { n = OffsetNumberNext(stk->gs_child); - } so->s_stack = stk->gs_parent; pfree(stk); @@ -235,13 +219,9 @@ gistnext(IndexScanDesc s, ScanDirection dir) po = (GISTPageOpaque) PageGetSpecialPointer(p); if (ScanDirectionIsBackward(dir)) - { n = PageGetMaxOffsetNumber(p); - } else - { n = FirstOffsetNumber; - } } } } @@ -296,9 +276,7 @@ gistindex_keytest(IndexTuple tuple, } if (!test == !(key[0].sk_flags & SK_NEGATE)) - { return (false); - } scanKeySize -= 1; key++; @@ -343,13 +321,9 @@ gistfindnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir) break; if (ScanDirectionIsBackward(dir)) - { n = OffsetNumberPrev(n); - } else - { n = OffsetNumberNext(n); - } } return (n); @@ -405,9 +379,7 @@ gistheapptr(Relation r, ItemPointer itemp) ReleaseBuffer(b); } else - { ItemPointerSetInvalid(ip); - } return (ip); } diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index e5fa6b44a2d..7b9d49726ba 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -102,17 +102,11 @@ gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key) * Set flags. */ if (RelationGetNumberOfBlocks(s->relation) == 0) - { s->flags = ScanUnmarked; - } else if (fromEnd) - { s->flags = ScanUnmarked | ScanUncheckedPrevious; - } else - { s->flags = ScanUnmarked | ScanUncheckedNext; - } s->scanFromEnd = fromEnd; @@ -276,9 +270,7 @@ gistdropscan(IndexScanDesc s) for (l = GISTScans; l != (GISTScanList) NULL && l->gsl_scan != s; l = l->gsl_next) - { prev = l; - } if (l == (GISTScanList) NULL) elog(ERROR, "GiST scan list corrupted -- cannot find 0x%lx", s); |