Merge remote-tracking branch 'remotes/origin/ignite-3478' into ignite-5935
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f4041a2e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f4041a2e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f4041a2e Branch: refs/heads/ignite-5935 Commit: f4041a2ec536fa36451ab74370f132ee671ba873 Parents: 1c2fded 39f7ae9 Author: sboikov <[email protected]> Authored: Fri Oct 27 11:08:07 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Oct 27 11:08:07 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/QueryEntity.java | 11 +- .../cache/query/annotations/QuerySqlField.java | 7 + .../internal/managers/discovery/DiscoCache.java | 45 +++-- .../discovery/DiscoveryCustomMessage.java | 13 +- .../discovery/GridDiscoveryManager.java | 191 +++++++++++-------- .../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, 708 insertions(+), 133 deletions(-) ----------------------------------------------------------------------
