You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2017/02/16 14:41:05 UTC
[13/17] ignite git commit: ignite-4652 - minor
ignite-4652 - minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/607e4187
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/607e4187
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/607e4187
Branch: refs/heads/ignite-4652
Commit: 607e418750b70bdb4bf27cf25a1bd77e7dd7d58b
Parents: b4283a3
Author: Sergi Vladykin <se...@gmail.com>
Authored: Wed Feb 15 19:19:52 2017 +0300
Committer: Sergi Vladykin <se...@gmail.com>
Committed: Wed Feb 15 19:19:52 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/database/tree/BPlusTree.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/607e4187/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 570569f..904d91e 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
@@ -1560,7 +1560,9 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
for (;;) {
r.init();
- switch (removeDown(r, r.rootId, 0L, 0L, r.rootLvl)) {
+ Result res = removeDown(r, r.rootId, 0L, 0L, r.rootLvl);
+
+ switch (res) {
case RETRY:
case RETRY_ROOT:
checkInterrupted();
@@ -1569,7 +1571,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
default:
if (!r.isFinished()) {
- Result res = r.finishTail();
+ res = r.finishTail();
// If not found, then the tree grew beyond our call stack -> retry from the actual root.
if (res == RETRY || res == NOT_FOUND) {