You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/18 14:20:45 UTC
[5/5] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-3477' into ignite-gg-11810-2
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810-2
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/963b218f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/963b218f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/963b218f
Branch: refs/heads/ignite-gg-11810-2
Commit: 963b218f1c93a7c06cc14dc06f1be252dd844fd0
Parents: 01b15ac
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jan 18 17:20:27 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jan 18 17:20:27 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/database/tree/BPlusTree.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/963b218f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
index 0fca55b..ff4be4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
@@ -106,9 +106,6 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
private final long metaPageId;
/** */
- private volatile TreeMetaData treeMeta;
-
- /** */
private final boolean canGetRowFromInner;
/** */