This is an automated email from the ASF dual-hosted git repository. sboikov pushed a change to branch ignite-1090 in repository https://gitbox.apache.org/repos/asf/ignite.git.
from 2da2ce1 Merge remote-tracking branch 'remotes/origin/master' into ignite-1090 add 396d9c9 IGNITE-10395 Fixed 'Invalid node order' assertion - Fixes #5835. add 208c53f IGNITE-11223: SQL: Make two-step plan immutable. Note that GridCacheSqlQuery is still mutable, what will be fixed separately. This closes #6070. new f06e7eb Merge remote-tracking branch 'remotes/origin/master' into ignite-1090 new f961c57 ignite-1090 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../managers/discovery/IgniteDiscoverySpi.java | 7 + .../processors/cache/ClusterCachesInfo.java | 2 - .../internal/processors/cache/GridCacheMvcc.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 +- .../discovery/tcp/internal/FutureTask.java} | 26 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 33 +- .../tcp/internal/TcpDiscoverySpiState.java | 5 +- .../messages/TcpDiscoveryDummyWakeupMessage.java} | 17 +- .../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 + 28 files changed, 1189 insertions(+), 527 deletions(-) copy modules/core/src/main/java/org/apache/ignite/{internal/util/GridTimerTask.java => spi/discovery/tcp/internal/FutureTask.java} (65%) copy modules/{zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientFailedException.java => core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDummyWakeupMessage.java} (73%) create mode 100644 modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryCoordinatorFailureTest.java