You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/20 11:27:11 UTC
[09/10] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4680-sb
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4680-sb
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5cfea992
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5cfea992
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5cfea992
Branch: refs/heads/ignite-4680-sb
Commit: 5cfea9926fe97b2e31a994d074ca40929a0d840d
Parents: 8835090 09f64e5
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 20 12:54:09 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 20 12:54:09 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/IgniteComputeImpl.java | 13 +-
.../communication/GridIoMessageFactory.java | 6 +
.../failover/GridFailoverContextImpl.java | 11 -
.../managers/failover/GridFailoverManager.java | 3 -
.../cache/CachePartitionExchangeWorkerTask.java | 29 ++
.../GridCachePartitionExchangeManager.java | 171 +++++++---
.../processors/cache/GridCacheProcessor.java | 19 ++
.../atomic/GridNearAtomicUpdateResponse.java | 192 ++---------
.../dht/atomic/NearCacheUpdates.java | 332 +++++++++++++++++++
.../GridDhtPartitionsExchangeFuture.java | 8 +-
.../processors/closure/AffinityTask.java | 6 -
.../closure/GridClosureProcessor.java | 35 +-
.../processors/task/GridTaskWorker.java | 7 +-
.../ignite/spi/failover/FailoverContext.java | 10 -
.../spi/failover/GridFailoverTestContext.java | 7 +-
.../Apache.Ignite.AspNet.Tests/App.config | 6 +-
.../IgniteOutputCacheProviderTest.cs | 2 +-
.../IgniteSessionStateStoreProviderTest.cs | 2 +-
.../Apache.Ignite.AspNet/Impl/ConfigUtil.cs | 4 +-
.../Binary/BinaryBuilderSelfTest.cs | 2 +-
.../Cache/Affinity/AffinityFieldTest.cs | 2 +-
.../Cache/Affinity/AffinityFunctionTest.cs | 4 +-
.../Cache/Affinity/AffinityTest.cs | 2 +-
.../Cache/CacheAbstractTest.cs | 2 +-
.../Cache/CacheConfigurationTest.cs | 2 +-
.../Cache/CacheDynamicStartTest.cs | 2 +-
.../Cache/CacheMetricsTest.cs | 2 +-
.../Cache/CacheNearTest.cs | 4 +-
.../Cache/Query/CacheLinqTest.cs | 2 +-
.../Cache/Query/CacheQueriesTest.cs | 2 +-
.../Continuous/ContinuousQueryAbstractTest.cs | 4 +-
.../Continuous/ContinuousQueryJavaFilterTest.cs | 2 +-
.../Cache/Store/CacheStoreSessionTest.cs | 2 +-
.../Cache/Store/CacheStoreTest.cs | 2 +-
.../Compute/ComputeApiTest.cs | 2 +-
.../Cache/Affinity/affinity-function2.xml | 2 +-
.../Config/Compute/compute-grid1.xml | 2 +-
.../Config/Compute/compute-grid2.xml | 2 +-
.../Config/Compute/compute-grid3.xml | 2 +-
.../Config/Lifecycle/lifecycle-beans.xml | 2 +-
.../Config/Lifecycle/lifecycle-no-beans.xml | 2 +-
.../Config/start-test-grid1.xml | 2 +-
.../Config/start-test-grid2.xml | 2 +-
.../ConsoleRedirectTest.cs | 2 +-
.../Dataload/DataStreamerTest.cs | 2 +-
.../Dataload/DataStreamerTestTopologyChange.cs | 2 +-
.../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 2 +-
.../IgniteConfigurationSectionTest.cs | 2 +-
.../IgniteConfigurationSerializerTest.cs | 19 +-
.../IgniteConfigurationTest.cs | 10 +-
.../Log/CustomLoggerTest.cs | 2 +-
.../Plugin/Cache/CachePluginTest.cs | 4 +-
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 2 +-
.../SerializationTest.cs | 2 +-
.../dotnet/Apache.Ignite.Core.Tests/app.config | 4 +-
.../Apache.Ignite.Core.Tests/custom_app.config | 2 +-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 24 +-
.../IgniteConfigurationSection.xsd | 2 +-
.../dotnet/Apache.Ignite.Core/Ignition.cs | 2 +-
.../Common/IgniteConfigurationXmlSerializer.cs | 34 +-
.../Interop/IPlatformTarget.cs | 1 -
.../App.config | 4 +-
.../EntityFrameworkCacheInitializationTest.cs | 2 +-
.../EntityFrameworkCacheTest.cs | 2 +-
.../IgniteDbConfiguration.cs | 4 +-
.../Misc/ClientReconnectExample.cs | 2 +-
66 files changed, 685 insertions(+), 364 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5cfea992/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
----------------------------------------------------------------------