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 2019/02/09 10:16:17 UTC
[ignite] 01/02: Merge remote-tracking branch
'remotes/origin/master' into ignite-1090
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-1090
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit f06e7eb9113209af0353123e295aaa9f0f7b3b94
Merge: 2da2ce1 208c53f
Author: sboikov <sb...@apache.org>
AuthorDate: Sat Feb 9 13:13:00 2019 +0300
Merge remote-tracking branch 'remotes/origin/master' into ignite-1090
.../managers/discovery/IgniteDiscoverySpi.java | 7 +
.../processors/cache/ClusterCachesInfo.java | 2 -
.../spi/communication/tcp/TcpCommunicationSpi.java | 10 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 6 +
.../ignite/spi/discovery/tcp/ServerImpl.java | 356 ++++++++++++++------
.../ignite/spi/discovery/tcp/TcpDiscoveryImpl.java | 22 +-
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 11 +-
.../{TcpDiscoverySpiState.java => FutureTask.java} | 57 ++--
.../tcp/internal/TcpDiscoveryNodesRing.java | 33 +-
.../tcp/internal/TcpDiscoverySpiState.java | 5 +-
.../TcpDiscoveryDummyWakeupMessage.java} | 42 +--
.../tcp/messages/TcpDiscoveryHandshakeRequest.java | 23 +-
.../messages/TcpDiscoveryNodeFailedMessage.java | 10 +-
.../IgniteTcpCommunicationConnectOnInitTest.java | 89 +++++
.../tcp/TcpDiscoveryCoordinatorFailureTest.java | 366 +++++++++++++++++++++
.../TcpDiscoveryPendingMessageDeliveryTest.java | 2 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
.../cache/query/GridCacheTwoStepQuery.java | 183 +++--------
.../internal/processors/query/h2/H2Utils.java | 141 ++++++++
.../processors/query/h2/IgniteH2Indexing.java | 250 ++++----------
.../processors/query/h2/dml/UpdatePlanBuilder.java | 21 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 59 ++--
.../query/h2/twostep/GridReduceQueryExecutor.java | 34 +-
.../query/h2/twostep/ReduceQueryRun.java | 5 +-
.../spi/discovery/zk/ZookeeperDiscoverySpi.java | 6 +
.../spi/discovery/zk/internal/ZkClusterNodes.java | 17 +
.../zk/internal/ZookeeperDiscoveryImpl.java | 11 +
27 files changed, 1203 insertions(+), 567 deletions(-)