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/29179ce9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/29179ce9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/29179ce9 Branch: refs/heads/ignite-db-x-10884 Commit: 29179ce9f3204652e21c5540222053fe844bcb9b Parents: 939b883 Author: S.Vladykin <[email protected]> Authored: Sun Apr 24 19:26:55 2016 +0300 Committer: S.Vladykin <[email protected]> Committed: Sun Apr 24 19:26:55 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/database/tree/BPlusTree.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/29179ce9/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 58f07e7..05fa56b 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 @@ -632,7 +632,7 @@ public abstract class BPlusTree<L, T extends L> { private void doFind(Get g) throws IgniteCheckedException { try { for (;;) { // Go down with retries. - g.initOperation(); + g.init(); switch (findDown(g, g.rootId, 0L, g.rootLvl)) { case Get.RETRY: @@ -832,12 +832,12 @@ public abstract class BPlusTree<L, T extends L> { * @return Removed row. * @throws IgniteCheckedException If failed. */ - public final T doRemove(L row, boolean ceil) throws IgniteCheckedException { + private T doRemove(L row, boolean ceil) throws IgniteCheckedException { Remove r = new Remove(row, ceil); try { for (;;) { - r.initOperation(); + r.init(); switch (removeDown(r, r.rootId, 0L, 0L, r.rootLvl)) { case Remove.RETRY: @@ -1018,7 +1018,7 @@ public abstract class BPlusTree<L, T extends L> { try { for (;;) { // Go down with retries. - p.initOperation(); + p.init(); switch (putDown(p, p.rootId, 0L, p.rootLvl)) { case Put.RETRY: @@ -1325,13 +1325,13 @@ public abstract class BPlusTree<L, T extends L> { /** */ long rmvId; - /** Starting point root level. May be outdated. Must be modified only in {@link Get#initOperation()}. */ + /** Starting point root level. May be outdated. Must be modified only in {@link Get#init()}. */ int rootLvl; - /** Starting point root ID. May be outdated. Must be modified only in {@link Get#initOperation()}. */ + /** Starting point root ID. May be outdated. Must be modified only in {@link Get#init()}. */ long rootId; - /** Meta page. Initialized by {@link Get#initOperation()}, released by {@link Get#releaseMeta()}. */ + /** Meta page. Initialized by {@link Get#init()}, released by {@link Get#releaseMeta()}. */ Page meta; /** */ @@ -1356,13 +1356,13 @@ public abstract class BPlusTree<L, T extends L> { } /** - * Initialize the given operation. + * Initialize operation. * * !!! Symmetrically with this method must be called {@link Get#releaseMeta()} in {@code finally} block. * * @throws IgniteCheckedException If failed. */ - final void initOperation() throws IgniteCheckedException { + final void init() throws IgniteCheckedException { if (meta == null) meta = page(metaPageId);
