Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a95a60b8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a95a60b8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a95a60b8 Branch: refs/heads/ignite-gg-11810-1 Commit: a95a60b80e30f76fe71709370fd157f2b4e90ea5 Parents: 81ce9d5 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jan 13 13:47:56 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jan 13 13:47:56 2017 +0300 ---------------------------------------------------------------------- .../pagemem/impl/PageMemoryNoStoreImpl.java | 43 ++++++++++---------- .../internal/pagemem/impl/PageNoStoreImpl.java | 13 ++---- 2 files changed, 25 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a95a60b8/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java index 79ac383..41e401d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java @@ -220,13 +220,13 @@ public class PageMemoryNoStoreImpl implements PageMemory { relPtr = seg.borrowFreePage(); if (relPtr != INVALID_REL_PTR) { - absPtr = seg.absolute(relPtr); + absPtr = seg.absolute(PageIdUtils.pageIndex(relPtr)); break; } } - // No segments conatined a free page. + // No segments contained a free page. if (relPtr == INVALID_REL_PTR) { int segAllocIdx = nextRoundRobinIndex(); @@ -238,7 +238,7 @@ public class PageMemoryNoStoreImpl implements PageMemory { relPtr = seg.allocateFreePage(flags); if (relPtr != INVALID_REL_PTR) { - absPtr = seg.absolute(relPtr); + absPtr = seg.absolute(PageIdUtils.pageIndex(relPtr)); break; } @@ -263,7 +263,7 @@ public class PageMemoryNoStoreImpl implements PageMemory { /** {@inheritDoc} */ @Override public boolean freePage(int cacheId, long pageId) { - Segment seg = segment(pageId); + Segment seg = segment(PageIdUtils.pageIndex(pageId)); seg.releaseFreePage(pageId); @@ -272,9 +272,11 @@ public class PageMemoryNoStoreImpl implements PageMemory { /** {@inheritDoc} */ @Override public Page page(int cacheId, long pageId) throws IgniteCheckedException { - Segment seg = segment(pageId); + int pageIdx = PageIdUtils.pageIndex(pageId); - return seg.acquirePage(cacheId, pageId); + Segment seg = segment(pageIdx); + + return seg.acquirePage(pageIdx, pageId); } /** {@inheritDoc} */ @@ -285,7 +287,7 @@ public class PageMemoryNoStoreImpl implements PageMemory { /** {@inheritDoc} */ @Override public void releasePage(Page p) { if (trackAcquiredPages) { - Segment seg = segment(p.id()); + Segment seg = segment(PageIdUtils.pageIndex(p.id())); seg.onPageRelease(); } @@ -442,12 +444,10 @@ public class PageMemoryNoStoreImpl implements PageMemory { } /** - * @param pageId Page ID. + * @param pageIdx Page index. * @return Segment. */ - private Segment segment(long pageId) { - long pageIdx = PageIdUtils.pageIndex(pageId); - + private Segment segment(int pageIdx) { int segIdx = segmentIndex(pageIdx); return segments[segIdx]; @@ -537,18 +537,17 @@ public class PageMemoryNoStoreImpl implements PageMemory { } /** - * @param cacheId Cache ID. * @param pageId Page ID to pin. * @return Pinned page impl. */ @SuppressWarnings("TypeMayBeWeakened") - private PageNoStoreImpl acquirePage(int cacheId, long pageId) { - long absPtr = absolute(pageId); + private PageNoStoreImpl acquirePage(int pageIdx, long pageId) { + long absPtr = absolute(pageIdx); if (trackAcquiredPages) acquiredPages.incrementAndGet(); - return new PageNoStoreImpl(PageMemoryNoStoreImpl.this, absPtr, cacheId, pageId); + return new PageNoStoreImpl(PageMemoryNoStoreImpl.this, absPtr, pageId); } /** @@ -558,12 +557,10 @@ public class PageMemoryNoStoreImpl implements PageMemory { } /** - * @param relativePtr Relative pointer. + * @param pageIdx Page index. * @return Absolute pointer. */ - private long absolute(long relativePtr) { - int pageIdx = PageIdUtils.pageIndex(relativePtr); - + private long absolute(int pageIdx) { pageIdx &= idxMask; long off = ((long)pageIdx) * sysPageSize; @@ -589,10 +586,12 @@ public class PageMemoryNoStoreImpl implements PageMemory { * @param pageId Page ID to release. */ private void releaseFreePage(long pageId) { + int pageIdx = PageIdUtils.pageIndex(pageId); + // Clear out flags and file ID. - long relPtr = PageIdUtils.pageId(0, (byte)0, PageIdUtils.pageIndex(pageId)); + long relPtr = PageIdUtils.pageId(0, (byte)0, pageIdx); - long absPtr = absolute(relPtr); + long absPtr = absolute(pageIdx); // Second, write clean relative pointer instead of page ID. writePageId(absPtr, relPtr); @@ -624,7 +623,7 @@ public class PageMemoryNoStoreImpl implements PageMemory { long cnt = ((freePageRelPtrMasked & COUNTER_MASK) + COUNTER_INC) & COUNTER_MASK; if (freePageRelPtr != INVALID_REL_PTR) { - long freePageAbsPtr = absolute(freePageRelPtr); + long freePageAbsPtr = absolute(PageIdUtils.pageIndex(freePageRelPtr)); long nextFreePageRelPtr = GridUnsafe.getLong(freePageAbsPtr) & ADDRESS_MASK; http://git-wip-us.apache.org/repos/asf/ignite/blob/a95a60b8/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java index 3d6a553..d68466f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java @@ -36,21 +36,17 @@ public class PageNoStoreImpl implements Page { private long pageId; /** */ - private int cacheId; - - /** */ private PageMemoryNoStoreImpl pageMem; /** + * @param pageMem Page memory. * @param absPtr Absolute pointer. + * @param pageId Page ID. */ - PageNoStoreImpl( - PageMemoryNoStoreImpl pageMem, long absPtr, int cacheId, long pageId - ) { + PageNoStoreImpl(PageMemoryNoStoreImpl pageMem, long absPtr, long pageId) { this.pageMem = pageMem; this.absPtr = absPtr; - this.cacheId = cacheId; this.pageId = pageId; } @@ -68,7 +64,7 @@ public class PageNoStoreImpl implements Page { /** {@inheritDoc} */ @Override public FullPageId fullId() { - return new FullPageId(pageId, cacheId); + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -142,7 +138,6 @@ public class PageNoStoreImpl implements Page { SB sb = new SB("PageNoStoreImpl [absPtr=0x"); sb.appendHex(absPtr); - sb.a(", cacheId=").a(cacheId); sb.a(", pageId=0x").appendHex(pageId); sb.a("]");