Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 ac33a7f03 -> f55ac405c
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java index f5f3d9b..4f5ebf6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java @@ -186,25 +186,6 @@ public final class X { } /** - * Gets either system property or environment variable with given name. - * - * @param name Name of the system property or environment variable. - * @param dflt Default value. - * @return Value of the system property or environment variable. - * Returns the default value if neither can be found for given name. - * @deprecated This method will be removed in the next major release. - * Use {@link org.apache.ignite.IgniteSystemProperties#getString(String)} instead. - */ - @Deprecated - @Nullable public static String getSystemOrEnv(String name, String dflt) { - assert name != null; - - String v = getSystemOrEnv(name); - - return F.isEmpty(v) ? dflt : v; - } - - /** * Creates string presentation of given time {@code span} in hh:mm:ss:msec {@code HMSM} format. * * @param span Time span. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java index 84ebffb..44411fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java +++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java @@ -152,20 +152,6 @@ public interface PortableObject extends Serializable, Cloneable { @Nullable public <T> T deserialize() throws PortableException; /** - * Creates a copy of this portable object and optionally changes field values - * if they are provided in map. If map is empty or {@code null}, clean copy - * is created. - * - * @param fields Fields to modify in copy. - * @return Copy of this portable object. - * @throws PortableException In case of error. - * @deprecated Use {@link PortableBuilder} instead. - * @see PortableBuilder - */ - @Deprecated - public PortableObject copy(@Nullable Map<String, Object> fields) throws PortableException; - - /** * Copies this portable object. * * @return Copy of this portable object. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java index 053e7be..f759523 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java @@ -33,12 +33,12 @@ public interface DiscoverySpiDataExchange { * @param nodeId ID of new node that joins topology. * @return Collection of discovery data objects from different components. */ - public List<Object> collect(UUID nodeId); + public Map<Integer, Object> collect(UUID nodeId); /** * Notifies discovery manager about data received from remote node. * * @param data Collection of discovery data objects from different components. */ - public void onExchange(List<Object> data); + public void onExchange(Map<Integer, Object> data); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java index e6543fd..bc7d044 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java @@ -888,10 +888,10 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp if (msg.topologyHistory() != null) topHist.putAll(msg.topologyHistory()); - Collection<List<Object>> dataList = msg.oldNodesDiscoveryData(); + Collection<Map<Integer, Object>> dataList = msg.oldNodesDiscoveryData(); if (dataList != null) { - for (List<Object> discoData : dataList) + for (Map<Integer, Object> discoData : dataList) exchange.onExchange(discoData); } @@ -912,7 +912,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp if (log.isDebugEnabled()) log.debug("Added new node to topology: " + node); - List<Object> data = msg.newNodeDiscoveryData(); + Map<Integer, Object> data = msg.newNodeDiscoveryData(); if (data != null) exchange.onExchange(data); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/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 7592f68..ddf4138 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 @@ -1373,31 +1373,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov } /** - * @param msg Error message. - * @return Remote grid version parsed from error message. - * @deprecated This method was created for preserving backward compatibility. During major version update - * parsing of error message should be replaced with new {@link org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage} - * which contains all necessary information. - */ - @Deprecated - @Nullable private String parseRemoteVersion(String msg) { - msg = msg.replaceAll("\\s", ""); - - final String verPrefix = "rmtBuildVer="; - - int startIdx = msg.indexOf(verPrefix); - int endIdx = msg.indexOf(',', startIdx); - - if (endIdx < 0) - endIdx = msg.indexOf(']', startIdx); - - if (startIdx < 0 || endIdx < 0) - return null; - - return msg.substring(startIdx + verPrefix.length() - 1, endIdx); - } - - /** * Tries to send join request message to a random node presenting in topology. * Address is provided by {@link org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} and message is * sent to first node connection succeeded to. @@ -3638,7 +3613,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov if (topChanged) { assert !node.visible() : "Added visible node [node=" + node + ", locNode=" + locNode + ']'; - List<Object> data = msg.newNodeDiscoveryData(); + Map<Integer, Object> data = msg.newNodeDiscoveryData(); if (data != null) exchange.onExchange(data); @@ -3653,7 +3628,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov if (msg.verified() && locNodeId.equals(node.id())) { // Discovery data. - Collection<List<Object>> dataList; + Collection<Map<Integer, Object>> dataList; synchronized (mux) { if (spiState == CONNECTING && locNode.internalOrder() != node.internalOrder()) { @@ -3712,7 +3687,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov // Notify outside of synchronized block. if (dataList != null) { - for (List<Object> discoData : dataList) + for (Map<Integer, Object> discoData : dataList) exchange.onExchange(discoData); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java index 6366ac0..e267a29 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java @@ -35,7 +35,7 @@ public class TcpDiscoveryJoinRequestMessage extends TcpDiscoveryAbstractMessage private TcpDiscoveryNode node; /** Discovery data. */ - private List<Object> discoData; + private Map<Integer, Object> discoData; /** * Public default no-arg constructor for {@link Externalizable} interface. @@ -50,7 +50,7 @@ public class TcpDiscoveryJoinRequestMessage extends TcpDiscoveryAbstractMessage * @param node New node that wants to join. * @param discoData Discovery data. */ - public TcpDiscoveryJoinRequestMessage(TcpDiscoveryNode node, List<Object> discoData) { + public TcpDiscoveryJoinRequestMessage(TcpDiscoveryNode node, Map<Integer, Object> discoData) { super(node.id()); this.node = node; @@ -69,7 +69,7 @@ public class TcpDiscoveryJoinRequestMessage extends TcpDiscoveryAbstractMessage /** * @return Discovery data. */ - public List<Object> discoveryData() { + public Map<Integer, Object> discoveryData() { return discoData; } @@ -92,7 +92,7 @@ public class TcpDiscoveryJoinRequestMessage extends TcpDiscoveryAbstractMessage super.writeExternal(out); out.writeObject(node); - U.writeCollection(out, discoData); + U.writeMap(out, discoData); } /** {@inheritDoc} */ @@ -100,7 +100,7 @@ public class TcpDiscoveryJoinRequestMessage extends TcpDiscoveryAbstractMessage super.readExternal(in); node = (TcpDiscoveryNode)in.readObject(); - discoData = U.readList(in); + discoData = U.readMap(in); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java index 7be4141..7c1b33b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java @@ -55,10 +55,10 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage { private Map<Long, Collection<ClusterNode>> topHist; /** Discovery data from new node. */ - private List<Object> newNodeDiscoData; + private Map<Integer, Object> newNodeDiscoData; /** Discovery data from old nodes. */ - private Collection<List<Object>> oldNodesDiscoData; + private Collection<Map<Integer, Object>> oldNodesDiscoData; /** Start time of the first grid node. */ private long gridStartTime; @@ -79,7 +79,9 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage { * @param gridStartTime Start time of the first grid node. */ public TcpDiscoveryNodeAddedMessage(UUID creatorNodeId, TcpDiscoveryNode node, - List<Object> newNodeDiscoData, long gridStartTime) { + Map<Integer, Object> newNodeDiscoData, + long gridStartTime) + { super(creatorNodeId); assert node != null; @@ -169,21 +171,21 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage { /** * @return Discovery data from new node. */ - public List<Object> newNodeDiscoveryData() { + public Map<Integer, Object> newNodeDiscoveryData() { return newNodeDiscoData; } /** * @return Discovery data from old nodes. */ - public Collection<List<Object>> oldNodesDiscoveryData() { + public Collection<Map<Integer, Object>> oldNodesDiscoveryData() { return oldNodesDiscoData; } /** * @param discoData Discovery data to add. */ - public void addDiscoveryData(List<Object> discoData) { + public void addDiscoveryData(Map<Integer, Object> discoData) { // Old nodes disco data may be null if message // makes more than 1 pass due to stopping of the nodes in topology. if (oldNodesDiscoData != null) @@ -215,13 +217,13 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage { U.writeCollection(out, top); U.writeMap(out, topHist); out.writeLong(gridStartTime); - U.writeCollection(out, newNodeDiscoData); + U.writeMap(out, newNodeDiscoData); out.writeInt(oldNodesDiscoData != null ? oldNodesDiscoData.size() : -1); if (oldNodesDiscoData != null) { - for (List<Object> list : oldNodesDiscoData) - U.writeCollection(out, list); + for (Map<Integer, Object> map : oldNodesDiscoData) + U.writeMap(out, map); } } @@ -235,7 +237,7 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage { top = U.readCollection(in); topHist = U.readTreeMap(in); gridStartTime = in.readLong(); - newNodeDiscoData = U.readList(in); + newNodeDiscoData = U.readMap(in); int oldNodesDiscoDataSize = in.readInt(); @@ -243,7 +245,7 @@ public class TcpDiscoveryNodeAddedMessage extends TcpDiscoveryAbstractMessage { oldNodesDiscoData = new ArrayList<>(oldNodesDiscoDataSize); for (int i = 0; i < oldNodesDiscoDataSize; i++) - oldNodesDiscoData.add(U.readList(in)); + oldNodesDiscoData.add(U.<Integer, Object>readMap(in)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index caa7875..d7db2c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -729,11 +729,11 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { /** * */ - @CacheQueryGroupIndex(name = "msg_tx", unique = true) + @CacheQueryGroupIndex(name = "msg_tx") @SuppressWarnings({"UnusedDeclaration"}) private static class Request implements Serializable { /** */ - @CacheQuerySqlField(unique = true) + @CacheQuerySqlField private Long id; /** */ @@ -774,7 +774,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { @SuppressWarnings({"UnusedDeclaration"}) private static class Response implements Serializable { /** */ - @CacheQuerySqlField(unique = true) + @CacheQuerySqlField private Long id; /** */ @@ -805,7 +805,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { */ private static class Session implements Serializable { /** */ - @CacheQuerySqlField(unique = true) + @CacheQuerySqlField private String terminalId; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java index 188370b..4aecbd1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java @@ -27,7 +27,7 @@ import java.io.*; */ public class GridCacheTestValue implements Serializable, Cloneable { /** */ - @CacheQuerySqlField(unique = true) + @CacheQuerySqlField private String val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java index f2f50dd..39dfda0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java @@ -55,8 +55,8 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu final AtomicReference<Integer> val = new AtomicReference<>(); final CountDownLatch latch = new CountDownLatch(1); - qry.callback(new P2<UUID, Collection<Map.Entry<Integer, Integer>>>() { - @Override public boolean apply(UUID uuid, Collection<Map.Entry<Integer, Integer>> entries) { + qry.localCallback(new P2<UUID, Collection<CacheContinuousQueryEntry<Integer, Integer>>>() { + @Override public boolean apply(UUID uuid, Collection<CacheContinuousQueryEntry<Integer, Integer>> entries) { assertEquals(1, entries.size()); Map.Entry<Integer, Integer> e = entries.iterator().next(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java index f39f866..27eaf58 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.query.continuous.*; +import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jdk8.backport.*; @@ -98,8 +99,8 @@ public class GridContinuousOperationsLoadTest { if (useQry) { CacheContinuousQuery<Object, Object> qry = cache.queries().createContinuousQuery(); - qry.callback(new PX2<UUID, Collection<Map.Entry<Object, Object>>>() { - @Override public boolean applyx(UUID uuid, Collection<Map.Entry<Object, Object>> entries) + qry.localCallback(new PX2<UUID, Collection<CacheContinuousQueryEntry<Object, Object>>>() { + @Override public boolean applyx(UUID uuid, Collection<CacheContinuousQueryEntry<Object, Object>> entries) throws IgniteInterruptedCheckedException { if (cbSleepMs > 0) U.sleep(cbSleepMs); @@ -110,8 +111,8 @@ public class GridContinuousOperationsLoadTest { } }); - qry.filter(new PX2<Object, Object>() { - @Override public boolean applyx(Object key, Object val) throws IgniteInterruptedCheckedException { + qry.remoteFilter(new IgnitePredicateX<CacheContinuousQueryEntry<Object, Object>>() { + @Override public boolean applyx(CacheContinuousQueryEntry e) throws IgniteInterruptedCheckedException { if (filterSleepMs > 0) U.sleep(filterSleepMs); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java index 2a3c627..d30f296 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/TestObject.java @@ -26,7 +26,7 @@ import java.io.*; */ public class TestObject implements Serializable { /** ID. */ - @CacheQuerySqlField(unique = true) + @CacheQuerySqlField private int id; /** Text. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java index 32c06bf..36ab84a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridAbstractDiscoverySelfTest.java @@ -380,11 +380,11 @@ public abstract class GridAbstractDiscoverySelfTest<T extends IgniteSpi> extends }); spi.setDataExchange(new DiscoverySpiDataExchange() { - @Override public List<Object> collect(UUID nodeId) { - return new LinkedList<>(); + @Override public Map<Integer, Object> collect(UUID nodeId) { + return new HashMap<Integer, Object>(); } - @Override public void onExchange(List<Object> data) { + @Override public void onExchange(Map<Integer, Object> data) { // No-op. } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java index 718c9fc..2e0d282 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java @@ -47,11 +47,11 @@ public class GridTcpDiscoverySpiStartStopSelfTest extends GridSpiStartStopAbstra @GridSpiTestConfig public DiscoverySpiDataExchange getDataExchange() { return new DiscoverySpiDataExchange() { - @Override public List<Object> collect(UUID nodeId) { + @Override public Map<Integer, Object> collect(UUID nodeId) { return null; } - @Override public void onExchange(List<Object> data) { + @Override public void onExchange(Map<Integer, Object> data) { // No-op. } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java index 462299d..3f02fa3 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java @@ -200,11 +200,11 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr discoSpi.setMetricsProvider(createMetricsProvider()); discoSpi.setDataExchange(new DiscoverySpiDataExchange() { - @Override public List<Object> collect(UUID nodeId) { - return new ArrayList<>(); + @Override public Map<Integer, Object> collect(UUID nodeId) { + return new HashMap<>(); } - @Override public void onExchange(List<Object> data) { + @Override public void onExchange(Map<Integer, Object> data) { } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java index 313c9cd..7393173 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java @@ -172,28 +172,28 @@ public class GridHadoopJobTracker extends GridHadoopComponent { CacheContinuousQuery<GridHadoopJobId, GridHadoopJobMetadata> qry = jobMetaCache().queries().createContinuousQuery(); - qry.callback(new IgniteBiPredicate<UUID, - Collection<Map.Entry<GridHadoopJobId, GridHadoopJobMetadata>>>() { - @Override public boolean apply(UUID nodeId, - final Collection<Map.Entry<GridHadoopJobId, GridHadoopJobMetadata>> evts) { - if (!busyLock.tryReadLock()) - return false; + qry.localCallback( + new IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<GridHadoopJobId, GridHadoopJobMetadata>>>() { + @Override public boolean apply(UUID nodeId, + final Collection<CacheContinuousQueryEntry<GridHadoopJobId, GridHadoopJobMetadata>> evts) { + if (!busyLock.tryReadLock()) + return false; - try { - // Must process query callback in a separate thread to avoid deadlocks. - evtProcSvc.submit(new EventHandler() { - @Override protected void body() throws IgniteCheckedException { - processJobMetadataUpdates(evts); - } - }); + try { + // Must process query callback in a separate thread to avoid deadlocks. + evtProcSvc.submit(new EventHandler() { + @Override protected void body() throws IgniteCheckedException { + processJobMetadataUpdates(evts); + } + }); - return true; - } - finally { - busyLock.readUnlock(); + return true; + } + finally { + busyLock.readUnlock(); + } } - } - }); + }); qry.execute(); @@ -629,7 +629,8 @@ public class GridHadoopJobTracker extends GridHadoopComponent { * @param updated Updated cache entries. * @throws IgniteCheckedException If failed. */ - private void processJobMetadataUpdates(Iterable<Map.Entry<GridHadoopJobId, GridHadoopJobMetadata>> updated) + private void processJobMetadataUpdates( + Iterable<CacheContinuousQueryEntry<GridHadoopJobId, GridHadoopJobMetadata>> updated) throws IgniteCheckedException { UUID locNodeId = ctx.localNodeId(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ce635b6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java index d5b5321..d47d838 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryTestValue.java @@ -35,7 +35,7 @@ public class GridCacheQueryTestValue implements Serializable { private int field2; /** */ - @CacheQuerySqlField(unique = true) + @CacheQuerySqlField private long field3; /** */
