Merge branches 'ignite-1026' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1026
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6dd707b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6dd707b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6dd707b Branch: refs/heads/ignite-648 Commit: d6dd707ba0806d3a01dc7acc09d6948226c0177d Parents: eef2b37 ad0a026 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Jun 18 12:37:21 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Jun 18 12:37:21 2015 -0700 ---------------------------------------------------------------------- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 +- .../s3/S3CheckpointSpiStartStopSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +- .../affinity/AffinityTopologyVersion.java | 7 - .../processors/cache/GridCacheUtils.java | 9 + .../processors/cache/IgniteCacheProxy.java | 5 + .../distributed/dht/GridDhtLocalPartition.java | 56 +- .../dht/GridDhtPartitionTopologyImpl.java | 4 +- .../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 | 21 +- .../messages/GridQueryNextPageResponse.java | 34 +- .../h2/twostep/messages/GridQueryRequest.java | 111 +++- .../apache/ignite/internal/util/GridDebug.java | 19 + .../communication/tcp/TcpCommunicationSpi.java | 42 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 35 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +- .../tcp/internal/TcpDiscoveryNode.java | 18 + .../apache/ignite/internal/GridSelfTest.java | 20 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 24 +- .../IgniteCacheAbstractStopBusySelfTest.java | 30 +- .../IgniteCacheAtomicStopBusySelfTest.java | 8 +- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 19 +- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +- .../DataStreamerMultiThreadedSelfTest.java | 3 + .../junits/GridTestKernalContext.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 8 +- .../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 + 46 files changed, 2577 insertions(+), 381 deletions(-) ----------------------------------------------------------------------
