Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-286
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/32f118db Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/32f118db Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/32f118db Branch: refs/heads/ignite-286 Commit: 32f118db6e88cbc5ba5332cd15a8691179991901 Parents: 7250844 75425c6 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 23 14:28:24 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 23 14:28:24 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 20 ++ .../ignite/configuration/TopologyValidator.java | 35 ++++ .../GridCachePartitionExchangeManager.java | 5 +- .../distributed/dht/GridDhtTopologyFuture.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 7 + .../colocated/GridDhtColocatedLockFuture.java | 24 ++- .../GridDhtPartitionsExchangeFuture.java | 17 ++ .../distributed/near/GridNearLockFuture.java | 26 ++- .../near/GridNearTxPrepareFuture.java | 20 ++ .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java | 2 +- .../cache/IgniteExcangeFutureHistoryTest.java | 74 ++++++++ ...gniteTopologyValidatorAbstractCacheTest.java | 183 +++++++++++++++++++ ...iteTopologyValidatorAbstractTxCacheTest.java | 125 +++++++++++++ ...ValidatorNearPartitionedAtomicCacheTest.java | 30 +++ ...logyValidatorNearPartitionedTxCacheTest.java | 30 +++ ...logyValidatorPartitionedAtomicCacheTest.java | 49 +++++ ...TopologyValidatorPartitionedTxCacheTest.java | 30 +++ ...ologyValidatorReplicatedAtomicCacheTest.java | 49 +++++ ...eTopologyValidatorReplicatedTxCacheTest.java | 30 +++ .../GridCacheLocalIsolatedNodesSelfTest.java | 102 +++++++++++ .../testframework/junits/GridAbstractTest.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 6 + .../IgniteTopologyValidatorTestSuit.java | 43 +++++ .../processors/query/h2/IgniteH2Indexing.java | 6 +- .../query/h2/twostep/GridMapQueryExecutor.java | 34 +++- .../h2/twostep/GridReduceQueryExecutor.java | 34 +++- .../h2/GridIndexingSpiAbstractSelfTest.java | 2 +- .../ignite/internal/GridFactorySelfTest.java | 3 +- 29 files changed, 976 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
