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/d7e35ee4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d7e35ee4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d7e35ee4 Branch: refs/heads/ignite-db-x-10884 Commit: d7e35ee4d025dda3e71b9178c36093f82e057ce0 Parents: 24a345a Author: S.Vladykin <[email protected]> Authored: Thu Apr 21 00:35:50 2016 +0300 Committer: S.Vladykin <[email protected]> Committed: Thu Apr 21 00:35:50 2016 +0300 ---------------------------------------------------------------------- .../cache/database/tree/BPlusTree.java | 22 +++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d7e35ee4/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 98fd8eb..61c49d7 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 @@ -403,7 +403,7 @@ public abstract class BPlusTree<L, T extends L> { } // Check that we have a correct view of the world. - if (lvl != 0 && inner(io).getLeft(buf, idx) != r.nonBackTailPage().id()) { + if (lvl != 0 && inner(io).getLeft(buf, idx) != r.getTail(lvl - 1, false).page.id()) { assert !found; return Remove.RETRY; @@ -806,7 +806,7 @@ public abstract class BPlusTree<L, T extends L> { public final T removeCeil(L row) throws IgniteCheckedException { assert row != null; - return remove(row, true); + return doRemove(row, true); } /** @@ -817,7 +817,7 @@ public abstract class BPlusTree<L, T extends L> { public final T remove(L row) throws IgniteCheckedException { assert row != null; - return remove(row, false); + return doRemove(row, false); } /** @@ -826,7 +826,7 @@ public abstract class BPlusTree<L, T extends L> { * @return Removed row. * @throws IgniteCheckedException If failed. */ - public final T remove(L row, boolean ceil) throws IgniteCheckedException { + public final T doRemove(L row, boolean ceil) throws IgniteCheckedException { Remove r = new Remove(row, ceil); try { @@ -2157,21 +2157,13 @@ public abstract class BPlusTree<L, T extends L> { } /** - * @return Non-back tail page. - */ - private Page nonBackTailPage() { - assert tail != null; - - return tail.fwd == null ? tail.page : tail.fwd.page; - } - - /** * @param lvl Level. * @param back Back page. * @return Tail. */ private Tail<L> getTail(int lvl, boolean back) { - assert lvl <= tail.lvl: "level is too high"; + assert tail != null; + assert lvl >= 0 && lvl <= tail.lvl: lvl; Tail<L> t = tail; @@ -2181,7 +2173,7 @@ public abstract class BPlusTree<L, T extends L> { else t = t.down; - assert t != null : "level is too low"; + assert t != null: lvl; } if (back)
