You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/02/02 11:29:12 UTC
[36/50] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx
GridKernal -> IgniteKernal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
new file mode 100644
index 0000000..d76fe95
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
@@ -0,0 +1,315 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.internal.executor.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Grid distributed executor test.
+ */
+@GridCommonTest(group = "Thread Tests")
+public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
+ /** */
+ public IgniteExecutorServiceTest() {
+ super(true);
+ }
+
+ /**
+ * @throws Exception Thrown in case of test failure.
+ */
+ public void testExecute() throws Exception {
+ Ignite ignite = G.ignite(getTestGridName());
+
+ ExecutorService srvc = createExecutorService(ignite);
+
+ srvc.execute(new Runnable() {
+ @IgniteInstanceResource
+ private Ignite ignite;
+
+ @Override public void run() {
+ System.out.println("Test message.");
+
+ assert this.ignite != null;
+ }
+ });
+
+ srvc.execute(new TestRunnable());
+
+ srvc.shutdown();
+ }
+
+ /**
+ * @throws Exception Thrown in case of test failure.
+ */
+ public void testSubmit() throws Exception {
+ Ignite ignite = G.ignite(getTestGridName());
+
+ ExecutorService srvc = createExecutorService(ignite);
+
+ Future<?> fut = srvc.submit(new TestRunnable());
+
+ Object res = fut.get();
+
+ info("Default Runnable result:" + res);
+
+ assert res == null : "Failed to get valid default result for submitted Runnable: " + res;
+
+ String val = "test-value";
+
+ fut = srvc.submit(new TestRunnable(), val);
+
+ res = fut.get();
+
+ info("Defined Runnable result:" + res);
+
+ assert val.equals(res) : "Failed to get valid predefined result for submitted Runnable: " + res;
+
+ fut = srvc.submit(new TestCallable<>(val));
+
+ res = fut.get();
+
+ info("Callable result:" + res);
+
+ assert val.equals(res) : "Failed to get valid result for submitted Callable: " + res;
+
+ srvc.shutdown();
+ }
+
+ /**
+ * @throws Exception Thrown in case of test failure.
+ */
+ public void testSubmitWithFutureTimeout() throws Exception {
+ Ignite ignite = G.ignite(getTestGridName());
+
+ ExecutorService srvc = createExecutorService(ignite);
+
+ Future<Integer> fut = srvc.submit(new TestCallable<>(3000)); // Just sleep for 3 seconds.
+
+ boolean ok = true;
+
+ try {
+ fut.get(1, TimeUnit.SECONDS);
+
+ ok = false;
+ }
+ catch (TimeoutException e) {
+ info("Task timeout elapsed: " + e.getMessage());
+ }
+
+ assert ok : "Timeout must be thrown.";
+
+ srvc.shutdown();
+ }
+
+ /**
+ * @throws Exception Thrown in case of test failure.
+ */
+ @SuppressWarnings("TooBroadScope")
+ public void testInvokeAll() throws Exception {
+ Ignite ignite = G.ignite(getTestGridName());
+
+ ExecutorService srvc = createExecutorService(ignite);
+
+ Collection<Callable<String>> cmds = new ArrayList<>(2);
+
+ String val1 = "test-value-1";
+ String val2 = "test-value-2";
+
+ cmds.add(new TestCallable<>(val1));
+ cmds.add(new TestCallable<>(val2));
+
+ List<Future<String>> futs = srvc.invokeAll(cmds);
+
+ assert futs != null;
+ assert futs.size() == 2;
+
+ String res1 = futs.get(0).get();
+ String res2 = futs.get(1).get();
+
+ assert val1.equals(res1) : "Failed to get valid result for first command: " + res1;
+ assert val2.equals(res2) : "Failed to get valid result for second command: " + res2;
+
+ srvc.shutdown();
+ }
+
+ /**
+ * @throws Exception Thrown in case of test failure.
+ */
+ @SuppressWarnings("TooBroadScope")
+ public void testInvokeAllWithTimeout() throws Exception {
+ Ignite ignite = G.ignite(getTestGridName());
+
+ ExecutorService srvc = createExecutorService(ignite);
+
+ Collection<Callable<Integer>> cmds = new ArrayList<>();
+
+ cmds.add(new TestCallable<>(3000)); // Just sleeps for 3 seconds.
+ cmds.add(new TestCallable<>(3000)); // Just sleeps for 3 seconds.
+
+ List<Future<Integer>> fut = srvc.invokeAll(cmds, 1, TimeUnit.SECONDS);
+
+ assert fut != null;
+ assert fut.size() == 2;
+
+ boolean ok = true;
+
+ try {
+ fut.get(0).get();
+
+ ok = false;
+ }
+ catch (CancellationException e) {
+ info("First timeout task is cancelled: " + e.getMessage());
+ }
+
+ assert ok : "First task must be cancelled.";
+
+ try {
+ fut.get(1).get();
+
+ ok = false;
+ }
+ catch (CancellationException e) {
+ info("Second timeout task is cancelled: " + e.getMessage());
+ }
+
+ assert ok : "Second task must be cancelled.";
+
+ srvc.shutdown();
+ }
+
+ /**
+ * @throws Exception Thrown in case of test failure.
+ */
+ @SuppressWarnings("TooBroadScope")
+ public void testInvokeAny() throws Exception {
+ Ignite ignite = G.ignite(getTestGridName());
+
+ ExecutorService srvc = createExecutorService(ignite);
+
+ Collection<Callable<String>> cmds = new ArrayList<>(2);
+
+ String val1 = "test-value-1";
+ String val2 = "test-value-2";
+
+ cmds.add(new TestCallable<>(val1));
+ cmds.add(new TestCallable<>(val2));
+
+ String res = srvc.invokeAny(cmds);
+
+ info("Result: " + res);
+
+ assert val1.equals(res) : "Failed to get valid result: " + res;
+
+ srvc.shutdown();
+ }
+
+ /**
+ * @throws Exception Thrown in case of test failure.
+ */
+ @SuppressWarnings("TooBroadScope")
+ public void testInvokeAnyWithTimeout() throws Exception {
+ Ignite ignite = G.ignite(getTestGridName());
+
+ ExecutorService srvc = createExecutorService(ignite);
+
+ Collection<Callable<Integer>> timeoutCmds = new ArrayList<>(2);
+
+ timeoutCmds.add(new TestCallable<>(5000));
+ timeoutCmds.add(new TestCallable<>(5000));
+
+ boolean ok = true;
+
+ try {
+ srvc.invokeAny(timeoutCmds, 1, TimeUnit.SECONDS);
+
+ ok = false;
+ }
+ catch (TimeoutException e) {
+ info("Task timeout elapsed: " + e.getMessage());
+ }
+
+ assert ok : "Timeout must be thrown.";
+
+ srvc.shutdown();
+ }
+
+ /**
+ * @param ignite Grid instance.
+ * @return Thrown in case of test failure.
+ */
+ private ExecutorService createExecutorService(Ignite ignite) {
+ assert ignite != null;
+
+ return new GridExecutorService((ClusterGroupAdapter) ignite, log());
+ }
+
+ /**
+ * @param <T> Type of the {@link Callable} argument.
+ */
+ private static class TestCallable<T> implements Callable<T>, Serializable {
+ /** */
+ private T data;
+
+ /** */
+ @IgniteInstanceResource
+ private Ignite ignite;
+
+ /**
+ * @param data Data.
+ */
+ TestCallable(T data) {
+ this.data = data;
+ }
+
+ /** {@inheritDoc} */
+ @Override public T call() throws Exception {
+ System.out.println("Test callable message.");
+
+ assert ignite != null;
+
+ if (data instanceof Integer)
+ Thread.sleep((Integer)data);
+
+ return data;
+ }
+ }
+
+ /** */
+ private static class TestRunnable implements Runnable, Serializable {
+ /** */
+ @IgniteInstanceResource
+ private Ignite ignite;
+
+ /** {@inheritDoc} */
+ @Override public void run() {
+ System.out.println("Test Runnable message.");
+
+ assert ignite != null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
new file mode 100644
index 0000000..22a3639
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
@@ -0,0 +1,476 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.compute.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ *
+ */
+@GridCommonTest(group = "Kernal Self")
+public class IgniteExplicitImplicitDeploymentSelfTest extends GridCommonAbstractTest {
+ /** */
+ public IgniteExplicitImplicitDeploymentSelfTest() {
+ super(/*start grid*/false);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ // Override P2P configuration to exclude Task and Job classes
+ cfg.setPeerClassLoadingLocalClassPathExclude(GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName());
+
+ cfg.setDeploymentMode(IgniteDeploymentMode.ISOLATED);
+
+ return cfg;
+ }
+
+ /**
+ * @throws Exception If test failed.
+ */
+ public void testImplicitDeployLocally() throws Exception {
+ execImplicitDeployLocally(true, true, true);
+ }
+
+ /**
+ * @throws Exception If test failed.
+ */
+ public void testImplicitDeployP2P() throws Exception {
+ execImplicitDeployP2P(true, true, true);
+ }
+
+ /**
+ * @throws Exception If test failed.
+ */
+ public void testExplicitDeployLocally() throws Exception {
+ execExplicitDeployLocally(true, true, true);
+ }
+
+ /**
+ * @throws Exception If test failed.
+ */
+ public void testExplicitDeployP2P() throws Exception {
+ execExplicitDeployP2P(true, true, true);
+ }
+
+ /**
+ * @param ignite Grid.
+ */
+ @SuppressWarnings({"CatchGenericClass"})
+ private void stopGrid(Ignite ignite) {
+ try {
+ if (ignite != null)
+ G.stop(ignite.name(), true);
+ }
+ catch (Throwable e) {
+ error("Got error when stopping grid.", e);
+ }
+ }
+
+ /**
+ * @param byCls If {@code true} than executes task by Class.
+ * @param byTask If {@code true} than executes task instance.
+ * @param byName If {@code true} than executes task by class name.
+ * @throws Exception If test failed.
+ */
+ @SuppressWarnings("unchecked")
+ private void execExplicitDeployLocally(boolean byCls, boolean byTask, boolean byName) throws Exception {
+ Ignite ignite = null;
+
+ try {
+ ignite = startGrid();
+
+ // Explicit Deployment. Task execution should return 0.
+ // Say resource class loader - different to task one.
+ ClassLoader ldr1 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "1"),
+ getClass().getClassLoader());
+
+ // Assume that users task and job were loaded with this class loader
+ ClassLoader ldr2 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "2"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
+
+ info("Loader1: " + ldr1);
+ info("Loader2: " + ldr2);
+
+ Class<? extends ComputeTask<String, Integer>> taskCls = (Class<? extends ComputeTask<String, Integer>>)
+ ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
+
+ // Check auto-deploy. It should pick up resource class loader.
+ if (byCls) {
+ ignite.compute().localDeployTask(taskCls, ldr1);
+
+ Integer res = ignite.compute().execute(taskCls, null);
+
+ assert res != null;
+ assert res == 2 : "Invalid response: " + res;
+ }
+
+ if (byTask) {
+ ignite.compute().localDeployTask(taskCls, ldr1);
+
+ Integer res = ignite.compute().execute(taskCls.newInstance(), null);
+
+ assert res != null;
+ assert res == 2 : "Invalid response: " + res;
+ }
+
+ if (byName) {
+ ignite.compute().localDeployTask(taskCls, ldr1);
+
+ Integer res = (Integer) ignite.compute().execute(taskCls.getName(), null);
+
+ assert res != null;
+ assert res == 1 : "Invalid response: " + res;
+ }
+ }
+ finally {
+ stopGrid(ignite);
+ }
+ }
+
+ /**
+ * @param byCls If {@code true} than executes task by Class.
+ * @param byTask If {@code true} than executes task instance.
+ * @param byName If {@code true} than executes task by class name.
+ * @throws Exception If test failed.
+ */
+ @SuppressWarnings("unchecked")
+ private void execImplicitDeployLocally(boolean byCls, boolean byTask, boolean byName) throws Exception {
+ Ignite ignite = null;
+
+ try {
+ ignite = startGrid();
+
+ // First task class loader.
+ ClassLoader ldr1 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "1"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
+
+ // Second task class loader
+ ClassLoader ldr2 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "2"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
+
+ // The same name but different classes/ class loaders.
+ Class<? extends ComputeTask<String, Integer>> taskCls1 = (Class<? extends ComputeTask<String, Integer>>)
+ ldr1.loadClass(GridDeploymentResourceTestTask.class.getName());
+
+ Class<? extends ComputeTask<String, Integer>> taskCls2 = (Class<? extends ComputeTask<String, Integer>>)
+ ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
+
+ if (byCls) {
+ Integer res1 = ignite.compute().execute(taskCls1, null);
+ Integer res2 = ignite.compute().execute(taskCls2, null);
+
+ assert res1 != null;
+ assert res2 != null;
+
+ assert res1 == 1 : "Invalid res1: " + res1;
+ assert res2 == 2 : "Invalid res2: " + res2;
+ }
+
+ if (byTask) {
+ Integer res1 = ignite.compute().execute(taskCls1.newInstance(), null);
+ Integer res2 = ignite.compute().execute(taskCls2.newInstance(), null);
+
+ assert res1 != null;
+ assert res2 != null;
+
+ assert res1 == 1 : "Invalid res1: " + res1;
+ assert res2 == 2 : "Invalid res2: " + res2;
+ }
+
+ if (byName) {
+ ignite.compute().localDeployTask(taskCls1, ldr1);
+
+ Integer res1 = (Integer) ignite.compute().execute(taskCls1.getName(), null);
+
+ ignite.compute().localDeployTask(taskCls2, ldr2);
+
+ Integer res2 = (Integer) ignite.compute().execute(taskCls2.getName(), null);
+
+ assert res1 != null;
+ assert res2 != null;
+
+ assert res1 == 1 : "Invalid res1: " + res1;
+ assert res2 == 2 : "Invalid res2: " + res2;
+ }
+ }
+ finally {
+ stopGrid(ignite);
+ }
+ }
+
+ /**
+ * @param byCls If {@code true} than executes task by Class.
+ * @param byTask If {@code true} than executes task instance.
+ * @param byName If {@code true} than executes task by class name.
+ * @throws Exception If test failed.
+ */
+ @SuppressWarnings("unchecked")
+ private void execExplicitDeployP2P(boolean byCls, boolean byTask, boolean byName) throws Exception {
+ Ignite ignite1 = null;
+ Ignite ignite2 = null;
+
+ try {
+ ignite1 = startGrid(1);
+ ignite2 = startGrid(2);
+
+ ClassLoader ldr1 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "1"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
+
+ ClassLoader ldr2 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "2"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
+
+ Class<? extends ComputeTask<String, Integer>> taskCls = (Class<? extends ComputeTask<String, Integer>>)
+ ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
+
+ if (byCls) {
+ ignite1.compute().localDeployTask(taskCls, ldr1);
+
+ // Even though the task is deployed with resource class loader,
+ // when we execute it, it will be redeployed with task class-loader.
+ Integer res = ignite1.compute().execute(taskCls, null);
+
+ assert res != null;
+ assert res == 2 : "Invalid response: " + res;
+ }
+
+
+ if (byTask) {
+ ignite1.compute().localDeployTask(taskCls, ldr1);
+
+ // Even though the task is deployed with resource class loader,
+ // when we execute it, it will be redeployed with task class-loader.
+ Integer res = ignite1.compute().execute(taskCls.newInstance(), null);
+
+ assert res != null;
+ assert res == 2 : "Invalid response: " + res;
+ }
+
+ if (byName) {
+ ignite1.compute().localDeployTask(taskCls, ldr1);
+
+ // Even though the task is deployed with resource class loader,
+ // when we execute it, it will be redeployed with task class-loader.
+ Integer res = (Integer) ignite1.compute().execute(taskCls.getName(), null);
+
+ assert res != null;
+ assert res == 1 : "Invalid response: " + res;
+ }
+ }
+ finally {
+ stopGrid(ignite2);
+ stopGrid(ignite1);
+ }
+ }
+
+ /**
+ * @param byCls If {@code true} than executes task by Class.
+ * @param byTask If {@code true} than executes task instance.
+ * @param byName If {@code true} than executes task by class name.
+ * @throws Exception If test failed.
+ */
+ @SuppressWarnings("unchecked")
+ private void execImplicitDeployP2P(boolean byCls, boolean byTask, boolean byName) throws Exception {
+ Ignite ignite1 = null;
+ Ignite ignite2 = null;
+
+ try {
+ ignite1 = startGrid(1);
+ ignite2 = startGrid(2);
+
+ ClassLoader ldr1 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "1"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
+
+ ClassLoader ldr2 = new GridTestClassLoader(
+ Collections.singletonMap("testResource", "2"),
+ getClass().getClassLoader(),
+ GridDeploymentResourceTestTask.class.getName(),
+ GridDeploymentResourceTestJob.class.getName()
+ );
+
+ Class<? extends ComputeTask<String, Integer>> taskCls1 = (Class<? extends ComputeTask<String, Integer>>)
+ ldr1.loadClass(GridDeploymentResourceTestTask.class.getName());
+
+ Class<? extends ComputeTask<String, Integer>> taskCls2 = (Class<? extends ComputeTask<String, Integer>>)
+ ldr2.loadClass(GridDeploymentResourceTestTask.class.getName());
+
+ if (byCls) {
+ Integer res1 = ignite1.compute().execute(taskCls1, null);
+ Integer res2 = ignite1.compute().execute(taskCls2, null);
+
+ assert res1 != null;
+ assert res2 != null;
+
+ assert res1 == 1 : "Invalid res1: " + res1;
+ assert res2 == 2 : "Invalid res2: " + res2;
+ }
+
+ if (byTask) {
+ Integer res1 = ignite1.compute().execute(taskCls1.newInstance(), null);
+ Integer res2 = ignite1.compute().execute(taskCls2.newInstance(), null);
+
+ assert res1 != null;
+ assert res2 != null;
+
+ assert res1 == 1 : "Invalid res1: " + res1;
+ assert res2 == 2 : "Invalid res2: " + res2;
+ }
+
+ if (byName) {
+ ignite1.compute().localDeployTask(taskCls1, ldr1);
+
+ Integer res1 = (Integer) ignite1.compute().execute(taskCls1.getName(), null);
+
+ ignite1.compute().localDeployTask(taskCls2, ldr2);
+
+ Integer res2 = (Integer) ignite1.compute().execute(taskCls2.getName(), null);
+
+ assert res1 != null;
+ assert res2 != null;
+
+ assert res1 == 1 : "Invalid res1: " + res1;
+ assert res2 == 2 : "Invalid res2: " + res2;
+ }
+ }
+ finally {
+ stopGrid(ignite1);
+ stopGrid(ignite2);
+ }
+ }
+
+ /**
+ * We use custom name to avoid auto-deployment in the same VM.
+ */
+ @SuppressWarnings({"PublicInnerClass"})
+ @ComputeTaskName("GridDeploymentResourceTestTask")
+ public static class GridDeploymentResourceTestTask extends ComputeTaskAdapter<String, Integer> {
+ /** */
+ @IgniteInstanceResource
+ private Ignite ignite;
+
+ /** {@inheritDoc} */
+ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, String arg) throws IgniteCheckedException {
+ Map<ComputeJobAdapter, ClusterNode> map = new HashMap<>(subgrid.size());
+
+ boolean ignoreLocNode = false;
+
+ UUID locId = ignite.configuration().getNodeId();
+
+ if (subgrid.size() == 1)
+ assert subgrid.get(0).id().equals(locId) : "Wrong node id.";
+ else
+ ignoreLocNode = true;
+
+ for (ClusterNode node : subgrid) {
+ // Ignore local node.
+ if (ignoreLocNode && node.id().equals(locId))
+ continue;
+
+ map.put(new GridDeploymentResourceTestJob(), node);
+ }
+
+ return map;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+ return results.get(0).getData();
+ }
+ }
+
+ /**
+ * Simple job for this test.
+ */
+ @SuppressWarnings({"PublicInnerClass"})
+ public static final class GridDeploymentResourceTestJob extends ComputeJobAdapter {
+ /** */
+ @IgniteLoggerResource
+ private IgniteLogger log;
+
+ /** {@inheritDoc} */
+ @Override public Serializable execute() throws IgniteCheckedException {
+ if (log.isInfoEnabled())
+ log.info("Executing grid job: " + this);
+
+ try {
+ ClassLoader ldr = Thread.currentThread().getContextClassLoader();
+
+ if (log.isInfoEnabled())
+ log.info("Loader (inside job): " + ldr);
+
+ InputStream in = ldr.getResourceAsStream("testResource");
+
+ if (in != null) {
+ Reader reader = new InputStreamReader(in);
+
+ try {
+ char res = (char)reader.read();
+
+ return Integer.parseInt(Character.toString(res));
+ }
+ finally {
+ U.close(in, null);
+ }
+ }
+
+ return null;
+ }
+ catch (IOException e) {
+ throw new IgniteCheckedException("Failed to execute job.", e);
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index 6b3ffc8..a4d6f6f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -112,7 +112,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
private GridCheckpointManager checkpoints(Ignite ignite) {
assert ignite != null;
- return ((GridKernal) ignite).context().checkpoint();
+ return ((IgniteKernal) ignite).context().checkpoint();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
index aeed502..46a380f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -109,8 +109,8 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
private void doSend() throws Exception {
- GridIoManager mgr0 = ((GridKernal)grid(0)).context().io();
- GridIoManager mgr1 = ((GridKernal)grid(1)).context().io();
+ GridIoManager mgr0 = ((IgniteKernal)grid(0)).context().io();
+ GridIoManager mgr1 = ((IgniteKernal)grid(1)).context().io();
String topic = "test-topic";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index 761809b..deb3edf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -165,7 +165,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
assertEquals(PERM_NODES_CNT, g.cluster().nodes().size());
for (final Ignite g : alive) {
- GridKernal k = (GridKernal)g;
+ IgniteKernal k = (IgniteKernal)g;
GridDiscoveryManager discoMgr = k.context().discovery();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
index 3c07eb4..090bee8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
@@ -86,7 +86,7 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testHasNearCache() throws Exception {
- GridKernal g0 = (GridKernal)startGrid(0); // PARTITIONED_ONLY cache.
+ IgniteKernal g0 = (IgniteKernal)startGrid(0); // PARTITIONED_ONLY cache.
assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, 0));
assertFalse(g0.context().discovery().hasNearCache(null, 0));
@@ -94,7 +94,7 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, 1));
assertFalse(g0.context().discovery().hasNearCache(null, 1));
- GridKernal g1 = (GridKernal)startGrid(1); // NEAR_ONLY cache.
+ IgniteKernal g1 = (IgniteKernal)startGrid(1); // NEAR_ONLY cache.
assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, 1));
assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, 2));
@@ -104,7 +104,7 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
assertTrue(g1.context().discovery().hasNearCache(CACHE_NAME, 2));
assertTrue(g1.context().discovery().hasNearCache(null, 2));
- GridKernal g2 = (GridKernal)startGrid(2); // NEAR_PARTITIONED cache.
+ IgniteKernal g2 = (IgniteKernal)startGrid(2); // NEAR_PARTITIONED cache.
assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, 1));
assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, 2));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java
index b422e7a..4158f18 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManagerSelfTest.java
@@ -67,7 +67,7 @@ public class GridSwapSpaceManagerSelfTest extends GridCommonAbstractTest {
private GridSwapSpaceManager getSwapSpaceManager(Ignite ignite) {
assert ignite != null;
- return ((GridKernal) ignite).context().swap();
+ return ((IgniteKernal) ignite).context().swap();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index e4de7c1..5d3877d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -111,8 +111,8 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
public void testAffinityProcessor() throws Exception {
Random rnd = new Random();
- final GridKernal grid1 = (GridKernal)grid(rnd.nextInt(NODES_CNT)); // With cache.
- GridKernal grid2 = (GridKernal)grid(NODES_CNT + rnd.nextInt(NODES_CNT)); // Without cache.
+ final IgniteKernal grid1 = (IgniteKernal)grid(rnd.nextInt(NODES_CNT)); // With cache.
+ IgniteKernal grid2 = (IgniteKernal)grid(NODES_CNT + rnd.nextInt(NODES_CNT)); // Without cache.
assertEquals(NODES_CNT * 2, grid1.nodes().size());
assertEquals(NODES_CNT * 2, grid2.nodes().size());
@@ -168,7 +168,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
* @throws Exception In case of any exception.
*/
public void testPerformance() throws Exception {
- GridKernal grid = (GridKernal)grid(0);
+ IgniteKernal grid = (IgniteKernal)grid(0);
GridAffinityProcessor aff = grid.context().affinity();
int keysSize = 1000000;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 5c4e4d5..4f55e2f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -3242,7 +3242,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testRemoveAfterClear() throws Exception {
- GridEx grid = grid(0);
+ IgniteEx grid = grid(0);
CacheDistributionMode distroMode = grid.cache(null).configuration().getDistributionMode();
@@ -3290,7 +3290,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testRemoveFilteredAfterClear() throws Exception {
- GridEx grid = grid(0);
+ IgniteEx grid = grid(0);
CacheDistributionMode distroMode = grid.cache(null).configuration().getDistributionMode();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index a18bb9a..0f9a11f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -388,7 +388,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
* @return Cache context.
*/
protected GridCacheContext<String, Integer> context(int idx) {
- return ((GridKernal)grid(idx)).<String, Integer>internalCache().context();
+ return ((IgniteKernal)grid(idx)).<String, Integer>internalCache().context();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java
index 24933cf..1bf6d8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityApiSelfTest.java
@@ -60,14 +60,14 @@ public class GridCacheAffinityApiSelfTest extends GridCacheAbstractSelfTest {
* @return Affinity.
*/
private CacheAffinityFunction affinity() {
- return ((GridKernal)grid(0)).internalCache().configuration().getAffinity();
+ return ((IgniteKernal)grid(0)).internalCache().configuration().getAffinity();
}
/**
* @return Affinity mapper.
*/
private CacheAffinityKeyMapper affinityMapper() {
- return ((GridKernal)grid(0)).internalCache().configuration().getAffinityMapper();
+ return ((IgniteKernal)grid(0)).internalCache().configuration().getAffinityMapper();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/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 3e537c5..570c133 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
@@ -442,7 +442,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
doWork();
- GridNearCacheAdapter near = (GridNearCacheAdapter)((GridKernal) ignite).internalCache();
+ GridNearCacheAdapter near = (GridNearCacheAdapter)((IgniteKernal) ignite).internalCache();
GridDhtCacheAdapter dht = near.dht();
long start = cntrs.get2().get();
@@ -570,7 +570,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
for (Ignite g : G.allGrids()) {
if (g.name().contains("server")) {
GridNearCacheAdapter<CacheAffinityKey<String>, Object> near =
- (GridNearCacheAdapter<CacheAffinityKey<String>, Object>)((GridKernal)g).
+ (GridNearCacheAdapter<CacheAffinityKey<String>, Object>)((IgniteKernal)g).
<CacheAffinityKey<String>, Object>internalCache();
GridDhtCacheAdapter<CacheAffinityKey<String>, Object> dht = near.dht();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
index 77b0c0b..6e9ee08 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java
@@ -103,7 +103,7 @@ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest {
grid(0).cache(null).putAll(map);
for (int g = 0; g < 3; g++) {
- GridKernal grid = (GridKernal)grid(g);
+ IgniteKernal grid = (IgniteKernal)grid(g);
for (Integer key : map.keySet()) {
GridCacheAdapter<Object, Object> cache = grid.internalCache();
@@ -130,7 +130,7 @@ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest {
grid(0).cache(null).putAll(map);
for (int g = 0; g < 4; g++) {
- GridKernal grid = (GridKernal)grid(g);
+ IgniteKernal grid = (IgniteKernal)grid(g);
for (Integer key : map.keySet()) {
GridCacheAdapter<Object, Object> cache = grid.internalCache();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
index 90487ba..a6b566a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFinishPartitionsSelfTest.java
@@ -44,7 +44,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest
private static final int GRID_CNT = 1;
/** Grid kernal. */
- private GridKernal grid;
+ private IgniteKernal grid;
/** {@inheritDoc} */
@Override protected int gridCount() {
@@ -53,7 +53,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- grid = (GridKernal)grid(0);
+ grid = (IgniteKernal)grid(0);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
index 40aa2bf..4bddd4a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
@@ -461,7 +461,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
private void checkSanityCheckDisabled(final IgniteTxConcurrency concurrency) throws Exception {
assert !sanityCheckEnabled();
- GridEx grid = grid(0);
+ IgniteEx grid = grid(0);
final UUID affinityKey = primaryKeyForCache(grid);
@@ -545,7 +545,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
assertEquals("Unexpected number of unlock events: " + unlocks.affectedKeys(), 0,
unlocks.affectedKeys().size());
- GridCacheAdapter<Object, Object> cacheAdapter = ((GridKernal)grid(0)).internalCache();
+ GridCacheAdapter<Object, Object> cacheAdapter = ((IgniteKernal)grid(0)).internalCache();
GridCacheAffinityManager<Object, Object> affMgr = cacheAdapter.context().affinity();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
index 1d9c1f6..8f1c3af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
@@ -125,7 +125,7 @@ public class GridCacheLeakTest extends GridCommonAbstractTest {
if (i % 5000 == 0) {
for (int g = 0; g < 3; g++) {
- GridCacheConcurrentMap<Object, Object> map = ((GridKernal)grid(g)).internalCache(CACHE_NAME).map();
+ GridCacheConcurrentMap<Object, Object> map = ((IgniteKernal)grid(g)).internalCache(CACHE_NAME).map();
info("Map size for cache [g=" + g + ", size=" + map.size() +
", pubSize=" + map.publicSize() + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
index b7f8239..9143160 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
@@ -135,7 +135,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT
// Check all grids have all exchange futures completed.
for (int i = 0; i < 4; i++) {
- GridKernal grid = (GridKernal)grid(i);
+ IgniteKernal grid = (IgniteKernal)grid(i);
GridCacheContext<Object, Object> cctx = grid.internalCache(null).context();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
index 7eebab8..f9add9e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
@@ -107,7 +107,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest {
startGrids(3);
try {
- GridKernal g = (GridKernal)grid(0);
+ IgniteKernal g = (IgniteKernal)grid(0);
GridCacheContext<Object, Object> cctx = g.internalCache().context();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
index e46511b..0a676be 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFlagsTest.java
@@ -32,7 +32,7 @@ import static org.apache.ignite.cache.CacheMode.*;
*/
public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
/** Grid. */
- private GridKernal grid;
+ private IgniteKernal grid;
/**
*
@@ -43,7 +43,7 @@ public class GridCacheMvccFlagsTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- grid = (GridKernal)grid();
+ grid = (IgniteKernal)grid();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
index b6d1fdb..b12b8bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
@@ -104,8 +104,8 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest {
tx.commit();
for (int i = 0; i < gridCnt; i++) {
- assert ((GridKernal)grid(i)).internalCache().context().mvcc().localCandidates().isEmpty();
- assert ((GridKernal)grid(i)).internalCache().context().mvcc().remoteCandidates().isEmpty();
+ assert ((IgniteKernal)grid(i)).internalCache().context().mvcc().localCandidates().isEmpty();
+ assert ((IgniteKernal)grid(i)).internalCache().context().mvcc().remoteCandidates().isEmpty();
}
}
finally {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
index f2d17af..d97c583 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java
@@ -37,7 +37,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*;
*/
public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
/** Grid. */
- private GridKernal grid;
+ private IgniteKernal grid;
/** VM ip finder for TCP discovery. */
private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -51,7 +51,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- grid = (GridKernal)grid();
+ grid = (IgniteKernal)grid();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
index 86e43b0..2044753 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
@@ -36,7 +36,7 @@ import static org.apache.ignite.cache.CacheMode.*;
*/
public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
/** Grid. */
- private GridKernal grid;
+ private IgniteKernal grid;
/** VM ip finder for TCP discovery. */
private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -50,7 +50,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- grid = (GridKernal)grid();
+ grid = (IgniteKernal)grid();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
index 7121ee1..53c5e93 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
@@ -108,7 +108,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest {
public void testTwoTx() throws Exception {
final GridCache<String, Integer> c = grid(0).cache(null);
- GridKernalContext ctx = ((GridKernal)grid(0)).context();
+ GridKernalContext ctx = ((IgniteKernal)grid(0)).context();
c.put(CNTR_KEY, 0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
index 7d4b5cb..a60ffc6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
@@ -160,7 +160,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest {
cache.put(i, i);
for (int i = 0; i < 10; i++) {
- GridCacheEntryEx<Object, Object> entry = ((GridKernal)g).context().cache().internalCache().peekEx(i);
+ GridCacheEntryEx<Object, Object> entry = ((IgniteKernal)g).context().cache().internalCache().peekEx(i);
if (entry != null)
assertFalse("Entry is locked after implicit transaction commit: " + entry, entry.lockedByAny());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
index c2cab27..d7a8a75 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
@@ -137,7 +137,7 @@ public class GridCacheOrderedPreloadingSelfTest extends GridCommonAbstractTest {
// For first node in topology replicated preloader gets completed right away.
for (int i = 1; i < GRID_CNT; i++) {
- GridKernal kernal = (GridKernal)grid(i);
+ IgniteKernal kernal = (IgniteKernal)grid(i);
GridFutureAdapter<?> fut1 = (GridFutureAdapter<?>)kernal.internalCache(FIRST_CACHE_NAME).preloader()
.syncFuture();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
index a819ab8..3ef9906 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
@@ -184,7 +184,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
* @return Size.
* @throws IgniteCheckedException If failed.
*/
- private long size(String cacheName, GridKernal g) throws IgniteCheckedException {
+ private long size(String cacheName, IgniteKernal g) throws IgniteCheckedException {
if (offheap)
return g.cache(cacheName).offHeapEntriesCount();
@@ -204,7 +204,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
try {
Ignite ignite1 = startGrid(1);
- GridKernal grid2 = (GridKernal)startGrid(2);
+ IgniteKernal grid2 = (IgniteKernal)startGrid(2);
GridCache<Integer, Object> cache1 = ignite1.cache(cacheName);
GridCache<Integer, Object> cache2 = grid2.cache(cacheName);
@@ -273,7 +273,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
* @param grid Kernal.
* @return Name for swap space.
*/
- private String swapSpaceName(String cacheName, GridKernal grid) {
+ private String swapSpaceName(String cacheName, IgniteKernal grid) {
GridCacheContext<Object, Object> cctx = grid.internalCache(cacheName).context();
return CU.swapSpaceName(cctx.isNear() ? cctx.near().dht().context() : cctx);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
index f25218a..492c621 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
@@ -230,7 +230,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
g.cache(null).put(KEY, VAL);
// Register listener.
- ((GridKernal)g).context().io().addMessageListener(
+ ((IgniteKernal)g).context().io().addMessageListener(
TOPIC_CACHE,
new GridMessageListener() {
@Override public void onMessage(UUID nodeId, Object msg) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index 6902ce2..5cf7383 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
@@ -205,7 +205,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
* @return Random entry from cache.
*/
@Nullable private CacheEntry<Integer, Object> randomEntry(Ignite g) {
- GridKernal g1 = (GridKernal)g;
+ IgniteKernal g1 = (IgniteKernal)g;
return g1.<Integer, Object>internalCache().randomEntry();
}
@@ -216,8 +216,8 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
private void checkCachesConsistency(Ignite ignite1, Ignite ignite2) throws Exception {
- GridKernal g1 = (GridKernal) ignite1;
- GridKernal g2 = (GridKernal) ignite2;
+ IgniteKernal g1 = (IgniteKernal) ignite1;
+ IgniteKernal g2 = (IgniteKernal) ignite2;
GridCacheAdapter<Integer, Object> cache1 = g1.internalCache();
GridCacheAdapter<Integer, Object> cache2 = g2.internalCache();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
index 10e60c2..ade174f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
@@ -85,7 +85,7 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes
assertNotNull(g);
assertTrue("Affinity node doesn't contain internal key [key=" + internalKey + ", node=" + n + ']',
- ((GridNearCacheAdapter)((GridKernal)g).internalCache()).dht().containsKey(internalKey, null));
+ ((GridNearCacheAdapter)((IgniteKernal)g).internalCache()).dht().containsKey(internalKey, null));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
index 140063a..4d031ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java
@@ -74,7 +74,7 @@ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest {
*/
public void testWarningOutput() throws Exception {
try {
- GridKernal g = (GridKernal)startGrid(1);
+ IgniteKernal g = (IgniteKernal)startGrid(1);
info(">>> Slow tx timeout is not set, long-live txs simulated.");
@@ -109,7 +109,7 @@ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest {
private void checkCache(Ignite g, String cacheName, boolean simulateTimeout,
boolean configureTimeout) throws Exception {
if (configureTimeout) {
- GridCacheAdapter<Integer, Integer> cache = ((GridKernal)g).internalCache(cacheName);
+ GridCacheAdapter<Integer, Integer> cache = ((IgniteKernal)g).internalCache(cacheName);
cache.context().tm().slowTxWarnTimeout(500);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
index 1fcda7e..94fd587 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
@@ -82,7 +82,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest {
c.put(1, "Cached value");
- GridCacheEntryEx<Object, Object> entry = ((GridKernal)g1).internalCache().peekEx(1);
+ GridCacheEntryEx<Object, Object> entry = ((IgniteKernal)g1).internalCache().peekEx(1);
assert entry != null;
assert entry.valueBytes().isNull();
@@ -103,7 +103,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest {
c.put(1, "Cached value");
- GridCacheEntryEx<Object, Object> entry = ((GridKernal)g1).internalCache().peekEx(1);
+ GridCacheEntryEx<Object, Object> entry = ((IgniteKernal)g1).internalCache().peekEx(1);
assert entry != null;
assert entry.valueBytes() != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java
index b983c07..7f49e27 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java
@@ -207,7 +207,7 @@ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest {
* @return Swap space name.
*/
private String spaceName() {
- return CU.swapSpaceName(((GridKernal)grid()).internalCache().context());
+ return CU.swapSpaceName(((IgniteKernal)grid()).internalCache().context());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
index b0b1e50..6b97f9a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerLoadTest.java
@@ -38,7 +38,7 @@ public class GridCacheTtlManagerLoadTest extends GridCacheTtlManagerSelfTest {
public void testLoad() throws Exception {
cacheMode = REPLICATED;
- final GridKernal g = (GridKernal)startGrid(0);
+ final IgniteKernal g = (IgniteKernal)startGrid(0);
try {
final AtomicBoolean stop = new AtomicBoolean();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
index 1709fac..adb2d40 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java
@@ -91,7 +91,7 @@ public class GridCacheTtlManagerSelfTest extends GridCommonAbstractTest {
private void checkTtl(CacheMode mode) throws Exception {
cacheMode = mode;
- final GridKernal g = (GridKernal)startGrid(0);
+ final IgniteKernal g = (IgniteKernal)startGrid(0);
try {
final String key = "key";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
index 6f0b1d6..095e621 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
@@ -77,7 +77,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
super.afterTest();
for (int i = 0; i < gridCount(); i++) {
- GridContinuousProcessor proc = ((GridKernal)grid(i)).context().continuous();
+ GridContinuousProcessor proc = ((IgniteKernal)grid(i)).context().continuous();
ConcurrentMap<?, ?> syncMsgFuts = GridTestUtils.getFieldValue(proc, "syncMsgFuts");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
index c4dca58..00d0ccf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
@@ -280,7 +280,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
if (printMemoryStats()) {
if (cntr.getAndIncrement() % 100 == 0)
// Print transaction memory stats.
- ((GridKernal)grid(gridIdx)).internalCache().context().tm().printMemoryStats();
+ ((IgniteKernal)grid(gridIdx)).internalCache().context().tm().printMemoryStats();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java
index ee07f72..421c195 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
@@ -74,7 +73,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra
* @return Near cache.
*/
GridNearCacheAdapter<String, Integer> near(Ignite g) {
- return (GridNearCacheAdapter<String, Integer>)((GridKernal)g).<String, Integer>internalCache();
+ return (GridNearCacheAdapter<String, Integer>)((IgniteKernal)g).<String, Integer>internalCache();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
index 6aa8acb..cecb254 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
@@ -346,7 +346,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac
info("Check key: " + key);
for (int i = 0; i < gridCount(); i++) {
- GridKernal grid = (GridKernal) grid(i);
+ IgniteKernal grid = (IgniteKernal) grid(i);
GridCacheAdapter cache = grid.internalCache(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
index 719b7fc..724929d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
@@ -129,7 +129,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
Ignite g = G.ignite(nodeId);
GridDhtCacheAdapter<Object, Integer> dht =
- ((GridKernal)g).<Object, Integer>internalCache().context().near().dht();
+ ((IgniteKernal)g).<Object, Integer>internalCache().context().near().dht();
return dht.peekEx(key);
}
@@ -142,7 +142,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
@Nullable private static GridCacheEntryEx<Object, Integer> nearEntry(UUID nodeId, Object key) {
Ignite g = G.ignite(nodeId);
- GridNearCacheAdapter<Object, Integer> near = ((GridKernal)g).<Object, Integer>internalCache().context().near();
+ GridNearCacheAdapter<Object, Integer> near = ((IgniteKernal)g).<Object, Integer>internalCache().context().near();
return near.peekEx(key);
}
@@ -460,7 +460,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe
onRemoveItemQueried(putCntr, ignite, i);
if (i % 50 == 0)
- ((GridKernal) ignite).internalCache().context().tm().printMemoryStats();
+ ((IgniteKernal) ignite).internalCache().context().tm().printMemoryStats();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
index afe9afe..ccd0b61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
@@ -349,7 +349,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb
info("Check key: " + key);
for (int i = 0; i < gridCount(); i++) {
- GridKernal grid = (GridKernal) grid(i);
+ IgniteKernal grid = (IgniteKernal) grid(i);
GridCacheAdapter cache = grid.internalCache(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
index a29d461..30bae26 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java
@@ -365,7 +365,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte
CacheAffinity<Object> aff = grid(0).cache(null).affinity();
for (int i = 0; i < gridCount(); i++) {
- for (GridCacheEntryEx e : ((GridKernal)grid(i)).context().cache().internalCache().map().allEntries0()) {
+ for (GridCacheEntryEx e : ((IgniteKernal)grid(i)).context().cache().internalCache().map().allEntries0()) {
if (aff.isPrimary(grid(i).localNode(), e.key()) && e.key() instanceof GridCacheQueueHeaderKey)
return i;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
index 763135d..e00fa58 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
@@ -392,7 +392,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl
// Ensure latch is removed on all nodes.
for (Ignite g : G.allGrids())
- assert ((GridKernal)g).internalCache(cacheName).context().dataStructures().
+ assert ((IgniteKernal)g).internalCache(cacheName).context().dataStructures().
countDownLatch(latchName, 10, true, false) == null;
checkRemovedLatch(latch);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index 131e7b4..412f2e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -178,7 +178,7 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest {
for (int i = 0; i < gridCount(); i++) {
Iterator<GridCacheEntryEx<Object, Object>> entries =
- ((GridKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator();
+ ((IgniteKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator();
while (entries.hasNext()) {
cnt++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 47d4daa..723a7ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -93,7 +93,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
assertSetIteratorsCleared();
for (int i = 0; i < gridCount(); i++) {
- GridKernal grid = (GridKernal)grid(i);
+ IgniteKernal grid = (IgniteKernal)grid(i);
GridCacheDataStructuresManager ds = grid.internalCache(null).context().dataStructures();
@@ -112,7 +112,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
*/
private void assertSetIteratorsCleared() {
for (int i = 0; i < gridCount(); i++) {
- GridKernal grid = (GridKernal) grid(i);
+ IgniteKernal grid = (IgniteKernal) grid(i);
GridCacheQueryManager queries = grid.internalCache(null).context().queries();
@@ -623,7 +623,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
UUID setNodeId = null;
for (int i = 0; i < gridCount(); i++) {
- GridKernal grid = (GridKernal)grid(i);
+ IgniteKernal grid = (IgniteKernal)grid(i);
Iterator<GridCacheEntryEx<Object, Object>> entries =
grid.context().cache().internalCache("noBackupsCache").map().allEntries0().iterator();
@@ -805,7 +805,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf
for (int i = 0; i < gridCount(); i++) {
Iterator<GridCacheEntryEx<Object, Object>> entries =
- ((GridKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator();
+ ((IgniteKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator();
while (entries.hasNext()) {
GridCacheEntryEx<Object, Object> entry = entries.next();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
index efcc227..c6a173c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java
@@ -189,7 +189,7 @@ public class GridCacheSetFailoverAbstractSelfTest extends GridCacheAbstractSelfT
for (int i = 0; i < gridCount(); i++) {
Iterator<GridCacheEntryEx<Object, Object>> entries =
- ((GridKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator();
+ ((IgniteKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator();
while (entries.hasNext()) {
GridCacheEntryEx<Object, Object> entry = entries.next();