Merge remote-tracking branch 'remotes/community/ignite-db-x' into
ignite-db-x-10884
Conflicts:
modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodePutGetSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4f04fad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4f04fad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4f04fad
Branch: refs/heads/ignite-db-x-10884
Commit: b4f04fad0c1b5ee901251244b38c3c3f2d3143ea
Parents: 4a8fb8f e52e37e
Author: sboikov <[email protected]>
Authored: Wed May 4 08:53:11 2016 +0300
Committer: sboikov <[email protected]>
Committed: Wed May 4 08:53:11 2016 +0300
----------------------------------------------------------------------
.../internal/pagemem/PageIdAllocator.java | 1 -
.../ignite/internal/pagemem/PageIdUtils.java | 46 +-
.../ignite/internal/pagemem/impl/PageImpl.java | 2 +-
.../internal/pagemem/impl/PageMemoryImpl.java | 24 +-
.../cache/database/MetadataStorage.java | 4 +-
.../processors/cache/database/RowStore.java | 117 +---
.../cache/database/freelist/FreeList.java | 18 +-
.../cache/database/freelist/FreeTree.java | 30 +-
.../cache/database/freelist/io/FreeInnerIO.java | 14 +-
.../cache/database/freelist/io/FreeLeafIO.java | 2 +-
.../cache/database/tree/BPlusTree.java | 639 +++++++++++--------
.../cache/database/tree/io/BPlusInnerIO.java | 13 +-
.../cache/database/tree/io/BPlusLeafIO.java | 10 +-
.../cache/database/tree/io/DataPageIO.java | 283 +++++---
.../cache/database/tree/io/IOVersions.java | 15 +-
.../cache/database/tree/reuse/ReuseBag.java | 8 +-
.../cache/database/tree/reuse/ReuseList.java | 20 +-
.../cache/database/tree/reuse/ReuseTree.java | 48 +-
.../database/tree/reuse/io/ReuseInnerIO.java | 18 +-
.../database/tree/reuse/io/ReuseLeafIO.java | 17 +-
.../cache/database/tree/util/PageHandler.java | 54 +-
.../query/h2/database/H2RowStore.java | 7 -
.../processors/query/h2/database/H2Tree.java | 25 +-
.../processors/query/h2/opt/GridH2Table.java | 18 +-
.../database/BPlusTreeReuseSelfTest.java | 79 +++
.../processors/database/BPlusTreeSelfTest.java | 103 +--
.../IgniteDbSingleNodePutGetSelfTest.java | 125 +++-
27 files changed, 970 insertions(+), 770 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4f04fad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusInnerIO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4f04fad/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2RowStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4f04fad/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodePutGetSelfTest.java
----------------------------------------------------------------------
