ignite-db - minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3abcfc1e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3abcfc1e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3abcfc1e Branch: refs/heads/ignite-db-x-gg-11124 Commit: 3abcfc1e346b9da9270ece09b8a55e5c8d6c54a0 Parents: cbfc4f1 Author: S.Vladykin <[email protected]> Authored: Thu Apr 28 07:25:56 2016 +0300 Committer: S.Vladykin <[email protected]> Committed: Thu Apr 28 07:25:56 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/database/tree/BPlusTree.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3abcfc1e/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 2d345c7..409c737 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 @@ -488,8 +488,7 @@ public abstract class BPlusTree<L, T extends L> { } // We don't have a back page, need to lock our forward and become a back for it. - // If found then we are on inner replacement page, it will be a top parent, no need to lock forward. - if (!found && r.fwdId != 0 && r.backId == 0) + if (r.fwdId != 0 && r.backId == 0) r.lockForward(lvl); r.addTail(page, buf, io, lvl, Tail.EXACT, idx); @@ -957,7 +956,7 @@ public abstract class BPlusTree<L, T extends L> { case Remove.GO_DOWN_X: assert backId != 0; - // We need to get backId here for our page, it must be the last child of our back. + // We need to get backId here for our child page, it must be the last child of our back. res = askNeighbor(backId, r, true); if (res != Remove.FOUND) @@ -1922,7 +1921,8 @@ public abstract class BPlusTree<L, T extends L> { // Free root if it became empty after merge. freePage(tail.page, tail.buf, tail.io, tail.lvl, false); } - else if (tail.sibling != null && tail.getCount() + tail.sibling.getCount() < tail.io.getMaxCount(tail.buf)) { + else if (tail.sibling != null && + tail.getCount() + tail.sibling.getCount() < tail.io.getMaxCount(tail.buf)) { // Release everything lower than tail, we've already merged this path. doReleaseTail(tail.down);
