ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [8/8] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5578
Date Fri, 28 Jul 2017 07:32:59 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-5578

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/68e4e451
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/68e4e451
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/68e4e451

Branch: refs/heads/ignite-5578
Commit: 68e4e451097bf17fea0d5ae16b5b66c152e6ab7e
Parents: cf80351 b698bbf
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Jul 28 10:32:36 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Jul 28 10:32:36 2017 +0300

----------------------------------------------------------------------
 .../eventstorage/GridEventStorageManager.java   |   14 +
 .../GridDhtPartitionsExchangeFuture.java        |   18 +-
 .../cache/query/GridCacheQueryManager.java      |   24 +-
 .../platform/PlatformTargetProxy.java           |   11 +
 .../platform/PlatformTargetProxyImpl.java       |   79 +-
 .../IgniteCacheBinaryObjectsScanSelfTest.java   |    9 +-
 ...acheBinaryObjectsScanWithEventsSelfTest.java |   30 +
 .../plugin/PlatformTestPluginTarget.java        |    7 +-
 modules/docker/2.1.0/Dockerfile                 |   46 +
 modules/docker/2.1.0/run.sh                     |   51 +
 modules/docker/Dockerfile                       |    2 +-
 .../IgniteBinaryCacheQueryTestSuite.java        |    2 +
 .../cpp/core-test/src/cluster_test.cpp          |   13 +
 .../platforms/cpp/core/include/ignite/ignite.h  |   15 +
 .../ignite/impl/cluster/cluster_group_impl.h    |   15 +
 .../cpp/core/include/ignite/impl/ignite_impl.h  |   46 +-
 modules/platforms/cpp/core/src/ignite.cpp       |   10 +
 .../src/impl/cluster/cluster_group_impl.cpp     |   26 +-
 .../platforms/cpp/core/src/impl/ignite_impl.cpp |   24 +
 .../cpp/jni/include/ignite/jni/exports.h        |    1 +
 .../platforms/cpp/jni/include/ignite/jni/java.h |    5 +-
 modules/platforms/cpp/jni/project/vs/module.def |    1 +
 modules/platforms/cpp/jni/src/exports.cpp       |    4 +
 modules/platforms/cpp/jni/src/java.cpp          |   19 +-
 .../Plugin/PluginTest.cs                        |   13 +-
 .../Apache.Ignite.Core.Tests/TestUtils.cs       |    7 +-
 .../Apache.Ignite.Core.csproj                   |    5 +-
 .../dotnet/Apache.Ignite.Core/Ignition.cs       |    9 +-
 .../Impl/Binary/BinaryProcessor.cs              |    6 +-
 .../Impl/Binary/BinaryWriterExtensions.cs       |  107 ++
 .../Cache/Affinity/PlatformAffinityFunction.cs  |    7 +-
 .../Impl/Cache/CacheAffinityImpl.cs             |   18 +-
 .../Impl/Cache/CacheEnumerator.cs               |    8 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  113 +-
 .../Impl/Cache/Query/AbstractQueryCursor.cs     |   12 +-
 .../Continuous/ContinuousQueryHandleImpl.cs     |   12 +-
 .../Impl/Cache/Query/FieldsQueryCursor.cs       |    6 +-
 .../Impl/Cache/Query/QueryCursor.cs             |    5 +-
 .../Impl/Cluster/ClusterGroupImpl.cs            |   76 +-
 .../Impl/Common/DelegateTypeDescriptor.cs       |    9 +-
 .../Impl/Common/Listenable.cs                   |    8 +-
 .../Impl/Compute/ComputeImpl.cs                 |   12 +-
 .../Impl/DataStructures/AtomicLong.cs           |    9 +-
 .../Impl/DataStructures/AtomicReference.cs      |    8 +-
 .../Impl/DataStructures/AtomicSequence.cs       |    9 +-
 .../Impl/Datastream/DataStreamerImpl.cs         |    8 +-
 .../Impl/Datastream/StreamReceiverHolder.cs     |   13 +-
 .../Apache.Ignite.Core/Impl/Events/Events.cs    |   11 +-
 .../Impl/IPlatformTargetInternal.cs             |  102 ++
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |   48 +-
 .../Impl/Messaging/Messaging.cs                 |   10 +-
 .../Impl/PlatformDisposableTargetAdapter.cs     |   75 ++
 .../Impl/PlatformJniTarget.cs                   |  536 +++++++++
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   | 1086 ------------------
 .../Impl/PlatformTargetAdapter.cs               |  534 +++++++++
 .../Impl/Services/Services.cs                   |   19 +-
 .../Impl/Transactions/TransactionsImpl.cs       |   29 +-
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs    |    3 +
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |   10 +-
 .../Impl/Unmanaged/UnmanagedUtils.cs            |    7 +
 .../Interop/IPlatformTarget.cs                  |   15 +
 61 files changed, 1994 insertions(+), 1443 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/68e4e451/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index ebd305a,52a74ab..e2e62ba
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@@ -563,41 -490,18 +563,41 @@@ public class GridDhtPartitionsExchangeF
                          initCachesOnLocalJoin();
                  }
  
+                 if (newCrd) {
 -                    IgniteInternalFuture<?> fut = cctx.affinity().initCoordinatorCaches(this);
++                    IgniteInternalFuture<?> fut = cctx.affinity().initCoordinatorCaches(this,
false);
+ 
+                     if (fut != null)
+                         fut.get();
++
++                    cctx.exchange().coordinatorInitialized();
+                 }
+ 
 -                exchange = CU.clientNode(discoEvt.eventNode()) ?
 -                    onClientNodeEvent(crdNode) :
 -                    onServerNodeEvent(crdNode);
 +                if (exchCtx.mergeExchanges()) {
 +                    if (localJoinExchange()) {
 +                        if (cctx.kernalContext().clientNode()) {
 +                            onClientNodeEvent(crdNode);
 +
 +                            exchange = ExchangeType.CLIENT;
 +                        }
 +                        else {
 +                            onServerNodeEvent(crdNode);
 +
 +                            exchange = ExchangeType.ALL;
 +                        }
 +                    }
 +                    else {
 +                        if (CU.clientNode(discoEvt.eventNode()))
 +                            exchange = onClientNodeEvent(crdNode);
 +                        else
 +                            exchange = cctx.kernalContext().clientNode() ? ExchangeType.CLIENT
: ExchangeType.ALL;
 +                    }
 +                }
 +                else {
 +                    exchange = CU.clientNode(discoEvt.eventNode()) ? onClientNodeEvent(crdNode)
:
 +                        onServerNodeEvent(crdNode);
 +                }
              }
  
-             if (newCrd) {
-                 IgniteInternalFuture<?> fut = cctx.affinity().initCoordinatorCaches(this,
false);
- 
-                 if (fut != null)
-                     fut.get();
- 
-                 cctx.exchange().coordinatorInitialized();
-             }
- 
              updateTopologies(crdNode);
  
              switch (exchange) {


Mime
View raw message