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/fa04fcd9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa04fcd9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa04fcd9 Branch: refs/heads/ignite-db-x-10884 Commit: fa04fcd988975f04b6cfe228df01981feb3b2a02 Parents: 54f2699 Author: S.Vladykin <[email protected]> Authored: Tue Apr 12 01:51:38 2016 +0300 Committer: S.Vladykin <[email protected]> Committed: Tue Apr 12 01:51:38 2016 +0300 ---------------------------------------------------------------------- .../processors/query/h2/database/BPlusTree.java | 40 ++++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa04fcd9/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/BPlusTree.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/BPlusTree.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/BPlusTree.java index 33a7080..a2fcaae 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/BPlusTree.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/BPlusTree.java @@ -2171,11 +2171,6 @@ public abstract class BPlusTree<L, T extends L> { } /** - * @return Allocated page. - */ - protected abstract Page allocatePage() throws IgniteCheckedException; - - /** * @param io IO. * @param buf Buffer. * @param cnt Row count. @@ -2207,15 +2202,6 @@ public abstract class BPlusTree<L, T extends L> { /** * @param buf Buffer. - * @param idx Index of row in the given buffer. - * @param row Lookup row. - * @return Comparison result as in {@link Comparator#compare(Object, Object)}. - * @throws IgniteCheckedException If failed. - */ - protected abstract int compare(BPlusIO<T> io, ByteBuffer buf, int idx, L row) throws IgniteCheckedException; - - /** - * @param buf Buffer. * @return IO. */ private BPlusIO<T> io(ByteBuffer buf) { @@ -2228,6 +2214,14 @@ public abstract class BPlusTree<L, T extends L> { } /** + * @param io IO. + * @return Inner page IO. + */ + private static BPlusIOInner inner(BPlusIO io) { + return (BPlusIOInner)io; + } + + /** * @param type Page type. * @param ver Page version. * @return IO. @@ -2245,16 +2239,15 @@ public abstract class BPlusTree<L, T extends L> { protected abstract BPlusIOLeaf<T> latestLeafIO(); /** - * @param io IO. - * @return Inner page IO. + * @param buf Buffer. + * @param idx Index of row in the given buffer. + * @param row Lookup row. + * @return Comparison result as in {@link Comparator#compare(Object, Object)}. + * @throws IgniteCheckedException If failed. */ - private static BPlusIOInner inner(BPlusIO io) { - return (BPlusIOInner)io; - } + protected abstract int compare(BPlusIO<T> io, ByteBuffer buf, int idx, L row) throws IgniteCheckedException; /** - * Get page by ID. - * * @param pageId Page ID. * @return Page. * @throws IgniteCheckedException If failed. @@ -2262,6 +2255,11 @@ public abstract class BPlusTree<L, T extends L> { protected abstract Page page(long pageId) throws IgniteCheckedException; /** + * @return Allocated page. + */ + protected abstract Page allocatePage() throws IgniteCheckedException; + + /** * Forward cursor. */ protected class ForwardCursor implements GridCursor<T> {
