[16/16] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-db-x' into ignite-db-x-10884

[sboikov]

Merge remote-tracking branch 'remotes/community/ignite-db-x' into 
ignite-db-x-10884

Conflicts:
        
modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodePutGetSelfTest.java


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

Branch: refs/heads/ignite-db-x-10884
Commit: 9fa657164e3167016f9a31c17d444f24edbec454
Parents: b4f04fa
Author: sboikov <sboi...@gridgain.com>
Authored: Wed May 4 09:01:17 2016 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Wed May 4 09:01:17 2016 +0300

----------------------------------------------------------------------
 .../cache/IgniteCacheOffheapManager.java        | 33 ++++++--------------
 1 file changed, 10 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa65716/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
index 32dfe5f..bb2ef3e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
@@ -103,7 +103,12 @@ public class IgniteCacheOffheapManager extends 
GridCacheManagerAdapter {
 
         rowStore = new CacheDataRowStore(cctx, freeList);
 
-        dataTree = new CacheDataTree(rowStore, cctx, dbMgr.pageMemory(), 
page.get1(), page.get2());
+        dataTree = new CacheDataTree(reuseList,
+            rowStore,
+            cctx,
+            dbMgr.pageMemory(),
+            page.get1(),
+            page.get2());
     }
 
     public ReuseList reuseList() {
@@ -579,12 +584,14 @@ public class IgniteCacheOffheapManager extends 
GridCacheManagerAdapter {
          * @param initNew Initialize new index.
          * @throws IgniteCheckedException If failed.
          */
-        public CacheDataTree(CacheDataRowStore rowStore,
+        public CacheDataTree(
+            ReuseList reuseList,
+            CacheDataRowStore rowStore,
             GridCacheContext cctx,
             PageMemory pageMem,
             FullPageId metaPageId,
             boolean initNew) throws IgniteCheckedException {
-            super(cctx.cacheId(), pageMem, metaPageId, null);
+            super(cctx.cacheId(), pageMem, metaPageId, reuseList, 
DataInnerIO.VERSIONS, DataLeafIO.VERSIONS);
 
             assert rowStore != null;
 
@@ -596,26 +603,6 @@ public class IgniteCacheOffheapManager extends 
GridCacheManagerAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override protected BPlusIO<KeySearchRow> io(int type, int ver) {
-            if (type == PageIO.T_DATA_REF_INNER)
-                return DataInnerIO.VERSIONS.forVersion(ver);
-
-            assert type == PageIO.T_DATA_REF_LEAF: type;
-
-            return DataLeafIO.VERSIONS.forVersion(ver);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected BPlusInnerIO<KeySearchRow> latestInnerIO() {
-            return DataInnerIO.VERSIONS.latest();
-        }
-
-        /** {@inheritDoc} */
-        @Override protected BPlusLeafIO<KeySearchRow> latestLeafIO() {
-            return DataLeafIO.VERSIONS.latest();
-        }
-
-        /** {@inheritDoc} */
         @Override protected int compare(BPlusIO<KeySearchRow> io, ByteBuffer 
buf, int idx, KeySearchRow row) throws IgniteCheckedException {
             KeySearchRow row0 = io.getLookupRow(this, buf, idx);