Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/95b7147f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/95b7147f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/95b7147f Branch: refs/heads/ignite-gg-10249 Commit: 95b7147fe18ef75ac67741647c9f2ab61a59dcb3 Parents: 8a1c85d a12302e Author: Denis Magda <dma...@gridgain.com> Authored: Wed Jun 10 18:04:08 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed Jun 10 18:04:08 2015 +0300 ---------------------------------------------------------------------- .../client/memcache/MemcacheRestExample.java | 32 ++++++++++---------- .../client/router/TcpSslRouterSelfTest.java | 5 +++ .../client/suite/IgniteClientTestSuite.java | 3 +- .../java/org/apache/ignite/IgniteCache.java | 25 ++++++++++++++- .../affinity/GridAffinityAssignmentCache.java | 5 ++- .../processors/cache/IgniteInternalCache.java | 27 +++++------------ .../internal/visor/query/VisorQueryJob.java | 2 +- .../internal/visor/util/VisorTaskUtils.java | 16 +++------- .../ignite/spi/discovery/tcp/ServerImpl.java | 6 ++-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../RoundRobinGlobalLoadBalancer.java | 2 +- .../ignite/GridSuppressedExceptionSelfTest.java | 4 ++- ...inodeUpdateNearEnabledNoBackupsSelfTest.java | 2 +- ...CacheMultinodeUpdateNearEnabledSelfTest.java | 2 +- .../processors/cache/GridCacheOffHeapTest.java | 28 ++++++++++++----- .../cache/GridCachePutAllFailoverSelfTest.java | 5 +++ .../processors/cache/GridCacheStopSelfTest.java | 5 +++ .../cache/GridCacheVersionMultinodeTest.java | 2 +- .../IgniteCacheInterceptorSelfTestSuite.java | 2 +- .../cache/IgniteCacheInvokeReadThroughTest.java | 5 +++ ...gniteCacheTransactionalStopBusySelfTest.java | 5 +++ .../IgniteTxMultiThreadedAbstractTest.java | 4 +-- ...dCacheQueueMultiNodeConsistencySelfTest.java | 5 +++ ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 +++ ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 +++ ...rtitionedDataStructuresFailoverSelfTest.java | 5 +++ ...edOffheapDataStructuresFailoverSelfTest.java | 5 +++ ...PartitionedQueueCreateMultiNodeSelfTest.java | 5 +++ ...dCachePartitionedQueueEntryMoveSelfTest.java | 5 +++ ...nedQueueFailoverDataConsistencySelfTest.java | 5 +++ ...eplicatedDataStructuresFailoverSelfTest.java | 5 +++ ...CacheLoadingConcurrentGridStartSelfTest.java | 5 +++ .../dht/GridCacheColocatedFailoverSelfTest.java | 5 +++ .../GridCacheColocatedTxExceptionSelfTest.java | 5 +++ ...ePartitionedNearDisabledMetricsSelfTest.java | 4 ++- ...dCachePartitionedTopologyChangeSelfTest.java | 5 +++ .../near/GridCacheNearTxExceptionSelfTest.java | 5 +++ .../GridCachePartitionedFailoverSelfTest.java | 5 +++ ...PartitionedFullApiMultithreadedSelfTest.java | 5 +++ .../GridCachePartitionedNodeRestartTest.java | 5 +++ ...ePartitionedOptimisticTxNodeRestartTest.java | 5 +++ ...CachePartitionedTxMultiThreadedSelfTest.java | 5 +++ .../GridCacheReplicatedFailoverSelfTest.java | 5 +++ ...eReplicatedFullApiMultithreadedSelfTest.java | 5 +++ .../GridCacheReplicatedInvalidateSelfTest.java | 4 +-- ...ridCacheReplicatedMultiNodeLockSelfTest.java | 5 +++ .../GridCacheReplicatedMultiNodeSelfTest.java | 5 +++ .../GridCacheReplicatedNodeRestartSelfTest.java | 5 +++ .../GridCacheReplicatedTxExceptionSelfTest.java | 5 +++ .../replicated/GridReplicatedTxPreloadTest.java | 2 ++ ...acheAtomicReplicatedNodeRestartSelfTest.java | 5 +++ .../GridCacheEvictionFilterSelfTest.java | 4 ++- ...cheSynchronousEvictionsFailoverSelfTest.java | 5 +++ .../IgniteCacheExpiryPolicyAbstractTest.java | 10 +++--- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 ++- ...dCacheLocalFullApiMultithreadedSelfTest.java | 5 +++ .../GridCacheLocalTxExceptionSelfTest.java | 5 +++ .../processors/igfs/IgfsModesSelfTest.java | 4 ++- .../unsafe/GridUnsafeMemorySelfTest.java | 4 ++- .../ignite/testframework/GridTestUtils.java | 2 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 24 ++++++--------- .../IgniteCacheEvictionSelfTestSuite.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 8 ++--- .../IgniteCacheFullApiSelfTestSuite.java | 8 ++--- .../testsuites/IgniteCacheRestartTestSuite.java | 10 +++--- .../ignite/testsuites/IgniteCacheTestSuite.java | 16 +++++----- .../testsuites/IgniteCacheTestSuite2.java | 4 +-- .../testsuites/IgniteCacheTestSuite3.java | 14 +++------ .../testsuites/IgniteCacheTestSuite4.java | 10 +++--- .../apache/ignite/util/GridRandomSelfTest.java | 4 ++- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 ++- .../collections/HadoopHashMapSelfTest.java | 4 ++- .../HadoopExternalTaskExecutionSelfTest.java | 2 ++ .../HadoopExternalCommunicationSelfTest.java | 5 +++ .../testsuites/IgniteHadoopTestSuite.java | 7 +++-- .../hibernate/HibernateL2CacheSelfTest.java | 5 +++ .../HibernateL2CacheTransactionalSelfTest.java | 5 +++ .../testsuites/IgniteHibernateTestSuite.java | 4 +-- .../cache/GridCacheCrossCacheQuerySelfTest.java | 8 +++-- .../IgniteCacheQueryNodeRestartSelfTest.java | 5 +++ .../h2/GridIndexingSpiAbstractSelfTest.java | 4 ++- .../query/h2/sql/BaseH2CompareQueryTest.java | 4 ++- .../IgniteCacheQuerySelfTestSuite.java | 2 +- .../IgniteWebSessionSelfTestSuite.java | 2 +- 84 files changed, 384 insertions(+), 150 deletions(-) ----------------------------------------------------------------------
