Merge branch 'ignite-sprint-6' into ignite-917-review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a3616c2d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a3616c2d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a3616c2d Branch: refs/heads/ignite-917-review Commit: a3616c2da6ce24aad8b440d6e82986ed7deb9de7 Parents: c826fab d874b00 Author: ashutak <ashu...@gridgain.com> Authored: Thu Jun 18 13:16:25 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Thu Jun 18 13:16:25 2015 +0300 ---------------------------------------------------------------------- .../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/GridCacheAdapter.java | 4 + .../processors/cache/IgniteCacheProxy.java | 7 + .../distributed/dht/GridDhtLocalPartition.java | 56 +- .../dht/GridDhtPartitionTopologyImpl.java | 4 +- .../dht/GridDhtPartitionsReservation.java | 292 +++++++++ .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../cache/distributed/dht/GridReservable.java | 35 + .../dht/preloader/GridDhtPartitionMap.java | 26 +- .../cache/query/GridCacheQueryManager.java | 33 - .../cache/query/GridCacheTwoStepQuery.java | 22 +- .../cache/transactions/IgniteTxHandler.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 7 +- .../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 + .../CacheStoreUsageMultinodeAbstractTest.java | 305 +++++++++ ...eUsageMultinodeDynamicStartAbstractTest.java | 169 +++++ ...oreUsageMultinodeDynamicStartAtomicTest.java | 32 + ...heStoreUsageMultinodeDynamicStartTxTest.java | 32 + ...reUsageMultinodeStaticStartAbstractTest.java | 158 +++++ ...toreUsageMultinodeStaticStartAtomicTest.java | 32 + ...cheStoreUsageMultinodeStaticStartTxTest.java | 32 + .../cache/GridCacheAbstractFullApiSelfTest.java | 24 +- .../IgniteCacheAbstractStopBusySelfTest.java | 30 +- .../IgniteCacheAtomicStopBusySelfTest.java | 8 +- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 19 +- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +- .../junits/GridTestKernalContext.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 8 +- .../testsuites/IgniteCacheTestSuite4.java | 4 + .../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 + 52 files changed, 3236 insertions(+), 339 deletions(-) ----------------------------------------------------------------------
