Merge branch 'ignite-4106-1.9' of https://github.com/gridgain/apache-ignite into ignite-1.9
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/658b4ad5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/658b4ad5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/658b4ad5 Branch: refs/heads/master Commit: 658b4ad5a3bf17fcb3fb9f364e47b4e28f5eea64 Parents: 963a9d9 4dc3694 Author: Sergi Vladykin <[email protected]> Authored: Wed Feb 22 13:17:43 2017 +0300 Committer: Sergi Vladykin <[email protected]> Committed: Wed Feb 22 13:17:43 2017 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 48 +++ .../processors/cache/GridCacheProcessor.java | 3 + .../processors/cache/IgniteCacheProxy.java | 6 +- .../closure/GridClosureProcessor.java | 2 +- .../processors/query/GridQueryIndexing.java | 27 +- .../processors/query/GridQueryProcessor.java | 141 ++----- .../messages/GridQueryNextPageRequest.java | 29 +- .../messages/GridQueryNextPageResponse.java | 29 +- .../query/h2/opt/GridH2SpatialIndex.java | 56 ++- .../query/h2/GridH2IndexingGeoSelfTest.java | 405 ++++++++++++++----- .../h2/GridH2IndexingSegmentedGeoSelfTest.java | 37 ++ .../testsuites/GeoSpatialIndexingTestSuite.java | 2 + .../cache/query/GridCacheTwoStepQuery.java | 17 + .../processors/query/h2/IgniteH2Indexing.java | 238 +++++++++-- .../query/h2/opt/DistributedJoinMode.java | 51 +++ .../query/h2/opt/GridH2IndexBase.java | 303 ++++++++++---- .../query/h2/opt/GridH2QueryContext.java | 84 +++- .../query/h2/opt/GridH2TreeIndex.java | 151 ++++--- .../query/h2/sql/GridSqlQuerySplitter.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 233 ++++++++--- .../query/h2/twostep/GridMergeIndex.java | 39 +- .../query/h2/twostep/GridMergeIndexSorted.java | 4 +- .../h2/twostep/GridReduceQueryExecutor.java | 69 ++-- .../h2/twostep/msg/GridH2IndexRangeRequest.java | 60 ++- .../twostep/msg/GridH2IndexRangeResponse.java | 62 ++- .../h2/twostep/msg/GridH2QueryRequest.java | 5 + .../query/IgniteSqlSegmentedIndexSelfTest.java | 263 ++++++++++++ .../query/IgniteSqlSplitterSelfTest.java | 136 ++++++- .../h2/GridIndexingSpiAbstractSelfTest.java | 26 +- .../FetchingQueryCursorStressTest.java | 277 +++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 31 files changed, 2262 insertions(+), 545 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/658b4ad5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/658b4ad5/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java ----------------------------------------------------------------------
