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:16 UTC
[ignite] branch ignite-1090 updated (2da2ce1 -> f961c57)
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
[ignite] 02/02: ignite-1090
Posted by sb...@apache.org.
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 f961c57325301e8bf9957ad3db5b39f4aba1c09b
Author: sboikov <sb...@apache.org>
AuthorDate: Sat Feb 9 13:16:02 2019 +0300
ignite-1090
---
.../java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index dc68d48..52523b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -975,7 +975,7 @@ public final class GridCacheMvcc {
* as system invalidate and marks these candidates as owned and used.
*
* @param ver Version to salvage.
- * @param near {@code True} if remove near cache candidate.
+ * @param near {@code True} If salvage near cache candidate.
*/
public void salvageRemote(GridCacheVersion ver, boolean near) {
assert ver != null;
[ignite] 01/02: Merge remote-tracking branch
'remotes/origin/master' into ignite-1090
Posted by sb...@apache.org.
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(-)