Repository: incubator-ignite Updated Branches: refs/heads/master 8c20bddb3 -> 0a66bd57b
Ignite - Fixes after initial code import. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0a66bd57 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0a66bd57 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0a66bd57 Branch: refs/heads/master Commit: 0a66bd57bfef7c867715a46f7d7c472dc38469e1 Parents: 8c20bdd Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Dec 5 14:35:49 2014 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Dec 5 14:35:49 2014 -0800 ---------------------------------------------------------------------- ...GridClientAbstractMultiThreadedSelfTest.java | 6 +- .../client/GridClientDefaultCacheSelfTest.java | 8 +- .../GridClientTcpSslAuthenticationSelfTest.java | 3 +- ...skExecutionAfterTopologyRestartSelfTest.java | 3 +- .../client/GridClientTopologyCacheSelfTest.java | 9 +- .../GridClientAbstractMultiNodeSelfTest.java | 11 +- .../integration/GridClientAbstractSelfTest.java | 12 +- .../GridClientPreferDirectSelfTest.java | 6 +- .../GridClientTcpConnectivitySelfTest.java | 3 +- .../router/GridClientFailedInitSelfTest.java | 8 +- .../router/GridRouterFactorySelfTest.java | 6 +- .../rest/GridAbstractRestProcessorSelfTest.java | 7 +- .../GridJettyRestProcessorAbstractSelfTest.java | 2 +- .../rest/GridRestBinaryProtocolSelfTest.java | 6 +- .../rest/GridRestMemcacheProtocolSelfTest.java | 6 +- .../rest/GridRestProcessorStartSelfTest.java | 13 +- .../processors/rest/GridRestProcessorTest.java | 6 +- .../rest/GridTaskCommandHandlerSelfTest.java | 11 +- .../jdbc/GridJdbcComplexQuerySelfTest.java | 4 +- .../jdbc/GridJdbcConnectionSelfTest.java | 7 +- .../jdbc/GridJdbcEmptyCacheSelfTest.java | 4 +- .../jdbc/GridJdbcLocalCachesSelfTest.java | 4 +- .../gridgain/jdbc/GridJdbcMetadataSelfTest.java | 4 +- .../jdbc/GridJdbcPreparedStatementSelfTest.java | 4 +- .../jdbc/GridJdbcResultSetSelfTest.java | 4 +- .../jdbc/GridJdbcStatementSelfTest.java | 4 +- .../gridgain/grid/kernal/GridComponentType.java | 2 +- .../processors/cache/GridCacheAdapter.java | 182 +------------------ .../processors/cache/GridCacheTxHandler.java | 159 +++++++++++++++- .../processors/cache/GridCacheTxManager.java | 50 ++++- ...dCachePessimisticCheckCommittedTxFuture.java | 35 ++-- ...CachePessimisticCheckCommittedTxRequest.java | 11 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- .../bamboo/GridDataGridTestSuite.java | 2 +- 34 files changed, 313 insertions(+), 295 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java index 9518858..21960b8 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java @@ -47,7 +47,7 @@ import static org.gridgain.testframework.GridTestUtils.*; */ public abstract class GridClientAbstractMultiThreadedSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Partitioned cache name. */ protected static final String PARTITIONED_CACHE_NAME = "partitioned"; @@ -155,7 +155,7 @@ public abstract class GridClientAbstractMultiThreadedSelfTest extends GridCommon assert c.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(REST_TCP_PORT_BASE); @@ -167,7 +167,7 @@ public abstract class GridClientAbstractMultiThreadedSelfTest extends GridCommon c.setClientConnectionConfiguration(clientCfg); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java index a4e7157..0edbe81 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java @@ -21,7 +21,7 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; import static org.gridgain.client.GridClientProtocol.*; -import static org.gridgain.grid.GridSystemProperties.*; +import static org.apache.ignite.IgniteSystemProperties.*; /** * Tests that client is able to connect to a grid with only default cache enabled. @@ -31,7 +31,7 @@ public class GridClientDefaultCacheSelfTest extends GridCommonAbstractTest { private static final String REST_JETTY_CFG = "modules/clients/src/test/resources/jetty/rest-jetty.xml"; /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Host. */ private static final String HOST = "127.0.0.1"; @@ -70,13 +70,13 @@ public class GridClientDefaultCacheSelfTest extends GridCommonAbstractTest { assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestJettyPath(REST_JETTY_CFG); cfg.setClientConnectionConfiguration(clientCfg); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/GridClientTcpSslAuthenticationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTcpSslAuthenticationSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTcpSslAuthenticationSelfTest.java index dac53ee..1c74b8d 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientTcpSslAuthenticationSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTcpSslAuthenticationSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.configuration.*; import org.gridgain.client.balancer.*; import org.gridgain.client.impl.*; import org.gridgain.client.ssl.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*; @@ -60,7 +59,7 @@ public class GridClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTe assert c.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(REST_TCP_PORT); clientCfg.setRestTcpSslEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTaskExecutionAfterTopologyRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTaskExecutionAfterTopologyRestartSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTaskExecutionAfterTopologyRestartSelfTest.java index 22ab8d8..2c273d9 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTaskExecutionAfterTopologyRestartSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTcpTaskExecutionAfterTopologyRestartSelfTest.java @@ -10,7 +10,6 @@ package org.gridgain.client; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.testframework.junits.common.*; import java.util.*; @@ -30,7 +29,7 @@ public class GridClientTcpTaskExecutionAfterTopologyRestartSelfTest extends Grid assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(PORT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java index a047215..43fdc82 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java @@ -10,7 +10,6 @@ package org.gridgain.client; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -19,7 +18,7 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; -import static org.gridgain.grid.GridSystemProperties.*; +import static org.apache.ignite.IgniteSystemProperties.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; @@ -42,7 +41,7 @@ public class GridClientTopologyCacheSelfTest extends GridCommonAbstractTest { private static final String CACHE_NAME = "cache"; /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -258,7 +257,7 @@ public class GridClientTopologyCacheSelfTest extends GridCommonAbstractTest { cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setSwapEnabled(false); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); @@ -268,7 +267,7 @@ public class GridClientTopologyCacheSelfTest extends GridCommonAbstractTest { assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(BINARY_PORT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java index de77eec..0cca292 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java @@ -15,6 +15,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; +import org.apache.ignite.spi.*; import org.gridgain.client.*; import org.gridgain.client.balancer.*; import org.gridgain.client.ssl.*; @@ -51,7 +52,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; @SuppressWarnings("ThrowableResultOfMethodCallIgnored") public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Partitioned cache name. */ private static final String PARTITIONED_CACHE_NAME = "partitioned"; @@ -125,7 +126,7 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst assert c.getClientConnectionConfiguration() == null; if (restEnabled) { - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(REST_TCP_PORT_BASE); @@ -139,7 +140,7 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst c.setClientConnectionConfiguration(clientCfg); } - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); @@ -751,14 +752,14 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst * Communication SPI which checks cache flags. */ @SuppressWarnings("unchecked") - private static class TestCommunicationSpi extends GridTcpCommunicationSpi { + private static class TestCommunicationSpi extends TcpCommunicationSpi { /** Node ID. */ @IgniteLocalNodeIdResource private UUID nodeId; /** {@inheritDoc} */ @Override public void sendMessage(ClusterNode node, GridTcpCommunicationMessageAdapter msg) - throws GridSpiException { + throws IgniteSpiException { checkSyncFlags((GridIoMessage)msg); super.sendMessage(node, msg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java index 9e46977..e6d74aa 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java @@ -34,7 +34,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.GridSystemProperties.*; +import static org.apache.ignite.IgniteSystemProperties.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; import static org.gridgain.testframework.GridTestUtils.*; @@ -45,7 +45,7 @@ import static org.gridgain.testframework.GridTestUtils.*; @SuppressWarnings("deprecation") public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final String CACHE_NAME = "cache"; @@ -185,7 +185,7 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(BINARY_PORT); @@ -201,7 +201,7 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest cfg.setClientConnectionConfiguration(clientCfg); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); @@ -210,7 +210,7 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest cfg.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration("replicated"), cacheConfiguration("partitioned"), cacheConfiguration(CACHE_NAME)); - clientCfg.setClientMessageInterceptor(new GridClientMessageInterceptor() { + clientCfg.setClientMessageInterceptor(new ClientMessageInterceptor() { @Override public Object onReceive(@Nullable Object obj) { if (obj != null) INTERCEPTED_OBJECTS.put(obj, obj); @@ -228,7 +228,7 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest }); // Specify swap SPI, otherwise test fails on windows. - cfg.setSwapSpaceSpi(new GridFileSwapSpaceSpi()); + cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/integration/GridClientPreferDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientPreferDirectSelfTest.java index 6a40a4a..b0d3a01 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientPreferDirectSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientPreferDirectSelfTest.java @@ -30,7 +30,7 @@ import static org.gridgain.client.integration.GridClientAbstractMultiNodeSelfTes */ public class GridClientPreferDirectSelfTest extends GridCommonAbstractTest { /** VM ip finder for TCP discovery. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final int NODES_CNT = 6; @@ -51,7 +51,7 @@ public class GridClientPreferDirectSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); @@ -61,7 +61,7 @@ public class GridClientPreferDirectSelfTest extends GridCommonAbstractTest { assert c.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(REST_TCP_PORT_BASE); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/integration/GridClientTcpConnectivitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientTcpConnectivitySelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientTcpConnectivitySelfTest.java index bd2eaa2..4b29cd4 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientTcpConnectivitySelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientTcpConnectivitySelfTest.java @@ -12,7 +12,6 @@ package org.gridgain.client.integration; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.gridgain.client.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.typedef.*; import org.jetbrains.annotations.*; @@ -28,7 +27,7 @@ public class GridClientTcpConnectivitySelfTest extends GridClientAbstractConnect assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); if (addr != null) clientCfg.setRestTcpHost(addr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/router/GridClientFailedInitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/router/GridClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/router/GridClientFailedInitSelfTest.java index 4edf56e..50a6406 100644 --- a/modules/clients/src/test/java/org/gridgain/client/router/GridClientFailedInitSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/router/GridClientFailedInitSelfTest.java @@ -25,7 +25,7 @@ import java.util.*; import static org.gridgain.client.GridClientProtocol.*; import static org.gridgain.client.integration.GridClientAbstractSelfTest.*; -import static org.gridgain.grid.GridSystemProperties.*; +import static org.apache.ignite.IgniteSystemProperties.*; /** * @@ -44,7 +44,7 @@ public class GridClientFailedInitSelfTest extends GridCommonAbstractTest { private static final int ROUTER_JETTY_PORT = 8081; /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { @@ -61,14 +61,14 @@ public class GridClientFailedInitSelfTest extends GridCommonAbstractTest { cfg.setLocalHost(HOST); - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(BINARY_PORT); clientCfg.setRestJettyPath(REST_JETTY_CFG); cfg.setClientConnectionConfiguration(clientCfg); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/client/router/GridRouterFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/router/GridRouterFactorySelfTest.java b/modules/clients/src/test/java/org/gridgain/client/router/GridRouterFactorySelfTest.java index 096ad82..72a64f9 100644 --- a/modules/clients/src/test/java/org/gridgain/client/router/GridRouterFactorySelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/router/GridRouterFactorySelfTest.java @@ -17,21 +17,21 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; -import static org.gridgain.grid.GridSystemProperties.*; +import static org.apache.ignite.IgniteSystemProperties.*; /** * Test routers factory. */ public class GridRouterFactorySelfTest extends GridCommonAbstractTest { /** Shared IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final int GRID_HTTP_PORT = 11087; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - GridTcpDiscoverySpi discoSpi = new GridTcpDiscoverySpi(); + TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); discoSpi.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java index b3dd2fd..7110758 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java @@ -10,7 +10,6 @@ package org.gridgain.grid.kernal.processors.rest; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -22,7 +21,7 @@ import org.gridgain.testframework.junits.common.*; */ abstract class GridAbstractRestProcessorSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Local host. */ protected static final String LOC_HOST = "127.0.0.1"; @@ -62,11 +61,11 @@ abstract class GridAbstractRestProcessorSelfTest extends GridCommonAbstractTest assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); cfg.setClientConnectionConfiguration(clientCfg); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridJettyRestProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridJettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridJettyRestProcessorAbstractSelfTest.java index 36fb488..d98a0fb 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridJettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridJettyRestProcessorAbstractSelfTest.java @@ -16,7 +16,7 @@ import java.net.*; import java.util.*; import java.util.regex.*; -import static org.gridgain.grid.GridSystemProperties.*; +import static org.apache.ignite.IgniteSystemProperties.*; /** * Tests for Jetty REST protocol. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java index 8e54d05..8f99de5 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java @@ -38,7 +38,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; @SuppressWarnings("unchecked") public class GridRestBinaryProtocolSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final String CACHE_NAME = "cache"; @@ -83,13 +83,13 @@ public class GridRestBinaryProtocolSelfTest extends GridCommonAbstractTest { assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(PORT); cfg.setClientConnectionConfiguration(clientCfg); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java index ee3a175..dee3175 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java @@ -30,7 +30,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; @SuppressWarnings("unchecked") public class GridRestMemcacheProtocolSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final String CACHE_NAME = "cache"; @@ -75,13 +75,13 @@ public class GridRestMemcacheProtocolSelfTest extends GridCommonAbstractTest { assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(PORT); cfg.setClientConnectionConfiguration(clientCfg); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorStartSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorStartSelfTest.java index 81e64ba..22eaac7 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorStartSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorStartSelfTest.java @@ -11,9 +11,8 @@ package org.gridgain.grid.kernal.processors.rest; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.spi.*; import org.gridgain.client.*; -import org.gridgain.grid.*; -import org.gridgain.grid.spi.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -29,7 +28,7 @@ import java.util.concurrent.*; */ public class GridRestProcessorStartSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final String HOST = "127.0.0.1"; @@ -51,7 +50,7 @@ public class GridRestProcessorStartSelfTest extends GridCommonAbstractTest { assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(TCP_PORT); @@ -138,16 +137,16 @@ public class GridRestProcessorStartSelfTest extends GridCommonAbstractTest { /** * Test SPI. */ - private class TestDiscoverySpi extends GridTcpDiscoverySpi { + private class TestDiscoverySpi extends TcpDiscoverySpi { /** {@inheritDoc} */ - @Override public void spiStart(@Nullable String gridName) throws GridSpiException { + @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException { gridReady.countDown(); try { proceed.await(); } catch (InterruptedException e) { - throw new GridSpiException("Failed to await start signal.", e); + throw new IgniteSpiException("Failed to await start signal.", e); } super.spiStart(gridName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java index 27ba47f..09c2fb6 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java @@ -92,9 +92,9 @@ public class GridRestProcessorTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked"}) private IgniteConfiguration cacheTestConfiguration(IgniteConfiguration cfg) { - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); - GridTcpDiscoveryVmIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); ipFinder.setShared(true); @@ -104,7 +104,7 @@ public class GridRestProcessorTest extends GridCommonAbstractTest { assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); // Ensure - no authentication. clientCfg.setRestSecretKey(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java index adabe2f..ec824ca 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTaskCommandHandlerSelfTest.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.processors.rest; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.gridgain.client.*; @@ -37,7 +38,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridTaskCommandHandlerSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final String CACHE_NAME = "cache"; @@ -56,7 +57,7 @@ public class GridTaskCommandHandlerSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - System.setProperty(GridSystemProperties.GG_REST_MAX_TASK_RESULTS, String.valueOf(MAX_TASK_RESULTS)); + System.setProperty(IgniteSystemProperties.GG_REST_MAX_TASK_RESULTS, String.valueOf(MAX_TASK_RESULTS)); startGrid(0); } @@ -65,7 +66,7 @@ public class GridTaskCommandHandlerSelfTest extends GridCommonAbstractTest { @Override protected void afterTestsStopped() throws Exception { stopAllGrids(); - System.clearProperty(GridSystemProperties.GG_REST_MAX_TASK_RESULTS); + System.clearProperty(IgniteSystemProperties.GG_REST_MAX_TASK_RESULTS); } /** {@inheritDoc} */ @@ -86,13 +87,13 @@ public class GridTaskCommandHandlerSelfTest extends GridCommonAbstractTest { assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); clientCfg.setRestTcpPort(BINARY_PORT); cfg.setClientConnectionConfiguration(clientCfg); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java index 2d2883f..65b3365 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcComplexQuerySelfTest.java @@ -32,7 +32,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridJdbcComplexQuerySelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -54,7 +54,7 @@ public class GridJdbcComplexQuerySelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java index 95807a6..63ad97c 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcConnectionSelfTest.java @@ -10,7 +10,6 @@ package org.gridgain.jdbc; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -27,7 +26,7 @@ import java.util.concurrent.*; */ public class GridJdbcConnectionSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Custom cache name. */ private static final String CUSTOM_CACHE_NAME = "custom-cache"; @@ -47,7 +46,7 @@ public class GridJdbcConnectionSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration(CUSTOM_CACHE_NAME)); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); @@ -55,7 +54,7 @@ public class GridJdbcConnectionSelfTest extends GridCommonAbstractTest { assert cfg.getClientConnectionConfiguration() == null; - GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration(); + ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); if (!gridName.endsWith("0")) clientCfg.setRestTcpPort(CUSTOM_PORT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java index 6a0a013..5f5b404 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcEmptyCacheSelfTest.java @@ -26,7 +26,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridJdbcEmptyCacheSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Cache name. */ private static final String CACHE_NAME = "cache"; @@ -50,7 +50,7 @@ public class GridJdbcEmptyCacheSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java index 561ac0b..2b217ef 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcLocalCachesSelfTest.java @@ -29,7 +29,7 @@ import static org.gridgain.jdbc.GridJdbcDriver.*; */ public class GridJdbcLocalCachesSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Cache name. */ private static final String CACHE_NAME = "cache"; @@ -55,7 +55,7 @@ public class GridJdbcLocalCachesSelfTest extends GridCommonAbstractTest { cfg.setIndexingSpi(idx); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java index dd02812..1f195f7 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcMetadataSelfTest.java @@ -32,7 +32,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridJdbcMetadataSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -49,7 +49,7 @@ public class GridJdbcMetadataSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java index 5759521..bcca917 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcPreparedStatementSelfTest.java @@ -32,7 +32,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridJdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -55,7 +55,7 @@ public class GridJdbcPreparedStatementSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java index 1661881..f3373ea 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcResultSetSelfTest.java @@ -36,7 +36,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; @SuppressWarnings("FloatingPointEquality") public class GridJdbcResultSetSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -62,7 +62,7 @@ public class GridJdbcResultSetSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java index 075a23c..6380656 100644 --- a/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/jdbc/GridJdbcStatementSelfTest.java @@ -29,7 +29,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridJdbcStatementSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -55,7 +55,7 @@ public class GridJdbcStatementSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi(); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/core/src/main/java/org/gridgain/grid/kernal/GridComponentType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridComponentType.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridComponentType.java index ef583b9..59ce18f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridComponentType.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridComponentType.java @@ -48,7 +48,7 @@ public enum GridComponentType { /** H2 indexing SPI. */ H2_INDEXING( - "org.gridgain.grid.spi.indexing.GridNoopIndexingSpi", + "org.apache.ignite.spi.indexing.NoopIndexingSpi", "org.gridgain.grid.spi.indexing.h2.GridH2IndexingSpi", "gridgain-indexing" ), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 35bec68..31cd964 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -508,35 +508,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im * @throws GridException If start failed. */ public void start() throws GridException { - if (!ctx.isNear()) { - ctx.io().addHandler(ctx.cacheId(), GridCacheOptimisticCheckPreparedTxRequest.class, - new CI2<UUID, GridCacheOptimisticCheckPreparedTxRequest<K, V>>() { - @Override public void apply(UUID nodeId, GridCacheOptimisticCheckPreparedTxRequest<K, V> req) { - processCheckPreparedTxRequest(nodeId, req); - } - }); - - ctx.io().addHandler(ctx.cacheId(), GridCacheOptimisticCheckPreparedTxResponse.class, - new CI2<UUID, GridCacheOptimisticCheckPreparedTxResponse<K, V>>() { - @Override public void apply(UUID nodeId, GridCacheOptimisticCheckPreparedTxResponse<K, V> res) { - processCheckPreparedTxResponse(nodeId, res); - } - }); - - ctx.io().addHandler(ctx.cacheId(), GridCachePessimisticCheckCommittedTxRequest.class, - new CI2<UUID, GridCachePessimisticCheckCommittedTxRequest<K, V>>() { - @Override public void apply(UUID nodeId, GridCachePessimisticCheckCommittedTxRequest<K, V> req) { - processCheckCommittedTxRequest(nodeId, req); - } - }); - - ctx.io().addHandler(ctx.cacheId(), GridCachePessimisticCheckCommittedTxResponse.class, - new CI2<UUID, GridCachePessimisticCheckCommittedTxResponse<K, V>>() { - @Override public void apply(UUID nodeId, GridCachePessimisticCheckCommittedTxResponse<K, V> res) { - processCheckCommittedTxResponse(nodeId, res); - } - }); - } + // No-op. } /** @@ -4571,158 +4543,6 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im } /** - * @param nodeId Node ID. - * @param req Request. - */ - protected void processCheckPreparedTxRequest(UUID nodeId, GridCacheOptimisticCheckPreparedTxRequest<K, V> req) { - if (log.isDebugEnabled()) - log.debug("Processing check prepared transaction requests [nodeId=" + nodeId + ", req=" + req + ']'); - - boolean prepared = ctx.tm().txsPreparedOrCommitted(req.nearXidVersion(), req.transactions()); - - GridCacheOptimisticCheckPreparedTxResponse<K, V> res = - new GridCacheOptimisticCheckPreparedTxResponse<>(req.version(), req.futureId(), req.miniId(), prepared); - - try { - if (log.isDebugEnabled()) - log.debug("Sending check prepared transaction response [nodeId=" + nodeId + ", res=" + res + ']'); - - ctx.io().send(nodeId, res); - } - catch (ClusterTopologyException ignored) { - if (log.isDebugEnabled()) - log.debug("Failed to send check prepared transaction response (did node leave grid?) [nodeId=" + - nodeId + ", res=" + res + ']'); - } - catch (GridException e) { - U.error(log, "Failed to send response to node [nodeId=" + nodeId + ", res=" + res + ']', e); - } - } - - /** - * @param nodeId Node ID. - * @param res Response. - */ - protected void processCheckPreparedTxResponse(UUID nodeId, GridCacheOptimisticCheckPreparedTxResponse<K, V> res) { - if (log.isDebugEnabled()) - log.debug("Processing check prepared transaction response [nodeId=" + nodeId + ", res=" + res + ']'); - - GridCacheOptimisticCheckPreparedTxFuture<K, V> fut = (GridCacheOptimisticCheckPreparedTxFuture<K, V>)ctx.mvcc(). - <Boolean>future(res.version(), res.futureId()); - - if (fut == null) { - if (log.isDebugEnabled()) - log.debug("Received response for unknown future (will ignore): " + res); - - return; - } - - fut.onResult(nodeId, res); - } - - /** - * @param nodeId Node ID. - * @param req Request. - */ - protected void processCheckCommittedTxRequest(final UUID nodeId, - final GridCachePessimisticCheckCommittedTxRequest<K, V> req) { - if (log.isDebugEnabled()) - log.debug("Processing check committed transaction request [nodeId=" + nodeId + ", req=" + req + ']'); - - // First check if we have near transaction with this ID. - GridCacheTxEx<K, V> tx = ctx.tm().localTxForRecovery(req.nearXidVersion(), !req.nearOnlyCheck()); - - // Either we found near transaction or one of transactions is being committed by user. - // Wait for it and send reply. - if (tx != null) { - assert tx.local(); - - if (log.isDebugEnabled()) - log.debug("Found active near transaction, will wait for completion [req=" + req + ", tx=" + tx + ']'); - - final GridCacheTxEx<K, V> tx0 = tx; - - tx.finishFuture().listenAsync(new CI1<IgniteFuture<GridCacheTx>>() { - @Override public void apply(IgniteFuture<GridCacheTx> f) { - GridCacheCommittedTxInfo<K, V> info = null; - - if (tx0.state() == COMMITTED) - info = new GridCacheCommittedTxInfo<>(tx0); - - GridCachePessimisticCheckCommittedTxResponse<K, V> - res = new GridCachePessimisticCheckCommittedTxResponse<>( - req.version(), req.futureId(), req.miniId(), info); - - if (log.isDebugEnabled()) - log.debug("Finished near transaction, sending response [req=" + req + ", res=" + res + ']'); - - sendCheckCommittedResponse(nodeId, res); - } - }); - - return; - } - - GridCacheCommittedTxInfo<K, V> info = ctx.tm().txCommitted(req.nearXidVersion(), req.originatingNodeId(), - req.originatingThreadId()); - - if (info == null && CU.isNearEnabled(ctx)) - info = ctx.dht().near().context().tm().txCommitted(req.nearXidVersion(), req.originatingNodeId(), - req.originatingThreadId()); - - GridCachePessimisticCheckCommittedTxResponse<K, V> res = new GridCachePessimisticCheckCommittedTxResponse<>( - req.version(), req.futureId(), req.miniId(), info); - - sendCheckCommittedResponse(nodeId, res); - } - - /** - * @param nodeId Node ID. - * @param res Response. - */ - protected void processCheckCommittedTxResponse(UUID nodeId, - GridCachePessimisticCheckCommittedTxResponse<K, V> res) { - if (log.isDebugEnabled()) - log.debug("Processing check committed transaction response [nodeId=" + nodeId + ", res=" + res + ']'); - - GridCachePessimisticCheckCommittedTxFuture<K, V> fut = - (GridCachePessimisticCheckCommittedTxFuture<K, V>)ctx.mvcc().<GridCacheCommittedTxInfo<K, V>>future( - res.version(), res.futureId()); - - if (fut == null) { - if (log.isDebugEnabled()) - log.debug("Received response for unknown future (will ignore): " + res); - - return; - } - - fut.onResult(nodeId, res); - } - - /** - * Sends check committed response to remote node. - * - * @param nodeId Node ID to send to. - * @param res Reponse to send. - */ - private void sendCheckCommittedResponse(UUID nodeId, GridCachePessimisticCheckCommittedTxResponse<K, V> res) { - try { - if (log.isDebugEnabled()) - log.debug("Sending check committed transaction response [nodeId=" + nodeId + ", res=" + res + ']'); - - ctx.io().send(nodeId, res); - } - catch (ClusterTopologyException ignored) { - if (log.isDebugEnabled()) - log.debug("Failed to send check committed transaction response (did node leave grid?) [nodeId=" + - nodeId + ", res=" + res + ']'); - } - catch (GridException e) { - U.error(log, "Failed to send response to node [nodeId=" + nodeId + ", res=" + res + ']', e); - } - } - - /** * Cache operation. */ private abstract class SyncOp<T> { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java index d0e2f8a..1c39ddd 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java @@ -101,6 +101,34 @@ public class GridCacheTxHandler<K, V> { processDhtTxFinishResponse(nodeId, (GridDhtTxFinishResponse<K, V>)msg); } }); + + ctx.io().addHandler(0, GridCacheOptimisticCheckPreparedTxRequest.class, + new CI2<UUID, GridCacheOptimisticCheckPreparedTxRequest<K, V>>() { + @Override public void apply(UUID nodeId, GridCacheOptimisticCheckPreparedTxRequest<K, V> req) { + processCheckPreparedTxRequest(nodeId, req); + } + }); + + ctx.io().addHandler(0, GridCacheOptimisticCheckPreparedTxResponse.class, + new CI2<UUID, GridCacheOptimisticCheckPreparedTxResponse<K, V>>() { + @Override public void apply(UUID nodeId, GridCacheOptimisticCheckPreparedTxResponse<K, V> res) { + processCheckPreparedTxResponse(nodeId, res); + } + }); + + ctx.io().addHandler(0, GridCachePessimisticCheckCommittedTxRequest.class, + new CI2<UUID, GridCachePessimisticCheckCommittedTxRequest<K, V>>() { + @Override public void apply(UUID nodeId, GridCachePessimisticCheckCommittedTxRequest<K, V> req) { + processCheckCommittedTxRequest(nodeId, req); + } + }); + + ctx.io().addHandler(0, GridCachePessimisticCheckCommittedTxResponse.class, + new CI2<UUID, GridCachePessimisticCheckCommittedTxResponse<K, V>>() { + @Override public void apply(UUID nodeId, GridCachePessimisticCheckCommittedTxResponse<K, V> res) { + processCheckCommittedTxResponse(nodeId, res); + } + }); } /** @@ -149,7 +177,7 @@ public class GridCacheTxHandler<K, V> { throw new GridClosureException(ex); IgniteFuture<GridCacheTxEx<K, V>> fut = locTx.prepareAsyncLocal(req.reads(), req.writes(), - locTx.transactionNodes(), req.last(), req.lastBackups()); + req.transactionNodes(), req.last(), req.lastBackups()); if (locTx.isRollbackOnly()) locTx.rollbackAsync(); @@ -1316,4 +1344,133 @@ public class GridCacheTxHandler<K, V> { return tx; } + + /** + * @param nodeId Node ID. + * @param req Request. + */ + protected void processCheckPreparedTxRequest(UUID nodeId, GridCacheOptimisticCheckPreparedTxRequest<K, V> req) { + if (log.isDebugEnabled()) + log.debug("Processing check prepared transaction requests [nodeId=" + nodeId + ", req=" + req + ']'); + + boolean prepared = ctx.tm().txsPreparedOrCommitted(req.nearXidVersion(), req.transactions()); + + GridCacheOptimisticCheckPreparedTxResponse<K, V> res = + new GridCacheOptimisticCheckPreparedTxResponse<>(req.version(), req.futureId(), req.miniId(), prepared); + + try { + if (log.isDebugEnabled()) + log.debug("Sending check prepared transaction response [nodeId=" + nodeId + ", res=" + res + ']'); + + ctx.io().send(nodeId, res); + } + catch (ClusterTopologyException ignored) { + if (log.isDebugEnabled()) + log.debug("Failed to send check prepared transaction response (did node leave grid?) [nodeId=" + + nodeId + ", res=" + res + ']'); + } + catch (GridException e) { + U.error(log, "Failed to send response to node [nodeId=" + nodeId + ", res=" + res + ']', e); + } + } + + /** + * @param nodeId Node ID. + * @param res Response. + */ + protected void processCheckPreparedTxResponse(UUID nodeId, GridCacheOptimisticCheckPreparedTxResponse<K, V> res) { + if (log.isDebugEnabled()) + log.debug("Processing check prepared transaction response [nodeId=" + nodeId + ", res=" + res + ']'); + + GridCacheOptimisticCheckPreparedTxFuture<K, V> fut = (GridCacheOptimisticCheckPreparedTxFuture<K, V>)ctx.mvcc(). + <Boolean>future(res.version(), res.futureId()); + + if (fut == null) { + if (log.isDebugEnabled()) + log.debug("Received response for unknown future (will ignore): " + res); + + return; + } + + fut.onResult(nodeId, res); + } + + /** + * @param nodeId Node ID. + * @param req Request. + */ + protected void processCheckCommittedTxRequest(final UUID nodeId, + final GridCachePessimisticCheckCommittedTxRequest<K, V> req) { + if (log.isDebugEnabled()) + log.debug("Processing check committed transaction request [nodeId=" + nodeId + ", req=" + req + ']'); + + IgniteFuture<GridCacheCommittedTxInfo<K, V>> infoFut = ctx.tm().checkPessimisticTxCommitted(req); + + infoFut.listenAsync(new CI1<IgniteFuture<GridCacheCommittedTxInfo<K, V>>>() { + @Override public void apply(IgniteFuture<GridCacheCommittedTxInfo<K, V>> infoFut) { + GridCacheCommittedTxInfo<K, V> info = null; + + try { + info = infoFut.get(); + } + catch (GridException e) { + U.error(log, "Failed to obtain committed info for transaction (will rollback): " + req, e); + } + + GridCachePessimisticCheckCommittedTxResponse<K, V> + res = new GridCachePessimisticCheckCommittedTxResponse<>( + req.version(), req.futureId(), req.miniId(), info); + + if (log.isDebugEnabled()) + log.debug("Finished waiting for tx committed info [req=" + req + ", res=" + res + ']'); + + sendCheckCommittedResponse(nodeId, res); } + }); + } + + /** + * @param nodeId Node ID. + * @param res Response. + */ + protected void processCheckCommittedTxResponse(UUID nodeId, + GridCachePessimisticCheckCommittedTxResponse<K, V> res) { + if (log.isDebugEnabled()) + log.debug("Processing check committed transaction response [nodeId=" + nodeId + ", res=" + res + ']'); + + GridCachePessimisticCheckCommittedTxFuture<K, V> fut = + (GridCachePessimisticCheckCommittedTxFuture<K, V>)ctx.mvcc().<GridCacheCommittedTxInfo<K, V>>future( + res.version(), res.futureId()); + + if (fut == null) { + if (log.isDebugEnabled()) + log.debug("Received response for unknown future (will ignore): " + res); + + return; + } + + fut.onResult(nodeId, res); + } + + /** + * Sends check committed response to remote node. + * + * @param nodeId Node ID to send to. + * @param res Reponse to send. + */ + private void sendCheckCommittedResponse(UUID nodeId, GridCachePessimisticCheckCommittedTxResponse<K, V> res) { + try { + if (log.isDebugEnabled()) + log.debug("Sending check committed transaction response [nodeId=" + nodeId + ", res=" + res + ']'); + + ctx.io().send(nodeId, res); + } + catch (ClusterTopologyException ignored) { + if (log.isDebugEnabled()) + log.debug("Failed to send check committed transaction response (did node leave grid?) [nodeId=" + + nodeId + ", res=" + res + ']'); + } + catch (GridException e) { + U.error(log, "Failed to send response to node [nodeId=" + nodeId + ", res=" + res + ']', e); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java index 967a666..2bc9a48 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java @@ -1905,15 +1905,16 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V GridCacheTxEntry<K, V> write = tx.writeMap().get(entry.txKey()); if (write != null) { - GridCacheEntryEx<K, V> cached = entry.cached(); + GridCacheEntryEx<K, V> cached = write.cached(); - if (cached == null || cached.detached()) { + GridCacheTxEntry<K, V> recovered = entry.cleanCopy(write.context()); + + if (cached == null || cached.detached()) cached = write.context().cache().entryEx(entry.key(), tx.topologyVersion()); - entry.cached(cached, cached.keyBytes()); - } + recovered.cached(cached, cached.keyBytes()); - tx.writeMap().put(entry.txKey(), entry); + tx.writeMap().put(entry.txKey(), recovered); continue; } @@ -1940,6 +1941,45 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V } /** + * @param req Check committed request. + * @return Check committed future. + */ + public IgniteFuture<GridCacheCommittedTxInfo<K, V>> checkPessimisticTxCommitted(GridCachePessimisticCheckCommittedTxRequest req) { + // First check if we have near transaction with this ID. + GridCacheTxEx<K, V> tx = localTxForRecovery(req.nearXidVersion(), !req.nearOnlyCheck()); + + // Either we found near transaction or one of transactions is being committed by user. + // Wait for it and send reply. + if (tx != null) { + assert tx.local(); + + if (log.isDebugEnabled()) + log.debug("Found active near transaction, will wait for completion [req=" + req + ", tx=" + tx + ']'); + + final GridCacheTxEx<K, V> tx0 = tx; + + return tx.finishFuture().chain(new C1<IgniteFuture<GridCacheTx>, GridCacheCommittedTxInfo<K, V>>() { + @Override public GridCacheCommittedTxInfo<K, V> apply(IgniteFuture<GridCacheTx> txFut) { + GridCacheCommittedTxInfo<K, V> info = null; + + if (tx0.state() == COMMITTED) + info = new GridCacheCommittedTxInfo<>(tx0); + + return info; + } + }); + } + + GridCacheCommittedTxInfo<K, V> info = txCommitted(req.nearXidVersion(), req.originatingNodeId(), + req.originatingThreadId()); + + if (info == null) + info = txCommitted(req.nearXidVersion(), req.originatingNodeId(), req.originatingThreadId()); + + return new GridFinishedFutureEx<>(info); + } + + /** * Timeout object for node failure handler. */ private final class NodeFailureTimeoutObject extends GridTimeoutObjectAdapter { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java index 965b1cf..e6a6fbf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java @@ -123,27 +123,30 @@ public class GridCachePessimisticCheckCommittedTxFuture<K, V> extends GridCompou if (rmtNode.id().equals(failedNodeId)) continue; - /* - * Send message to all cache nodes in the topology. - */ + GridCachePessimisticCheckCommittedTxRequest<K, V> req = new GridCachePessimisticCheckCommittedTxRequest<>( + tx, + originatingThreadId, futureId(), nearCheck); - MiniFuture fut = new MiniFuture(rmtNode.id()); + if (rmtNode.isLocal()) + add(cctx.tm().checkPessimisticTxCommitted(req)); + else { + MiniFuture fut = new MiniFuture(rmtNode.id()); - GridCachePessimisticCheckCommittedTxRequest<K, V> req = new GridCachePessimisticCheckCommittedTxRequest<>(tx, - originatingThreadId, futureId(), fut.futureId(), nearCheck); + req.miniId(fut.futureId()); - add(fut); + add(fut); - try { - cctx.io().send(rmtNode.id(), req); - } - catch (ClusterTopologyException ignored) { - fut.onNodeLeft(); - } - catch (GridException e) { - fut.onError(e); + try { + cctx.io().send(rmtNode.id(), req); + } + catch (ClusterTopologyException ignored) { + fut.onNodeLeft(); + } + catch (GridException e) { + fut.onError(e); - break; + break; + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java index 99d2f6c..b7f8c2a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java @@ -57,14 +57,12 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr * @param tx Transaction. * @param originatingThreadId Originating thread ID. * @param futId Future ID. - * @param miniId Mini future ID. */ public GridCachePessimisticCheckCommittedTxRequest(GridCacheTxEx<K, V> tx, long originatingThreadId, IgniteUuid futId, - IgniteUuid miniId, boolean nearOnlyCheck) { + boolean nearOnlyCheck) { super(tx.xidVersion(), 0); this.futId = futId; - this.miniId = miniId; this.nearOnlyCheck = nearOnlyCheck; nearXidVer = tx.nearXidVersion(); @@ -108,6 +106,13 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr } /** + * @param miniId Mini ID to set. + */ + public void miniId(IgniteUuid miniId) { + this.miniId = miniId; + } + + /** * @return Flag indicating that this request was sent only to near node. If this flag is set, no finalizing * will be executed on receiving (near) node since this is a user node. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java index 99ffc1b..f844ab7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java @@ -19,7 +19,6 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.kernal.processors.cache.distributed.near.*; import org.apache.ignite.spi.communication.tcp.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.typedef.*; @@ -174,10 +173,9 @@ public abstract class GridCacheTxOriginatingNodeFailureAbstractSelfTest extends boolean txFinished = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { for (GridKernal g : grids) { - GridCacheAdapter<?, ?> cache = g.internalCache(); + GridCacheSharedContext<Object, Object> ctx = g.context().cache().context(); - int txNum = cache.isNear() ? ((GridNearCacheAdapter)cache).dht().context().tm().idMapSize() : - cache.context().tm().idMapSize(); + int txNum = ctx.tm().idMapSize(); if (txNum != 0) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a66bd57/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java index ba3291b..7dfbded 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java @@ -303,7 +303,7 @@ public class GridDataGridTestSuite extends TestSuite { suite.addTest(GridCacheIteratorsSelfTestSuite.suite()); // Add tx recovery test suite. -// suite.addTest(GridCacheTxRecoverySelfTestSuite.suite()); + suite.addTest(GridCacheTxRecoverySelfTestSuite.suite()); // Cache interceptor tests. suite.addTest(GridCacheInterceptorSelfTestSuite.suite());
