Repository: ignite Updated Branches: refs/heads/ignite-3477 4cf2b3da8 -> 4db65d292
ignite-3477 Minor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4db65d29 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4db65d29 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4db65d29 Branch: refs/heads/ignite-3477 Commit: 4db65d292b33b88378ed029973562f665829b843 Parents: 4cf2b3d Author: sboikov <[email protected]> Authored: Tue Jan 24 16:06:40 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Jan 24 16:06:40 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/pagemem/PageMemory.java | 13 ++----------- .../internal/pagemem/impl/PageMemoryNoStoreImpl.java | 13 +++++++------ .../ignite/internal/pagemem/impl/PageNoStoreImpl.java | 2 ++ 3 files changed, 11 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4db65d29/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java index cfee19f..2e427de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java @@ -35,22 +35,13 @@ public interface PageMemory extends LifecycleAware, PageIdAllocator { * @param cacheId Cache ID. * @param pageId Page ID. * @return Page. + * @throws IgniteCheckedException If failed. */ public Page page(int cacheId, long pageId) throws IgniteCheckedException; /** - * @see #page(int, long) - * Will not read page from file if it is not present in memory. - * TODO this method should be moved to PageMemoryEx altogether will all WAL records. - * - * @param cacheId Cache id. - * @param pageId Page id. - * @param restore Get page for memory restore - */ - public Page page(int cacheId, long pageId, boolean restore) throws IgniteCheckedException; - - /** * @param page Page to release. + * @throws IgniteCheckedException If failed. */ public void releasePage(Page page) throws IgniteCheckedException; http://git-wip-us.apache.org/repos/asf/ignite/blob/4db65d29/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 41e401d..3bc5241 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 @@ -147,6 +147,7 @@ public class PageMemoryNoStoreImpl implements PageMemory { boolean trackAcquiredPages ) { assert log != null || sharedCtx != null; + assert pageSize % 8 == 0; this.log = sharedCtx != null ? sharedCtx.logger(PageMemoryNoStoreImpl.class) : log; this.directMemoryProvider = directMemoryProvider; @@ -154,6 +155,8 @@ public class PageMemoryNoStoreImpl implements PageMemory { sysPageSize = pageSize + PAGE_OVERHEAD; + assert sysPageSize % 8 == 0 : sysPageSize; + // TODO configure concurrency level. rwLock = new OffheapReadWriteLock(128); } @@ -280,11 +283,6 @@ public class PageMemoryNoStoreImpl implements PageMemory { } /** {@inheritDoc} */ - @Override public Page page(int cacheId, long pageId, boolean restore) throws IgniteCheckedException { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ @Override public void releasePage(Page p) { if (trackAcquiredPages) { Segment seg = segment(PageIdUtils.pageIndex(p.id())); @@ -537,6 +535,7 @@ public class PageMemoryNoStoreImpl implements PageMemory { } /** + * @param pageIdx Page index. * @param pageId Page ID to pin. * @return Pinned page impl. */ @@ -544,6 +543,8 @@ public class PageMemoryNoStoreImpl implements PageMemory { private PageNoStoreImpl acquirePage(int pageIdx, long pageId) { long absPtr = absolute(pageIdx); + assert absPtr % 8 == 0 : absPtr; + if (trackAcquiredPages) acquiredPages.incrementAndGet(); @@ -642,7 +643,7 @@ public class PageMemoryNoStoreImpl implements PageMemory { /** * @return Relative pointer of the allocated page. - * @throws GridOffHeapOutOfMemoryException + * @throws GridOffHeapOutOfMemoryException If failed to allocate. * @param tag Tag to initialize RW lock. */ private long allocateFreePage(int tag) throws GridOffHeapOutOfMemoryException { http://git-wip-us.apache.org/repos/asf/ignite/blob/4db65d29/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 b52df55..e82b5d2 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 @@ -42,6 +42,8 @@ public class PageNoStoreImpl implements Page { * @param pageId Page ID. */ PageNoStoreImpl(PageMemoryNoStoreImpl pageMem, long absPtr, long pageId) { + assert absPtr % 8 == 0 : absPtr; + this.pageMem = pageMem; this.absPtr = absPtr;
