ignite-db - refactor more
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/20b06380 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/20b06380 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/20b06380 Branch: refs/heads/ignite-db-x-10884 Commit: 20b06380d89b0403d6dd64ef950974b411df1ca1 Parents: 7cb0605 Author: S.Vladykin <[email protected]> Authored: Wed Apr 13 02:39:01 2016 +0300 Committer: S.Vladykin <[email protected]> Committed: Wed Apr 13 02:39:01 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/database/tree/io/BPlusIO.java | 5 +++-- .../cache/database/tree/io/BPlusInnerIO.java | 5 +++-- .../cache/database/tree/io/BPlusLeafIO.java | 5 +++-- .../cache/database/tree/io/BPlusMetaIO.java | 7 +------ .../processors/cache/database/tree/io/DataPageIO.java | 7 +------ .../processors/cache/database/tree/io/PageIO.java | 14 ++++++++++---- .../processors/query/h2/database/io/H2InnerIO.java | 7 +------ .../processors/query/h2/database/io/H2LeafIO.java | 7 +------ 8 files changed, 23 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/20b06380/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java index bd09a0e..90d24ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusIO.java @@ -46,13 +46,14 @@ public abstract class BPlusIO<L> extends PageIO { protected final int itemSize; /** + * @param type Page type. * @param ver Page format version. * @param leaf If this is a leaf IO. * @param canGetRow If we can get full row from this page. * @param itemSize Single item size on page. */ - protected BPlusIO(int ver, boolean leaf, boolean canGetRow, int itemSize) { - super(ver); + protected BPlusIO(int type, int ver, boolean leaf, boolean canGetRow, int itemSize) { + super(type, ver); assert itemSize > 0 : itemSize; assert canGetRow || !leaf: "leaf page always must be able to get full row"; http://git-wip-us.apache.org/repos/asf/ignite/blob/20b06380/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusInnerIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusInnerIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusInnerIO.java index 4ff00ed..945f3a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusInnerIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusInnerIO.java @@ -33,12 +33,13 @@ public abstract class BPlusInnerIO<L> extends BPlusIO<L> { protected final int SHIFT_RIGHT = SHIFT_LINK + itemSize; /** + * @param type Page type. * @param ver Page format version. * @param canGetRow If we can get full row from this page. * @param itemSize Single item size on page. */ - protected BPlusInnerIO(int ver, boolean canGetRow, int itemSize) { - super(ver, false, canGetRow, itemSize); + protected BPlusInnerIO(int type, int ver, boolean canGetRow, int itemSize) { + super(type, ver, false, canGetRow, itemSize); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/20b06380/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java index 9e7e4fb..9712ff0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java @@ -24,11 +24,12 @@ import java.nio.ByteBuffer; */ public abstract class BPlusLeafIO<L> extends BPlusIO<L> { /** + * @param type Page type. * @param ver Page format version. * @param itemSize Single item size on page. */ - protected BPlusLeafIO(int ver, int itemSize) { - super(ver, true, true, itemSize); + protected BPlusLeafIO(int type, int ver, int itemSize) { + super(type, ver, true, true, itemSize); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/20b06380/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java index 7034548..8250263 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java @@ -38,12 +38,7 @@ public class BPlusMetaIO extends PageIO { * @param ver Page format version. */ protected BPlusMetaIO(int ver) { - super(ver); - } - - /** {@inheritDoc} */ - @Override public int getType() { - return T_BPLUS_META; + super(T_BPLUS_META, ver); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/20b06380/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java index 9c43a0d..8c535eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java @@ -52,12 +52,7 @@ public class DataPageIO extends PageIO { * @param ver Page format version. */ protected DataPageIO(int ver) { - super(ver); - } - - /** {@inheritDoc} */ - @Override public int getType() { - return T_DATA; + super(T_DATA, ver); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/20b06380/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java index 001d5cc..8fc780c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PageIO.java @@ -55,17 +55,21 @@ public abstract class PageIO { /** */ private final int ver; + /** */ + private final int type; + /** + * @param type Page type. * @param ver Page format version. */ - protected PageIO(int ver) { + protected PageIO(int type, int ver) { assert ver > 0 && ver < 65535: ver; + assert type > 0 && type < 65535: type; + this.type = type; this.ver = ver; } - - /** * @return Page type. */ @@ -140,7 +144,9 @@ public abstract class PageIO { /** * @return Type. */ - public abstract int getType(); + public final int getType() { + return type; + } /** * @return Version. http://git-wip-us.apache.org/repos/asf/ignite/blob/20b06380/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2InnerIO.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2InnerIO.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2InnerIO.java index 67cf415..1e39599 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2InnerIO.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2InnerIO.java @@ -37,12 +37,7 @@ public class H2InnerIO extends BPlusInnerIO<SearchRow> implements H2RowLinkIO { * @param ver Page format version. */ private H2InnerIO(int ver) { - super(ver, true, 8); - } - - /** {@inheritDoc} */ - @Override public final int getType() { - return T_H2_REF_INNER; + super(T_H2_REF_INNER, ver, true, 8); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/20b06380/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java index ecaab95..fcccf8a 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java @@ -37,12 +37,7 @@ public class H2LeafIO extends BPlusLeafIO<SearchRow> implements H2RowLinkIO { * @param ver Page format version. */ protected H2LeafIO(int ver) { - super(ver, 8); - } - - /** {@inheritDoc} */ - @Override public int getType() { - return T_H2_REF_LEAF; + super(T_H2_REF_LEAF, ver, 8); } /** {@inheritDoc} */
