Merge remote-tracking branch 'remotes/origin/master' into ignite-2407
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f74adf0e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f74adf0e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f74adf0e Branch: refs/heads/ignite-2407 Commit: f74adf0e631728546c7f34b725569e6b34ed4628 Parents: 220d3e2 d2d5d24 Author: sboikov <[email protected]> Authored: Wed Mar 2 21:25:21 2016 +0300 Committer: sboikov <[email protected]> Committed: Wed Mar 2 21:25:21 2016 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 7 +- bin/ignite.sh | 6 +- .../internal/binary/BinaryEnumObjectImpl.java | 43 +- .../discovery/GridDiscoveryManager.java | 18 +- .../processors/cache/CacheLazyEntry.java | 3 +- .../internal/processors/cache/CacheObject.java | 3 + .../processors/cache/GridCacheProcessor.java | 20 + .../processors/cache/GridCacheUtils.java | 28 + .../cache/affinity/GridCacheAffinityImpl.java | 7 +- .../binary/CacheObjectBinaryProcessorImpl.java | 3 +- .../dht/GridDhtPartitionTopologyImpl.java | 12 +- .../util/StripedCompositeReadWriteLock.java | 164 + .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../cache/VisorCacheAggregatedMetrics.java | 113 +- .../internal/visor/cache/VisorCacheMetrics.java | 88 +- .../cache/VisorCacheMetricsCollectorTask.java | 21 +- .../visor/cache/VisorCacheMetricsV2.java | 66 + .../internal/visor/cache/VisorCacheV2.java | 2 +- .../ignite/resources/JobContextResource.java | 4 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 15 + .../ignite/spi/IgniteSpiConsistencyChecked.java | 8 + .../ignite/spi/discovery/tcp/ClientImpl.java | 6 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../tcp/internal/TcpDiscoveryNode.java | 25 + .../TcpDiscoveryMulticastIpFinder.java | 1 + .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 + .../spi/swapspace/noop/NoopSwapSpaceSpi.java | 2 + .../internal/binary/BinaryEnumsSelfTest.java | 51 +- .../cache/CacheEntryProcessorCopySelfTest.java | 213 + .../cache/CacheEnumOperationsAbstractTest.java | 32 + .../cache/GridCacheAbstractFullApiSelfTest.java | 10 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 479 +- ...ridCacheSwapSpaceSpiConsistencySelfTest.java | 146 + .../IgniteCacheConfigVariationsFullApiTest.java | 5851 ++++++++++++++++++ ...idCacheReplicatedPreloadOffHeapSelfTest.java | 3 +- .../GridCacheReplicatedPreloadSelfTest.java | 16 +- .../GridSwapSpaceSpiConsistencySelfTest.java | 131 + .../configvariations/CacheStartMode.java | 29 + .../configvariations/ConfigFactory.java | 39 + .../configvariations/ConfigParameter.java | 34 + .../configvariations/ConfigVariations.java | 346 ++ .../ConfigVariationsFactory.java | 197 + .../ConfigVariationsTestSuiteBuilder.java | 382 ++ .../IgniteConfigVariationsTestSuite.java | 50 + .../configvariations/Parameters.java | 377 ++ .../configvariations/VariationsIterator.java | 174 + .../configvariations/VariationsTestsConfig.java | 161 + .../testframework/junits/GridAbstractTest.java | 43 +- ...IgniteCacheConfigVariationsAbstractTest.java | 583 ++ .../IgniteConfigVariationsAbstractTest.java | 420 ++ .../ConfigVariationsTestSuiteBuilderTest.java | 112 + .../testframework/test/ParametersTest.java | 87 + .../test/VariationsIteratorTest.java | 156 + .../ignite/testsuites/IgniteBasicTestSuite.java | 8 + ...heBasicConfigVariationsFullApiTestSuite.java | 41 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite5.java | 2 + .../IgniteSpiSwapSpaceSelfTestSuite.java | 2 + .../processors/query/h2/IgniteH2Indexing.java | 112 +- .../cache/CacheQueryNewClientSelfTest.java | 115 + .../IgniteCacheQuerySelfTestSuite.java | 6 +- .../Apache.Ignite.Core.Tests.csproj | 1 + .../ProjectFilesTest.cs | 94 + .../commands/cache/VisorCacheCommand.scala | 30 +- .../yardstick/IgniteBenchmarkArguments.java | 11 + .../org/apache/ignite/yardstick/IgniteNode.java | 2 + .../cache/IgniteCacheAbstractBenchmark.java | 54 + modules/zookeeper/pom.xml | 50 +- .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 24 +- 69 files changed, 10953 insertions(+), 394 deletions(-) ----------------------------------------------------------------------
