Merge branch 'ignite-gg-11414' into ignite-gg-8.0.2.ea2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2266e2ac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2266e2ac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2266e2ac Branch: refs/heads/ignite-3477 Commit: 2266e2ac3af446ab36c9d646d2b8abde719295e9 Parents: 6c6cbd3 e03a980 Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com> Authored: Wed Jan 11 14:39:56 2017 +0300 Committer: Dmitriy Govorukhin <dgovoruk...@gridgain.com> Committed: Wed Jan 11 14:39:56 2017 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 30 --- .../cache/IgniteCacheOffheapManagerImpl.java | 6 +- .../cache/database/tree/BPlusTree.java | 19 +- .../util/GridCursorIteratorWrapper.java | 36 ++++ .../apache/ignite/internal/util/IgniteTree.java | 70 +++++++ .../offheap/unsafe/GridOffHeapSnapTreeMap.java | 11 +- .../internal/util/snaptree/SnapTreeMap.java | 10 +- .../processors/database/BPlusTreeSelfTest.java | 33 ++++ .../query/h2/opt/GridH2SpatialIndex.java | 24 ++- .../internal/processors/query/h2/H2Cursor.java | 105 ++++++++++ .../processors/query/h2/IgniteH2Indexing.java | 42 +--- .../query/h2/database/H2PkHashIndex.java | 37 ++-- .../query/h2/database/H2TreeIndex.java | 133 +++++-------- .../query/h2/opt/GridH2IndexBase.java | 182 ++++++++++++----- .../processors/query/h2/opt/GridH2Table.java | 4 +- .../query/h2/opt/GridH2TreeIndex.java | 195 ++++++++++++------- .../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +- .../query/IgniteSqlDistributedJoinSelfTest.java | 179 +++++++++++++++++ .../query/IgniteSqlSplitterSelfTest.java | 6 +- .../query/h2/opt/GridH2TableSelfTest.java | 29 +-- .../query/h2/sql/GridQueryParsingTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 15 -- .../IgniteCacheQuerySelfTestSuite3.java | 2 + .../IgniteDistributedJoinTestSuite.java | 38 ++++ 24 files changed, 862 insertions(+), 348 deletions(-) ----------------------------------------------------------------------