Merge remote-tracking branch 'origin/ignite-3477-master' into ignite-3477-master-apache
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ae084d0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ae084d0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ae084d0 Branch: refs/heads/ignite-3477-master Commit: 4ae084d047edd3b7dea73c66a373e37eb4cde876 Parents: 1a7b91d 7eb1234 Author: Dmitriy Govorukhin <[email protected]> Authored: Tue Apr 11 15:25:55 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Tue Apr 11 15:25:55 2017 +0300 ---------------------------------------------------------------------- .../communication/GridIoMessageFactory.java | 8 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCachePreloader.java | 4 +- .../cache/GridCachePreloaderAdapter.java | 4 +- .../distributed/dht/GridDhtLocalPartition.java | 7 +- .../dht/preloader/GridDhtPartitionDemander.java | 2 +- .../dht/preloader/GridDhtPartitionSupplier.java | 8 +- .../GridDhtPartitionSupplyMessage.java | 103 +++-- .../GridDhtPartitionSupplyMessageV2.java | 422 ------------------- .../dht/preloader/GridDhtPreloader.java | 2 +- .../utils/PlatformConfigurationUtils.java | 3 +- .../resources/META-INF/classnames.properties | 1 - .../cache/ClusterStateAbstractTest.java | 10 +- .../CacheLateAffinityAssignmentTest.java | 6 +- .../IgniteCacheReadFromBackupTest.java | 6 +- .../atomic/IgniteCacheAtomicProtocolTest.java | 3 +- .../processors/query/h2/IgniteH2Indexing.java | 15 +- .../processors/query/h2/opt/GridH2Table.java | 15 +- .../cpp/core-test/config/cache-identity-32.xml | 50 +++ .../core-test/config/cache-identity-default.xml | 154 +++++++ .../cpp/core-test/config/cache-identity.xml | 124 +----- .../cpp/core-test/config/cache-store-32.xml | 50 +++ .../core-test/config/cache-store-default.xml | 71 ++++ .../cpp/core-test/config/cache-store.xml | 41 +- .../cpp/core-test/project/vs/core-test.vcxproj | 8 + .../project/vs/core-test.vcxproj.filters | 12 + .../src/binary_identity_resolver_test.cpp | 8 + .../cpp/core-test/src/binary_object_test.cpp | 8 + .../cpp/core-test/src/cache_invoke_test.cpp | 4 + .../cpp/core-test/src/cache_store_test.cpp | 11 +- .../cpp/core-test/src/cluster_test.cpp | 4 + .../cpp/core-test/src/continuous_query_test.cpp | 5 + .../Affinity/AffinityFunctionSpringTest.cs | 6 +- .../Cache/Affinity/AffinityFunctionTest.cs | 92 +--- .../Cache/CacheConfigurationTest.cs | 23 +- .../Config/Cache/Affinity/affinity-function.xml | 4 +- .../IgniteConfigurationSerializerTest.cs | 8 +- .../IgniteConfigurationTest.cs | 2 - .../Apache.Ignite.Core.csproj | 2 - .../Cache/Affinity/Fair/FairAffinityFunction.cs | 32 -- .../Cache/Affinity/Fair/Package-Info.cs | 26 -- .../Cache/Affinity/IAffinityFunction.cs | 3 +- .../Cache/Configuration/CacheConfiguration.cs | 81 +--- .../IgniteConfigurationSection.xsd | 29 -- .../Affinity/AffinityFunctionSerializer.cs | 18 +- 45 files changed, 513 insertions(+), 988 deletions(-) ----------------------------------------------------------------------
