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/10/27 08:10:19 UTC
[7/9] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-3478
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e37dfa3b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e37dfa3b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e37dfa3b
Branch: refs/heads/ignite-5935
Commit: e37dfa3b9a96d13ba38dc4c564ebeb4d0bccefa1
Parents: 987a57e f0500e2
Author: sboikov <sb...@gridgain.com>
Authored: Fri Oct 27 10:53:33 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Oct 27 10:53:33 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/cache/QueryEntity.java | 11 +-
.../cache/query/annotations/QuerySqlField.java | 7 +
.../internal/managers/discovery/DiscoCache.java | 44 +++--
.../discovery/DiscoveryCustomMessage.java | 13 +-
.../discovery/GridDiscoveryManager.java | 190 +++++++++++--------
.../cache/CacheAffinityChangeMessage.java | 8 +
.../ClientCacheChangeDiscoveryMessage.java | 9 +
.../ClientCacheChangeDummyDiscoveryMessage.java | 9 +
.../cache/DynamicCacheChangeBatch.java | 9 +
.../binary/MetadataUpdateAcceptedMessage.java | 9 +
.../binary/MetadataUpdateProposedMessage.java | 9 +
.../GridDhtPartitionsExchangeFuture.java | 3 +-
.../GridCacheDatabaseSharedManager.java | 16 +-
.../snapshot/IgniteCacheSnapshotManager.java | 6 +-
.../persistence/snapshot/SnapshotOperation.java | 6 +-
.../cache/query/QueryEntityIndexDescriptor.java | 2 +
.../cache/query/QueryEntityTypeDescriptor.java | 19 ++
.../cluster/ChangeGlobalStateFinishMessage.java | 9 +
.../cluster/ChangeGlobalStateMessage.java | 11 +-
.../continuous/AbstractContinuousMessage.java | 10 +
.../StartRoutineAckDiscoveryMessage.java | 2 +-
.../StartRoutineDiscoveryMessage.java | 2 +-
.../StopRoutineAckDiscoveryMessage.java | 2 +-
.../continuous/StopRoutineDiscoveryMessage.java | 2 +-
.../marshaller/MappingAcceptedMessage.java | 9 +
.../marshaller/MappingProposedMessage.java | 9 +
.../message/SchemaAbstractDiscoveryMessage.java | 10 +
.../message/SchemaProposeDiscoveryMessage.java | 3 +-
.../communication/tcp/TcpCommunicationSpi.java | 3 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +
...entConnectAfterCommunicationFailureTest.java | 156 +++++++++++++++
.../IgniteDiscoveryCacheReuseSelfTest.java | 89 +++++++++
.../IgniteClientReconnectTestSuite.java | 4 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 6 +-
.../processors/query/h2/IgniteH2Indexing.java | 27 ++-
.../processors/query/h2/opt/GridH2Table.java | 60 ++++++
.../IgniteCacheInsertSqlQuerySelfTest.java | 18 ++
.../query/IgniteSqlNotNullConstraintTest.java | 35 ++--
38 files changed, 706 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e37dfa3b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e37dfa3b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 642864c,a6737dc..716c43b
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@@ -624,25 -625,11 +626,13 @@@ public class GridDiscoveryManager exten
updateClientNodes(node.id());
}
- DiscoCache discoCache = null;
-
+ ctx.coordinators().onDiscoveryEvent(type, topSnapshot, topVer);
+
boolean locJoinEvt = type == EVT_NODE_JOINED && node.id().equals(locNode.id());
- IgniteInternalFuture<Boolean> transitionWaitFut = null;
-
ChangeGlobalStateFinishMessage stateFinishMsg = null;
- if (locJoinEvt) {
- discoCache = createDiscoCache(new AffinityTopologyVersion(topVer, minorTopVer),
- ctx.state().clusterState(),
- locNode,
- topSnapshot);
-
- transitionWaitFut = ctx.state().onLocalJoin(discoCache);
- }
- else if (type == EVT_NODE_FAILED || type == EVT_NODE_LEFT)
+ if (type == EVT_NODE_FAILED || type == EVT_NODE_LEFT)
stateFinishMsg = ctx.state().onNodeLeft(node);
final AffinityTopologyVersion nextTopVer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e37dfa3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e37dfa3b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e37dfa3b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
----------------------------------------------------------------------