Merge branches 'ignite-1.6' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b52edcaa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b52edcaa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b52edcaa Branch: refs/heads/master Commit: b52edcaae59819e0ed8be25e9aa7c9c61394b501 Parents: 223708a 1dc1d85 Author: Alexey Kuznetsov <[email protected]> Authored: Tue May 17 11:01:48 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue May 17 11:01:48 2016 +0700 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 716 ++++++++++++++++++- .../rest/JettyRestProcessorSignedSelfTest.java | 5 +- .../JettyRestProcessorUnsignedSelfTest.java | 5 +- .../apache/ignite/IgniteSystemProperties.java | 20 + .../cache/CacheWeakQueryIteratorsHolder.java | 169 ++++- .../processors/cache/GridCacheAdapter.java | 13 +- .../processors/cache/GridCacheSwapManager.java | 12 +- .../processors/cache/IgniteCacheProxy.java | 39 +- .../binary/CacheObjectBinaryProcessorImpl.java | 16 +- .../cache/distributed/dht/GridDhtGetFuture.java | 77 +- .../distributed/dht/GridDhtGetSingleFuture.java | 4 + .../dht/GridDhtTransactionalCacheAdapter.java | 57 +- .../dht/atomic/GridDhtAtomicCache.java | 52 +- .../dht/preloader/GridDhtForceKeysFuture.java | 6 +- .../dht/preloader/GridDhtPreloader.java | 28 +- .../processors/cache/query/CacheQuery.java | 10 +- .../cache/query/CacheQueryFuture.java | 13 +- .../query/GridCacheDistributedQueryManager.java | 100 ++- .../cache/query/GridCacheLocalQueryManager.java | 34 +- .../cache/query/GridCacheQueryAdapter.java | 175 +++-- .../cache/query/GridCacheQueryErrorFuture.java | 12 +- .../query/GridCacheQueryFutureAdapter.java | 10 +- .../cache/query/GridCacheQueryManager.java | 502 +++++++++---- .../continuous/GridContinuousProcessor.java | 1 - .../datastructures/GridCacheSetImpl.java | 9 +- .../utils/PlatformConfigurationUtils.java | 111 ++- .../service/GridServiceProcessor.java | 49 +- .../visor/compute/VisorGatewayTask.java | 361 ++++++++++ .../internal/visor/util/VisorTaskUtils.java | 10 +- .../communication/tcp/TcpCommunicationSpi.java | 32 +- .../GridCacheAbstractLocalStoreSelfTest.java | 2 + .../CacheLateAffinityAssignmentTest.java | 2 +- ...niteCacheClientNodeChangingTopologyTest.java | 9 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 2 + ...achePartitionedPreloadLifecycleSelfTest.java | 102 +-- ...CacheReplicatedPreloadLifecycleSelfTest.java | 132 +--- .../IgniteCacheExpiryPolicyTestSuite.java | 3 + .../ConfigVariationsTestSuiteBuilder.java | 4 +- ...IgniteCacheConfigVariationsAbstractTest.java | 2 +- .../IgniteConfigVariationsAbstractTest.java | 27 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 3 +- modules/indexing/pom.xml | 7 + .../processors/query/h2/IgniteH2Indexing.java | 59 ++ .../CacheAbstractQueryMetricsSelfTest.java | 4 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 34 +- .../IgniteCacheConfigVariationsQueryTest.java | 505 +++++++++++++ .../IgniteCacheQueryH2IndexingLeakTest.java | 214 ++++++ ...gniteCacheConfigVariationQueryTestSuite.java | 41 ++ .../IgniteCacheQuerySelfTestSuite.java | 2 + modules/mesos/pom.xml | 43 +- .../apache/ignite/mesos/ClusterProperties.java | 94 ++- .../apache/ignite/mesos/IgniteFramework.java | 15 +- .../ignite/mesos/resource/IgniteProvider.java | 198 ++--- .../ignite/mesos/resource/ResourceProvider.java | 78 +- modules/platforms/cpp/DEVNOTES.txt | 10 + modules/platforms/cpp/Makefile.am | 5 +- modules/platforms/cpp/Makefile.amrel | 5 +- modules/platforms/cpp/examples/README.txt | 1 + modules/platforms/cpp/odbc/README.txt | 7 +- .../cpp/odbc/install/install_amd64.cmd | 35 +- .../platforms/cpp/odbc/install/install_x86.cmd | 17 +- .../Apache.Ignite.Core.Tests.csproj | 3 + .../Binary/BinaryCompactFooterInteropTest.cs | 1 - .../Cache/CacheConfigurationTest.cs | 7 + .../Continuous/ContinuousQueryJavaFilterTest.cs | 1 - .../Cache/Store/CacheStoreTest.cs | 1 - .../Compute/ComputeApiTest.cs | 1 - .../Compute/MixedClusterTest.cs | 1 - .../Config/spring-test.xml | 46 ++ .../Apache.Ignite.Core.Tests/DeploymentTest.cs | 1 - .../Apache.Ignite.Core.Tests/ExecutableTest.cs | 1 - .../IgniteConfigurationSerializerTest.cs | 57 +- .../IgniteConfigurationTest.cs | 48 +- .../IgniteStartStopTest.cs | 1 - .../Apache.Ignite.Core.Tests/ReconnectTest.cs | 1 - .../Services/ServicesTest.cs | 1 - .../Apache.Ignite.Core.csproj | 1 + .../Cache/Configuration/CacheConfiguration.cs | 11 + .../Discovery/Tcp/TcpDiscoverySpi.cs | 161 +++++ .../Apache.Ignite.Core/IgniteConfiguration.cs | 173 +++-- .../IgniteConfigurationSection.xsd | 36 + .../dotnet/Apache.Ignite.Core/Ignition.cs | 1 - .../Impl/Binary/BinaryReaderExtensions.cs | 24 + .../Impl/Binary/BinaryWriterExtensions.cs | 78 ++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 1 - .../http/jetty/GridJettyJsonConfig.java | 288 +++++--- .../http/jetty/GridJettyRestHandler.java | 2 +- .../http/jetty/GridJettyRestProtocol.java | 2 +- .../schema/test/model/ignite-type-metadata.xml | 12 +- .../IgniteCacheRandomOperationBenchmark.java | 4 +- pom.xml | 2 +- 91 files changed, 4205 insertions(+), 1072 deletions(-) ----------------------------------------------------------------------
