Merge branches 'ignite-709_2' and 'ignite-943' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-943
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ecc08ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ecc08ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ecc08ef Branch: refs/heads/ignite-sprint-5 Commit: 5ecc08ef15a170593f755c2e2bdd18045c71a7aa Parents: 982cb0c 9d3ab16 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed May 27 18:35:34 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed May 27 18:35:34 2015 +0300 ---------------------------------------------------------------------- dev-tools/slurp.sh | 14 +- dev-tools/src/main/groovy/jiraslurp.groovy | 265 ++- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../ignite/internal/GridKernalContext.java | 5 + .../ignite/internal/GridKernalContextImpl.java | 5 + .../discovery/GridDiscoveryManager.java | 73 +- .../affinity/GridAffinityAssignmentCache.java | 32 + .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheAffinityManager.java | 14 + .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheGateway.java | 2 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheMvccManager.java | 32 +- .../GridCachePartitionExchangeManager.java | 67 +- .../processors/cache/GridCachePreloader.java | 6 +- .../cache/GridCachePreloaderAdapter.java | 11 +- .../processors/cache/GridCacheProcessor.java | 6 +- .../cache/GridCacheSharedContext.java | 1 + .../processors/cache/GridCacheUtils.java | 228 +-- .../processors/cache/IgniteCacheProxy.java | 3 +- .../distributed/GridDistributedTxMapping.java | 17 + .../GridDistributedTxRemoteAdapter.java | 10 +- .../dht/GridClientPartitionTopology.java | 8 +- .../dht/GridDhtAssignmentFetchFuture.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 27 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 22 +- .../dht/GridDhtTransactionalCacheAdapter.java | 224 ++- .../distributed/dht/GridDhtTxLocalAdapter.java | 8 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 10 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 78 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 112 +- .../dht/colocated/GridDhtColocatedCache.java | 12 +- .../colocated/GridDhtColocatedLockFuture.java | 207 +- .../dht/preloader/GridDhtForceKeysFuture.java | 4 +- .../preloader/GridDhtPartitionDemandPool.java | 26 +- .../preloader/GridDhtPartitionSupplyPool.java | 29 +- .../GridDhtPartitionsExchangeFuture.java | 305 ++- .../preloader/GridDhtPartitionsFullMessage.java | 4 +- .../GridDhtPartitionsSingleMessage.java | 33 +- .../dht/preloader/GridDhtPreloader.java | 28 +- .../preloader/GridDhtPreloaderAssignments.java | 3 +- .../distributed/near/GridNearCacheAdapter.java | 2 +- .../distributed/near/GridNearLockFuture.java | 271 ++- .../distributed/near/GridNearLockRequest.java | 68 +- .../distributed/near/GridNearLockResponse.java | 48 +- .../near/GridNearOptimisticTxPrepareFuture.java | 77 +- .../GridNearPessimisticTxPrepareFuture.java | 5 +- .../near/GridNearTransactionalCache.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 43 +- .../near/GridNearTxPrepareRequest.java | 72 +- .../near/GridNearTxPrepareResponse.java | 70 +- .../processors/cache/local/GridLocalCache.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../cache/query/GridCacheQueryAdapter.java | 10 +- .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 15 +- .../cache/transactions/IgniteTxHandler.java | 148 +- .../processors/query/GridQueryIndexing.java | 16 + .../processors/query/GridQueryProcessor.java | 52 +- .../internal/util/future/GridFutureAdapter.java | 4 +- .../core/src/main/resources/ignite.properties | 2 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +- .../GridCacheAbstractFailoverSelfTest.java | 2 +- .../GridCacheAbstractRemoveFailureTest.java | 20 + .../IgniteCachePartitionMapUpdateTest.java | 226 +++ ...niteCacheClientNodeChangingTopologyTest.java | 1797 ++++++++++++++++++ ...teCacheClientNodePartitionsExchangeTest.java | 632 ++++++ .../GridCacheDhtClientRemoveFailureTest.java | 28 + .../dht/IgniteCacheMultiTxLockSelfTest.java | 47 +- ...cClientInvalidPartitionHandlingSelfTest.java | 29 + .../GridCacheAtomicClientRemoveFailureTest.java | 28 + ...eAtomicInvalidPartitionHandlingSelfTest.java | 17 +- .../junits/common/GridCommonAbstractTest.java | 4 +- .../IgniteCacheFailoverTestSuite.java | 4 +- .../testsuites/IgniteCacheTestSuite2.java | 10 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 20 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 17 + .../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +- .../query/h2/sql/GridSqlOperationType.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +- .../local/IgniteCacheLocalQuerySelfTest.java | 6 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/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/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../commands/tasks/VisorTasksCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 63 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 13 +- 119 files changed, 4860 insertions(+), 1105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ecc08ef/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ----------------------------------------------------------------------
