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 13:44:05 UTC
[48/50] [abbrv] ignite git commit: fix treeMeta initialization after
start
fix treeMeta initialization after start
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/338de7eb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/338de7eb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/338de7eb
Branch: refs/heads/ignite-gg-11810-2
Commit: 338de7ebf33cf0ccd7d90d78a8cfbdfb0daa9863
Parents: aa70af0
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jan 18 12:47:41 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jan 18 12:47:41 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/database/tree/BPlusTree.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/338de7eb/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 09d68da..e4afc13 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;
/** */
@@ -121,6 +118,9 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
private final AtomicLong globalRmvId;
/** */
+ private volatile TreeMetaData treeMeta;
+
+ /** */
private final GridTreePrinter<Long> treePrinter = new GridTreePrinter<Long>() {
/** */
private boolean keys = true;
@@ -674,6 +674,8 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
assert res == TRUE: res;
}
+
+ assert treeMeta != null;
}
}