You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/30 11:49:46 UTC
[17/50] [abbrv] ignite git commit: IGNITE-4827: Remove compatibility
logic for 1.x versions. This closes #1654.
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
index 843dfce..00587b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArg.java
@@ -32,8 +32,14 @@ public class VisorQueryArg implements Serializable {
/** Query text. */
private final String qryTxt;
+ /** Distributed joins enabled flag. */
+ private final boolean distributedJoins;
+
+ /** Enforce join order flag. */
+ private final boolean enforceJoinOrder;
+
/** Flag whether to execute query locally. */
- private final boolean local;
+ private final boolean loc;
/** Result batch size. */
private final int pageSize;
@@ -41,13 +47,18 @@ public class VisorQueryArg implements Serializable {
/**
* @param cacheName Cache name for query.
* @param qryTxt Query text.
- * @param local Flag whether to execute query locally.
+ * @param distributedJoins If {@code true} then distributed joins enabled.
+ * @param enforceJoinOrder If {@code true} then enforce join order.
+ * @param loc Flag whether to execute query locally.
* @param pageSize Result batch size.
*/
- public VisorQueryArg(String cacheName, String qryTxt, boolean local, int pageSize) {
+ public VisorQueryArg(String cacheName, String qryTxt,
+ boolean distributedJoins, boolean enforceJoinOrder, boolean loc, int pageSize) {
this.cacheName = cacheName;
this.qryTxt = qryTxt;
- this.local = local;
+ this.distributedJoins = distributedJoins;
+ this.enforceJoinOrder = enforceJoinOrder;
+ this.loc = loc;
this.pageSize = pageSize;
}
@@ -61,15 +72,29 @@ public class VisorQueryArg implements Serializable {
/**
* @return Query txt.
*/
- public String queryTxt() {
+ public String queryText() {
return qryTxt;
}
/**
+ * @return Distributed joins enabled flag.
+ */
+ public boolean distributedJoins() {
+ return distributedJoins;
+ }
+
+ /**
+ * @return Enforce join order flag.
+ */
+ public boolean enforceJoinOrder() {
+ return enforceJoinOrder;
+ }
+
+ /**
* @return {@code true} if query should be executed locally.
*/
public boolean local() {
- return local;
+ return loc;
}
/**
@@ -78,4 +103,4 @@ public class VisorQueryArg implements Serializable {
public int pageSize() {
return pageSize;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV2.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV2.java
deleted file mode 100644
index 8ed3976..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV2.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.visor.query;
-
-/**
- * Arguments for {@link VisorQueryTask}.
- */
-public class VisorQueryArgV2 extends VisorQueryArg {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Distributed joins enabled flag. */
- private final boolean distributedJoins;
-
- /**
- * @param cacheName Cache name for query.
- * @param qryTxt Query text.
- * @param distributedJoins If {@code true} then distributed joins enabled.
- * @param loc Flag whether to execute query locally.
- * @param pageSize Result batch size.
- */
- public VisorQueryArgV2(String cacheName, String qryTxt, boolean distributedJoins, boolean loc, int pageSize) {
- super(cacheName, qryTxt, loc, pageSize);
-
- this.distributedJoins = distributedJoins;
- }
-
- /**
- * @return Distributed joins enabled flag.
- */
- public boolean distributedJoins() {
- return distributedJoins;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV3.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV3.java
deleted file mode 100644
index f32c00a..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryArgV3.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.visor.query;
-
-/**
- * Arguments for {@link VisorQueryTask}.
- */
-public class VisorQueryArgV3 extends VisorQueryArgV2 {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Enforce join order flag. */
- private final boolean enforceJoinOrder;
-
- /**
- * @param cacheName Cache name for query.
- * @param qryTxt Query text.
- * @param distributedJoins If {@code true} then distributed joins enabled.
- * @param enforceJoinOrder If {@code true} then enforce join order.
- * @param loc Flag whether to execute query locally.
- * @param pageSize Result batch size.
- */
- public VisorQueryArgV3(String cacheName, String qryTxt,
- boolean distributedJoins, boolean enforceJoinOrder, boolean loc, int pageSize) {
- super(cacheName, qryTxt, distributedJoins, loc, pageSize);
-
- this.enforceJoinOrder = enforceJoinOrder;
- }
-
- /**
- * @return Enforce join order flag.
- */
- public boolean enforceJoinOrder() {
- return enforceJoinOrder;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
index 1ac90ad..2a5905e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java
@@ -108,7 +108,7 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten
try {
UUID nid = ignite.localNode().id();
- String qryTxt = arg.queryTxt();
+ String qryTxt = arg.queryText();
boolean scan = qryTxt == null;
@@ -157,11 +157,11 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten
duration));
}
else {
- SqlFieldsQuery qry = new SqlFieldsQuery(arg.queryTxt());
+ SqlFieldsQuery qry = new SqlFieldsQuery(arg.queryText());
qry.setPageSize(arg.pageSize());
+ qry.setDistributedJoins(arg.distributedJoins());
+ qry.setEnforceJoinOrder(arg.enforceJoinOrder());
qry.setLocal(arg.local());
- qry.setDistributedJoins(arg instanceof VisorQueryArgV2 && ((VisorQueryArgV2)arg).distributedJoins());
- qry.setEnforceJoinOrder(arg instanceof VisorQueryArgV3 && ((VisorQueryArgV3)arg).enforceJoinOrder());
long start = U.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
index 829adb3..ca319db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorEventMapper.java
@@ -136,7 +136,7 @@ public class VisorEventMapper implements IgniteClosure<Event, VisorGridEvent> {
ClusterNode node = de.eventNode();
return new VisorGridDiscoveryEvent(type, id, name, nid, ts, msg, shortDisplay, node.id(),
- F.first(node.addresses()), node.isDaemon());
+ F.first(node.addresses()), node.isDaemon(), de.topologyVersion());
}
/** {@inheritDoc} */
@@ -144,4 +144,4 @@ public class VisorEventMapper implements IgniteClosure<Event, VisorGridEvent> {
return map(evt, evt.type(), evt.id(), evt.name(), evt.node().id(), evt.timestamp(), evt.message(),
evt.shortDisplay());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 8e4590e..9805950 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -41,7 +41,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
-import java.util.UUID;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.zip.ZipEntry;
@@ -55,21 +54,18 @@ import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicyMBean;
import org.apache.ignite.cache.eviction.lru.LruEvictionPolicyMBean;
import org.apache.ignite.cache.eviction.sorted.SortedEvictionPolicyMBean;
import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.events.DiscoveryEvent;
import org.apache.ignite.events.Event;
import org.apache.ignite.internal.processors.igfs.IgfsEx;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.event.VisorGridDiscoveryEventV2;
import org.apache.ignite.internal.visor.event.VisorGridEvent;
import org.apache.ignite.internal.visor.event.VisorGridEventsLost;
import org.apache.ignite.internal.visor.file.VisorFileBlock;
import org.apache.ignite.internal.visor.log.VisorLogFile;
import org.apache.ignite.lang.IgniteClosure;
import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
import static java.lang.System.getProperty;
@@ -390,17 +386,6 @@ public class VisorTaskUtils {
/** Mapper from grid event to Visor data transfer object. */
public static final VisorEventMapper EVT_MAPPER = new VisorEventMapper();
- /** Mapper from grid event to Visor data transfer object. */
- public static final VisorEventMapper EVT_MAPPER_V2 = new VisorEventMapper() {
- @Override protected VisorGridEvent discoveryEvent(DiscoveryEvent de, int type, IgniteUuid id, String name,
- UUID nid, long ts, String msg, String shortDisplay) {
- ClusterNode node = de.eventNode();
-
- return new VisorGridDiscoveryEventV2(type, id, name, nid, ts, msg, shortDisplay, node.id(),
- F.first(node.addresses()), node.isDaemon(), de.topologyVersion());
- }
- };
-
/**
* Grabs local events and detects if events was lost since last poll.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 2dc7598..42879b7 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -243,9 +243,6 @@ import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.SSL_META
@IgniteSpiConsistencyChecked(optional = false)
public class TcpCommunicationSpi extends IgniteSpiAdapter
implements CommunicationSpi<Message>, TcpCommunicationSpiMBean {
- /** */
- private static final IgniteProductVersion MULTIPLE_CONN_SINCE_VER = IgniteProductVersion.fromString("1.8.2");
-
/** IPC error message. */
public static final String OUT_OF_RESOURCES_TCP_MSG = "Failed to allocate shared memory segment " +
"(switching to TCP, may be slower).";
@@ -2340,7 +2337,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
else {
GridCommunicationClient client = null;
- int connIdx = useMultipleConnections(node) ? connPlc.connectionIndex() : 0;
+ int connIdx = connPlc.connectionIndex();
try {
boolean retry;
@@ -2430,7 +2427,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
GridCommunicationClient[] newClients;
if (curClients == null) {
- newClients = new GridCommunicationClient[useMultipleConnections(node) ? connectionsPerNode : 1];
+ newClients = new GridCommunicationClient[connectionsPerNode];
newClients[connIdx] = addClient;
if (clients.putIfAbsent(node.id(), newClients) == null)
@@ -2865,7 +2862,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
sslMeta.sslEngine(sslEngine);
}
- Integer handshakeConnIdx = useMultipleConnections(node) ? connIdx : null;
+ Integer handshakeConnIdx = connIdx;
rcvCnt = safeHandshake(ch,
recoveryDesc,
@@ -3357,14 +3354,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/**
* @param node Node.
- * @return {@code True} if given node supports multiple connections per-node for communication.
- */
- private boolean useMultipleConnections(ClusterNode node) {
- return node.version().compareToIgnoreTimestamp(MULTIPLE_CONN_SINCE_VER) >= 0;
- }
-
- /**
- * @param node Node.
* @return {@code True} if can use in/out connection pair for communication.
*/
private boolean usePairedConnections(ClusterNode node) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 35dcdba..3e7d815 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -69,9 +69,7 @@ import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.IgniteNodeAttributes;
import org.apache.ignite.internal.IgnitionEx;
import org.apache.ignite.internal.events.DiscoveryCustomEvent;
-import org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager;
import org.apache.ignite.internal.processors.security.SecurityContext;
-import org.apache.ignite.internal.processors.service.GridServiceProcessor;
import org.apache.ignite.internal.util.GridBoundedLinkedHashSet;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -171,10 +169,6 @@ class ServerImpl extends TcpDiscoveryImpl {
private static final int ENSURED_MSG_HIST_SIZE = getInteger(IGNITE_DISCOVERY_CLIENT_RECONNECT_HISTORY_SIZE, 512);
/** */
- private static final IgniteProductVersion CUSTOM_MSG_ALLOW_JOINING_FOR_VERIFIED_SINCE =
- IgniteProductVersion.fromString("1.5.0");
-
- /** */
private IgniteThreadPoolExecutor utilityPool;
/** Nodes ring. */
@@ -2942,14 +2936,7 @@ class ServerImpl extends TcpDiscoveryImpl {
}
}
- if (msg instanceof TcpDiscoveryConnectionCheckMessage) {
- if (!next.version().greaterThanEqual(TcpDiscoverySpi.FAILURE_DETECTION_MAJOR_VER,
- TcpDiscoverySpi.FAILURE_DETECTION_MINOR_VER,
- TcpDiscoverySpi.FAILURE_DETECTION_MAINT_VER))
- // Preserve backward compatibility with nodes of older versions.
- msg = new TcpDiscoveryStatusCheckMessage(locNode, null);
- }
- else
+ if (!(msg instanceof TcpDiscoveryConnectionCheckMessage))
prepareNodeAddedMessage(msg, next.id(), pendingMsgs.msgs, pendingMsgs.discardId,
pendingMsgs.customDiscardId);
@@ -3625,15 +3612,9 @@ class ServerImpl extends TcpDiscoveryImpl {
return;
}
- boolean rmtLateAssignBool;
-
- if (node.version().compareToIgnoreTimestamp(CacheAffinitySharedManager.LATE_AFF_ASSIGN_SINCE) >= 0) {
- Boolean rmtLateAssign = node.attribute(ATTR_LATE_AFFINITY_ASSIGNMENT);
- // Can be null only in tests.
- rmtLateAssignBool = rmtLateAssign != null ? rmtLateAssign : false;
- }
- else
- rmtLateAssignBool = false;
+ Boolean rmtLateAssign = node.attribute(ATTR_LATE_AFFINITY_ASSIGNMENT);
+ // Can be null only in tests.
+ boolean rmtLateAssignBool = rmtLateAssign != null ? rmtLateAssign : false;
if (locLateAssignBool != rmtLateAssignBool) {
String errMsg = "Local node's cache affinity assignment mode differs from " +
@@ -3660,61 +3641,31 @@ class ServerImpl extends TcpDiscoveryImpl {
final Boolean locSrvcCompatibilityEnabled = locNode.attribute(ATTR_SERVICES_COMPATIBILITY_MODE);
- if (node.version().compareToIgnoreTimestamp(GridServiceProcessor.LAZY_SERVICES_CFG_SINCE) >= 0) {
- final Boolean rmtSrvcCompatibilityEnabled = node.attribute(ATTR_SERVICES_COMPATIBILITY_MODE);
-
- if (!F.eq(locSrvcCompatibilityEnabled, rmtSrvcCompatibilityEnabled)) {
- utilityPool.execute(
- new Runnable() {
- @Override public void run() {
- String errMsg = "Local node's " + IGNITE_SERVICES_COMPATIBILITY_MODE +
- " property value differs from remote node's value " +
- "(to make sure all nodes in topology have identical IgniteServices compatibility mode, " +
- "configure system property explicitly) " +
- "[locSrvcCompatibilityEnabled=" + locSrvcCompatibilityEnabled +
- ", rmtSrvcCompatibilityEnabled=" + rmtSrvcCompatibilityEnabled +
- ", locNodeAddrs=" + U.addressesAsString(locNode) +
- ", rmtNodeAddrs=" + U.addressesAsString(node) +
- ", locNodeId=" + locNode.id() + ", rmtNodeId=" + msg.creatorNodeId() + ']';
-
- String sndMsg = "Local node's " + IGNITE_SERVICES_COMPATIBILITY_MODE +
- " property value differs from remote node's value " +
- "(to make sure all nodes in topology have identical IgniteServices compatibility mode, " +
- "configure system property explicitly) " +
- "[locSrvcCompatibilityEnabled=" + rmtSrvcCompatibilityEnabled +
- ", rmtSrvcCompatibilityEnabled=" + locSrvcCompatibilityEnabled +
- ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort=" + node.discoveryPort() +
- ", rmtNodeAddr=" + U.addressesAsString(locNode) + ", locNodeId=" + node.id() +
- ", rmtNodeId=" + locNode.id() + ']';
+ final Boolean rmtSrvcCompatibilityEnabled = node.attribute(ATTR_SERVICES_COMPATIBILITY_MODE);
- nodeCheckError(
- node,
- errMsg,
- sndMsg);
- }
- });
-
- // Ignore join request.
- return;
- }
- }
- else if (Boolean.FALSE.equals(locSrvcCompatibilityEnabled)) {
+ if (!F.eq(locSrvcCompatibilityEnabled, rmtSrvcCompatibilityEnabled)) {
utilityPool.execute(
new Runnable() {
@Override public void run() {
- String errMsg = "Remote node doesn't support lazy services configuration and " +
- "cannot be joined to local node because local node's "
- + IGNITE_SERVICES_COMPATIBILITY_MODE + " property value explicitly set to 'false'" +
- "[locNodeAddrs=" + U.addressesAsString(locNode) +
+ String errMsg = "Local node's " + IGNITE_SERVICES_COMPATIBILITY_MODE +
+ " property value differs from remote node's value " +
+ "(to make sure all nodes in topology have identical IgniteServices compatibility mode, " +
+ "configure system property explicitly) " +
+ "[locSrvcCompatibilityEnabled=" + locSrvcCompatibilityEnabled +
+ ", rmtSrvcCompatibilityEnabled=" + rmtSrvcCompatibilityEnabled +
+ ", locNodeAddrs=" + U.addressesAsString(locNode) +
", rmtNodeAddrs=" + U.addressesAsString(node) +
- ", locNodeId=" + locNode.id() + ", rmtNodeId=" + node.id() + ']';
+ ", locNodeId=" + locNode.id() + ", rmtNodeId=" + msg.creatorNodeId() + ']';
- String sndMsg = "Local node doesn't support lazy services configuration and " +
- "cannot be joined to local node because remote node's "
- + IGNITE_SERVICES_COMPATIBILITY_MODE + " property value explicitly set to 'false'" +
- "[locNodeAddrs=" + U.addressesAsString(node) +
- ", rmtNodeAddrs=" + U.addressesAsString(locNode) +
- ", locNodeId=" + node.id() + ", rmtNodeId=" + locNode.id() + ']';
+ String sndMsg = "Local node's " + IGNITE_SERVICES_COMPATIBILITY_MODE +
+ " property value differs from remote node's value " +
+ "(to make sure all nodes in topology have identical IgniteServices compatibility mode, " +
+ "configure system property explicitly) " +
+ "[locSrvcCompatibilityEnabled=" + rmtSrvcCompatibilityEnabled +
+ ", rmtSrvcCompatibilityEnabled=" + locSrvcCompatibilityEnabled +
+ ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort=" + node.discoveryPort() +
+ ", rmtNodeAddr=" + U.addressesAsString(locNode) + ", locNodeId=" + node.id() +
+ ", rmtNodeId=" + locNode.id() + ']';
nodeCheckError(
node,
@@ -5113,10 +5064,7 @@ class ServerImpl extends TcpDiscoveryImpl {
joiningEmpty = joiningNodes.isEmpty();
}
- if (ring.minimumNodeVersion().compareTo(CUSTOM_MSG_ALLOW_JOINING_FOR_VERIFIED_SINCE) >= 0)
- delayMsg = msg.topologyVersion() == 0L && !joiningEmpty;
- else
- delayMsg = !joiningEmpty;
+ delayMsg = msg.topologyVersion() == 0L && !joiningEmpty;
if (delayMsg) {
if (log.isDebugEnabled()) {
@@ -6279,9 +6227,7 @@ class ServerImpl extends TcpDiscoveryImpl {
"[sock=" + sock + ", locNodeId=" + getLocalNodeId() +
", rmtNodeId=" + clientNodeId + ", msg=" + msg + ']');
}
-
- if (clientVer != null &&
- clientVer.compareTo(TcpDiscoveryClientAckResponse.CLIENT_ACK_SINCE_VERSION) >= 0) {
+ else {
if (msgLog.isDebugEnabled())
msgLog.debug("Sending message ack to client [sock=" + sock + ", locNodeId="
+ getLocalNodeId() + ", rmtNodeId=" + clientNodeId + ", msg=" + msg + ']');
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 4516f75..e8b937a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -218,15 +218,6 @@ import org.jetbrains.annotations.Nullable;
@DiscoverySpiOrderSupport(true)
@DiscoverySpiHistorySupport(true)
public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, TcpDiscoverySpiMBean {
- /** Failure detection timeout feature major version. */
- final static byte FAILURE_DETECTION_MAJOR_VER = 1;
-
- /** Failure detection timeout feature minor version. */
- final static byte FAILURE_DETECTION_MINOR_VER = 4;
-
- /** Failure detection timeout feature maintainance version. */
- final static byte FAILURE_DETECTION_MAINT_VER = 1;
-
/** Node attribute that is mapped to node's external addresses (value is <tt>disc.tcp.ext-addrs</tt>). */
public static final String ATTR_EXT_ADDRS = "disc.tcp.ext-addrs";
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
index 0a656d5..b75d60b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
@@ -19,7 +19,6 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.lang.IgniteUuid;
/**
@@ -30,9 +29,6 @@ public class TcpDiscoveryClientAckResponse extends TcpDiscoveryAbstractMessage {
private static final long serialVersionUID = 0L;
/** */
- public static final IgniteProductVersion CLIENT_ACK_SINCE_VERSION = IgniteProductVersion.fromString("1.4.0");
-
- /** */
private final IgniteUuid msgId;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index dfbdb4d..698d358 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -24,6 +24,7 @@ org.apache.ignite.IgniteException
org.apache.ignite.IgniteIllegalStateException
org.apache.ignite.IgniteInterruptedException
org.apache.ignite.IgniteState
+org.apache.ignite.IgniteSystemProperties$1
org.apache.ignite.binary.BinaryInvalidTypeException
org.apache.ignite.binary.BinaryObject
org.apache.ignite.binary.BinaryObjectException
@@ -159,6 +160,8 @@ org.apache.ignite.events.IgfsEvent
org.apache.ignite.events.JobEvent
org.apache.ignite.events.SwapSpaceEvent
org.apache.ignite.events.TaskEvent
+org.apache.ignite.hadoop.HadoopInputSplit
+org.apache.ignite.hadoop.HadoopMapReducePlan
org.apache.ignite.igfs.IgfsConcurrentModificationException
org.apache.ignite.igfs.IgfsCorruptedFileException
org.apache.ignite.igfs.IgfsDirectoryNotEmptyException
@@ -261,6 +264,10 @@ org.apache.ignite.internal.client.impl.GridClientNodeMetricsAdapter
org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason
org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException
org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$2
+org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$3
+org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$5
+org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$6
+org.apache.ignite.internal.client.impl.connection.GridClientNioTcpConnection$7
org.apache.ignite.internal.client.impl.connection.GridClientTopology$1
org.apache.ignite.internal.client.impl.connection.GridConnectionIdleClosedException
org.apache.ignite.internal.cluster.ClusterGroupAdapter
@@ -301,6 +308,7 @@ org.apache.ignite.internal.jdbc2.JdbcSqlFieldsQuery
org.apache.ignite.internal.managers.GridManagerAdapter$1$1
org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager$CheckpointSet
org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequest
+org.apache.ignite.internal.managers.communication.GridIoManager$1
org.apache.ignite.internal.managers.communication.GridIoManager$ConcurrentHashMap0
org.apache.ignite.internal.managers.communication.GridIoMessage
org.apache.ignite.internal.managers.communication.GridIoUserMessage
@@ -310,13 +318,13 @@ org.apache.ignite.internal.managers.deployment.GridDeploymentPerVersionStore$2
org.apache.ignite.internal.managers.deployment.GridDeploymentRequest
org.apache.ignite.internal.managers.deployment.GridDeploymentResponse
org.apache.ignite.internal.managers.discovery.CustomMessageWrapper
+org.apache.ignite.internal.managers.discovery.DiscoCache$1
+org.apache.ignite.internal.managers.discovery.DiscoCache$2
org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage
org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$1
org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$2
org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$4$1
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$4$2
org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$6
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$DiscoCache$1
org.apache.ignite.internal.managers.discovery.GridLocalMetrics
org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessage
org.apache.ignite.internal.managers.indexing.GridIndexingManager$1
@@ -381,9 +389,9 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$12
org.apache.ignite.internal.processors.cache.GridCacheAdapter$13
org.apache.ignite.internal.processors.cache.GridCacheAdapter$14
org.apache.ignite.internal.processors.cache.GridCacheAdapter$15
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$16
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$16$1
org.apache.ignite.internal.processors.cache.GridCacheAdapter$17
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$18$1
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$18
org.apache.ignite.internal.processors.cache.GridCacheAdapter$2
org.apache.ignite.internal.processors.cache.GridCacheAdapter$26$1
org.apache.ignite.internal.processors.cache.GridCacheAdapter$28
@@ -396,16 +404,12 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$48
org.apache.ignite.internal.processors.cache.GridCacheAdapter$49
org.apache.ignite.internal.processors.cache.GridCacheAdapter$50
org.apache.ignite.internal.processors.cache.GridCacheAdapter$51
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$52
org.apache.ignite.internal.processors.cache.GridCacheAdapter$53
org.apache.ignite.internal.processors.cache.GridCacheAdapter$54
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$54$1
org.apache.ignite.internal.processors.cache.GridCacheAdapter$55
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$57
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$58
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$58$1
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$59
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$56
org.apache.ignite.internal.processors.cache.GridCacheAdapter$6
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$60
org.apache.ignite.internal.processors.cache.GridCacheAdapter$9
org.apache.ignite.internal.processors.cache.GridCacheAdapter$AsyncOp$1
org.apache.ignite.internal.processors.cache.GridCacheAdapter$AsyncOp$1$1
@@ -420,7 +424,6 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadCacheClosure
org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadCacheJob
org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadCacheJobV2
org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadKeysCallable
-org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadKeysCallableV2
org.apache.ignite.internal.processors.cache.GridCacheAdapter$PartitionSizeLongJob
org.apache.ignite.internal.processors.cache.GridCacheAdapter$PartitionSizeLongTask
org.apache.ignite.internal.processors.cache.GridCacheAdapter$SizeJob
@@ -542,12 +545,12 @@ org.apache.ignite.internal.processors.cache.GridCacheValueCollection$1
org.apache.ignite.internal.processors.cache.GridDeferredAckMessageSender$DeferredAckMessageBuffer
org.apache.ignite.internal.processors.cache.IgniteCacheProxy
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$1
-org.apache.ignite.internal.processors.cache.IgniteCacheProxy$10
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2$1
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$3
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$4
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$5
+org.apache.ignite.internal.processors.cache.IgniteCacheProxy$7
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$8
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$9
org.apache.ignite.internal.processors.cache.KeyCacheObject
@@ -582,7 +585,6 @@ org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockReque
org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockResponse
org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest
org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse
-org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping
org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest
org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest$1
org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest$2
@@ -608,7 +610,7 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetSingleFutu
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetSingleFuture$2
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtGetSingleFuture$3
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException
-org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition$3
+org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition$1
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$1
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$2
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$3
@@ -657,6 +659,7 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFu
org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture$1
org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture$2
org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture$3
+org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture$1
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateRequest
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$10
@@ -669,7 +672,6 @@ org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomic
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$17
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$18
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$19
-org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$2
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$20
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$21
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$22
@@ -680,6 +682,7 @@ org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomic
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$27
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$28
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$29
+org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$3
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$30
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$31
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$4
@@ -688,13 +691,17 @@ org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomic
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$7
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$8
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$9
+org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$UpdateReplyClosure
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicDeferredUpdateResponse
+org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicNearResponse
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicSingleUpdateRequest
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateRequest
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateResponse
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicAbstractSingleUpdateRequest
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicAbstractUpdateFuture$1
+org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicAbstractUpdateFuture$DhtLeftResult
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicAbstractUpdateRequest
+org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicCheckUpdateRequest
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicFullUpdateRequest
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateFilterRequest
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateFuture$1
@@ -705,6 +712,7 @@ org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomi
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateFuture$2
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateFuture$3
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse
+org.apache.ignite.internal.processors.cache.distributed.dht.atomic.UpdateErrors
org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache
org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$2
org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$3
@@ -727,15 +735,11 @@ org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPar
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$1$1
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$2
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$3
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$3$1
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$4$1
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$5$1
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$DemandWorker$1
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$DemandWorker$2
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap
-org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplier$1
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplier$SupplyContextPhase
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage
@@ -844,13 +848,13 @@ org.apache.ignite.internal.processors.cache.query.GridCacheQueryAdapter$ScanQuer
org.apache.ignite.internal.processors.cache.query.GridCacheQueryDetailMetricsAdapter
org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$1
org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$2
+org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$10
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$11
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$12
+org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$13
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$14
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$15
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$16
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$17
-org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$18$1
+org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$17$1
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$4$1
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$4$2
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$5
@@ -860,14 +864,17 @@ org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$8
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$9
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$CacheSqlIndexMetadata
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$CacheSqlMetadata
+org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$CachedResult
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$CachedResult$QueueIterator
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$CompoundIterator
+org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$FieldsResult
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$1
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$2
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$3
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$OffheapIteratorClosure
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$PeekValueExpiryAwareIterator
+org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$QueryResult
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$RequestFutureMap
org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$RequestFutureMap$1
org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsAdapter
@@ -909,6 +916,7 @@ org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$Stor
org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$ValueStatus
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx$FinalizationStatus
org.apache.ignite.internal.processors.cache.transactions.IgniteTxAdapter
+org.apache.ignite.internal.processors.cache.transactions.IgniteTxAdapter$1
org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry
org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$1
org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$10
@@ -979,18 +987,12 @@ org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl
org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserKeyCacheObjectImpl
org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage
org.apache.ignite.internal.processors.clock.GridClockDeltaVersion
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLAV2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1V2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2
+org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2MLAV2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2V2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4
+org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4MLAV2
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4V2
+org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4
org.apache.ignite.internal.processors.closure.GridClosureProcessor$T1
org.apache.ignite.internal.processors.closure.GridClosureProcessor$T10
org.apache.ignite.internal.processors.closure.GridClosureProcessor$T11
@@ -1033,7 +1035,6 @@ org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl$Buffer$1
org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl$Buffer$2
org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl$Buffer$3
org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl$DataStreamerPda
-org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl$DefaultIoPolicyResolver
org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl$IsolatedUpdater
org.apache.ignite.internal.processors.datastreamer.DataStreamerRequest
org.apache.ignite.internal.processors.datastreamer.DataStreamerResponse
@@ -1087,6 +1088,7 @@ org.apache.ignite.internal.processors.datastructures.GridCacheCountDownLatchImpl
org.apache.ignite.internal.processors.datastructures.GridCacheCountDownLatchValue
org.apache.ignite.internal.processors.datastructures.GridCacheInternalKeyImpl
org.apache.ignite.internal.processors.datastructures.GridCacheLockImpl
+org.apache.ignite.internal.processors.datastructures.GridCacheLockImpl$Sync
org.apache.ignite.internal.processors.datastructures.GridCacheLockState
org.apache.ignite.internal.processors.datastructures.GridCacheQueueAdapter$AddProcessor
org.apache.ignite.internal.processors.datastructures.GridCacheQueueAdapter$ClearProcessor
@@ -1098,6 +1100,7 @@ org.apache.ignite.internal.processors.datastructures.GridCacheQueueHeaderKey
org.apache.ignite.internal.processors.datastructures.GridCacheQueueItemKey
org.apache.ignite.internal.processors.datastructures.GridCacheQueueProxy
org.apache.ignite.internal.processors.datastructures.GridCacheSemaphoreImpl
+org.apache.ignite.internal.processors.datastructures.GridCacheSemaphoreImpl$Sync
org.apache.ignite.internal.processors.datastructures.GridCacheSemaphoreState
org.apache.ignite.internal.processors.datastructures.GridCacheSetHeader
org.apache.ignite.internal.processors.datastructures.GridCacheSetHeaderKey
@@ -1110,13 +1113,10 @@ org.apache.ignite.internal.processors.dr.GridDrType
org.apache.ignite.internal.processors.dr.IgniteDrDataStreamerCacheUpdater
org.apache.ignite.internal.processors.hadoop.HadoopDefaultJobInfo
org.apache.ignite.internal.processors.hadoop.HadoopFileBlock
-org.apache.ignite.hadoop.HadoopInputSplit
org.apache.ignite.internal.processors.hadoop.HadoopJobId
-org.apache.ignite.internal.processors.hadoop.HadoopJobInfo
org.apache.ignite.internal.processors.hadoop.HadoopJobPhase
org.apache.ignite.internal.processors.hadoop.HadoopJobProperty
org.apache.ignite.internal.processors.hadoop.HadoopJobStatus
-org.apache.ignite.hadoop.HadoopMapReducePlan
org.apache.ignite.internal.processors.hadoop.HadoopTaskInfo
org.apache.ignite.internal.processors.hadoop.HadoopTaskType
org.apache.ignite.internal.processors.hadoop.message.HadoopMessage
@@ -1203,6 +1203,14 @@ org.apache.ignite.internal.processors.igfs.meta.IgfsMetaUpdateTimesProcessor
org.apache.ignite.internal.processors.job.GridJobProcessor$5
org.apache.ignite.internal.processors.job.GridJobWorker$3
org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor$SnapshotReducer
+org.apache.ignite.internal.processors.marshaller.MappedName
+org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessage
+org.apache.ignite.internal.processors.marshaller.MappingExchangeResult$ResultType
+org.apache.ignite.internal.processors.marshaller.MappingProposedMessage
+org.apache.ignite.internal.processors.marshaller.MappingProposedMessage$ProposalStatus
+org.apache.ignite.internal.processors.marshaller.MarshallerMappingItem
+org.apache.ignite.internal.processors.marshaller.MissingMappingRequestMessage
+org.apache.ignite.internal.processors.marshaller.MissingMappingResponseMessage
org.apache.ignite.internal.processors.odbc.OdbcProtocolVersion
org.apache.ignite.internal.processors.odbc.escape.OdbcEscapeType
org.apache.ignite.internal.processors.platform.PlatformAbstractConfigurationClosure
@@ -1266,6 +1274,7 @@ org.apache.ignite.internal.processors.platform.events.PlatformEventFilterListene
org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter
org.apache.ignite.internal.processors.platform.messaging.PlatformMessageFilterImpl
org.apache.ignite.internal.processors.platform.messaging.PlatformMessageLocalFilter
+org.apache.ignite.internal.processors.platform.plugin.cache.PlatformCachePluginConfiguration
org.apache.ignite.internal.processors.platform.services.PlatformAbstractService
org.apache.ignite.internal.processors.platform.services.PlatformService
org.apache.ignite.internal.processors.platform.services.PlatformServices$2
@@ -1276,19 +1285,18 @@ org.apache.ignite.internal.processors.platform.utils.PlatformFutureUtils$Interna
org.apache.ignite.internal.processors.platform.websession.PlatformDotNetSessionLockProcessor
org.apache.ignite.internal.processors.platform.websession.PlatformDotNetSessionSetAndUnlockProcessor
org.apache.ignite.internal.processors.query.GridQueryFieldMetadata
+org.apache.ignite.internal.processors.query.GridQueryProcessor$2
org.apache.ignite.internal.processors.query.GridQueryProcessor$3
org.apache.ignite.internal.processors.query.GridQueryProcessor$4
org.apache.ignite.internal.processors.query.GridQueryProcessor$5
org.apache.ignite.internal.processors.query.GridQueryProcessor$6
org.apache.ignite.internal.processors.query.GridQueryProcessor$7
-org.apache.ignite.internal.processors.query.GridQueryProcessor$8
-org.apache.ignite.internal.processors.query.GridQueryProcessor$IndexType
org.apache.ignite.internal.processors.query.IgniteSQLException
+org.apache.ignite.internal.processors.query.QueryUtils$IndexType
org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest
org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse
org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageRequest
org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageResponse
-org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryRequest
org.apache.ignite.internal.processors.resource.GridResourceIoc$AnnotationSet
org.apache.ignite.internal.processors.resource.GridResourceIoc$ResourceAnnotation
org.apache.ignite.internal.processors.rest.GridRestCommand
@@ -1451,6 +1459,7 @@ org.apache.ignite.internal.util.GridSerializableList
org.apache.ignite.internal.util.GridSerializableMap
org.apache.ignite.internal.util.GridSerializableSet
org.apache.ignite.internal.util.GridSetWrapper
+org.apache.ignite.internal.util.GridSnapshotLock$Sync
org.apache.ignite.internal.util.GridSpiCloseableIteratorWrapper
org.apache.ignite.internal.util.GridStringBuilder
org.apache.ignite.internal.util.GridSynchronizedMap
@@ -1613,6 +1622,7 @@ org.apache.ignite.internal.util.lang.IgniteReducerX
org.apache.ignite.internal.util.lang.IgniteSingletonIterator
org.apache.ignite.internal.util.nio.GridNioEmbeddedFuture$1
org.apache.ignite.internal.util.nio.GridNioException
+org.apache.ignite.internal.util.nio.GridNioFutureImpl
org.apache.ignite.internal.util.nio.GridNioMessageTracker
org.apache.ignite.internal.util.nio.GridNioServer$NioOperation
org.apache.ignite.internal.util.nio.GridNioServer$RandomBalancer
@@ -1630,6 +1640,7 @@ org.apache.ignite.internal.util.offheap.unsafe.GridUnsafePartitionedMap$2
org.apache.ignite.internal.util.offheap.unsafe.GridUnsafePartitionedMap$3
org.apache.ignite.internal.util.offheap.unsafe.GridUnsafePartitionedMap$PartitionedMapCloseableIterator
org.apache.ignite.internal.util.snaptree.CopyOnWriteManager$COWEpoch
+org.apache.ignite.internal.util.snaptree.CopyOnWriteManager$Latch
org.apache.ignite.internal.util.snaptree.Epoch$Root
org.apache.ignite.internal.util.snaptree.EpochNode
org.apache.ignite.internal.util.snaptree.EpochNode$Child
@@ -1694,7 +1705,6 @@ org.apache.ignite.internal.visor.cache.VisorCacheMetadataTask$VisorCacheMetadata
org.apache.ignite.internal.visor.cache.VisorCacheMetrics
org.apache.ignite.internal.visor.cache.VisorCacheMetricsCollectorTask
org.apache.ignite.internal.visor.cache.VisorCacheMetricsCollectorTask$VisorCacheMetricsCollectorJob
-org.apache.ignite.internal.visor.cache.VisorCacheMetricsV2
org.apache.ignite.internal.visor.cache.VisorCacheNearConfiguration
org.apache.ignite.internal.visor.cache.VisorCacheNodesTask
org.apache.ignite.internal.visor.cache.VisorCacheNodesTask$VisorCacheNodesJob
@@ -1703,7 +1713,6 @@ org.apache.ignite.internal.visor.cache.VisorCachePartitions
org.apache.ignite.internal.visor.cache.VisorCachePartitionsTask
org.apache.ignite.internal.visor.cache.VisorCachePartitionsTask$VisorCachePartitionsJob
org.apache.ignite.internal.visor.cache.VisorCacheQueryConfiguration
-org.apache.ignite.internal.visor.cache.VisorCacheQueryConfigurationV2
org.apache.ignite.internal.visor.cache.VisorCacheQueryDetailMetrics
org.apache.ignite.internal.visor.cache.VisorCacheQueryDetailMetricsCollectorTask
org.apache.ignite.internal.visor.cache.VisorCacheQueryDetailMetricsCollectorTask$VisorCacheQueryDetailMetricsCollectorJob
@@ -1723,14 +1732,10 @@ org.apache.ignite.internal.visor.cache.VisorCacheStartTask$VisorCacheStartJob
org.apache.ignite.internal.visor.cache.VisorCacheStopTask
org.apache.ignite.internal.visor.cache.VisorCacheStopTask$VisorCacheStopJob
org.apache.ignite.internal.visor.cache.VisorCacheStoreConfiguration
-org.apache.ignite.internal.visor.cache.VisorCacheStoreConfigurationV2
org.apache.ignite.internal.visor.cache.VisorCacheSwapBackupsTask
org.apache.ignite.internal.visor.cache.VisorCacheSwapBackupsTask$VisorCachesSwapBackupsJob
org.apache.ignite.internal.visor.cache.VisorCacheTypeFieldMetadata
org.apache.ignite.internal.visor.cache.VisorCacheTypeMetadata
-org.apache.ignite.internal.visor.cache.VisorCacheV2
-org.apache.ignite.internal.visor.cache.VisorCacheV3
-org.apache.ignite.internal.visor.cache.VisorCacheV4
org.apache.ignite.internal.visor.compute.VisorComputeCancelSessionsTask
org.apache.ignite.internal.visor.compute.VisorComputeCancelSessionsTask$VisorComputeCancelSessionsJob
org.apache.ignite.internal.visor.compute.VisorComputeResetMetricsTask
@@ -1739,6 +1744,7 @@ org.apache.ignite.internal.visor.compute.VisorComputeToggleMonitoringTask
org.apache.ignite.internal.visor.compute.VisorComputeToggleMonitoringTask$VisorComputeToggleMonitoringJob
org.apache.ignite.internal.visor.compute.VisorGatewayTask
org.apache.ignite.internal.visor.compute.VisorGatewayTask$VisorGatewayJob
+org.apache.ignite.internal.visor.compute.VisorGatewayTask$VisorGatewayJob$1
org.apache.ignite.internal.visor.debug.VisorThreadDumpTask
org.apache.ignite.internal.visor.debug.VisorThreadDumpTask$VisorDumpThreadJob
org.apache.ignite.internal.visor.debug.VisorThreadInfo
@@ -1746,7 +1752,6 @@ org.apache.ignite.internal.visor.debug.VisorThreadLockInfo
org.apache.ignite.internal.visor.debug.VisorThreadMonitorInfo
org.apache.ignite.internal.visor.event.VisorGridDeploymentEvent
org.apache.ignite.internal.visor.event.VisorGridDiscoveryEvent
-org.apache.ignite.internal.visor.event.VisorGridDiscoveryEventV2
org.apache.ignite.internal.visor.event.VisorGridEvent
org.apache.ignite.internal.visor.event.VisorGridEventsLost
org.apache.ignite.internal.visor.event.VisorGridJobEvent
@@ -1818,9 +1823,11 @@ org.apache.ignite.internal.visor.node.VisorRestConfiguration
org.apache.ignite.internal.visor.node.VisorSegmentationConfiguration
org.apache.ignite.internal.visor.node.VisorSpisConfiguration
org.apache.ignite.internal.visor.node.VisorTransactionConfiguration
+org.apache.ignite.internal.visor.query.VisorCancelQueriesTask
+org.apache.ignite.internal.visor.query.VisorCancelQueriesTask$VisorCancelQueriesJob
+org.apache.ignite.internal.visor.query.VisorCollectRunningQueriesTask
+org.apache.ignite.internal.visor.query.VisorCollectRunningQueriesTask$VisorCollectRunningQueriesJob
org.apache.ignite.internal.visor.query.VisorQueryArg
-org.apache.ignite.internal.visor.query.VisorQueryArgV2
-org.apache.ignite.internal.visor.query.VisorQueryArgV3
org.apache.ignite.internal.visor.query.VisorQueryCleanupTask
org.apache.ignite.internal.visor.query.VisorQueryCleanupTask$VisorQueryCleanupJob
org.apache.ignite.internal.visor.query.VisorQueryField
@@ -1831,6 +1838,7 @@ org.apache.ignite.internal.visor.query.VisorQueryResult
org.apache.ignite.internal.visor.query.VisorQueryResultEx
org.apache.ignite.internal.visor.query.VisorQueryScanSubstringFilter
org.apache.ignite.internal.visor.query.VisorQueryTask
+org.apache.ignite.internal.visor.query.VisorRunningQuery
org.apache.ignite.internal.visor.service.VisorCancelServiceTask
org.apache.ignite.internal.visor.service.VisorCancelServiceTask$VisorCancelServiceJob
org.apache.ignite.internal.visor.service.VisorServiceDescriptor
@@ -1840,7 +1848,6 @@ org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException
org.apache.ignite.internal.visor.util.VisorEventMapper
org.apache.ignite.internal.visor.util.VisorExceptionWrapper
org.apache.ignite.internal.visor.util.VisorTaskUtils$4
-org.apache.ignite.internal.visor.util.VisorTaskUtils$5
org.apache.ignite.internal.websession.WebSessionAttributeProcessor
org.apache.ignite.internal.websession.WebSessionEntity
org.apache.ignite.lang.IgniteBiClosure
@@ -1870,6 +1877,8 @@ org.apache.ignite.plugin.PluginNotFoundException
org.apache.ignite.plugin.PluginValidationException
org.apache.ignite.plugin.extensions.communication.Message
org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType
+org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosure
+org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosure
org.apache.ignite.plugin.security.SecurityBasicPermissionSet
org.apache.ignite.plugin.security.SecurityCredentials
org.apache.ignite.plugin.security.SecurityException
@@ -1909,6 +1918,7 @@ org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage
org.apache.ignite.spi.discovery.tcp.ClientImpl$State
org.apache.ignite.spi.discovery.tcp.ServerImpl$IpFinderCleaner$1
org.apache.ignite.spi.discovery.tcp.ServerImpl$IpFinderCleaner$2
+org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket
org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode
org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode$1
org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing$1
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
index 76655c8..257f385 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
@@ -29,7 +29,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.TestRecordingCommunicationSpi;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage;
import org.apache.ignite.internal.util.typedef.internal.CU;
@@ -333,12 +333,12 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
GridDhtPartitionFullMap emptyFullMap = parts.get(cacheId);
- for (GridDhtPartitionMap2 map : emptyFullMap.values())
+ for (GridDhtPartitionMap map : emptyFullMap.values())
assertEquals(0, map.map().size());
GridDhtPartitionFullMap fullMap = parts.get(dupCacheId);
- for (GridDhtPartitionMap2 map : fullMap.values())
+ for (GridDhtPartitionMap map : fullMap.values())
assertFalse(map.map().isEmpty());
}
@@ -369,13 +369,13 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
assertEquals(dupCacheId, dupPartsData.get(cacheId));
assertFalse(dupPartsData.containsKey(dupCacheId));
- Map<Integer, GridDhtPartitionMap2> parts = msg.partitions();
+ Map<Integer, GridDhtPartitionMap> parts = msg.partitions();
- GridDhtPartitionMap2 emptyMap = parts.get(cacheId);
+ GridDhtPartitionMap emptyMap = parts.get(cacheId);
assertEquals(0, emptyMap.map().size());
- GridDhtPartitionMap2 map = parts.get(dupCacheId);
+ GridDhtPartitionMap map = parts.get(dupCacheId);
assertFalse(map.map().isEmpty());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index 18a9f38..d42d391 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -36,7 +36,7 @@ import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
import org.apache.ignite.internal.util.typedef.CAX;
@@ -312,10 +312,10 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
GridDhtPartitionFullMap fullMap = top.partitionMap(true);
- for (Map.Entry<UUID, GridDhtPartitionMap2> fe : fullMap.entrySet()) {
+ for (Map.Entry<UUID, GridDhtPartitionMap> fe : fullMap.entrySet()) {
UUID nodeId = fe.getKey();
- GridDhtPartitionMap2 m = fe.getValue();
+ GridDhtPartitionMap m = fe.getValue();
for (Map.Entry<Integer, GridDhtPartitionState> e : m.entrySet()) {
int p = e.getKey();
@@ -453,12 +453,12 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
assert orig.keySet().equals(cmp.keySet());
- for (Map.Entry<UUID, GridDhtPartitionMap2> entry : orig.entrySet()) {
+ for (Map.Entry<UUID, GridDhtPartitionMap> entry : orig.entrySet()) {
UUID nodeId = entry.getKey();
- GridDhtPartitionMap2 nodeMap = entry.getValue();
+ GridDhtPartitionMap nodeMap = entry.getValue();
- GridDhtPartitionMap2 cmpMap = cmp.get(nodeId);
+ GridDhtPartitionMap cmpMap = cmp.get(nodeId);
assert cmpMap != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index 744623a..3549fc0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -38,7 +38,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.CacheRebalancingEvent;
import org.apache.ignite.events.Event;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.P1;
@@ -361,7 +361,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
GridDhtPartitionFullMap allParts = dht.topology().partitionMap(false);
- for (GridDhtPartitionMap2 parts : allParts.values()) {
+ for (GridDhtPartitionMap parts : allParts.values()) {
if (!parts.nodeId().equals(g.cluster().localNode().id())) {
for (Map.Entry<Integer, GridDhtPartitionState> e : parts.entrySet()) {
int p = e.getKey();
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
index d57ae57..5cc3ac2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
@@ -24,7 +24,6 @@ import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
@@ -34,15 +33,13 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.managers.communication.GridIoMessage;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage;
import org.apache.ignite.internal.util.typedef.G;
@@ -415,7 +412,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
GridDhtPartitionTopology remoteTop = remoteDht.topology();
- GridDhtPartitionMap2 pMap = remoteTop.partitionMap(true).get(((IgniteKernal)g).getLocalNodeId());
+ GridDhtPartitionMap pMap = remoteTop.partitionMap(true).get(((IgniteKernal)g).getLocalNodeId());
assertEquals(pMap.size(), locs.size());
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
index a496f30..a218bcb 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
@@ -201,66 +201,6 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
}
/**
- * @throws Exception In case of error.
- */
- public void testConnectionCheckMessageBackwardCompatibility() throws Exception {
- TestTcpDiscoverySpi nextSpi = null;
- TcpDiscoveryNode nextNode = null;
-
- IgniteProductVersion nextNodeVer = null;
-
- try {
- assert firstSpi().connCheckStatusMsgCntSent == 0;
-
- nextNode = ((ServerImpl)(firstSpi().impl)).ring().nextNode();
-
- assertNotNull(nextNode);
-
- nextSpi = null;
-
- for (int i = 1; i < spis.size(); i++)
- if (spis.get(i).getLocalNode().id().equals(nextNode.id())) {
- nextSpi = (TestTcpDiscoverySpi)spis.get(i);
- break;
- }
-
- assertNotNull(nextSpi);
-
- assert nextSpi.connCheckStatusMsgCntReceived == 0;
-
- nextNodeVer = nextNode.version();
-
- // Overriding the version of the next node. Connection check message must not been sent to it.
- nextNode.version(new IgniteProductVersion(TcpDiscoverySpi.FAILURE_DETECTION_MAJOR_VER,
- (byte)(TcpDiscoverySpi.FAILURE_DETECTION_MINOR_VER - 1), TcpDiscoverySpi.FAILURE_DETECTION_MAINT_VER,
- 0l, null));
-
- firstSpi().countConnCheckMsg = true;
- nextSpi.countConnCheckMsg = true;
-
- Thread.sleep(firstSpi().failureDetectionTimeout() / 2);
-
- firstSpi().countConnCheckMsg = false;
- nextSpi.countConnCheckMsg = false;
-
- int sent = firstSpi().connCheckStatusMsgCntSent;
- int received = nextSpi.connCheckStatusMsgCntReceived;
-
- assert sent == 0 : "messages sent: " + sent;
- assert received == 0 : "messages received: " + received;
- }
- finally {
- firstSpi().resetState();
-
- if (nextSpi != null)
- nextSpi.resetState();
-
- if (nextNode != null && nextNodeVer != null)
- nextNode.version(nextNodeVer);
- }
- }
-
- /**
* Returns the first spi with failure detection timeout enabled.
*
* @return SPI.
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index ec31e59..20117bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -73,7 +73,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartit
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
import org.apache.ignite.internal.processors.cache.local.GridLocalCache;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
@@ -576,7 +576,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
while (failed) {
failed = false;
- for (GridDhtPartitionMap2 pMap : top.partitionMap(true).values()) {
+ for (GridDhtPartitionMap pMap : top.partitionMap(true).values()) {
if (failed)
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/488b25e1/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 8fadfeb..7cd9f17 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -66,7 +66,6 @@ import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQuery
import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse;
import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageRequest;
import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageResponse;
-import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryRequest;
import org.apache.ignite.internal.processors.query.h2.twostep.msg.GridH2QueryRequest;
import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
import org.apache.ignite.internal.util.GridSpinBusyLock;
@@ -74,7 +73,6 @@ import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.X;
-import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.h2.jdbc.JdbcResultSet;
@@ -209,8 +207,6 @@ public class GridMapQueryExecutor {
onNextPageRequest(node, (GridQueryNextPageRequest)msg);
else if (msg instanceof GridQueryCancelRequest)
onCancel(node, (GridQueryCancelRequest)msg);
- else if (msg instanceof GridQueryRequest)
- onQueryRequest(node, (GridQueryRequest)msg);
else
processed = false;
@@ -405,41 +401,6 @@ public class GridMapQueryExecutor {
}
/**
- * Executing queries locally.
- *
- * @param node Node.
- * @param req Query request.
- */
- private void onQueryRequest(ClusterNode node, GridQueryRequest req) {
- List<Integer> cacheIds;
-
- if (req.extraSpaces() != null) {
- cacheIds = new ArrayList<>(req.extraSpaces().size() + 1);
-
- cacheIds.add(CU.cacheId(req.space()));
-
- for (String extraSpace : req.extraSpaces())
- cacheIds.add(CU.cacheId(extraSpace));
- }
- else
- cacheIds = Collections.singletonList(CU.cacheId(req.space()));
-
- onQueryRequest0(node,
- req.requestId(),
- 0,
- req.queries(),
- cacheIds,
- req.topologyVersion(),
- null,
- req.partitions(),
- null,
- req.pageSize(),
- OFF,
- true,
- req.timeout());
- }
-
- /**
* @param node Node.
* @param req Query request.
*/