Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-gg-10411
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0759fc9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0759fc9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0759fc9e Branch: refs/heads/ignite-gg-10411 Commit: 0759fc9ebf1ee6d3d773ad8381c0592768cab021 Parents: 28adb89 6974a8e Author: ptupitsyn <ptupit...@gridgain.com> Authored: Fri Jun 19 12:36:26 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Fri Jun 19 12:36:26 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 +- .../s3/S3CheckpointSpiStartStopSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../affinity/AffinityTopologyVersion.java | 7 - .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/GridCacheUtils.java | 9 + .../processors/cache/IgniteCacheProxy.java | 12 + .../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 | 21 +- .../messages/GridQueryNextPageResponse.java | 34 +- .../h2/twostep/messages/GridQueryRequest.java | 111 +++- .../processors/task/GridTaskProcessor.java | 23 +- .../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 + .../core/src/main/resources/ignite.properties | 2 +- .../apache/ignite/internal/GridSelfTest.java | 20 +- .../GridTaskFailoverAffinityRunTest.java | 170 +++++ .../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 +- ...ridCachePartitionNotLoadedEventSelfTest.java | 82 +++ .../distributed/IgniteCacheManyClientsTest.java | 1 + .../DataStreamerMultiThreadedSelfTest.java | 3 + .../junits/GridTestKernalContext.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 8 +- .../testsuites/IgniteCacheTestSuite4.java | 4 + .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../ignite/util/TestTcpCommunicationSpi.java | 21 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../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 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 102 files changed, 3694 insertions(+), 434 deletions(-) ----------------------------------------------------------------------
