Merge branches 'ignite-484-1' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de531896 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de531896 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de531896 Branch: refs/heads/ignite-950 Commit: de53189605c859a6eb9aa09c8181d5720c5dc28b Parents: 4cc376b eebf9c1 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Jun 18 09:51:50 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Jun 18 09:51:50 2015 +0300 ---------------------------------------------------------------------- .../affinity/AffinityTopologyVersion.java | 7 - .../distributed/dht/GridDhtLocalPartition.java | 56 +- .../dht/GridDhtPartitionsReservation.java | 292 +++++++++ .../cache/distributed/dht/GridReservable.java | 35 + .../dht/preloader/GridDhtPartitionMap.java | 26 +- .../cache/query/GridCacheQueryManager.java | 33 - .../cache/query/GridCacheTwoStepQuery.java | 22 +- .../processors/query/GridQueryIndexing.java | 14 +- .../processors/query/GridQueryProcessor.java | 14 +- .../messages/GridQueryNextPageResponse.java | 34 +- .../h2/twostep/messages/GridQueryRequest.java | 111 +++- .../apache/ignite/internal/util/GridDebug.java | 19 + .../processors/query/h2/IgniteH2Indexing.java | 79 ++- .../query/h2/sql/GridSqlQuerySplitter.java | 49 +- .../query/h2/twostep/GridMapQueryExecutor.java | 332 +++++++--- .../query/h2/twostep/GridMergeIndex.java | 17 +- .../h2/twostep/GridMergeIndexUnsorted.java | 7 +- .../h2/twostep/GridReduceQueryExecutor.java | 650 ++++++++++++++++--- .../query/h2/twostep/GridResultPage.java | 21 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 3 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 - ...lientQueryReplicatedNodeRestartSelfTest.java | 419 ++++++++++++ .../IgniteCacheQueryNodeRestartSelfTest.java | 36 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 383 +++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 25 files changed, 2380 insertions(+), 282 deletions(-) ----------------------------------------------------------------------
