ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: Moved IgniteCacheOffheapManagerImpl's inner classes into separate package.
Date Tue, 05 Sep 2017 11:58:37 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 4f80f8664 -> dab27856c


Moved IgniteCacheOffheapManagerImpl's inner classes into separate package.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dab27856
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dab27856
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dab27856

Branch: refs/heads/master
Commit: dab27856c9139629379906ce050f7e17c8561a9b
Parents: 4f80f86
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Sep 5 14:58:29 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Sep 5 14:58:29 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/IgniteCacheOffheapManagerImpl.java      | 2 +-
 .../internal/processors/cache/tree/AbstractDataInnerIO.java  | 8 ++++----
 .../internal/processors/cache/tree/AbstractDataLeafIO.java   | 8 ++++----
 .../processors/cache/tree/AbstractPendingEntryInnerIO.java   | 8 ++++----
 .../processors/cache/tree/AbstractPendingEntryLeafIO.java    | 8 ++++----
 .../internal/processors/cache/tree/CacheDataRowStore.java    | 6 +++---
 .../ignite/internal/processors/cache/tree/CacheDataTree.java | 3 ++-
 .../processors/cache/tree/CacheIdAwareDataInnerIO.java       | 4 ++--
 .../processors/cache/tree/CacheIdAwareDataLeafIO.java        | 4 ++--
 .../cache/tree/CacheIdAwarePendingEntryInnerIO.java          | 4 ++--
 .../cache/tree/CacheIdAwarePendingEntryLeafIO.java           | 4 ++--
 .../ignite/internal/processors/cache/tree/DataInnerIO.java   | 8 ++++----
 .../ignite/internal/processors/cache/tree/DataLeafIO.java    | 8 ++++----
 .../ignite/internal/processors/cache/tree/DataRow.java       | 1 +
 .../internal/processors/cache/tree/PendingEntriesTree.java   | 6 +++---
 .../internal/processors/cache/tree/PendingEntryInnerIO.java  | 8 ++++----
 .../internal/processors/cache/tree/PendingEntryLeafIO.java   | 8 ++++----
 .../java/org/apache/ignite/internal/util/lang/GridFunc.java  | 1 +
 18 files changed, 51 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index aabb2d0..ba6f7d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -188,7 +188,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
     }
 
     /**
-     *
+     * @param cacheId Cache ID.
      */
     private void removeCacheData(int cacheId) {
         assert grp.affinityNode();

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
index 03e23ff..d5b28ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
@@ -18,12 +18,12 @@
 package org.apache.ignite.internal.processors.cache.tree;
 
 import org.apache.ignite.internal.pagemem.PageUtils;
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter;
 import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
 import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusInnerIO;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.lang.IgniteInClosure;
 
 /**
@@ -36,7 +36,7 @@ public abstract class AbstractDataInnerIO extends BPlusInnerIO<CacheSearchRow>
i
      * @param canGetRow If we can get full row from this page.
      * @param itemSize Single item size on page.
      */
-    protected AbstractDataInnerIO(int type, int ver, boolean canGetRow, int itemSize) {
+    AbstractDataInnerIO(int type, int ver, boolean canGetRow, int itemSize) {
         super(type, ver, canGetRow, itemSize);
     }
 
@@ -48,7 +48,7 @@ public abstract class AbstractDataInnerIO extends BPlusInnerIO<CacheSearchRow>
i
         PageUtils.putInt(pageAddr, off + 8, row.hash());
 
         if (storeCacheId()) {
-            assert row.cacheId() != GridCacheUtils.UNDEFINED_CACHE_ID : row;
+            assert row.cacheId() != CU.UNDEFINED_CACHE_ID : row;
 
             PageUtils.putInt(pageAddr, off + 12, row.cacheId());
         }
@@ -76,7 +76,7 @@ public abstract class AbstractDataInnerIO extends BPlusInnerIO<CacheSearchRow>
i
         if (storeCacheId()) {
             int cacheId = ((RowLinkIO)srcIo).getCacheId(srcPageAddr, srcIdx);
 
-            assert cacheId != GridCacheUtils.UNDEFINED_CACHE_ID;
+            assert cacheId != CU.UNDEFINED_CACHE_ID;
 
             PageUtils.putInt(dstPageAddr, off + 12, cacheId);
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java
index 9199dab..e9a3a9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java
@@ -18,12 +18,12 @@
 package org.apache.ignite.internal.processors.cache.tree;
 
 import org.apache.ignite.internal.pagemem.PageUtils;
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter;
 import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
 import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusLeafIO;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.lang.IgniteInClosure;
 
 /**
@@ -35,7 +35,7 @@ public abstract class AbstractDataLeafIO extends BPlusLeafIO<CacheSearchRow>
imp
      * @param ver Page format version.
      * @param itemSize Single item size on page.
      */
-    protected AbstractDataLeafIO(int type, int ver, int itemSize) {
+    AbstractDataLeafIO(int type, int ver, int itemSize) {
         super(type, ver, itemSize);
     }
 
@@ -47,7 +47,7 @@ public abstract class AbstractDataLeafIO extends BPlusLeafIO<CacheSearchRow>
imp
         PageUtils.putInt(pageAddr, off + 8, row.hash());
 
         if (storeCacheId()) {
-            assert row.cacheId() != GridCacheUtils.UNDEFINED_CACHE_ID;
+            assert row.cacheId() != CU.UNDEFINED_CACHE_ID;
 
             PageUtils.putInt(pageAddr, off + 12, row.cacheId());
         }
@@ -66,7 +66,7 @@ public abstract class AbstractDataLeafIO extends BPlusLeafIO<CacheSearchRow>
imp
         if (storeCacheId()) {
             int cacheId = ((RowLinkIO)srcIo).getCacheId(srcPageAddr, srcIdx);
 
-            assert cacheId != GridCacheUtils.UNDEFINED_CACHE_ID;
+            assert cacheId != CU.UNDEFINED_CACHE_ID;
 
             PageUtils.putInt(dstPageAddr, off + 12, cacheId);
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryInnerIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryInnerIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryInnerIO.java
index 5a72c3d..1ba0472 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryInnerIO.java
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.tree;
 
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.pagemem.PageUtils;
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusInnerIO;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 
 /**
  *
@@ -34,7 +34,7 @@ public abstract class AbstractPendingEntryInnerIO extends BPlusInnerIO<PendingRo
      * @param canGetRow If we can get full row from this page.
      * @param itemSize Single item size on page.
      */
-    protected AbstractPendingEntryInnerIO(int type, int ver, boolean canGetRow, int itemSize)
{
+    AbstractPendingEntryInnerIO(int type, int ver, boolean canGetRow, int itemSize) {
         super(type, ver, canGetRow, itemSize);
     }
 
@@ -47,7 +47,7 @@ public abstract class AbstractPendingEntryInnerIO extends BPlusInnerIO<PendingRo
         PageUtils.putLong(pageAddr, off + 8, row.link);
 
         if (storeCacheId()) {
-            assert row.cacheId != GridCacheUtils.UNDEFINED_CACHE_ID;
+            assert row.cacheId != CU.UNDEFINED_CACHE_ID;
 
             PageUtils.putInt(pageAddr, off + 16, row.cacheId);
         }
@@ -70,7 +70,7 @@ public abstract class AbstractPendingEntryInnerIO extends BPlusInnerIO<PendingRo
         if (storeCacheId()) {
             int cacheId = ((PendingRowIO)srcIo).getCacheId(srcPageAddr, srcIdx);
 
-            assert cacheId != GridCacheUtils.UNDEFINED_CACHE_ID;
+            assert cacheId != CU.UNDEFINED_CACHE_ID;
 
             PageUtils.putInt(dstPageAddr, dstOff + 16, cacheId);
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryLeafIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryLeafIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryLeafIO.java
index febe77c..b64b2e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractPendingEntryLeafIO.java
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.tree;
 
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.pagemem.PageUtils;
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusLeafIO;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 
 /**
  *
@@ -33,7 +33,7 @@ public abstract class AbstractPendingEntryLeafIO extends BPlusLeafIO<PendingRow>
      * @param ver Page format version.
      * @param itemSize Single item size on page.
      */
-    protected AbstractPendingEntryLeafIO(int type, int ver, int itemSize) {
+    AbstractPendingEntryLeafIO(int type, int ver, int itemSize) {
         super(type, ver, itemSize);
     }
 
@@ -46,7 +46,7 @@ public abstract class AbstractPendingEntryLeafIO extends BPlusLeafIO<PendingRow>
         PageUtils.putLong(pageAddr, off + 8, row.link);
 
         if (storeCacheId()) {
-            assert row.cacheId != GridCacheUtils.UNDEFINED_CACHE_ID;
+            assert row.cacheId != CU.UNDEFINED_CACHE_ID;
 
             PageUtils.putInt(pageAddr, off + 16, row.cacheId);
         }
@@ -69,7 +69,7 @@ public abstract class AbstractPendingEntryLeafIO extends BPlusLeafIO<PendingRow>
         if (storeCacheId()) {
             int cacheId = ((PendingRowIO)srcIo).getCacheId(srcPageAddr, srcIdx);
 
-            assert cacheId != GridCacheUtils.UNDEFINED_CACHE_ID;
+            assert cacheId != CU.UNDEFINED_CACHE_ID;
 
             PageUtils.putInt(dstPageAddr, dstOff + 16, cacheId);
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataRowStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataRowStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataRowStore.java
index 9cf8813..28d8919 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataRowStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataRowStore.java
@@ -18,12 +18,12 @@
 package org.apache.ignite.internal.processors.cache.tree;
 
 import org.apache.ignite.internal.processors.cache.CacheGroupContext;
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
 import org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter;
 import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
 import org.apache.ignite.internal.processors.cache.persistence.RowStore;
 import org.apache.ignite.internal.processors.cache.persistence.freelist.FreeList;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 
 /**
  *
@@ -56,7 +56,7 @@ public class CacheDataRowStore extends RowStore {
     CacheSearchRow keySearchRow(int cacheId, int hash, long link) {
         DataRow dataRow = new DataRow(grp, hash, link, partId, CacheDataRowAdapter.RowData.KEY_ONLY);
 
-        if (dataRow.cacheId() == GridCacheUtils.UNDEFINED_CACHE_ID && grp.sharedGroup())
+        if (dataRow.cacheId() == CU.UNDEFINED_CACHE_ID && grp.sharedGroup())
             dataRow.cacheId(cacheId);
 
         return dataRow;
@@ -72,7 +72,7 @@ public class CacheDataRowStore extends RowStore {
     CacheDataRow dataRow(int cacheId, int hash, long link, CacheDataRowAdapter.RowData rowData)
{
         DataRow dataRow = new DataRow(grp, hash, link, partId, rowData);
 
-        if (dataRow.cacheId() == GridCacheUtils.UNDEFINED_CACHE_ID && grp.sharedGroup())
+        if (dataRow.cacheId() == CU.UNDEFINED_CACHE_ID && grp.sharedGroup())
             dataRow.cacheId(cacheId);
 
         return dataRow;

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
index 06ca5b5..36306cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
@@ -83,7 +83,7 @@ public class CacheDataTree extends BPlusTree<CacheSearchRow, CacheDataRow>
{
     /**
      * @return Row store.
      */
-    public CacheDataRowStore rowStore() {
+    CacheDataRowStore rowStore() {
         return rowStore;
     }
 
@@ -155,6 +155,7 @@ public class CacheDataTree extends BPlusTree<CacheSearchRow, CacheDataRow>
{
 
         final long pageId = pageId(link);
         final long page = acquirePage(pageId);
+
         try {
             long pageAddr = readLock(pageId, page); // Non-empty data page must not be recycled.
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java
index 8740147..acb42a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataInnerIO.java
@@ -32,11 +32,11 @@ public final class CacheIdAwareDataInnerIO extends AbstractDataInnerIO
{
     /**
      * @param ver Page format version.
      */
-    CacheIdAwareDataInnerIO(int ver) {
+    private CacheIdAwareDataInnerIO(int ver) {
         super(T_CACHE_ID_AWARE_DATA_REF_INNER, ver, true, 16);
     }
 
-
+    /** {@inheritDoc} */
     @Override public int getCacheId(long pageAddr, int idx) {
         return PageUtils.getInt(pageAddr, offset(idx) + 12);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java
index 1f82cbb..7263168 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwareDataLeafIO.java
@@ -32,11 +32,11 @@ public final class CacheIdAwareDataLeafIO extends AbstractDataLeafIO {
     /**
      * @param ver Page format version.
      */
-    CacheIdAwareDataLeafIO(int ver) {
+    private CacheIdAwareDataLeafIO(int ver) {
         super(T_CACHE_ID_AWARE_DATA_REF_LEAF, ver, 16);
     }
 
-
+    /** {@inheritDoc} */
     @Override public int getCacheId(long pageAddr, int idx) {
         return PageUtils.getInt(pageAddr, offset(idx) + 12);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryInnerIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryInnerIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryInnerIO.java
index f166841..59c7b65 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryInnerIO.java
@@ -32,11 +32,11 @@ public final class CacheIdAwarePendingEntryInnerIO extends AbstractPendingEntryI
     /**
      * @param ver Page format version.
      */
-    CacheIdAwarePendingEntryInnerIO(int ver) {
+    private CacheIdAwarePendingEntryInnerIO(int ver) {
         super(T_CACHE_ID_AWARE_PENDING_REF_INNER, ver, true, 20);
     }
 
-
+    /** {@inheritDoc} */
     @Override public int getCacheId(long pageAddr, int idx) {
         return PageUtils.getInt(pageAddr, offset(idx) + 16);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryLeafIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryLeafIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryLeafIO.java
index 3fee2b6..e6208ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheIdAwarePendingEntryLeafIO.java
@@ -32,11 +32,11 @@ public final class CacheIdAwarePendingEntryLeafIO extends AbstractPendingEntryLe
     /**
      * @param ver Page format version.
      */
-    CacheIdAwarePendingEntryLeafIO(int ver) {
+    private CacheIdAwarePendingEntryLeafIO(int ver) {
         super(T_CACHE_ID_AWARE_PENDING_REF_LEAF, ver, 20);
     }
 
-
+    /** {@inheritDoc} */
     @Override public int getCacheId(long pageAddr, int idx) {
         return PageUtils.getInt(pageAddr, offset(idx) + 16);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java
index 15cc3a0..8625338 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataInnerIO.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.tree;
 
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 
 /**
  *
@@ -32,13 +32,13 @@ public final class DataInnerIO extends AbstractDataInnerIO {
     /**
      * @param ver Page format version.
      */
-    DataInnerIO(int ver) {
+    private DataInnerIO(int ver) {
         super(T_DATA_REF_INNER, ver, true, 12);
     }
 
-
+    /** {@inheritDoc} */
     @Override public int getCacheId(long pageAddr, int idx) {
-        return GridCacheUtils.UNDEFINED_CACHE_ID;
+        return CU.UNDEFINED_CACHE_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java
index 66cbaa4..d53964f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataLeafIO.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.tree;
 
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 
 /**
  *
@@ -32,13 +32,13 @@ public final class DataLeafIO extends AbstractDataLeafIO {
     /**
      * @param ver Page format version.
      */
-    DataLeafIO(int ver) {
+    private DataLeafIO(int ver) {
         super(T_DATA_REF_LEAF, ver, 12);
     }
 
-
+    /** {@inheritDoc} */
     @Override public int getCacheId(long pageAddr, int idx) {
-        return GridCacheUtils.UNDEFINED_CACHE_ID;
+        return CU.UNDEFINED_CACHE_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataRow.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataRow.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataRow.java
index 00ad95c..29bbaaf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataRow.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/DataRow.java
@@ -36,6 +36,7 @@ public class DataRow extends CacheDataRowAdapter {
     protected int hash;
 
     /**
+     * @param grp Cache group (used to initialize row).
      * @param hash Hash code.
      * @param link Link.
      * @param part Partition.

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntriesTree.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntriesTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntriesTree.java
index 6b6090a..fad3a50 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntriesTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntriesTree.java
@@ -20,10 +20,10 @@ package org.apache.ignite.internal.processors.cache.tree;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.pagemem.PageMemory;
 import org.apache.ignite.internal.processors.cache.CacheGroupContext;
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
 import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 
 /**
  *
@@ -75,8 +75,8 @@ public class PendingEntriesTree extends BPlusTree<PendingRow, PendingRow>
{
         int cmp;
 
         if (grp.sharedGroup()) {
-            assert row.cacheId != GridCacheUtils.UNDEFINED_CACHE_ID : "Cache ID is not provided!";
-            assert io.getCacheId(pageAddr, idx) != GridCacheUtils.UNDEFINED_CACHE_ID : "Cache
ID is not stored!";
+            assert row.cacheId != CU.UNDEFINED_CACHE_ID : "Cache ID is not provided!";
+            assert io.getCacheId(pageAddr, idx) != CU.UNDEFINED_CACHE_ID : "Cache ID is not
stored!";
 
             cmp = Integer.compare(io.getCacheId(pageAddr, idx), row.cacheId);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryInnerIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryInnerIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryInnerIO.java
index 2cfd6a3..b6ffb44 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryInnerIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryInnerIO.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.tree;
 
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 
 /**
  *
@@ -32,13 +32,13 @@ public final class PendingEntryInnerIO extends AbstractPendingEntryInnerIO
{
     /**
      * @param ver Page format version.
      */
-    PendingEntryInnerIO(int ver) {
+    private PendingEntryInnerIO(int ver) {
         super(T_PENDING_REF_INNER, ver, true, 16);
     }
 
-
+    /** {@inheritDoc} */
     @Override public int getCacheId(long pageAddr, int idx) {
-        return GridCacheUtils.UNDEFINED_CACHE_ID;
+        return CU.UNDEFINED_CACHE_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryLeafIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryLeafIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryLeafIO.java
index 653f3dc..28a3b22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryLeafIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/PendingEntryLeafIO.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.cache.tree;
 
-import org.apache.ignite.internal.processors.cache.GridCacheUtils;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 
 /**
  *
@@ -32,13 +32,13 @@ public final class PendingEntryLeafIO extends AbstractPendingEntryLeafIO
{
     /**
      * @param ver Page format version.
      */
-    PendingEntryLeafIO(int ver) {
+    private PendingEntryLeafIO(int ver) {
         super(T_PENDING_REF_LEAF, ver, 16);
     }
 
-
+    /** {@inheritDoc} */
     @Override public int getCacheId(long pageAddr, int idx) {
-        return GridCacheUtils.UNDEFINED_CACHE_ID;
+        return CU.UNDEFINED_CACHE_ID;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/dab27856/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index fbb47c4..24b9d48 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -1386,6 +1386,7 @@ public class GridFunc {
      * @param p Optional filtering predicates.
      * @return Iterator from given iterator and optional filtering predicate.
      */
+    @SafeVarargs
     public static <T1, T2> Iterator<T2> iterator(final Iterator<? extends
T1> c,
         final IgniteClosure<? super T1, T2> trans,
         final boolean readOnly,


Mime
View raw message