Repository: incubator-ignite Updated Branches: refs/heads/ignite-648 fbcb8275d -> 2a47e7068
ignite-648: Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a47e706 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a47e706 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a47e706 Branch: refs/heads/ignite-648 Commit: 2a47e7068e310dee61b94b1e6968e58108df8b23 Parents: fbcb827 Author: Artem Shutak <[email protected]> Authored: Wed Apr 15 11:28:13 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Wed Apr 15 11:28:13 2015 +0300 ---------------------------------------------------------------------- ...CachePartitionedMultiJvmFullApiSelfTest.java | 36 ++++---- .../cache/multijvm/IgniteExProxy.java | 27 ++++-- .../internal/multijvm/IgniteNodeRunner.java | 90 -------------------- 3 files changed, 38 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a47e706/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java index 2f30e6b..c94eccb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedMultiJvmFullApiSelfTest.java @@ -134,24 +134,24 @@ public class GridCachePartitionedMultiJvmFullApiSelfTest extends GridCachePartit for (int i = 0; i < size; i++) putMap.put(i, i * i); -// IgniteEx grid0 = grid(0); -//kill -9 16067 -// IgniteCache<Object, Object> c0 = grid0.cache(null); -// -// IgniteEx grid1 = grid(1); -// -// IgniteCache<Object, Object> c1 = grid1.cache(null); -// -// c0.putAll(putMap); -// -// atomicClockModeDelay(c0); -// -// c1.removeAll(putMap.keySet()); -// -// for (int i = 0; i < size; i++) { -// assertNull(c0.get(i)); -// assertNull(c1.get(i)); -// } + IgniteEx grid0 = grid(0); + + IgniteCache<Object, Object> c0 = grid0.cache(null); + + IgniteEx grid1 = grid(1); + + IgniteCache<Object, Object> c1 = grid1.cache(null); + + c0.putAll(putMap); + + atomicClockModeDelay(c0); + + c1.removeAll(putMap.keySet()); + + for (int i = 0; i < size; i++) { + assertNull(c0.get(i)); + assertNull(c1.get(i)); + } for (IgniteExProxy ignite : ignites.values()) ignite.getProcess().kill(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a47e706/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java index 02381c3..d6e2478 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/IgniteExProxy.java @@ -26,7 +26,6 @@ import org.apache.ignite.internal.cluster.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.plugin.*; @@ -250,13 +249,27 @@ public class IgniteExProxy implements IgniteEx { @Override public <K, V> IgniteCache<K, V> cache(@Nullable final String name) { ClusterGroup grp = locJvmGrid.cluster().forNodeId(id); - return locJvmGrid.compute(grp).apply(new C1<Set<String>, IgniteCache<K,V>>() { - @Override public IgniteCache<K,V> apply(Set<String> objects) { - X.println(">>>>> Cache"); - - return Ignition.ignite().cache(name); + locJvmGrid.compute().broadcast(new IgniteRunnable() { + @Override public void run() { + System.out.println(">>>>> trololo"); } - }, Collections.<String>emptySet()); + }); + +// locJvmGrid.compute(grp).run(new IgniteRunnable() { +// @Override public void run() { +// X.println(">>>>> trololo"); +// } +// }); + +// return locJvmGrid.compute(grp).apply(new C1<Set<String>, IgniteCache<K,V>>() { +// @Override public IgniteCache<K,V> apply(Set<String> objects) { +// X.println(">>>>> Cache"); +// +// return Ignition.ignite().cache(name); +// } +// }, Collections.<String>emptySet()); +// + return null; } @Override public IgniteTransactions transactions() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a47e706/modules/spring/src/test/java/org/apache/ignite/internal/multijvm/IgniteNodeRunner.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/multijvm/IgniteNodeRunner.java b/modules/spring/src/test/java/org/apache/ignite/internal/multijvm/IgniteNodeRunner.java deleted file mode 100644 index 0e33baa..0000000 --- a/modules/spring/src/test/java/org/apache/ignite/internal/multijvm/IgniteNodeRunner.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.multijvm; - -import org.apache.ignite.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; - -/** - * Run ignite node. - */ -public class IgniteNodeRunner { - public static final String TASK_EXECUTED = "Event.TaskExecuted"; - public static final String EXECUTE_TASK = "Cmd.ExecuteTask="; - public static final String TASK_ARGS = ", Cmd.TaskArgs="; - public static final String STOP = "Cmd.Stop"; - - public static void main(String[] args) throws Exception { - try { - X.println(GridJavaProcess.PID_MSG_PREFIX + U.jvmPid()); - - assert args != null; - assert args.length >= 1; - - X.println("Starting Ignite Node..."); - - String cfg = args[0]; - - Ignite ignite = Ignition.start(cfg); - - // Read commands. - String cmd; - - final BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); - - boolean running = true; - - while (running) { - cmd = br.readLine(); - - X.println(">>>>> Got cmd [" + cmd + ']'); - - if (cmd.startsWith(EXECUTE_TASK)) { - String taskClsName = cmd.substring(EXECUTE_TASK.length(), cmd.indexOf(TASK_ARGS)); - String taskArgs = cmd.substring(cmd.indexOf(TASK_ARGS) + TASK_ARGS.length()); - - X.println(">>>>> Task=" + taskClsName + ", args=" + taskArgs); - - Task task = (Task)Class.forName(taskClsName).newInstance(); - - task.execute(ignite, taskArgs.split(" ")); - - X.println(TASK_EXECUTED); - } - else if (cmd.startsWith(STOP)) { - Ignition.stopAll(false); - - running = false; - } - } - } - catch (Throwable e) { - e.printStackTrace(); - - System.exit(1); - } - } - - public static interface Task { - boolean execute(Ignite ignite, String... args); - } -}
