Merge branch 'master' into ignite-1786
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b127a5db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b127a5db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b127a5db Branch: refs/heads/ignite-1786 Commit: b127a5dbde77db21f3e532f725556bed1395b26b Parents: 119f2c9 cfffa2c Author: vozerov-gridgain <[email protected]> Authored: Mon Feb 15 15:55:54 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Feb 15 15:55:54 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 4 +- .../cache/GridCacheClearAllRunnable.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 11 +- .../processors/cache/GridCacheMapEntry.java | 102 ++-- .../processors/cache/GridCacheProcessor.java | 10 +- .../processors/cache/GridCacheSwapManager.java | 43 +- .../dht/GridDhtPartitionTopologyImpl.java | 7 +- .../GridDhtPartitionsExchangeFuture.java | 6 + .../continuous/GridContinuousProcessor.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 + .../TcpDiscoveryCustomEventMessage.java | 10 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 4 +- .../internal/GridAffinityNoCacheSelfTest.java | 6 +- .../cache/CacheConfigurationLeakTest.java | 62 +++ .../GridCacheOffHeapValuesEvictionSelfTest.java | 26 + .../processors/cache/GridCacheTestEntryEx.java | 5 +- .../GridSessionCheckpointAbstractSelfTest.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +- .../testsuites/IgniteCacheTestSuite2.java | 2 + .../query/h2/twostep/GridMergeIndex.java | 32 +- .../h2/twostep/GridMergeIndexUnsorted.java | 19 +- .../query/h2/twostep/GridMergeTable.java | 16 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../CacheQueryOffheapEvictDataLostTest.java | 138 +++++ .../CacheRandomOperationsMultithreadedTest.java | 507 +++++++++++++++++++ .../near/IgniteCacheQueryNodeFailTest.java | 148 ++++++ .../IgniteCacheQuerySelfTestSuite.java | 5 + .../IgniteCacheWithIndexingTestSuite.java | 2 + .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 2 +- 29 files changed, 1047 insertions(+), 141 deletions(-) ----------------------------------------------------------------------
