Merge branch 'ignite-sprint-7' into ignite-964-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d81938b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d81938b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d81938b Branch: refs/heads/ignite-964-1 Commit: 4d81938b9112b8316a81f5e43c075241d7798e61 Parents: 2d1669e 7828d19 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Jul 3 17:00:15 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Jul 3 17:00:15 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 5 + .../apache/ignite/IgniteSystemProperties.java | 3 + .../processors/cache/CacheOperationContext.java | 44 ++- .../processors/cache/GridCacheAdapter.java | 91 +++--- .../processors/cache/GridCacheAtomicFuture.java | 12 +- .../processors/cache/GridCacheMvccManager.java | 8 +- .../processors/cache/GridCacheProxyImpl.java | 10 +- .../processors/cache/GridCacheSwapManager.java | 257 +++++++++------ .../processors/cache/GridCacheUtils.java | 42 +++ .../processors/cache/IgniteCacheProxy.java | 36 ++- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 177 ++++++++-- .../datastructures/GridCacheAtomicLongImpl.java | 25 +- .../GridCacheAtomicSequenceImpl.java | 11 +- .../GridCacheAtomicStampedImpl.java | 21 +- .../GridCacheCountDownLatchImpl.java | 16 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../IgniteCachePutRetryAbstractSelfTest.java | 147 +++++++++ .../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 ++ ...gniteCachePutRetryTransactionalSelfTest.java | 74 +++++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../GridCachePartitionedFailoverSelfTest.java | 5 + .../GridCacheEvictionFilterSelfTest.java | 2 - .../inmemory/GridTestSwapSpaceSpi.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 3 + .../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 - .../IgniteCacheQueryNodeRestartSelfTest2.java | 5 + .../util/spring/IgniteSpringHelperImpl.java | 72 +++-- .../IgniteExcludeInConfigurationTest.java | 78 +++++ .../org/apache/ignite/spring/sprint-exclude.xml | 57 ++++ .../testsuites/IgniteSpringTestSuite.java | 2 + .../ignite/visor/commands/VisorConsole.scala | 3 +- .../visor/commands/open/VisorOpenCommand.scala | 319 +++++++++++++++++++ .../scala/org/apache/ignite/visor/visor.scala | 230 +------------ .../ignite/visor/VisorRuntimeBaseSpec.scala | 2 + .../commands/kill/VisorKillCommandSpec.scala | 1 + .../commands/start/VisorStartCommandSpec.scala | 1 + .../commands/tasks/VisorTasksCommandSpec.scala | 1 + .../commands/vvm/VisorVvmCommandSpec.scala | 1 + 44 files changed, 1379 insertions(+), 480 deletions(-) ----------------------------------------------------------------------
