[05/31] incubator-ignite git commit: # IGNITE-386: WIP on internal namings.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace354c6/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
new file mode 100644
index 000..6915d17
--- /dev/null
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
@@ -0,0 +1,552 @@
+/*
+ * 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.processors.hadoop;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.processors.hadoop.v2.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+import org.objectweb.asm.*;
+import org.objectweb.asm.commons.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.util.concurrent.atomic.*;
+
+/**
+ * Class loader allowing explicitly load classes without delegation to parent
class loader.
+ * Also supports class parsing for finding dependencies which contain
transitive dependencies
+ * unavailable for parent.
+ */
+public class HadoopClassLoader extends URLClassLoader {
+/**
+ * We are very parallel capable.
+ */
+static {
+registerAsParallelCapable();
+}
+
+/** */
+private static final URLClassLoader APP_CLS_LDR =
(URLClassLoader)HadoopClassLoader.class.getClassLoader();
+
+/** */
+private static final Collection appJars =
F.asList(APP_CLS_LDR.getURLs());
+
+/** */
+private static volatile Collection hadoopJars;
+
+/** */
+private static final Map cache = new
ConcurrentHashMap8<>();
+
+/** */
+private static final Map bytesCache = new
ConcurrentHashMap8<>();
+
+/**
+ * @param urls Urls.
+ */
+public HadoopClassLoader(URL[] urls) {
+super(addHadoopUrls(urls), APP_CLS_LDR);
+
+assert !(getParent() instanceof HadoopClassLoader);
+}
+
+/**
+ * Need to parse only Ignite Hadoop and IGFS classes.
+ *
+ * @param cls Class name.
+ * @return {@code true} if we need to check this class.
+ */
+private static boolean isIgfsHadoop(String cls) {
+String ignitePackagePrefix = "org.apache.ignite";
+int len = ignitePackagePrefix.length();
+
+return cls.startsWith(ignitePackagePrefix) && (cls.indexOf("igfs.",
len) != -1 || cls.indexOf(".fs.", len) != -1 || cls.indexOf("hadoop.", len) !=
-1);
+}
+
+/**
+ * @param cls Class name.
+ * @return {@code true} If this is Hadoop class.
+ */
+private static boolean isHadoop(String cls) {
+return cls.startsWith("org.apache.hadoop.");
+}
+
+/** {@inheritDoc} */
+@Override protected Class loadClass(String name, boolean resolve)
throws ClassNotFoundException {
+try {
+if (isHadoop(name)) { // Always load Hadoop classes explicitly,
since Hadoop can be available in App classpath.
+if (name.endsWith(".util.ShutdownHookManager")) // Dirty hack
to get rid of Hadoop shutdown hooks.
+return loadFromBytes(name,
GridHadoopShutdownHookManager.class.getName());
+else if (name.endsWith(".util.NativeCodeLoader"))
+return loadFromBytes(name,
GridHadoopNativeCodeLoader.class.getName());
+
+return loadClassExplicitly(name, resolve);
+}
+
+if (isIgfsHadoop(name)) { // For Ignite Hadoop and IGFS classes we
have to check if they depend on Hadoop.
+Boolean hasDeps = cache.get(name);
+
+if (hasDeps == null) {
+hasDeps = hasExternalDependencies(name, new
HashSet());
+
+cache.put(name, hasDeps);
+}
+
+if (hasDeps)
+return loadClassExplicitly(name, resolve);
+}
+
+return super.loadClass(name, resolve);
+}
+catch (NoClassDefFoundError | ClassNotFoundExc
[02/31] incubator-ignite git commit: # IGNITE-386: WIP on internal namings.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace354c6/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopEmbeddedTaskExecutor.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopEmbeddedTaskExecutor.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopEmbeddedTaskExecutor.java
new file mode 100644
index 000..f896daa
--- /dev/null
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopEmbeddedTaskExecutor.java
@@ -0,0 +1,146 @@
+/*
+ * 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.processors.hadoop.taskexecutor;
+
+import org.apache.ignite.*;
+import org.apache.ignite.internal.processors.hadoop.*;
+import org.apache.ignite.internal.processors.hadoop.jobtracker.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+import java.util.*;
+import java.util.concurrent.*;
+
+
+/**
+ * Task executor.
+ */
+public class HadoopEmbeddedTaskExecutor extends HadoopTaskExecutorAdapter {
+/** Job tracker. */
+private HadoopJobTracker jobTracker;
+
+/** */
+private final ConcurrentMap> jobs = new ConcurrentHashMap<>();
+
+/** Executor service to run tasks. */
+private GridHadoopExecutorService exec;
+
+/** {@inheritDoc} */
+@Override public void onKernalStart() throws IgniteCheckedException {
+super.onKernalStart();
+
+jobTracker = ctx.jobTracker();
+
+exec = new GridHadoopExecutorService(log,
ctx.kernalContext().gridName(),
+ctx.configuration().getMaxParallelTasks(),
ctx.configuration().getMaxTaskQueueSize());
+}
+
+/** {@inheritDoc} */
+@Override public void onKernalStop(boolean cancel) {
+if (exec != null) {
+exec.shutdown(3000);
+
+if (cancel) {
+for (GridHadoopJobId jobId : jobs.keySet())
+cancelTasks(jobId);
+}
+}
+}
+
+/** {@inheritDoc} */
+@Override public void stop(boolean cancel) {
+if (exec != null && !exec.shutdown(3))
+U.warn(log, "Failed to finish running tasks in 30 sec.");
+}
+
+/** {@inheritDoc} */
+@Override public void run(final GridHadoopJob job,
Collection tasks) throws IgniteCheckedException {
+if (log.isDebugEnabled())
+log.debug("Submitting tasks for local execution [locNodeId=" +
ctx.localNodeId() +
+", tasksCnt=" + tasks.size() + ']');
+
+Collection executedTasks = jobs.get(job.id());
+
+if (executedTasks == null) {
+executedTasks = new GridConcurrentHashSet<>();
+
+Collection extractedCol =
jobs.put(job.id(), executedTasks);
+
+assert extractedCol == null;
+}
+
+final Collection finalExecutedTasks =
executedTasks;
+
+for (final GridHadoopTaskInfo info : tasks) {
+assert info != null;
+
+GridHadoopRunnableTask task = new GridHadoopRunnableTask(log, job,
ctx.shuffle().memory(), info,
+ctx.localNodeId()) {
+@Override protected void onTaskFinished(GridHadoopTaskStatus
status) {
+if (log.isDebugEnabled())
+log.debug("Finished task execution [jobId=" + job.id()
+ ", taskInfo=" + info + ", " +
+"waitTime=" + waitTime() + ", execTime=" +
executionTime() + ']');
+
+finalExecutedTasks.remove(this);
+
+jobTracker.onTaskFinished(info, status);
+}
+
+@Override protected GridHadoopTaskInput
createInput(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
+return ctx.shuffle().input(taskCtx);
+}
+
+@Override protected GridHadoopTaskOutput
createOutput(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
+return ctx.shuffle().output(taskCtx);
+}
+
[22/31] incubator-ignite git commit: # IGNITE-386: WIP on internal namings (3).
# IGNITE-386: WIP on internal namings (3). Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1c4b00d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c4b00d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c4b00d4 Branch: refs/heads/ignite-386 Commit: 1c4b00d4131fef7e05a661516b2b2f8fd480bb2e Parents: 288709a Author: vozerov-gridgain Authored: Tue Mar 3 16:01:21 2015 +0300 Committer: vozerov-gridgain Committed: Tue Mar 3 16:01:21 2015 +0300 -- .../processors/hadoop/HadoopClassLoader.java|4 +- .../processors/hadoop/HadoopCounters.java |4 +- .../processors/hadoop/HadoopDefaultJobInfo.java |2 +- .../internal/processors/hadoop/HadoopUtils.java |6 +- .../taskexecutor/GridHadoopRunnableTask.java| 268 .../HadoopEmbeddedTaskExecutor.java | 16 +- .../taskexecutor/HadoopExecutorService.java |4 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 268 .../external/HadoopExternalTaskExecutor.java|8 +- .../child/GridHadoopChildProcessRunner.java | 440 -- .../child/GridHadoopExternalProcessStarter.java | 296 .../child/HadoopChildProcessRunner.java | 440 ++ .../child/HadoopExternalProcessStarter.java | 296 .../GridHadoopAbstractCommunicationClient.java | 96 -- .../GridHadoopCommunicationClient.java | 72 - .../GridHadoopExternalCommunication.java| 1431 -- .../GridHadoopHandshakeTimeoutException.java| 42 - .../GridHadoopIpcToNioAdapter.java | 239 --- .../GridHadoopMarshallerFilter.java | 84 - .../GridHadoopMessageListener.java | 39 - .../GridHadoopTcpNioCommunicationClient.java| 99 -- .../HadoopAbstractCommunicationClient.java | 96 ++ .../HadoopCommunicationClient.java | 72 + .../HadoopExternalCommunication.java| 1431 ++ .../HadoopHandshakeTimeoutException.java| 42 + .../communication/HadoopIpcToNioAdapter.java| 239 +++ .../communication/HadoopMarshallerFilter.java | 84 + .../communication/HadoopMessageListener.java| 39 + .../HadoopTcpNioCommunicationClient.java| 99 ++ .../hadoop/v1/GridHadoopV1CleanupTask.java | 62 - .../hadoop/v1/GridHadoopV1Counter.java | 105 -- .../hadoop/v1/GridHadoopV1MapTask.java | 111 -- .../hadoop/v1/GridHadoopV1OutputCollector.java | 130 -- .../hadoop/v1/GridHadoopV1Partitioner.java | 44 - .../hadoop/v1/GridHadoopV1ReduceTask.java | 92 -- .../hadoop/v1/GridHadoopV1Reporter.java | 79 - .../hadoop/v1/GridHadoopV1SetupTask.java| 56 - .../hadoop/v1/GridHadoopV1Splitter.java | 97 -- .../processors/hadoop/v1/GridHadoopV1Task.java | 95 -- .../hadoop/v1/HadoopV1CleanupTask.java | 62 + .../processors/hadoop/v1/HadoopV1Counter.java | 105 ++ .../processors/hadoop/v1/HadoopV1MapTask.java | 111 ++ .../hadoop/v1/HadoopV1OutputCollector.java | 130 ++ .../hadoop/v1/HadoopV1Partitioner.java | 44 + .../hadoop/v1/HadoopV1ReduceTask.java | 92 ++ .../processors/hadoop/v1/HadoopV1Reporter.java | 79 + .../processors/hadoop/v1/HadoopV1SetupTask.java | 56 + .../processors/hadoop/v1/HadoopV1Splitter.java | 97 ++ .../processors/hadoop/v1/HadoopV1Task.java | 95 ++ .../hadoop/v2/GridHadoopExternalSplit.java | 87 -- .../hadoop/v2/GridHadoopNativeCodeLoader.java | 74 - .../v2/GridHadoopSerializationWrapper.java | 133 -- .../v2/GridHadoopShutdownHookManager.java | 96 -- .../hadoop/v2/GridHadoopSplitWrapper.java | 118 -- .../hadoop/v2/GridHadoopV2CleanupTask.java | 73 - .../hadoop/v2/GridHadoopV2Context.java | 230 --- .../hadoop/v2/GridHadoopV2Counter.java | 87 -- .../processors/hadoop/v2/GridHadoopV2Job.java | 280 .../v2/GridHadoopV2JobResourceManager.java | 305 .../hadoop/v2/GridHadoopV2MapTask.java | 109 -- .../hadoop/v2/GridHadoopV2Partitioner.java | 44 - .../hadoop/v2/GridHadoopV2ReduceTask.java | 88 -- .../hadoop/v2/GridHadoopV2SetupTask.java| 66 - .../hadoop/v2/GridHadoopV2Splitter.java | 105 -- .../processors/hadoop/v2/GridHadoopV2Task.java | 181 --- .../hadoop/v2/GridHadoopV2TaskContext.java | 443 -- .../v2/GridHadoopWritableSerialization.java | 74 - .../hadoop/v2/HadoopExternalSplit.java | 87 ++ .../hadoop/v2/HadoopNativeCodeLoader.java | 74 + .../hadoop/v2/HadoopSerializationWrapper.java | 133 ++ .../hadoop/v2/HadoopShutdownHookManager.java| 96 ++ .../hadoop/v2/HadoopSplitWrapper.java | 118 ++ .../hadoop/v2/HadoopV2CleanupTask.java | 73 + ..
[01/31] incubator-ignite git commit: # IGNITE-386: WIP on internal namings.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-386 7d46deb24 -> e1ffc10f6
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace354c6/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java
index 5fad86f..1688dec 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java
@@ -40,7 +40,7 @@ public class IgfsEventsTestSuite extends TestSuite {
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
-GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
+HadoopClassLoader ldr = new HadoopClassLoader(null);
TestSuite suite = new TestSuite("Ignite FS Events Test Suite");
@@ -60,7 +60,7 @@ public class IgfsEventsTestSuite extends TestSuite {
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suiteNoarchOnly() throws Exception {
-GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
+HadoopClassLoader ldr = new HadoopClassLoader(null);
TestSuite suite = new TestSuite("Ignite IGFS Events Test Suite Noarch
Only");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace354c6/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoaderTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoaderTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoaderTest.java
deleted file mode 100644
index 767be7c..000
---
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoaderTest.java
+++ /dev/null
@@ -1,69 +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.processors.hadoop;
-
-import junit.framework.*;
-import org.apache.hadoop.mapreduce.*;
-
-/**
- *
- */
-public class GridHadoopClassLoaderTest extends TestCase {
-/** */
-GridHadoopClassLoader ldr = new GridHadoopClassLoader(null);
-
-/**
- * @throws Exception If failed.
- */
-public void testClassLoading() throws Exception {
-assertNotSame(Test1.class, ldr.loadClass(Test1.class.getName()));
-assertNotSame(Test2.class, ldr.loadClass(Test2.class.getName()));
-assertSame(Test3.class, ldr.loadClass(Test3.class.getName()));
-}
-
-//public void testDependencySearch() {
-//assertTrue(ldr.hasExternalDependencies(Test1.class.getName(), new
HashSet()));
-//assertTrue(ldr.hasExternalDependencies(Test2.class.getName(), new
HashSet()));
-//}
-
-/**
- *
- */
-private static class Test1 {
-/** */
-Test2 t2;
-
-/** */
-Job[][] jobs = new Job[4][4];
-}
-
-/**
- *
- */
-private static abstract class Test2 {
-/** */
-abstract Test1 t1();
-}
-
-/**
- *
- */
-private static class Test3 {
-// No-op.
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace354c6/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java
index 80cd226..7e2b2de 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java
@@ -169,7 +169,7 @@ public class GridHado
[20/31] incubator-ignite git commit: # IGNITE-386: WIP on internal namings (3).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c4b00d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopAbstractCommunicationClient.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopAbstractCommunicationClient.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopAbstractCommunicationClient.java
new file mode 100644
index 000..3a5d84a
--- /dev/null
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopAbstractCommunicationClient.java
@@ -0,0 +1,96 @@
+/*
+ * 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.processors.hadoop.taskexecutor.external.communication;
+
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+import java.util.concurrent.atomic.*;
+
+/**
+ * Implements basic lifecycle for communication clients.
+ */
+public abstract class HadoopAbstractCommunicationClient implements
HadoopCommunicationClient {
+/** Time when this client was last used. */
+private volatile long lastUsed = U.currentTimeMillis();
+
+/** Reservations. */
+private final AtomicInteger reserves = new AtomicInteger();
+
+/** {@inheritDoc} */
+@Override public boolean close() {
+return reserves.compareAndSet(0, -1);
+}
+
+/** {@inheritDoc} */
+@Override public void forceClose() {
+reserves.set(-1);
+}
+
+/** {@inheritDoc} */
+@Override public boolean closed() {
+return reserves.get() == -1;
+}
+
+/** {@inheritDoc} */
+@Override public boolean reserve() {
+while (true) {
+int r = reserves.get();
+
+if (r == -1)
+return false;
+
+if (reserves.compareAndSet(r, r + 1))
+return true;
+}
+}
+
+/** {@inheritDoc} */
+@Override public void release() {
+while (true) {
+int r = reserves.get();
+
+if (r == -1)
+return;
+
+if (reserves.compareAndSet(r, r - 1))
+return;
+}
+}
+
+/** {@inheritDoc} */
+@Override public boolean reserved() {
+return reserves.get() > 0;
+}
+
+/** {@inheritDoc} */
+@Override public long getIdleTime() {
+return U.currentTimeMillis() - lastUsed;
+}
+
+/**
+ * Updates used time.
+ */
+protected void markUsed() {
+lastUsed = U.currentTimeMillis();
+}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return S.toString(HadoopAbstractCommunicationClient.class, this);
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c4b00d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopCommunicationClient.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopCommunicationClient.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopCommunicationClient.java
new file mode 100644
index 000..ce42e9a
--- /dev/null
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopCommunicationClient.java
@@ -0,0 +1,72 @@
+/*
+ * 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
[13/31] incubator-ignite git commit: # IGNITE-386: WIP on internal namings (2).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/288709a1/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
deleted file mode 100644
index 342cbab..000
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
+++ /dev/null
@@ -1,434 +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.processors.hadoop.planner;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.igfs.hadoop.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.resources.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.IgniteFs.*;
-
-/**
- * Default map-reduce planner implementation.
- */
-public class GridHadoopDefaultMapReducePlanner implements
GridHadoopMapReducePlanner {
-/** Injected grid. */
-@IgniteInstanceResource
-private Ignite ignite;
-
-/** Logger. */
-@SuppressWarnings("UnusedDeclaration")
-@LoggerResource
-private IgniteLogger log;
-
-/** {@inheritDoc} */
-@Override public GridHadoopMapReducePlan preparePlan(GridHadoopJob job,
Collection top,
-@Nullable GridHadoopMapReducePlan oldPlan) throws
IgniteCheckedException {
-// Convert collection of topology nodes to collection of topology node
IDs.
-Collection topIds = new HashSet<>(top.size(), 1.0f);
-
-for (ClusterNode topNode : top)
-topIds.add(topNode.id());
-
-Map> mappers = mappers(top,
topIds, job.input());
-
-int rdcCnt = job.info().reducers();
-
-if (rdcCnt < 0)
-throw new IgniteCheckedException("Number of reducers must be
non-negative, actual: " + rdcCnt);
-
-Map reducers = reducers(top, mappers, rdcCnt);
-
-return new GridHadoopDefaultMapReducePlan(mappers, reducers);
-}
-
-/**
- * Create plan for mappers.
- *
- * @param top Topology nodes.
- * @param topIds Topology node IDs.
- * @param splits Splits.
- * @return Mappers map.
- * @throws IgniteCheckedException If failed.
- */
-private Map>
mappers(Collection top, Collection topIds,
-Iterable splits) throws IgniteCheckedException {
-Map> mappers = new HashMap<>();
-
-Map> nodes = hosts(top);
-
-Map nodeLoads = new HashMap<>(top.size(), 1.0f); //
Track node load.
-
-for (UUID nodeId : topIds)
-nodeLoads.put(nodeId, 0);
-
-for (GridHadoopInputSplit split : splits) {
-UUID nodeId = nodeForSplit(split, topIds, nodes, nodeLoads);
-
-if (log.isDebugEnabled())
-log.debug("Mapped split to node [split=" + split + ", nodeId="
+ nodeId + ']');
-
-Collection nodeSplits = mappers.get(nodeId);
-
-if (nodeSplits == null) {
-nodeSplits = new ArrayList<>();
-
-mappers.put(nodeId, nodeSplits);
-}
-
-nodeSplits.add(split);
-
-// Updated node load.
-nodeLoads.put(nodeId, nodeLoads.get(nodeId) + 1);
-}
-
-return mappers;
-}
-
-/**
- * Groups nodes by host names.
- *
- * @param top Topology to group.
- * @return Map.
- */
-private static Map> hosts(Collection
top) {
-Map> grouped = U.newHashMap(top.size());
-
-for (ClusterNode node : top) {
-for (String host : node.hostNames()) {
-Collection nodeIds = grouped.get(host);
-
-
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-237 [deleted] f144a892e
incubator-ignite git commit: # IGNITE-386: Compilation fixes.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-386 e1ffc10f6 -> 50487c00f
# IGNITE-386: Compilation fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50487c00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50487c00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50487c00
Branch: refs/heads/ignite-386
Commit: 50487c00fc9b9e4fc725dd33049e9d1159428b12
Parents: e1ffc10
Author: vozerov-gridgain
Authored: Tue Mar 3 16:34:27 2015 +0300
Committer: vozerov-gridgain
Committed: Tue Mar 3 16:34:27 2015 +0300
--
.../igfs/IgniteHadoopFileSystemAbstractSelfTest.java| 12 ++--
.../igfs/IgniteHadoopFileSystemClientSelfTest.java | 4 ++--
.../igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java| 10 +-
3 files changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50487c00/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
index 98817ee..3d6fe4a 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
@@ -412,15 +412,15 @@ public abstract class
IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
public void testIpcCache() throws Exception {
HadoopIgfsEx hadoop = GridTestUtils.getFieldValue(fs, "rmtClient",
"delegateRef", "value", "hadoop");
-if (hadoop instanceof HadoopOutProcIgfs) {
+if (hadoop instanceof HadoopIgfsOutProc) {
FileSystem fsOther = null;
try {
-Field field =
HadoopIpcIgfsIo.class.getDeclaredField("ipcCache");
+Field field =
HadoopIgfsIpcIo.class.getDeclaredField("ipcCache");
field.setAccessible(true);
-Map cache = (Map)field.get(null);
+Map cache = (Map)field.get(null);
Configuration cfg = configuration(PRIMARY_AUTHORITY,
skipEmbed, skipLocShmem);
@@ -441,13 +441,13 @@ public abstract class
IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
assertEquals(initSize, cache.size());
-Field stopField =
HadoopIpcIgfsIo.class.getDeclaredField("stopping");
+Field stopField =
HadoopIgfsIpcIo.class.getDeclaredField("stopping");
stopField.setAccessible(true);
-HadoopIpcIgfsIo io = null;
+HadoopIgfsIpcIo io = null;
-for (Map.Entry ioEntry :
cache.entrySet()) {
+for (Map.Entry ioEntry :
cache.entrySet()) {
if (endpoint.contains(ioEntry.getKey())) {
io = ioEntry.getValue();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50487c00/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java
index 0025da3..7f9aace 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java
@@ -125,7 +125,7 @@ public class IgniteHadoopFileSystemClientSelfTest extends
IgfsCommonAbstractTest
try {
switchHandlerErrorFlag(true);
-HadoopIgfs client = new HadoopOutProcIgfs("127.0.0.1", 10500,
getTestGridName(0), "igfs", LOG);
+HadoopIgfs client = new HadoopIgfsOutProc("127.0.0.1", 10500,
getTestGridName(0), "igfs", LOG);
client.handshake(null);
@@ -133,7 +133,7 @@ public class IgniteHadoopFileSystemClientSelfTest extends
IgfsCommonAbstractTest
HadoopIgfsStreamDelegate delegate = client.create(path, true,
false, 1, 1024, null);
-final HadoopOutputIgfsStream igfsOut = new
HadoopOutputIgfsStream(delegate, LOG,
+final HadoopIgfsOutputStream igfsOut = new
HadoopIgfsOutputStream(delegate, LOG,
IgfsLogger.disabledLogger(), 0);
// This call should return fine as exception is thrown for the
first time.
http://git-wip-us.apache.org
incubator-ignite git commit: Make IgniteEvents.withAsync() public (all method in the interfaces must be public)
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 2a68e64eb -> 6909cc4b4
Make IgniteEvents.withAsync() public (all method in the interfaces must be
public)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6909cc4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6909cc4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6909cc4b
Branch: refs/heads/sprint-2
Commit: 6909cc4b45f78dc6ab649462b075bf12a9047eb5
Parents: 2a68e64
Author: sevdokimov
Authored: Tue Mar 3 16:36:00 2015 +0300
Committer: sevdokimov
Committed: Tue Mar 3 16:36:00 2015 +0300
--
modules/core/src/main/java/org/apache/ignite/IgniteEvents.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6909cc4b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
index f6adecb..5a92900 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
@@ -257,5 +257,5 @@ public interface IgniteEvents extends IgniteAsyncSupport {
public boolean isEnabled(int type);
/** {@inheritDoc} */
-@Override IgniteEvents withAsync();
+@Override public IgniteEvents withAsync();
}
[1/5] incubator-ignite git commit: # IGNITE-386: Moving classes (5).
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-386 50487c00f -> 4c85f1209
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c85f120/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsWrapper.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsWrapper.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsWrapper.java
new file mode 100644
index 000..1dada21
--- /dev/null
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsWrapper.java
@@ -0,0 +1,511 @@
+/*
+ * 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.processors.hadoop.igfs;
+
+import org.apache.commons.logging.*;
+import org.apache.hadoop.conf.*;
+import org.apache.ignite.*;
+import org.apache.ignite.igfs.*;
+import org.apache.ignite.internal.processors.igfs.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.atomic.*;
+
+import static
org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsEndpoint.*;
+import static
org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsUtils.*;
+
+/**
+ * Wrapper for IGFS server.
+ */
+public class HadoopIgfsWrapper implements HadoopIgfs {
+/** Delegate. */
+private final AtomicReference delegateRef = new
AtomicReference<>();
+
+/** Authority. */
+private final String authority;
+
+/** Connection string. */
+private final HadoopIgfsEndpoint endpoint;
+
+/** Log directory. */
+private final String logDir;
+
+/** Configuration. */
+private final Configuration conf;
+
+/** Logger. */
+private final Log log;
+
+/**
+ * Constructor.
+ *
+ * @param authority Authority (connection string).
+ * @param logDir Log directory for server.
+ * @param conf Configuration.
+ * @param log Current logger.
+ */
+public HadoopIgfsWrapper(String authority, String logDir, Configuration
conf, Log log) throws IOException {
+try {
+this.authority = authority;
+this.endpoint = new HadoopIgfsEndpoint(authority);
+this.logDir = logDir;
+this.conf = conf;
+this.log = log;
+}
+catch (IgniteCheckedException e) {
+throw new IOException("Failed to parse endpoint: " + authority, e);
+}
+}
+
+/** {@inheritDoc} */
+@Override public IgfsHandshakeResponse handshake(String logDir) throws
IOException {
+return withReconnectHandling(new
FileSystemClosure() {
+@Override public IgfsHandshakeResponse apply(HadoopIgfsEx hadoop,
+IgfsHandshakeResponse hndResp) {
+return hndResp;
+}
+});
+}
+
+/** {@inheritDoc} */
+@Override public void close(boolean force) {
+Delegate delegate = delegateRef.get();
+
+if (delegate != null && delegateRef.compareAndSet(delegate, null))
+delegate.close(force);
+}
+
+/** {@inheritDoc} */
+@Override public IgfsFile info(final IgfsPath path) throws IOException {
+return withReconnectHandling(new FileSystemClosure() {
+@Override public IgfsFile apply(HadoopIgfsEx hadoop,
IgfsHandshakeResponse hndResp)
+throws IgniteCheckedException, IOException {
+return hadoop.info(path);
+}
+}, path);
+}
+
+/** {@inheritDoc} */
+@Override public IgfsFile update(final IgfsPath path, final Map props) throws IOException {
+return withReconnectHandling(new FileSystemClosure() {
+@Override public IgfsFile apply(HadoopIgfsEx hadoop,
IgfsHandshakeResponse hndResp)
+throws IgniteCheckedException, IOException {
+return hadoop.update(path, props);
+}
+}, path);
+}
+
+/** {@inheritDoc} */
+@Override public Boolean setTimes(fi
[3/5] incubator-ignite git commit: # IGNITE-386: Moving classes (5).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c85f120/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/HadoopIgfsWrapper.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/HadoopIgfsWrapper.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/HadoopIgfsWrapper.java
deleted file mode 100644
index 69e6503..000
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/HadoopIgfsWrapper.java
+++ /dev/null
@@ -1,511 +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.igfs.hadoop;
-
-import org.apache.commons.logging.*;
-import org.apache.hadoop.conf.*;
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.processors.igfs.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.igfs.hadoop.HadoopIgfsEndpoint.*;
-import static org.apache.ignite.internal.igfs.hadoop.HadoopIgfsUtils.*;
-
-/**
- * Wrapper for IGFS server.
- */
-public class HadoopIgfsWrapper implements HadoopIgfs {
-/** Delegate. */
-private final AtomicReference delegateRef = new
AtomicReference<>();
-
-/** Authority. */
-private final String authority;
-
-/** Connection string. */
-private final HadoopIgfsEndpoint endpoint;
-
-/** Log directory. */
-private final String logDir;
-
-/** Configuration. */
-private final Configuration conf;
-
-/** Logger. */
-private final Log log;
-
-/**
- * Constructor.
- *
- * @param authority Authority (connection string).
- * @param logDir Log directory for server.
- * @param conf Configuration.
- * @param log Current logger.
- */
-public HadoopIgfsWrapper(String authority, String logDir, Configuration
conf, Log log) throws IOException {
-try {
-this.authority = authority;
-this.endpoint = new HadoopIgfsEndpoint(authority);
-this.logDir = logDir;
-this.conf = conf;
-this.log = log;
-}
-catch (IgniteCheckedException e) {
-throw new IOException("Failed to parse endpoint: " + authority, e);
-}
-}
-
-/** {@inheritDoc} */
-@Override public IgfsHandshakeResponse handshake(String logDir) throws
IOException {
-return withReconnectHandling(new
FileSystemClosure() {
-@Override public IgfsHandshakeResponse apply(HadoopIgfsEx hadoop,
-IgfsHandshakeResponse hndResp) {
-return hndResp;
-}
-});
-}
-
-/** {@inheritDoc} */
-@Override public void close(boolean force) {
-Delegate delegate = delegateRef.get();
-
-if (delegate != null && delegateRef.compareAndSet(delegate, null))
-delegate.close(force);
-}
-
-/** {@inheritDoc} */
-@Override public IgfsFile info(final IgfsPath path) throws IOException {
-return withReconnectHandling(new FileSystemClosure() {
-@Override public IgfsFile apply(HadoopIgfsEx hadoop,
IgfsHandshakeResponse hndResp)
-throws IgniteCheckedException, IOException {
-return hadoop.info(path);
-}
-}, path);
-}
-
-/** {@inheritDoc} */
-@Override public IgfsFile update(final IgfsPath path, final Map props) throws IOException {
-return withReconnectHandling(new FileSystemClosure() {
-@Override public IgfsFile apply(HadoopIgfsEx hadoop,
IgfsHandshakeResponse hndResp)
-throws IgniteCheckedException, IOException {
-return hadoop.update(path, props);
-}
-}, path);
-}
-
-/** {@inheritDoc} */
-@Override public Boolean setTimes(final IgfsPath path, final long
accessTime, final long modificationTime)
-throws IOException {
-return withReconnectHandling(new FileSystemClosure() {
-
[4/5] incubator-ignite git commit: # IGNITE-386: Moving classes (5).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c85f120/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/HadoopIgfsIpcIo.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/HadoopIgfsIpcIo.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/HadoopIgfsIpcIo.java
deleted file mode 100644
index 47e5763..000
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/HadoopIgfsIpcIo.java
+++ /dev/null
@@ -1,599 +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.igfs.hadoop;
-
-import org.apache.commons.logging.*;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.igfs.common.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.ipc.*;
-import org.apache.ignite.internal.util.ipc.shmem.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-/**
- * IO layer implementation based on blocking IPC streams.
- */
-@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
-public class HadoopIgfsIpcIo implements HadoopIgfsIo {
-/** Logger. */
-private Log log;
-
-/** Request futures map. */
-private ConcurrentMap reqMap =
-new ConcurrentHashMap8<>();
-
-/** Request ID counter. */
-private AtomicLong reqIdCnt = new AtomicLong();
-
-/** Endpoint. */
-private IpcEndpoint endpoint;
-
-/** Endpoint output stream. */
-private IgfsDataOutputStream out;
-
-/** Protocol. */
-private final IgfsMarshaller marsh;
-
-/** Client reader thread. */
-private Thread reader;
-
-/** Lock for graceful shutdown. */
-private final ReadWriteLock busyLock = new ReentrantReadWriteLock();
-
-/** Stopping flag. */
-private volatile boolean stopping;
-
-/** Server endpoint address. */
-private final String endpointAddr;
-
-/** Number of open file system sessions. */
-private final AtomicInteger activeCnt = new AtomicInteger(1);
-
-/** Event listeners. */
-private final Collection lsnrs =
-new GridConcurrentHashSet<>();
-
-/** Cached connections. */
-private static final ConcurrentMap ipcCache =
-new ConcurrentHashMap8<>();
-
-/** Striped lock that prevents multiple instance creation in {@link
#get(Log, String)}. */
-private static final GridStripedLock initLock = new GridStripedLock(32);
-
-/**
- * @param endpointAddr Endpoint.
- * @param marsh Protocol.
- * @param log Logger to use.
- */
-public HadoopIgfsIpcIo(String endpointAddr, IgfsMarshaller marsh, Log log)
{
-assert endpointAddr != null;
-assert marsh != null;
-
-this.endpointAddr = endpointAddr;
-this.marsh = marsh;
-this.log = log;
-}
-
-/**
- * Returns a started and valid instance of this class
- * for a given endpoint.
- *
- * @param log Logger to use for new instance.
- * @param endpoint Endpoint string.
- * @return New or existing cached instance, which is started and
operational.
- * @throws IOException If new instance was created but failed to start.
- */
-public static HadoopIgfsIpcIo get(Log log, String endpoint) throws
IOException {
-while (true) {
-HadoopIgfsIpcIo clientIo = ipcCache.get(endpoint);
-
-if (clientIo != null) {
-if (clientIo.acquire())
-return clientIo;
-else
-// If concurrent close.
-ipcCache.remove(endpoint, clientIo);
-}
-else {
-Lock lock = initLock.getLock(endpoint);
-
-lock.lock();
-
-try {
-clientIo = ipcCache.get(endpoint);
-
-if (clientIo != null)
[5/5] incubator-ignite git commit: # IGNITE-386: Moving classes (5).
# IGNITE-386: Moving classes (5). Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4c85f120 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4c85f120 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4c85f120 Branch: refs/heads/ignite-386 Commit: 4c85f1209b49a895d3bdff5817cbad406e9e1739 Parents: 50487c0 Author: vozerov-gridgain Authored: Tue Mar 3 16:37:21 2015 +0300 Committer: vozerov-gridgain Committed: Tue Mar 3 16:37:21 2015 +0300 -- .../fs/IgniteHadoopSecondaryFileSystem.java | 2 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 4 +- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 4 +- .../ignite/internal/igfs/hadoop/HadoopIgfs.java | 198 -- .../HadoopIgfsCommunicationException.java | 57 -- .../igfs/hadoop/HadoopIgfsEndpoint.java | 210 --- .../internal/igfs/hadoop/HadoopIgfsEx.java | 88 --- .../internal/igfs/hadoop/HadoopIgfsFuture.java | 94 --- .../internal/igfs/hadoop/HadoopIgfsInProc.java | 409 .../igfs/hadoop/HadoopIgfsInputStream.java | 626 --- .../internal/igfs/hadoop/HadoopIgfsIo.java | 76 --- .../internal/igfs/hadoop/HadoopIgfsIpcIo.java | 599 -- .../igfs/hadoop/HadoopIgfsIpcIoListener.java| 36 -- .../igfs/hadoop/HadoopIgfsJclLogger.java| 112 .../internal/igfs/hadoop/HadoopIgfsOutProc.java | 466 -- .../igfs/hadoop/HadoopIgfsOutputStream.java | 201 -- .../igfs/hadoop/HadoopIgfsProperties.java | 88 --- .../igfs/hadoop/HadoopIgfsProxyInputStream.java | 335 -- .../hadoop/HadoopIgfsProxyOutputStream.java | 165 - .../internal/igfs/hadoop/HadoopIgfsReader.java | 104 --- .../igfs/hadoop/HadoopIgfsStreamDelegate.java | 96 --- .../hadoop/HadoopIgfsStreamEventListener.java | 39 -- .../internal/igfs/hadoop/HadoopIgfsUtils.java | 131 .../internal/igfs/hadoop/HadoopIgfsWrapper.java | 511 --- .../processors/hadoop/igfs/HadoopIgfs.java | 198 ++ .../igfs/HadoopIgfsCommunicationException.java | 57 ++ .../hadoop/igfs/HadoopIgfsEndpoint.java | 210 +++ .../processors/hadoop/igfs/HadoopIgfsEx.java| 88 +++ .../hadoop/igfs/HadoopIgfsFuture.java | 94 +++ .../hadoop/igfs/HadoopIgfsInProc.java | 409 .../hadoop/igfs/HadoopIgfsInputStream.java | 626 +++ .../processors/hadoop/igfs/HadoopIgfsIo.java| 76 +++ .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 599 ++ .../hadoop/igfs/HadoopIgfsIpcIoListener.java| 36 ++ .../hadoop/igfs/HadoopIgfsJclLogger.java| 112 .../hadoop/igfs/HadoopIgfsOutProc.java | 466 ++ .../hadoop/igfs/HadoopIgfsOutputStream.java | 201 ++ .../hadoop/igfs/HadoopIgfsProperties.java | 88 +++ .../hadoop/igfs/HadoopIgfsProxyInputStream.java | 335 ++ .../igfs/HadoopIgfsProxyOutputStream.java | 165 + .../hadoop/igfs/HadoopIgfsReader.java | 104 +++ .../hadoop/igfs/HadoopIgfsStreamDelegate.java | 96 +++ .../igfs/HadoopIgfsStreamEventListener.java | 39 ++ .../processors/hadoop/igfs/HadoopIgfsUtils.java | 131 .../hadoop/igfs/HadoopIgfsWrapper.java | 511 +++ .../planner/HadoopDefaultMapReducePlanner.java | 2 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 2 +- .../IgniteHadoopFileSystemClientSelfTest.java | 2 +- ...IgniteHadoopFileSystemHandshakeSelfTest.java | 2 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 +- 50 files changed, 4651 insertions(+), 4651 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c85f120/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopSecondaryFileSystem.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopSecondaryFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopSecondaryFileSystem.java index 9547e9f..44e2c20 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopSecondaryFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopSecondaryFileSystem.java @@ -24,7 +24,7 @@ import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.ipc.*; import org.apache.ignite.*; import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.igfs.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.igfs.*; import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-u
[2/5] incubator-ignite git commit: # IGNITE-386: Moving classes (5).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c85f120/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsIpcIo.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsIpcIo.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsIpcIo.java
new file mode 100644
index 000..c9c61fe
--- /dev/null
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsIpcIo.java
@@ -0,0 +1,599 @@
+/*
+ * 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.processors.hadoop.igfs;
+
+import org.apache.commons.logging.*;
+import org.apache.ignite.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.igfs.common.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.ipc.*;
+import org.apache.ignite.internal.util.ipc.shmem.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+import java.util.concurrent.locks.*;
+
+/**
+ * IO layer implementation based on blocking IPC streams.
+ */
+@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+public class HadoopIgfsIpcIo implements HadoopIgfsIo {
+/** Logger. */
+private Log log;
+
+/** Request futures map. */
+private ConcurrentMap reqMap =
+new ConcurrentHashMap8<>();
+
+/** Request ID counter. */
+private AtomicLong reqIdCnt = new AtomicLong();
+
+/** Endpoint. */
+private IpcEndpoint endpoint;
+
+/** Endpoint output stream. */
+private IgfsDataOutputStream out;
+
+/** Protocol. */
+private final IgfsMarshaller marsh;
+
+/** Client reader thread. */
+private Thread reader;
+
+/** Lock for graceful shutdown. */
+private final ReadWriteLock busyLock = new ReentrantReadWriteLock();
+
+/** Stopping flag. */
+private volatile boolean stopping;
+
+/** Server endpoint address. */
+private final String endpointAddr;
+
+/** Number of open file system sessions. */
+private final AtomicInteger activeCnt = new AtomicInteger(1);
+
+/** Event listeners. */
+private final Collection lsnrs =
+new GridConcurrentHashSet<>();
+
+/** Cached connections. */
+private static final ConcurrentMap ipcCache =
+new ConcurrentHashMap8<>();
+
+/** Striped lock that prevents multiple instance creation in {@link
#get(Log, String)}. */
+private static final GridStripedLock initLock = new GridStripedLock(32);
+
+/**
+ * @param endpointAddr Endpoint.
+ * @param marsh Protocol.
+ * @param log Logger to use.
+ */
+public HadoopIgfsIpcIo(String endpointAddr, IgfsMarshaller marsh, Log log)
{
+assert endpointAddr != null;
+assert marsh != null;
+
+this.endpointAddr = endpointAddr;
+this.marsh = marsh;
+this.log = log;
+}
+
+/**
+ * Returns a started and valid instance of this class
+ * for a given endpoint.
+ *
+ * @param log Logger to use for new instance.
+ * @param endpoint Endpoint string.
+ * @return New or existing cached instance, which is started and
operational.
+ * @throws IOException If new instance was created but failed to start.
+ */
+public static HadoopIgfsIpcIo get(Log log, String endpoint) throws
IOException {
+while (true) {
+HadoopIgfsIpcIo clientIo = ipcCache.get(endpoint);
+
+if (clientIo != null) {
+if (clientIo.acquire())
+return clientIo;
+else
+// If concurrent close.
+ipcCache.remove(endpoint, clientIo);
+}
+else {
+Lock lock = initLock.getLock(endpoint);
+
+lock.lock();
+
+try {
+clientIo = ipcCache.get(endp
[1/3] incubator-ignite git commit: # gg-9869: rename IgniteDataLoader -> IgniteDataStreamer + Impl
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-394 [created] d06158309
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0615830/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
new file mode 100644
index 000..3f94752
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
@@ -0,0 +1,1453 @@
+/*
+ * 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.processors.dataload;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.cluster.*;
+import org.apache.ignite.internal.managers.communication.*;
+import org.apache.ignite.internal.managers.deployment.*;
+import org.apache.ignite.internal.managers.eventstorage.*;
+import org.apache.ignite.internal.processors.affinity.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
+import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.dr.*;
+import org.apache.ignite.internal.processors.portable.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.future.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.Map.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.internal.GridTopic.*;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+
+/**
+ * Data loader implementation.
+ */
+@SuppressWarnings("unchecked")
+public class IgniteDataStreamerImpl implements IgniteDataStreamer,
Delayed {
+/** Isolated updater. */
+private static final Updater ISOLATED_UPDATER = new IsolatedUpdater();
+
+/** Cache updater. */
+private Updater updater = ISOLATED_UPDATER;
+
+/** */
+private byte[] updaterBytes;
+
+/** Max remap count before issuing an error. */
+private static final int DFLT_MAX_REMAP_CNT = 32;
+
+/** Log reference. */
+private static final AtomicReference logRef = new
AtomicReference<>();
+
+/** Cache name ({@code null} for default cache). */
+private final String cacheName;
+
+/** Portable enabled flag. */
+private final boolean portableEnabled;
+
+/**
+ * If {@code true} then data will be transferred in compact format (only
keys and values).
+ * Otherwise full map entry will be transferred (this is requires by DR
internal logic).
+ */
+private final boolean compact;
+
+/** Per-node buffer size. */
+@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+private int bufSize = DFLT_PER_NODE_BUFFER_SIZE;
+
+/** */
+private int parallelOps = DFLT_MAX_PARALLEL_OPS;
+
+/** */
+private long autoFlushFreq;
+
+/** Mapping. */
+@GridToStringInclude
+private ConcurrentMap bufMappings = new
ConcurrentHashMap8<>();
+
+/** Logger. */
+private IgniteLogger log;
+
+/** Discovery listener. */
+private final GridLocalEventListener discoLsnr;
+
+/** Context. */
+private final GridKernalContext ctx;
+
+/** Communication topic for responses. */
+private final Object topic;
+
+/** */
+private byte[] topicBytes;
+
+/** {@code True} if data loader has been cancelled. */
+private volatile boolean cancelled;
+
+/** Active futures of this data loader. */
+@GridT
[2/3] incubator-ignite git commit: # gg-9869: rename IgniteDataLoader -> IgniteDataStreamer + Impl
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0615830/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
deleted file mode 100644
index ed3bbcb..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++ /dev/null
@@ -1,1453 +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.processors.dataload;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.processors.portable.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-
-/**
- * Data loader implementation.
- */
-@SuppressWarnings("unchecked")
-public class IgniteDataLoaderImpl implements IgniteDataLoader,
Delayed {
-/** Isolated updater. */
-private static final Updater ISOLATED_UPDATER = new IsolatedUpdater();
-
-/** Cache updater. */
-private Updater updater = ISOLATED_UPDATER;
-
-/** */
-private byte[] updaterBytes;
-
-/** Max remap count before issuing an error. */
-private static final int DFLT_MAX_REMAP_CNT = 32;
-
-/** Log reference. */
-private static final AtomicReference logRef = new
AtomicReference<>();
-
-/** Cache name ({@code null} for default cache). */
-private final String cacheName;
-
-/** Portable enabled flag. */
-private final boolean portableEnabled;
-
-/**
- * If {@code true} then data will be transferred in compact format (only
keys and values).
- * Otherwise full map entry will be transferred (this is requires by DR
internal logic).
- */
-private final boolean compact;
-
-/** Per-node buffer size. */
-@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
-private int bufSize = DFLT_PER_NODE_BUFFER_SIZE;
-
-/** */
-private int parallelOps = DFLT_MAX_PARALLEL_OPS;
-
-/** */
-private long autoFlushFreq;
-
-/** Mapping. */
-@GridToStringInclude
-private ConcurrentMap bufMappings = new
ConcurrentHashMap8<>();
-
-/** Logger. */
-private IgniteLogger log;
-
-/** Discovery listener. */
-private final GridLocalEventListener discoLsnr;
-
-/** Context. */
-private final GridKernalContext ctx;
-
-/** Communication topic for responses. */
-private final Object topic;
-
-/** */
-private byte[] topicBytes;
-
-/** {@code True} if data loader has been cancelled. */
-private volatile boolean cancelled;
-
-/** Active futures of this data loader. */
-@GridToStringInclude
-private final Collection> activeFuts = new
GridConcurrentHashSet<>();
-
-/**
[3/3] incubator-ignite git commit: # gg-9869: rename IgniteDataLoader -> IgniteDataStreamer + Impl
# gg-9869: rename IgniteDataLoader -> IgniteDataStreamer + Impl
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0615830
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0615830
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0615830
Branch: refs/heads/ignite-394
Commit: d06158309ed7b9b4283ceb713743b1cdd3fa0ec8
Parents: 2a68e64
Author: Artem Shutak
Authored: Tue Mar 3 16:52:21 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 16:52:21 2015 +0300
--
.../datagrid/CacheDataLoaderExample.java|6 +-
.../datagrid/CachePopularNumbersExample.java|4 +-
.../src/main/java/org/apache/ignite/Ignite.java |8 +-
.../org/apache/ignite/IgniteDataLoader.java | 379 -
.../org/apache/ignite/IgniteDataStreamer.java | 379 +
.../apache/ignite/internal/IgniteKernal.java|2 +-
.../processors/cache/GridCacheAdapter.java | 10 +-
.../GridDistributedCacheAdapter.java|4 +-
.../dataload/GridDataLoadCacheUpdaters.java | 32 +-
.../dataload/GridDataLoadUpdateJob.java |4 +-
.../dataload/GridDataLoaderFuture.java |4 +-
.../dataload/GridDataLoaderProcessor.java | 16 +-
.../dataload/IgniteDataLoaderImpl.java | 1453 --
.../dataload/IgniteDataStreamerImpl.java| 1453 ++
.../dr/GridDrDataLoadCacheUpdater.java |2 +-
.../processors/igfs/IgfsDataManager.java| 10 +-
...iteTxConsistencyRestartAbstractSelfTest.java |2 +-
...idCachePartitionedHitsAndMissesSelfTest.java |4 +-
.../GridCacheLruNearEvictionPolicySelfTest.java |2 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java |2 +-
.../dataload/GridDataLoaderImplSelfTest.java|5 +-
.../dataload/GridDataLoaderPerformanceTest.java |2 +-
.../GridDataLoaderProcessorSelfTest.java| 27 +-
.../loadtests/colocation/GridTestMain.java |2 +-
.../loadtests/discovery/GridGcTimeoutTest.java |2 +-
.../mapper/GridContinuousMapperLoadTest1.java |2 +-
.../mapper/GridContinuousMapperLoadTest2.java |2 +-
.../ignite/testframework/junits/IgniteMock.java |4 +-
.../scala/org/apache/ignite/scalar/scalar.scala |8 +-
.../org/apache/ignite/IgniteSpringBean.java |2 +-
.../cache/IgniteSqlQueryBenchmark.java |2 +-
.../cache/IgniteSqlQueryJoinBenchmark.java |2 +-
32 files changed, 1918 insertions(+), 1918 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0615830/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
index 57b0cd2..4cdbfd4 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
@@ -21,8 +21,8 @@ import org.apache.ignite.*;
import org.apache.ignite.examples.*;
/**
- * Demonstrates how cache can be populated with data utilizing {@link
IgniteDataLoader} API.
- * {@link IgniteDataLoader} is a lot more efficient to use than standard
+ * Demonstrates how cache can be populated with data utilizing {@link
IgniteDataStreamer} API.
+ * {@link IgniteDataStreamer} is a lot more efficient to use than standard
* {@code put(...)} operation as it properly buffers cache requests
* together and properly manages load on remote nodes.
*
@@ -63,7 +63,7 @@ public class CacheDataLoaderExample {
long start = System.currentTimeMillis();
-try (IgniteDataLoader ldr =
ignite.dataLoader(CACHE_NAME)) {
+try (IgniteDataStreamer ldr =
ignite.dataLoader(CACHE_NAME)) {
// Configure loader.
ldr.perNodeBufferSize(1024);
ldr.perNodeParallelLoadOperations(8);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0615830/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
index 0f71681..1fc737b 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
@@ -92,7 +92,
incubator-ignite git commit: # gg-9869: rename GridDataLoaderProcessor -> IgniteDataStreamerProcessor + tests
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-394 d06158309 -> b27e1f3db
# gg-9869: rename GridDataLoaderProcessor -> IgniteDataStreamerProcessor + tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b27e1f3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b27e1f3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b27e1f3d
Branch: refs/heads/ignite-394
Commit: b27e1f3db751999f379fd60dd96380e77b65be4e
Parents: d061583
Author: Artem Shutak
Authored: Tue Mar 3 16:56:08 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 16:56:08 2015 +0300
--
.../ignite/internal/GridKernalContext.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 10 +-
.../apache/ignite/internal/IgniteKernal.java| 2 +-
.../dataload/GridDataLoaderProcessor.java | 316 ---
.../dataload/IgniteDataStreamerProcessor.java | 316 +++
.../GridDataLoaderProcessorSelfTest.java| 924 ---
.../IgniteDataStreamerProcessorSelfTest.java| 924 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +-
8 files changed, 1248 insertions(+), 1248 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b27e1f3d/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index cb9ffa1..c497c06 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -247,7 +247,7 @@ public interface GridKernalContext extends
Iterable {
*
* @return Data loader processor.
*/
-public GridDataLoaderProcessor dataLoad();
+public IgniteDataStreamerProcessor dataLoad();
/**
* Gets file system processor.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b27e1f3d/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 756c16a..71a357e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -202,7 +202,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
/** */
@GridToStringInclude
-private GridDataLoaderProcessor dataLdrProc;
+private IgniteDataStreamerProcessor dataLdrProc;
/** */
@GridToStringInclude
@@ -446,8 +446,8 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
affProc = (GridAffinityProcessor)comp;
else if (comp instanceof GridRestProcessor)
restProc = (GridRestProcessor)comp;
-else if (comp instanceof GridDataLoaderProcessor)
-dataLdrProc = (GridDataLoaderProcessor)comp;
+else if (comp instanceof IgniteDataStreamerProcessor)
+dataLdrProc = (IgniteDataStreamerProcessor)comp;
else if (comp instanceof IgfsProcessorAdapter)
igfsProc = (IgfsProcessorAdapter)comp;
else if (comp instanceof GridOffHeapProcessor)
@@ -660,8 +660,8 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
-@Override public GridDataLoaderProcessor dataLoad() {
-return (GridDataLoaderProcessor)dataLdrProc;
+@Override public IgniteDataStreamerProcessor dataLoad() {
+return (IgniteDataStreamerProcessor)dataLdrProc;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b27e1f3d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 336f872..2299f3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -753,7 +753,7 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
startProcessor(ctx, new GridTaskProcessor(ctx), attrs
[02/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (6).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSplitWrapperSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSplitWrapperSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSplitWrapperSelfTest.java
index 040730b..ee490be 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSplitWrapperSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSplitWrapperSelfTest.java
@@ -29,7 +29,7 @@ import java.util.concurrent.*;
/**
* Self test of {@link
org.apache.ignite.internal.processors.hadoop.v2.HadoopSplitWrapper}.
*/
-public class HadoopSplitWrapperSelfTest extends GridHadoopAbstractSelfTest {
+public class HadoopSplitWrapperSelfTest extends HadoopAbstractSelfTest {
/**
* Tests serialization of wrapper and the wrapped native split.
* @throws Exception If fails.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskExecutionSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskExecutionSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskExecutionSelfTest.java
new file mode 100644
index 000..a489f28
--- /dev/null
+++
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskExecutionSelfTest.java
@@ -0,0 +1,551 @@
+/*
+ * 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.processors.hadoop;
+
+import org.apache.hadoop.conf.*;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.*;
+import org.apache.hadoop.io.*;
+import org.apache.hadoop.mapreduce.*;
+import org.apache.hadoop.mapreduce.lib.input.*;
+import org.apache.hadoop.mapreduce.lib.output.*;
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.hadoop.fs.v1.*;
+import org.apache.ignite.igfs.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.testframework.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import static org.apache.ignite.internal.processors.hadoop.HadoopUtils.*;
+
+/**
+ * Tests map-reduce task execution basics.
+ */
+public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest {
+/** */
+private static GridHadoopSharedMap m =
GridHadoopSharedMap.map(HadoopTaskExecutionSelfTest.class);
+
+/** Line count. */
+private static final AtomicInteger totalLineCnt = m.put("totalLineCnt",
new AtomicInteger());
+
+/** Executed tasks. */
+private static final AtomicInteger executedTasks = m.put("executedTasks",
new AtomicInteger());
+
+/** Cancelled tasks. */
+private static final AtomicInteger cancelledTasks =
m.put("cancelledTasks", new AtomicInteger());
+
+/** Working directory of each task. */
+private static final Map taskWorkDirs =
m.put("taskWorkDirs",
+new ConcurrentHashMap());
+
+/** Mapper id to fail. */
+private static final AtomicInteger failMapperId = m.put("failMapperId",
new AtomicInteger());
+
+/** Number of splits of the current input. */
+private static final AtomicInteger splitsCount = m.put("splitsCount", new
AtomicInteger());
+
+/** Test param. */
+private static final String MAP_WRITE = "test.map.write";
+
+
+/** {@inheritDoc} */
+@Override public IgfsConfiguration igfsConfiguration() {
+IgfsConfiguration cfg = super.igfsConfiguration();
+
+cfg.setFragmentizerEnabled(false);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected
[13/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (7).
# IGNITE-386: Moving core classes (7). Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28fad185 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28fad185 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28fad185 Branch: refs/heads/ignite-386 Commit: 28fad1854ce1684bb941bd424430ea25ef870e7a Parents: 06525ca Author: vozerov-gridgain Authored: Tue Mar 3 17:14:08 2015 +0300 Committer: vozerov-gridgain Committed: Tue Mar 3 17:14:09 2015 +0300 -- config/hadoop/default-config.xml| 2 +- .../configuration/HadoopConfiguration.java | 173 +++ .../configuration/IgniteConfiguration.java | 7 +- .../ignite/internal/GridKernalContext.java | 2 +- .../ignite/internal/GridKernalContextImpl.java | 8 +- .../ignite/internal/IgniteComponentType.java| 2 +- .../hadoop/GridHadoopConfiguration.java | 172 --- .../processors/hadoop/GridHadoopCounters.java | 49 .../processors/hadoop/GridHadoopJobId.java | 103 --- .../processors/hadoop/GridHadoopJobInfo.java| 83 -- .../processors/hadoop/GridHadoopJobPhase.java | 38 --- .../hadoop/GridHadoopJobProperty.java | 138 - .../processors/hadoop/GridHadoopJobStatus.java | 207 - .../hadoop/GridHadoopMapReducePlan.java | 80 - .../hadoop/GridHadoopMapReducePlanner.java | 40 --- .../processors/hadoop/GridHadoopTaskInfo.java | 153 -- .../internal/processors/hadoop/Hadoop.java | 16 +- .../processors/hadoop/HadoopCounter.java| 44 --- .../processors/hadoop/HadoopCounterWriter.java | 36 --- .../internal/processors/hadoop/HadoopJob.java | 10 +- .../internal/processors/hadoop/HadoopJobId.java | 103 +++ .../processors/hadoop/HadoopJobInfo.java| 83 ++ .../processors/hadoop/HadoopJobPhase.java | 38 +++ .../processors/hadoop/HadoopJobProperty.java| 138 + .../processors/hadoop/HadoopJobStatus.java | 207 + .../processors/hadoop/HadoopMapReducePlan.java | 80 + .../hadoop/HadoopMapReducePlanner.java | 40 +++ .../processors/hadoop/HadoopNoopProcessor.java | 76 + .../hadoop/HadoopProcessorAdapter.java | 96 ++ .../internal/processors/hadoop/HadoopTask.java | 6 +- .../processors/hadoop/HadoopTaskContext.java| 11 +- .../processors/hadoop/HadoopTaskInfo.java | 153 ++ .../hadoop/IgniteHadoopNoopProcessor.java | 74 - .../hadoop/IgniteHadoopProcessorAdapter.java| 94 -- .../hadoop/counter/HadoopCounter.java | 44 +++ .../hadoop/counter/HadoopCounterWriter.java | 37 +++ .../hadoop/counter/HadoopCounters.java | 49 .../fs/IgniteHadoopFileSystemCounterWriter.java | 3 +- .../processors/hadoop/HadoopClassLoader.java| 6 +- .../processors/hadoop/HadoopContext.java| 11 +- .../processors/hadoop/HadoopCounterGroup.java | 121 .../processors/hadoop/HadoopCounters.java | 216 -- .../processors/hadoop/HadoopDefaultJobInfo.java | 6 +- .../internal/processors/hadoop/HadoopImpl.java | 16 +- .../hadoop/HadoopMapReduceCounterGroup.java | 121 .../hadoop/HadoopMapReduceCounters.java | 216 ++ .../processors/hadoop/HadoopProcessor.java | 30 +- .../internal/processors/hadoop/HadoopUtils.java | 6 +- .../hadoop/counter/HadoopCounterAdapter.java| 1 - .../hadoop/counter/HadoopCountersImpl.java | 7 +- .../hadoop/counter/HadoopLongCounter.java | 2 - .../counter/HadoopPerformanceCounter.java | 20 +- .../hadoop/igfs/HadoopIgfsJclLogger.java| 5 +- .../hadoop/jobtracker/HadoopJobMetadata.java| 41 +-- .../hadoop/jobtracker/HadoopJobTracker.java | 161 +- .../planner/HadoopDefaultMapReducePlan.java | 2 +- .../planner/HadoopDefaultMapReducePlanner.java | 6 +- .../hadoop/proto/HadoopClientProtocol.java | 17 +- .../proto/HadoopProtocolJobCountersTask.java| 7 +- .../proto/HadoopProtocolJobStatusTask.java | 6 +- .../hadoop/proto/HadoopProtocolKillJobTask.java | 2 +- .../proto/HadoopProtocolNextTaskIdTask.java | 4 +- .../proto/HadoopProtocolSubmitJobTask.java | 12 +- .../hadoop/shuffle/HadoopShuffle.java | 12 +- .../hadoop/shuffle/HadoopShuffleAck.java| 8 +- .../hadoop/shuffle/HadoopShuffleJob.java| 4 +- .../hadoop/shuffle/HadoopShuffleMessage.java| 8 +- .../HadoopConcurrentHashMultimap.java | 2 +- .../shuffle/collections/HadoopHashMultimap.java | 2 +- .../collections/HadoopHashMultimapBase.java | 2 +- .../shuffle/collections/HadoopMultimapBase.java | 4 +- .../shuffle/collections/HadoopSkipList.java | 2 +- .../HadoopE
[10/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (7).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fad185/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
index db95b2f..04a96de 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
@@ -70,7 +70,7 @@ public class HadoopExternalTaskExecutor extends
HadoopTaskExecutorAdapter {
private final ConcurrentMap runningProcsByProcId =
new ConcurrentHashMap8<>();
/** Starting processes. */
-private final ConcurrentMap
runningProcsByJobId = new ConcurrentHashMap8<>();
+private final ConcurrentMap
runningProcsByJobId = new ConcurrentHashMap8<>();
/** Busy lock. */
private final GridSpinReadWriteLock busyLock = new GridSpinReadWriteLock();
@@ -135,7 +135,7 @@ public class HadoopExternalTaskExecutor extends
HadoopTaskExecutorAdapter {
if (log.isDebugEnabled())
log.debug("Updating job information for remote task process
[proc=" + proc + ", meta=" + meta + ']');
-if (meta.phase() == GridHadoopJobPhase.PHASE_COMPLETE) {
+if (meta.phase() == HadoopJobPhase.PHASE_COMPLETE) {
if (log.isDebugEnabled())
log.debug("Completed job execution, will terminate child
process [jobId=" + meta.jobId() +
", proc=" + proc + ']');
@@ -191,7 +191,7 @@ public class HadoopExternalTaskExecutor extends
HadoopTaskExecutorAdapter {
/** {@inheritDoc} */
@SuppressWarnings("ConstantConditions")
-@Override public void run(final HadoopJob job, final
Collection tasks) throws IgniteCheckedException {
+@Override public void run(final HadoopJob job, final
Collection tasks) throws IgniteCheckedException {
if (!busyLock.tryReadLock()) {
if (log.isDebugEnabled())
log.debug("Failed to start hadoop tasks (grid is stopping,
will ignore).");
@@ -255,7 +255,7 @@ public class HadoopExternalTaskExecutor extends
HadoopTaskExecutorAdapter {
}
/** {@inheritDoc} */
-@Override public void cancelTasks(GridHadoopJobId jobId) {
+@Override public void cancelTasks(HadoopJobId jobId) {
HadoopProcess proc = runningProcsByJobId.get(jobId);
if (proc != null)
@@ -269,7 +269,7 @@ public class HadoopExternalTaskExecutor extends
HadoopTaskExecutorAdapter {
* @param job Job instance.
* @param tasks Collection of tasks to execute in started process.
*/
-private void sendExecutionRequest(HadoopProcess proc, HadoopJob job,
Collection tasks)
+private void sendExecutionRequest(HadoopProcess proc, HadoopJob job,
Collection tasks)
throws IgniteCheckedException {
// Must synchronize since concurrent process crash may happen and will
receive onConnectionLost().
proc.lock();
@@ -312,10 +312,10 @@ public class HadoopExternalTaskExecutor extends
HadoopTaskExecutorAdapter {
* @param state Fail state.
* @param e Optional error.
*/
-private void notifyTasksFailed(Iterable tasks,
HadoopTaskState state, Throwable e) {
+private void notifyTasksFailed(Iterable tasks,
HadoopTaskState state, Throwable e) {
HadoopTaskStatus fail = new HadoopTaskStatus(state, e);
-for (GridHadoopTaskInfo task : tasks)
+for (HadoopTaskInfo task : tasks)
jobTracker.onTaskFinished(task, fail);
}
@@ -325,12 +325,12 @@ public class HadoopExternalTaskExecutor extends
HadoopTaskExecutorAdapter {
* @param job Job instance.
* @param plan Map reduce plan.
*/
-private HadoopProcess startProcess(final HadoopJob job, final
GridHadoopMapReducePlan plan) {
+private HadoopProcess startProcess(final HadoopJob job, final
HadoopMapReducePlan plan) {
final UUID childProcId = UUID.randomUUID();
-GridHadoopJobId jobId = job.id();
+HadoopJobId jobId = job.id();
-final GridHadoopProcessFuture fut = new
GridHadoopProcessFuture(childProcId, jobId, ctx.kernalContext());
+final HadoopProcessFuture fut = new HadoopProcessFuture(childProcId,
jobId, ctx.kernalContext());
final HadoopProcess proc = new HadoopProcess(jobId, fut,
plan.reducers(ctx.localNodeId()));
@@ -538,7 +538,7 @@ public class HadoopExternalTaskExecutor extends
HadoopTaskExecutorAdapter {
* @param jobId Job ID.
* @return Job work folder.
*/
-p
[07/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (6).
# IGNITE-386: Moving core classes (6). Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/06525cad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/06525cad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/06525cad Branch: refs/heads/ignite-386 Commit: 06525cad18194d779d9cad4ce67bf6ac9933d768 Parents: 4c85f12 Author: vozerov-gridgain Authored: Tue Mar 3 17:01:53 2015 +0300 Committer: vozerov-gridgain Committed: Tue Mar 3 17:01:53 2015 +0300 -- .../org/apache/ignite/internal/IgniteEx.java| 2 +- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../internal/processors/hadoop/GridHadoop.java | 86 --- .../processors/hadoop/GridHadoopCounter.java| 44 -- .../hadoop/GridHadoopCounterWriter.java | 36 -- .../processors/hadoop/GridHadoopCounters.java | 4 +- .../processors/hadoop/GridHadoopFileBlock.java | 162 -- .../processors/hadoop/GridHadoopInputSplit.java | 54 -- .../processors/hadoop/GridHadoopJob.java| 102 .../processors/hadoop/GridHadoopJobInfo.java| 4 +- .../hadoop/GridHadoopMapReducePlan.java | 2 +- .../hadoop/GridHadoopMapReducePlanner.java | 2 +- .../hadoop/GridHadoopPartitioner.java | 33 -- .../hadoop/GridHadoopSerialization.java | 54 -- .../processors/hadoop/GridHadoopTask.java | 72 --- .../hadoop/GridHadoopTaskContext.java | 189 --- .../processors/hadoop/GridHadoopTaskInfo.java | 16 +- .../processors/hadoop/GridHadoopTaskInput.java | 55 -- .../processors/hadoop/GridHadoopTaskOutput.java | 40 -- .../processors/hadoop/GridHadoopTaskType.java | 56 -- .../internal/processors/hadoop/Hadoop.java | 86 +++ .../processors/hadoop/HadoopCounter.java| 44 ++ .../processors/hadoop/HadoopCounterWriter.java | 36 ++ .../processors/hadoop/HadoopFileBlock.java | 162 ++ .../processors/hadoop/HadoopInputSplit.java | 54 ++ .../internal/processors/hadoop/HadoopJob.java | 102 .../processors/hadoop/HadoopPartitioner.java| 33 ++ .../processors/hadoop/HadoopSerialization.java | 54 ++ .../internal/processors/hadoop/HadoopTask.java | 72 +++ .../processors/hadoop/HadoopTaskContext.java| 189 +++ .../processors/hadoop/HadoopTaskInput.java | 55 ++ .../processors/hadoop/HadoopTaskOutput.java | 40 ++ .../processors/hadoop/HadoopTaskType.java | 56 ++ .../hadoop/IgniteHadoopNoopProcessor.java | 2 +- .../hadoop/IgniteHadoopProcessorAdapter.java| 2 +- .../fs/IgniteHadoopFileSystemCounterWriter.java | 2 +- .../processors/hadoop/HadoopCounters.java | 6 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 4 +- .../internal/processors/hadoop/HadoopImpl.java | 2 +- .../processors/hadoop/HadoopProcessor.java | 4 +- .../hadoop/counter/HadoopCounterAdapter.java| 2 +- .../hadoop/counter/HadoopCountersImpl.java | 24 +- .../hadoop/counter/HadoopLongCounter.java | 2 +- .../counter/HadoopPerformanceCounter.java | 4 +- .../hadoop/jobtracker/HadoopJobMetadata.java| 10 +- .../hadoop/jobtracker/HadoopJobTracker.java | 68 +-- .../planner/HadoopDefaultMapReducePlan.java | 8 +- .../planner/HadoopDefaultMapReducePlanner.java | 24 +- .../proto/HadoopProtocolJobCountersTask.java| 2 +- .../proto/HadoopProtocolJobStatusTask.java | 2 +- .../hadoop/proto/HadoopProtocolKillJobTask.java | 2 +- .../proto/HadoopProtocolNextTaskIdTask.java | 2 +- .../proto/HadoopProtocolSubmitJobTask.java | 2 +- .../hadoop/proto/HadoopProtocolTaskAdapter.java | 2 +- .../hadoop/shuffle/HadoopShuffle.java | 4 +- .../hadoop/shuffle/HadoopShuffleJob.java| 30 +- .../HadoopConcurrentHashMultimap.java | 6 +- .../shuffle/collections/HadoopHashMultimap.java | 4 +- .../collections/HadoopHashMultimapBase.java | 8 +- .../shuffle/collections/HadoopMultimap.java | 6 +- .../shuffle/collections/HadoopMultimapBase.java | 12 +- .../shuffle/collections/HadoopSkipList.java | 14 +- .../HadoopEmbeddedTaskExecutor.java | 10 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +- .../taskexecutor/HadoopTaskExecutorAdapter.java | 6 +- .../external/HadoopExternalTaskExecutor.java| 18 +- .../child/HadoopChildProcessRunner.java | 8 +- .../hadoop/v1/HadoopV1CleanupTask.java | 2 +- .../processors/hadoop/v1/HadoopV1MapTask.java | 10 +- .../hadoop/v1/HadoopV1OutputCollector.java | 4 +- .../hadoop/v1/HadoopV1Partitioner.java | 2 +- .../hadoop/v1/HadoopV1ReduceTask.java | 6 +- .../processors/hadoop/v1/HadoopV1Reporter.java | 4 +- .../processors/hadoop/v1/HadoopV1SetupTask.java | 2 +- .../processors/hadoop/v1/Hadoop
[01/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (6).
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-386 4c85f1209 -> 28fad1854
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/GridHadoopDataStreamSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/GridHadoopDataStreamSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/GridHadoopDataStreamSelfTest.java
deleted file mode 100644
index 98475fb..000
---
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/streams/GridHadoopDataStreamSelfTest.java
+++ /dev/null
@@ -1,151 +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.processors.hadoop.shuffle.streams;
-
-import org.apache.ignite.internal.util.offheap.unsafe.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- *
- */
-public class GridHadoopDataStreamSelfTest extends GridCommonAbstractTest {
-
-public void testStreams() throws IOException {
-GridUnsafeMemory mem = new GridUnsafeMemory(0);
-
-HadoopDataOutStream out = new HadoopDataOutStream(mem);
-
-int size = 4 * 1024;
-
-final long ptr = mem.allocate(size);
-
-out.buffer().set(ptr, size);
-
-out.writeBoolean(false);
-out.writeBoolean(true);
-out.writeBoolean(false);
-out.write(17);
-out.write(121);
-out.write(0xfafa);
-out.writeByte(17);
-out.writeByte(121);
-out.writeByte(0xfafa);
-out.writeChar('z');
-out.writeChar('o');
-out.writeChar('r');
-out.writeShort(100);
-out.writeShort(Short.MIN_VALUE);
-out.writeShort(Short.MAX_VALUE);
-out.writeShort(65535);
-out.writeShort(65536); // 0
-out.writeInt(Integer.MAX_VALUE);
-out.writeInt(Integer.MIN_VALUE);
-out.writeInt(-1);
-out.writeInt(0);
-out.writeInt(1);
-out.writeFloat(0.33f);
-out.writeFloat(0.5f);
-out.writeFloat(-0.7f);
-out.writeFloat(Float.MAX_VALUE);
-out.writeFloat(Float.MIN_VALUE);
-out.writeFloat(Float.MIN_NORMAL);
-out.writeFloat(Float.POSITIVE_INFINITY);
-out.writeFloat(Float.NEGATIVE_INFINITY);
-out.writeFloat(Float.NaN);
-out.writeDouble(-12312312.3779);
-out.writeDouble(123123.234);
-out.writeDouble(Double.MAX_VALUE);
-out.writeDouble(Double.MIN_VALUE);
-out.writeDouble(Double.MIN_NORMAL);
-out.writeDouble(Double.NEGATIVE_INFINITY);
-out.writeDouble(Double.POSITIVE_INFINITY);
-out.writeDouble(Double.NaN);
-out.writeLong(Long.MAX_VALUE);
-out.writeLong(Long.MIN_VALUE);
-out.writeLong(0);
-out.writeLong(-1L);
-out.write(new byte[]{1,2,3});
-out.write(new byte[]{0,1,2,3}, 1, 2);
-out.writeUTF("mom washes rum");
-
-HadoopDataInStream in = new HadoopDataInStream(mem);
-
-in.buffer().set(ptr, out.buffer().pointer());
-
-assertEquals(false, in.readBoolean());
-assertEquals(true, in.readBoolean());
-assertEquals(false, in.readBoolean());
-assertEquals(17, in.read());
-assertEquals(121, in.read());
-assertEquals(0xfa, in.read());
-assertEquals(17, in.readByte());
-assertEquals(121, in.readByte());
-assertEquals((byte)0xfa, in.readByte());
-assertEquals('z', in.readChar());
-assertEquals('o', in.readChar());
-assertEquals('r', in.readChar());
-assertEquals(100, in.readShort());
-assertEquals(Short.MIN_VALUE, in.readShort());
-assertEquals(Short.MAX_VALUE, in.readShort());
-assertEquals(-1, in.readShort());
-assertEquals(0, in.readShort());
-assertEquals(Integer.MAX_VALUE, in.readInt());
-assertEquals(Integer.MIN_VALUE, in.readInt());
-assertEquals(-1, in.r
[06/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (6).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskOutput.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskOutput.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskOutput.java
new file mode 100644
index 000..41d9847
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskOutput.java
@@ -0,0 +1,40 @@
+/*
+ * 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.processors.hadoop;
+
+import org.apache.ignite.*;
+
+/**
+ * Task output.
+ */
+public interface HadoopTaskOutput extends AutoCloseable {
+/**
+ * Writes key and value to the output.
+ *
+ * @param key Key.
+ * @param val Value.
+ */
+public void write(Object key, Object val) throws IgniteCheckedException;
+
+/**
+ * Closes output.
+ *
+ * @throws IgniteCheckedException If failed.
+ */
+@Override public void close() throws IgniteCheckedException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskType.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskType.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskType.java
new file mode 100644
index 000..a88e189
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskType.java
@@ -0,0 +1,56 @@
+/*
+ * 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.processors.hadoop;
+
+import org.jetbrains.annotations.*;
+
+/**
+* Task type.
+*/
+public enum HadoopTaskType {
+/** Setup task. */
+SETUP,
+
+/** Map task. */
+MAP,
+
+/** Reduce task. */
+REDUCE,
+
+/** Combine task. */
+COMBINE,
+
+/** Commit task. */
+COMMIT,
+
+/** Abort task. */
+ABORT;
+
+/** Enumerated values. */
+private static final HadoopTaskType[] VALS = values();
+
+/**
+ * Efficiently gets enumerated value from its ordinal.
+ *
+ * @param ord Ordinal value.
+ * @return Enumerated value.
+ */
+@Nullable public static HadoopTaskType fromOrdinal(byte ord) {
+return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
index d0ef4ce..caa9194 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopNoopProcessor.java
@@ -33,7 +33,7 @@ public class IgniteHadoopNoopProcessor extends
IgniteHadoopProcessorAdapter {
[05/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (6).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
index 6345704..3f2b96e 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/HadoopChildProcessRunner.java
@@ -34,7 +34,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static
org.apache.ignite.internal.processors.hadoop.GridHadoopTaskType.*;
+import static org.apache.ignite.internal.processors.hadoop.HadoopTaskType.*;
/**
* Hadoop process base.
@@ -69,7 +69,7 @@ public class HadoopChildProcessRunner {
private final GridFutureAdapterEx initFut = new GridFutureAdapterEx<>();
/** Job instance. */
-private GridHadoopJob job;
+private HadoopJob job;
/** Number of uncompleted tasks. */
private final AtomicInteger pendingTasks = new AtomicInteger();
@@ -179,12 +179,12 @@ public class HadoopChildProcessRunner {
onTaskFinished0(this, status);
}
-@Override protected GridHadoopTaskInput
createInput(GridHadoopTaskContext ctx)
+@Override protected HadoopTaskInput
createInput(HadoopTaskContext ctx)
throws IgniteCheckedException {
return shuffleJob.input(ctx);
}
-@Override protected GridHadoopTaskOutput
createOutput(GridHadoopTaskContext ctx)
+@Override protected HadoopTaskOutput
createOutput(HadoopTaskContext ctx)
throws IgniteCheckedException {
return shuffleJob.output(ctx);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1CleanupTask.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1CleanupTask.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1CleanupTask.java
index 85f08be..cf550ab 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1CleanupTask.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1CleanupTask.java
@@ -42,7 +42,7 @@ public class HadoopV1CleanupTask extends HadoopV1Task {
}
/** {@inheritDoc} */
-@Override public void run(GridHadoopTaskContext taskCtx) throws
IgniteCheckedException {
+@Override public void run(HadoopTaskContext taskCtx) throws
IgniteCheckedException {
HadoopV2TaskContext ctx = (HadoopV2TaskContext)taskCtx;
JobContext jobCtx = ctx.jobContext();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1MapTask.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1MapTask.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1MapTask.java
index 51856d6..3501f56 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1MapTask.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1MapTask.java
@@ -42,8 +42,8 @@ public class HadoopV1MapTask extends HadoopV1Task {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
-@Override public void run(GridHadoopTaskContext taskCtx) throws
IgniteCheckedException {
-GridHadoopJob job = taskCtx.job();
+@Override public void run(HadoopTaskContext taskCtx) throws
IgniteCheckedException {
+HadoopJob job = taskCtx.job();
HadoopV2TaskContext ctx = (HadoopV2TaskContext)taskCtx;
@@ -51,12 +51,12 @@ public class HadoopV1MapTask extends HadoopV1Task {
InputFormat inFormat = jobConf.getInputFormat();
-GridHadoopInputSplit split = info().inputSplit();
+HadoopInputSplit split = info().inputSplit();
Inpu
[03/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (6).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractWordCountTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractWordCountTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractWordCountTest.java
new file mode 100644
index 000..1390982
--- /dev/null
+++
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractWordCountTest.java
@@ -0,0 +1,138 @@
+/*
+ * 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.processors.hadoop;
+
+import com.google.common.base.*;
+import org.apache.hadoop.conf.*;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.ignite.igfs.*;
+import org.apache.ignite.internal.processors.igfs.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Abstract class for tests based on WordCount test job.
+ */
+public abstract class HadoopAbstractWordCountTest extends
HadoopAbstractSelfTest {
+/** Input path. */
+protected static final String PATH_INPUT = "/input";
+
+/** Output path. */
+protected static final String PATH_OUTPUT = "/output";
+
+/** IGFS instance. */
+protected IgfsEx igfs;
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+Configuration cfg = new Configuration();
+
+setupFileSystems(cfg);
+
+// Init cache by correct LocalFileSystem implementation
+FileSystem.getLocal(cfg);
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+igfs = (IgfsEx)startGrids(gridCount()).fileSystem(igfsName);
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+stopAllGrids(true);
+}
+
+/** {@inheritDoc} */
+@Override protected boolean igfsEnabled() {
+return true;
+}
+
+/** {@inheritDoc} */
+@Override protected int gridCount() {
+return 1;
+}
+
+/**
+ * Generates test file.
+ *
+ * @param path File name.
+ * @param wordCounts Words and counts.
+ * @throws Exception If failed.
+ */
+protected void generateTestFile(String path, Object... wordCounts) throws
Exception {
+List wordsArr = new ArrayList<>();
+
+//Generating
+for (int i = 0; i < wordCounts.length; i += 2) {
+String word = (String) wordCounts[i];
+int cnt = (Integer) wordCounts[i + 1];
+
+while (cnt-- > 0)
+wordsArr.add(word);
+}
+
+//Shuffling
+for (int i = 0; i < wordsArr.size(); i++) {
+int j = (int)(Math.random() * wordsArr.size());
+
+Collections.swap(wordsArr, i, j);
+}
+
+//Input file preparing
+PrintWriter testInputFileWriter = new PrintWriter(igfs.create(new
IgfsPath(path), true));
+
+int j = 0;
+
+while (j < wordsArr.size()) {
+int i = 5 + (int)(Math.random() * 5);
+
+List subList = wordsArr.subList(j, Math.min(j + i,
wordsArr.size()));
+j += i;
+
+testInputFileWriter.println(Joiner.on(' ').join(subList));
+}
+
+testInputFileWriter.close();
+}
+
+/**
+ * Reads whole text file into String.
+ *
+ * @param fileName Name of the file to read.
+ * @return Content of the file as String value.
+ * @throws Exception If could not read the file.
+ */
+protected String readAndSortFile(String fileName) throws Exception {
+BufferedReader reader = new BufferedReader(new
InputStreamReader(igfs.open(new IgfsPath(fileName;
+
+List list = new ArrayList<>();
+
+String line;
+
+while ((line = reader.readLine()) != null)
+list.add(line);
+
+Collections.sort(list);
+
+return Joiner.on('\n').join(list) + "\n";
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/hadoop/src/
[12/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (7).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fad185/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlan.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlan.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlan.java
new file mode 100644
index 000..3da2fb1
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlan.java
@@ -0,0 +1,80 @@
+/*
+ * 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.processors.hadoop;
+
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Map-reduce job execution plan.
+ */
+public interface HadoopMapReducePlan extends Serializable {
+/**
+ * Gets collection of file blocks for which mappers should be executed.
+ *
+ * @param nodeId Node ID to check.
+ * @return Collection of file blocks or {@code null} if no mappers should
be executed on given node.
+ */
+@Nullable public Collection mappers(UUID nodeId);
+
+/**
+ * Gets reducer IDs that should be started on given node.
+ *
+ * @param nodeId Node ID to check.
+ * @return Array of reducer IDs.
+ */
+@Nullable public int[] reducers(UUID nodeId);
+
+/**
+ * Gets collection of all node IDs involved in map part of job execution.
+ *
+ * @return Collection of node IDs.
+ */
+public Collection mapperNodeIds();
+
+/**
+ * Gets collection of all node IDs involved in reduce part of job
execution.
+ *
+ * @return Collection of node IDs.
+ */
+public Collection reducerNodeIds();
+
+/**
+ * Gets overall number of mappers for the job.
+ *
+ * @return Number of mappers.
+ */
+public int mappers();
+
+/**
+ * Gets overall number of reducers for the job.
+ *
+ * @return Number of reducers.
+ */
+public int reducers();
+
+/**
+ * Gets node ID for reducer.
+ *
+ * @param reducer Reducer.
+ * @return Node ID.
+ */
+public UUID nodeForReducer(int reducer);
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fad185/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlanner.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlanner.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlanner.java
new file mode 100644
index 000..ab885fe
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReducePlanner.java
@@ -0,0 +1,40 @@
+/*
+ * 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.processors.hadoop;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Map-reduce execution planner.
+ */
+public interface HadoopMapReducePlanner {
+/**
+ * Prepares map-reduce execution plan for the given job and topology.
+ *
+ * @param job Job.
+ * @param top Topology.
+ * @param oldPlan Old plan in case of partial failure.
+
[08/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (7).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fad185/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimapSelftest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimapSelftest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimapSelftest.java
deleted file mode 100644
index 43b1f02..000
---
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimapSelftest.java
+++ /dev/null
@@ -1,267 +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.processors.hadoop.shuffle.collections;
-
-import com.google.common.collect.*;
-import org.apache.hadoop.io.*;
-import org.apache.ignite.internal.processors.hadoop.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.offheap.unsafe.*;
-import org.apache.ignite.internal.util.typedef.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static
org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory.*;
-
-/**
- *
- */
-public class GridHadoopConcurrentHashMultimapSelftest extends
HadoopAbstractMapTest {
-/** */
-public void testMapSimple() throws Exception {
-GridUnsafeMemory mem = new GridUnsafeMemory(0);
-
-//mem.listen(new GridOffHeapEventListener() {
-//@Override public void onEvent(GridOffHeapEvent evt) {
-//if (evt == GridOffHeapEvent.ALLOCATE)
-//U.dumpStack();
-//}
-//});
-
-Random rnd = new Random();
-
-int mapSize = 16 << rnd.nextInt(3);
-
-GridHadoopJobInfo job = new JobInfo();
-
-HadoopTaskContext taskCtx = new TaskContext();
-
-HadoopConcurrentHashMultimap m = new HadoopConcurrentHashMultimap(job,
mem, mapSize);
-
-HadoopConcurrentHashMultimap.Adder a = m.startAdding(taskCtx);
-
-Multimap mm = ArrayListMultimap.create();
-Multimap vis = ArrayListMultimap.create();
-
-for (int i = 0, vals = 4 * mapSize + rnd.nextInt(25); i < vals; i++) {
-int key = rnd.nextInt(mapSize);
-int val = rnd.nextInt();
-
-a.write(new IntWritable(key), new IntWritable(val));
-mm.put(key, val);
-
-X.println("k: " + key + " v: " + val);
-
-a.close();
-
-check(m, mm, vis, taskCtx);
-
-a = m.startAdding(taskCtx);
-}
-
-//a.add(new IntWritable(10), new IntWritable(2));
-//mm.put(10, 2);
-//check(m, mm);
-
-a.close();
-
-X.println("Alloc: " + mem.allocatedSize());
-
-m.close();
-
-assertEquals(0, mem.allocatedSize());
-}
-
-private void check(HadoopConcurrentHashMultimap m, Multimap mm,
-final Multimap vis, HadoopTaskContext taskCtx)
throws Exception {
-final HadoopTaskInput in = m.input(taskCtx);
-
-Map> mmm = mm.asMap();
-
-int keys = 0;
-
-while (in.next()) {
-keys++;
-
-IntWritable k = (IntWritable)in.key();
-
-assertNotNull(k);
-
-Deque vs = new LinkedList<>();
-
-Iterator it = in.values();
-
-while (it.hasNext())
-vs.addFirst(((IntWritable) it.next()).get());
-
-Collection exp = mmm.get(k.get());
-
-assertEquals(exp, vs);
-}
-
-assertEquals(mmm.size(), keys);
-
-assertEquals(m.keys(), keys);
-
-X.println("keys: " + keys + " cap: " + m.capacity());
-
-// Check visitor.
-
-final byte[] buf = new byte[4];
-
-final GridDataInput dataInput = new GridUnsafeDataInput();
-
-m.visit(false, new HadoopConcurrentHashMultimap.Visitor() {
-/** */
-IntWritable key = new IntWritable();
-
-/** */
-IntWr
[11/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (7).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fad185/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobMetadata.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobMetadata.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobMetadata.java
index 2d64277..3f574e9 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobMetadata.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobMetadata.java
@@ -19,6 +19,7 @@ package
org.apache.ignite.internal.processors.hadoop.jobtracker;
import org.apache.ignite.internal.processors.hadoop.*;
import org.apache.ignite.internal.processors.hadoop.counter.*;
+import org.apache.ignite.internal.processors.hadoop.counter.HadoopCounters;
import org.apache.ignite.internal.processors.hadoop.taskexecutor.external.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -26,7 +27,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
import java.util.*;
-import static
org.apache.ignite.internal.processors.hadoop.GridHadoopJobPhase.*;
+import static org.apache.ignite.internal.processors.hadoop.HadoopJobPhase.*;
/**
* Hadoop job metadata. Internal object used for distributed job state
tracking.
@@ -36,16 +37,16 @@ public class HadoopJobMetadata implements Externalizable {
private static final long serialVersionUID = 0L;
/** Job ID. */
-private GridHadoopJobId jobId;
+private HadoopJobId jobId;
/** Job info. */
-private GridHadoopJobInfo jobInfo;
+private HadoopJobInfo jobInfo;
/** Node submitted job. */
private UUID submitNodeId;
/** Map-reduce plan. */
-private GridHadoopMapReducePlan mrPlan;
+private HadoopMapReducePlan mrPlan;
/** Pending splits for which mapper should be executed. */
private Map pendingSplits;
@@ -58,7 +59,7 @@ public class HadoopJobMetadata implements Externalizable {
private Map reducersAddrs;
/** Job phase. */
-private GridHadoopJobPhase phase = PHASE_SETUP;
+private HadoopJobPhase phase = PHASE_SETUP;
/** Fail cause. */
@GridToStringExclude
@@ -68,7 +69,7 @@ public class HadoopJobMetadata implements Externalizable {
private long ver;
/** Job counters */
-private GridHadoopCounters counters = new HadoopCountersImpl();
+private HadoopCounters counters = new HadoopCountersImpl();
/**
* Empty constructor required by {@link Externalizable}.
@@ -84,7 +85,7 @@ public class HadoopJobMetadata implements Externalizable {
* @param jobId Job ID.
* @param jobInfo Job info.
*/
-public HadoopJobMetadata(UUID submitNodeId, GridHadoopJobId jobId,
GridHadoopJobInfo jobInfo) {
+public HadoopJobMetadata(UUID submitNodeId, HadoopJobId jobId,
HadoopJobInfo jobInfo) {
this.jobId = jobId;
this.jobInfo = jobInfo;
this.submitNodeId = submitNodeId;
@@ -120,14 +121,14 @@ public class HadoopJobMetadata implements Externalizable {
/**
* @param phase Job phase.
*/
-public void phase(GridHadoopJobPhase phase) {
+public void phase(HadoopJobPhase phase) {
this.phase = phase;
}
/**
* @return Job phase.
*/
-public GridHadoopJobPhase phase() {
+public HadoopJobPhase phase() {
return phase;
}
@@ -188,14 +189,14 @@ public class HadoopJobMetadata implements Externalizable {
/**
* @return Job ID.
*/
-public GridHadoopJobId jobId() {
+public HadoopJobId jobId() {
return jobId;
}
/**
* @param mrPlan Map-reduce plan.
*/
-public void mapReducePlan(GridHadoopMapReducePlan mrPlan) {
+public void mapReducePlan(HadoopMapReducePlan mrPlan) {
assert this.mrPlan == null : "Map-reduce plan can only be initialized
once.";
this.mrPlan = mrPlan;
@@ -204,14 +205,14 @@ public class HadoopJobMetadata implements Externalizable {
/**
* @return Map-reduce plan.
*/
-public GridHadoopMapReducePlan mapReducePlan() {
+public HadoopMapReducePlan mapReducePlan() {
return mrPlan;
}
/**
* @return Job info.
*/
-public GridHadoopJobInfo jobInfo() {
+public HadoopJobInfo jobInfo() {
return jobInfo;
}
@@ -220,7 +221,7 @@ public class HadoopJobMetadata implements Externalizable {
*
* @return Collection of counters.
*/
-public GridHadoopCounters counters() {
+public HadoopCounters counters() {
return counters;
}
@@ -229,7 +230,7 @@ public class HadoopJobMetadata implements Externalizable {
*
* @param c
[09/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (7).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fad185/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceTest.java
index 486b856..6242ecc 100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceTest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.hadoop.fs.*;
import org.apache.ignite.igfs.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.hadoop.counter.*;
+import org.apache.ignite.internal.processors.hadoop.counter.HadoopCounters;
import org.apache.ignite.internal.processors.hadoop.examples.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -56,7 +57,7 @@ public class HadoopMapReduceTest extends
HadoopAbstractWordCountTest {
igfs.mkdirs(inDir);
-IgfsPath inFile = new IgfsPath(inDir,
GridHadoopWordCount2.class.getSimpleName() + "-input");
+IgfsPath inFile = new IgfsPath(inDir,
HadoopWordCount2.class.getSimpleName() + "-input");
generateTestFile(inFile.toString(), "red", 10, "blue", 20,
"green", 15, "yellow", 7 );
@@ -82,11 +83,11 @@ public class HadoopMapReduceTest extends
HadoopAbstractWordCountTest {
// File system coordinates.
setupFileSystems(jobConf);
-GridHadoopWordCount1.setTasksClasses(jobConf, !useNewMapper,
!useNewCombiner, !useNewReducer);
+HadoopWordCount1.setTasksClasses(jobConf, !useNewMapper,
!useNewCombiner, !useNewReducer);
Job job = Job.getInstance(jobConf);
-GridHadoopWordCount2.setTasksClasses(job, useNewMapper,
useNewCombiner, useNewReducer);
+HadoopWordCount2.setTasksClasses(job, useNewMapper,
useNewCombiner, useNewReducer);
job.setOutputKeyClass(Text.class);
job.setOutputValueClass(IntWritable.class);
@@ -94,9 +95,9 @@ public class HadoopMapReduceTest extends
HadoopAbstractWordCountTest {
FileInputFormat.setInputPaths(job, new Path(igfsScheme() +
inFile.toString()));
FileOutputFormat.setOutputPath(job, new Path(igfsScheme() +
PATH_OUTPUT));
-job.setJarByClass(GridHadoopWordCount2.class);
+job.setJarByClass(HadoopWordCount2.class);
-GridHadoopJobId jobId = new GridHadoopJobId(UUID.randomUUID(), 1);
+HadoopJobId jobId = new HadoopJobId(UUID.randomUUID(), 1);
IgniteInternalFuture fut = grid(0).hadoop().submit(jobId,
createJobInfo(job.getConfiguration()));
@@ -121,8 +122,8 @@ public class HadoopMapReduceTest extends
HadoopAbstractWordCountTest {
* @param jobId Job id.
* @throws IgniteCheckedException
*/
-private void checkJobStatistics(GridHadoopJobId jobId) throws
IgniteCheckedException, IOException {
-GridHadoopCounters cntrs = grid(0).hadoop().counters(jobId);
+private void checkJobStatistics(HadoopJobId jobId) throws
IgniteCheckedException, IOException {
+HadoopCounters cntrs = grid(0).hadoop().counters(jobId);
HadoopPerformanceCounter perfCntr =
HadoopPerformanceCounter.getCounter(cntrs, null);
@@ -191,6 +192,6 @@ public class HadoopMapReduceTest extends
HadoopAbstractWordCountTest {
BufferedReader reader = new BufferedReader(new
InputStreamReader(igfs.open(statPath)));
-assertEquals(apiEvtCnt,
GridHadoopTestUtils.simpleCheckJobStatFile(reader));
+assertEquals(apiEvtCnt,
HadoopTestUtils.simpleCheckJobStatFile(reader));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28fad185/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopPopularWordsTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopPopularWordsTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopPopularWordsTest.java
new file mode 100644
index 000..a2f2ac3
--- /dev/null
+++
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopPopularWordsTest.java
@@ -0,0 +1,294 @@
+/*
+ * 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
+ * th
[04/13] incubator-ignite git commit: # IGNITE-386: Moving core classes (6).
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06525cad/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
--
diff --git
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
deleted file mode 100644
index 7dffbc3..000
---
a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
+++ /dev/null
@@ -1,330 +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.processors.hadoop;
-
-import org.apache.hadoop.fs.*;
-import org.apache.hadoop.mapreduce.*;
-import org.apache.hadoop.mapreduce.lib.input.*;
-import org.apache.hadoop.mapreduce.lib.output.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.internal.processors.hadoop.HadoopUtils.*;
-
-/**
- * Job tracker self test.
- */
-public class GridHadoopJobTrackerSelfTest extends GridHadoopAbstractSelfTest {
-/** */
-private static final String PATH_OUTPUT = "/test-out";
-
-/** Test block count parameter name. */
-private static final int BLOCK_CNT = 10;
-
-/** */
-private static GridHadoopSharedMap m =
GridHadoopSharedMap.map(GridHadoopJobTrackerSelfTest.class);
-
-/** Map task execution count. */
-private static final AtomicInteger mapExecCnt = m.put("mapExecCnt", new
AtomicInteger());
-
-/** Reduce task execution count. */
-private static final AtomicInteger reduceExecCnt = m.put("reduceExecCnt",
new AtomicInteger());
-
-/** Reduce task execution count. */
-private static final AtomicInteger combineExecCnt =
m.put("combineExecCnt", new AtomicInteger());
-
-/** */
-private static final Map latch = m.put("latch",
new HashMap());
-
-/** {@inheritDoc} */
-@Override protected boolean igfsEnabled() {
-return true;
-}
-
-/** {@inheritDoc} */
-@Override protected void beforeTestsStarted() throws Exception {
-super.beforeTestsStarted();
-
-startGrids(gridCount());
-}
-
-/** {@inheritDoc} */
-@Override protected void afterTestsStopped() throws Exception {
-stopAllGrids();
-
-super.afterTestsStopped();
-}
-
-/** {@inheritDoc} */
-@Override protected void beforeTest() throws Exception {
-latch.put("mapAwaitLatch", new CountDownLatch(1));
-latch.put("reduceAwaitLatch", new CountDownLatch(1));
-latch.put("combineAwaitLatch", new CountDownLatch(1));
-}
-
-/** {@inheritDoc} */
-@Override protected void afterTest() throws Exception {
-mapExecCnt.set(0);
-combineExecCnt.set(0);
-reduceExecCnt.set(0);
-}
-
-/** {@inheritDoc} */
-@Override public GridHadoopConfiguration hadoopConfiguration(String
gridName) {
-GridHadoopConfiguration cfg = super.hadoopConfiguration(gridName);
-
-cfg.setMapReducePlanner(new GridHadoopTestRoundRobinMrPlanner());
-cfg.setExternalExecution(false);
-
-return cfg;
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testSimpleTaskSubmit() throws Exception {
-try {
-UUID globalId = UUID.randomUUID();
-
-Job job = Job.getInstance();
-setupFileSystems(job.getConfiguration());
-
-job.setMapperClass(TestMapper.class);
-job.setReducerClass(TestReducer.class);
-job.setInputFormatClass(InFormat.class);
-
-FileOutputFormat.setOutputPath(job, new Path(igfsScheme() +
PATH_OUTPUT + "1"));
-
-GridHadoopJobId jobId = new GridHadoopJobId(globalId, 1);
-
-grid(0).hadoop().submit(jobId,
createJobInfo(job.getConfiguration()));
-
-checkStatus(jobId, false);
-
-info("Releasing map latch.");
-
-
incubator-ignite git commit: # IGNITE-312 Bug fix: custom event must be performed in same order in each nodes.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-312 [created] 38ebb3e3a
# IGNITE-312 Bug fix: custom event must be performed in same order in each
nodes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38ebb3e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38ebb3e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38ebb3e3
Branch: refs/heads/ignite-312
Commit: 38ebb3e3aeb242efda79d652e83a41ed7b53cd6c
Parents: 893d0fe
Author: sevdokimov
Authored: Tue Mar 3 18:25:19 2015 +0300
Committer: sevdokimov
Committed: Tue Mar 3 18:25:19 2015 +0300
--
.../eventstorage/GridEventStorageManager.java | 3 +-
.../ignite/internal/util/IgniteUtils.java | 30 ++
.../spi/discovery/tcp/TcpDiscoverySpi.java | 33
.../TcpDiscoveryCustomEventMessage.java | 1 +
4 files changed, 40 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38ebb3e3/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 82af8bf..36ea7e4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.events.*;
import org.apache.ignite.internal.managers.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.managers.deployment.*;
@@ -434,7 +435,7 @@ public class GridEventStorageManager extends
GridManagerAdapter
* @return {@code true} if this is an internal event.
*/
private boolean isInternalEvent(int type) {
-return F.contains(EVTS_DISCOVERY_ALL, type);
+return type == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT ||
F.contains(EVTS_DISCOVERY_ALL, type);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38ebb3e3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index de71f59..7412ba2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -26,6 +26,7 @@ import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.cluster.*;
import org.apache.ignite.internal.compute.*;
+import org.apache.ignite.internal.events.*;
import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.mxbean.*;
import org.apache.ignite.internal.processors.cache.*;
@@ -452,22 +453,25 @@ public abstract class IgniteUtils {
}
// Event names initialization.
-for (Field field : EventType.class.getFields()) {
-if (field.getType().equals(int.class)) {
-try {
-assert field.getName().startsWith("EVT_") : "Invalid event
name (should start with 'EVT_': " +
-field.getName();
+Class[] evtHolderClasses = new Class[]{EventType.class,
DiscoveryCustomEvent.class};
-int type = field.getInt(null);
+for (Class cls : evtHolderClasses) {
+for (Field field : cls.getFields()) {
+if (Modifier.isStatic(field.getModifiers()) &&
field.getType().equals(int.class)) {
+if (field.getName().startsWith("EVT_")) {
+try {
+int type = field.getInt(null);
-String prev = GRID_EVT_NAMES.put(type,
field.getName().substring(4));
+String prev = GRID_EVT_NAMES.put(type,
field.getName().substring("EVT_".length()));
-// Check for duplicate event types.
-assert prev == null : "Duplicate event [type=" + type + ",
name1=" + prev +
-", name2=" + field.getName() + ']';
-}
-catch (IllegalAcces
[2/4] incubator-ignite git commit: # ignite-51-filters
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6febd89a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index bc317de..88200bb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -285,7 +285,7 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
}
/** {@inheritDoc} */
-@Override public IgnitePredicate> predicate() {
+@Override public CacheEntryPredicate predicate() {
return delegate.predicate();
}
@@ -303,13 +303,8 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
}
/** {@inheritDoc} */
-@Override public CacheProjection projection(@Nullable
IgniteBiPredicate p) {
-return delegate.projection(p);
-}
-
-/** {@inheritDoc} */
@Override public CacheProjection projection(
-@Nullable IgnitePredicate> filter) {
+@Nullable CacheEntryPredicate filter) {
return delegate.projection(filter);
}
@@ -394,30 +389,6 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
}
/** {@inheritDoc} */
-@Override public void forEach(IgniteInClosure> vis) {
-GridCacheProjectionImpl prev = gate.enter(prj);
-
-try {
-delegate.forEach(vis);
-}
-finally {
-gate.leave(prev);
-}
-}
-
-/** {@inheritDoc} */
-@Override public boolean forAll(IgnitePredicate> vis) {
-GridCacheProjectionImpl prev = gate.enter(prj);
-
-try {
-return delegate.forAll(vis);
-}
-finally {
-gate.leave(prev);
-}
-}
-
-/** {@inheritDoc} */
@Nullable @Override public V reload(K key)
throws IgniteCheckedException {
GridCacheProjectionImpl prev = gate.enter(prj);
@@ -504,7 +475,7 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
/** {@inheritDoc} */
@Override public V get(K key, @Nullable GridCacheEntryEx entry, boolean
deserializePortable,
-@Nullable IgnitePredicate>... filter) throws
IgniteCheckedException {
+@Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
GridCacheProjectionImpl prev = gate.enter(prj);
try {
@@ -660,7 +631,7 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
}
/** {@inheritDoc} */
-@Nullable @Override public V put(K key, V val, @Nullable
IgnitePredicate>[] filter)
+@Nullable @Override public V put(K key, V val, @Nullable
CacheEntryPredicate[] filter)
throws IgniteCheckedException {
GridCacheProjectionImpl prev = gate.enter(prj);
@@ -674,7 +645,7 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
/** {@inheritDoc} */
@Override public V put(K key, V val, @Nullable GridCacheEntryEx entry,
long ttl,
-@Nullable IgnitePredicate>... filter) throws
IgniteCheckedException {
+@Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
GridCacheProjectionImpl prev = gate.enter(prj);
try {
@@ -687,7 +658,7 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
/** {@inheritDoc} */
@Override public IgniteInternalFuture putAsync(K key, V val,
-@Nullable IgnitePredicate>[] filter) {
+@Nullable CacheEntryPredicate[] filter) {
GridCacheProjectionImpl prev = gate.enter(prj);
try {
@@ -700,7 +671,7 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
/** {@inheritDoc} */
@Override public IgniteInternalFuture putAsync(K key, V val, @Nullable
GridCacheEntryEx entry, long ttl,
-@Nullable IgnitePredicate>... filter) {
+@Nullable CacheEntryPredicate... filter) {
GridCacheProjectionImpl prev = gate.enter(prj);
try {
@@ -713,7 +684,7 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
/** {@inheritDoc} */
@Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx
entry, long ttl,
-@Nullable IgnitePredicate>... filter) throws
IgniteCheckedException {
+@Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
GridCacheProjectionImpl prev = gate.enter(prj);
try {
@@ -725,7 +696,7 @@ public class GridCacheProxyImpl implements
GridCacheProxy, Externali
}
/** {@inheritDoc} */
-@Override public boolean putx(K key, V val, @Nullable
IgnitePredicate>[] filter)
[1/4] incubator-ignite git commit: # ignite-51-filters
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51-filters [created] 6febd89af
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6febd89a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
index 4e769e4..8a8fb5c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
@@ -82,7 +82,7 @@ public final class GridLocalLockFuture extends
GridFutureAdapter
private IgniteLogger log;
/** Filter. */
-private IgnitePredicate>[] filter;
+private CacheEntryPredicate[] filter;
/** Transaction. */
private IgniteTxLocalEx tx;
@@ -111,7 +111,7 @@ public final class GridLocalLockFuture extends
GridFutureAdapter
IgniteTxLocalEx tx,
GridLocalCache cache,
long timeout,
-IgnitePredicate>[] filter) {
+CacheEntryPredicate[] filter) {
super(cctx.kernalContext());
assert keys != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6febd89a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 588d987..a4a586f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -110,7 +110,7 @@ public class GridLocalAtomicCache extends
GridCacheAdapter {
V val,
@Nullable GridCacheEntryEx cached,
long ttl,
-@Nullable IgnitePredicate>[] filter) throws
IgniteCheckedException {
+@Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException {
A.notNull(key, "key", val, "val");
ctx.denyOnLocalRead();
@@ -132,7 +132,7 @@ public class GridLocalAtomicCache extends
GridCacheAdapter {
V val,
@Nullable GridCacheEntryEx cached,
long ttl,
-@Nullable IgnitePredicate>... filter) throws
IgniteCheckedException {
+@Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
A.notNull(key, "key", val, "val");
ctx.denyOnLocalRead();
@@ -151,7 +151,7 @@ public class GridLocalAtomicCache extends
GridCacheAdapter {
/** {@inheritDoc} */
@Override public boolean putx(K key,
V val,
-IgnitePredicate>[] filter) throws
IgniteCheckedException {
+CacheEntryPredicate[] filter) throws IgniteCheckedException {
A.notNull(key, "key", val, "val");
ctx.denyOnLocalRead();
@@ -173,7 +173,7 @@ public class GridLocalAtomicCache extends
GridCacheAdapter {
V val,
@Nullable GridCacheEntryEx entry,
long ttl,
-@Nullable IgnitePredicate>... filter) {
+@Nullable CacheEntryPredicate... filter) {
A.notNull(key, "key", val, "val");
ctx.denyOnLocalRead();
@@ -192,7 +192,7 @@ public class GridLocalAtomicCache extends
GridCacheAdapter {
V val,
@Nullable GridCacheEntryEx entry,
long ttl,
-@Nullable IgnitePredicate>... filter) {
+@Nullable CacheEntryPredicate... filter) {
A.notNull(key, "key", val, "val");
ctx.denyOnLocalRead();
@@ -208,61 +208,55 @@ public class GridLocalAtomicCache extends
GridCacheAdapter {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public V putIfAbsent(K key, V val) throws IgniteCheckedException
{
-return put(key, val, ctx.noPeekArray());
+return put(key, val, ctx.noValArray());
}
/** {@inheritDoc} */
@Override public IgniteInternalFuture putIfAbsentAsync(K key, V val) {
-return putAsync(key, val, ctx.noPeekArray());
+return putAsync(key, val, ctx.noValArray());
}
/** {@inheritDoc} */
@Override public boolean putxIfAbsent(K key, V val) throws
IgniteCheckedException {
-return putx(key, val, ctx.noPeekArray());
+return putx(key, val, ctx.noValArray());
}
/** {@inheritDoc} */
@Override public IgniteInternalFuture putxIfAbsentAsync(K key, V
val) {
-return putxAsync(key, val, ctx.noPeekArray());
+return putxAsync(ke
[3/4] incubator-ignite git commit: # ignite-51-filters
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6febd89a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index bcf0f0c..eb31100 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -147,11 +147,11 @@ public class GridCacheContext implements
Externalizable {
/** Grid cache. */
private GridCacheAdapter cache;
-/** No-value filter array. */
-private IgnitePredicate>[] noValArr;
+/** No value filter array. */
+private CacheEntryPredicate[] noValArr0;
-/** Has-value filter array. */
-private IgnitePredicate>[] hasValArr;
+/** Has value filter array. */
+private CacheEntryPredicate[] hasValArr0;
/** No-peek-value filter array. */
private IgnitePredicate>[] noPeekArr;
@@ -159,9 +159,6 @@ public class GridCacheContext implements
Externalizable {
/** Has-peek-value filter array. */
private IgnitePredicate>[] hasPeekArr;
-/** No-op filter array. */
-private IgnitePredicate>[] trueArr;
-
/** Cached local rich node. */
private ClusterNode locNode;
@@ -290,11 +287,11 @@ public class GridCacheContext implements
Externalizable {
log = ctx.log(getClass());
-noValArr = new IgnitePredicate[]{F.cacheNoGetValue()};
-hasValArr = new IgnitePredicate[]{F.cacheHasGetValue()};
noPeekArr = new IgnitePredicate[]{F.cacheNoPeekValue()};
hasPeekArr = new IgnitePredicate[]{F.cacheHasPeekValue()};
-trueArr = new IgnitePredicate[]{F.alwaysTrue()};
+
+noValArr0 = new CacheEntryPredicate[]{new
CacheEntryPredicateNoValue()};
+hasValArr0 = new CacheEntryPredicate[]{new
CacheEntryPredicateHasValue()};
cacheObjCtx = new CacheObjectContext(ctx);
@@ -964,33 +961,34 @@ public class GridCacheContext implements
Externalizable {
public CacheJtaManagerAdapter jta() {
return jtaMgr;
}
+
/**
* @return No get-value filter.
*/
-public IgnitePredicate>[] noGetArray() {
-return noValArr;
+@SuppressWarnings("unchecked")
+public IgnitePredicate>[] noPeekArray() {
+return (IgnitePredicate>[])((IgnitePredicate[])noPeekArr);
}
/**
* @return Has get-value filer.
*/
-public IgnitePredicate>[] hasGetArray() {
-return hasValArr;
+public IgnitePredicate>[] hasPeekArray() {
+return hasPeekArr;
}
/**
- * @return No get-value filter.
+ * @return No value filter.
*/
-@SuppressWarnings("unchecked")
-public IgnitePredicate>[] noPeekArray() {
-return (IgnitePredicate>[])((IgnitePredicate[])noPeekArr);
+public CacheEntryPredicate[] noValArray() {
+return noValArr0;
}
/**
- * @return Has get-value filer.
+ * @return Has value filter.
*/
-public IgnitePredicate>[] hasPeekArray() {
-return hasPeekArr;
+public CacheEntryPredicate[] hasValArray() {
+return noValArr0;
}
/**
@@ -1005,17 +1003,11 @@ public class GridCacheContext implements
Externalizable {
}
/**
- * @return Empty filter.
- */
-public IgnitePredicate> truex() {
-return F.alwaysTrue();
-}
-
-/**
- * @return No-op array.
+ * @param val Value to check.
+ * @return Predicate array that checks for value.
*/
-public IgnitePredicate>[] trueArray() {
-return trueArr;
+public CacheEntryPredicate[] equalsValArray(V val) {
+return new CacheEntryPredicate[]{new
CacheEntryPredicateContainsValue(toCacheObject(val))};
}
/**
@@ -1098,6 +1090,29 @@ public class GridCacheContext implements
Externalizable {
}
/**
+ * @param e Entry.
+ * @param p Predicates.
+ * @return {@code True} if predicates passed.
+ * @throws IgniteCheckedException If failed.
+ */
+public boolean isAll(GridCacheEntryEx e, CacheEntryPredicate[] p) throws
IgniteCheckedException {
+if (p == null || p.length == 0)
+return true;
+
+try {
+for (CacheEntryPredicate p0 : p) {
+if (p0 != null && !p0.apply(e))
+return false;
+}
+}
+catch (RuntimeException ex) {
+throw U.cast(ex);
+}
+
+return true;
+}
+
+/**
* Forces LOCAL flag.
*
* @return Previously forced flags.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6febd89a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache
[4/4] incubator-ignite git commit: # ignite-51-filters
# ignite-51-filters Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6febd89a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6febd89a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6febd89a Branch: refs/heads/ignite-51-filters Commit: 6febd89af5768c7977ab26a3bea3b277a66b74b9 Parents: 90172c7 Author: sboikov Authored: Tue Mar 3 18:53:16 2015 +0300 Committer: sboikov Committed: Tue Mar 3 18:53:16 2015 +0300 -- .../processors/cache/CacheEntryPredicate.java | 42 ++ .../cache/CacheEntryPredicateAdapter.java | 66 +++ .../cache/CacheEntryPredicateContainsValue.java | 99 .../cache/CacheEntryPredicateHasValue.java | 28 ++ .../cache/CacheEntryPredicateNoValue.java | 28 ++ .../cache/CacheEntrySerializablePredicate.java | 100 .../processors/cache/CacheProjection.java | 80 +-- .../processors/cache/EvictableEntryImpl.java| 2 +- .../processors/cache/GridCacheAdapter.java | 275 --- .../cache/GridCacheClearAllRunnable.java| 2 +- .../cache/GridCacheConcurrentMap.java | 64 +-- .../processors/cache/GridCacheContext.java | 77 +-- .../cache/GridCacheDeploymentManager.java | 107 ++-- .../processors/cache/GridCacheEntryEx.java | 22 +- .../cache/GridCacheEvictionManager.java | 29 +- .../processors/cache/GridCacheKeySet.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 62 +-- .../processors/cache/GridCacheMessage.java | 18 +- .../processors/cache/GridCacheProjectionEx.java | 24 +- .../cache/GridCacheProjectionImpl.java | 493 --- .../processors/cache/GridCacheProxyImpl.java| 93 ++-- .../processors/cache/GridCacheUtils.java| 84 +++- .../cache/GridCacheValueCollection.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../GridDistributedCacheAdapter.java| 6 +- .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java| 4 +- .../distributed/dht/GridDhtLockFuture.java | 4 +- .../dht/GridDhtTransactionalCacheAdapter.java | 10 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 8 +- .../dht/atomic/GridDhtAtomicCache.java | 69 ++- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 30 +- .../dht/colocated/GridDhtColocatedCache.java| 12 +- .../colocated/GridDhtColocatedLockFuture.java | 6 +- .../distributed/near/GridNearAtomicCache.java | 36 +- .../distributed/near/GridNearCacheAdapter.java | 68 +-- .../distributed/near/GridNearLockFuture.java| 12 +- .../distributed/near/GridNearLockRequest.java | 39 +- .../near/GridNearTransactionalCache.java| 6 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../distributed/near/GridNearTxRemote.java | 4 +- .../processors/cache/local/GridLocalCache.java | 8 +- .../cache/local/GridLocalLockFuture.java| 4 +- .../local/atomic/GridLocalAtomicCache.java | 102 ++-- .../query/GridCacheDistributedQueryManager.java | 4 +- .../cache/query/GridCacheLocalQueryFuture.java | 3 +- .../cache/query/GridCacheQueriesImpl.java | 4 +- .../cache/query/GridCacheQueryAdapter.java | 8 +- .../cache/query/GridCacheQueryInfo.java | 7 +- .../cache/query/GridCacheQueryManager.java | 42 +- .../cache/query/GridCacheQueryRequest.java | 6 +- .../cache/transactions/IgniteInternalTx.java| 2 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxEntry.java | 10 +- .../transactions/IgniteTxLocalAdapter.java | 52 +- .../cache/transactions/IgniteTxLocalEx.java | 4 +- .../org/apache/ignite/internal/util/F0.java | 12 + .../ignite/internal/util/lang/GridFunc.java | 52 -- .../cache/GridCacheAbstractFullApiSelfTest.java | 6 +- .../processors/cache/GridCacheTestEntryEx.java | 22 +- .../distributed/GridCacheEventAbstractTest.java | 12 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 10 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 9 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 34 -- .../cache/GridCacheAbstractQuerySelfTest.java | 20 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 17 - .../cache/spring/SpringDynamicCacheManager.java | 10 +- 68 files changed, 1225 insertions(+), 1366 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6febd89a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java -- diff --git a/modules/core/
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-312 [deleted] 38ebb3e3a
[6/7] incubator-ignite git commit: ignite-release-test SCM connection
ignite-release-test SCM connection Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/694061f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/694061f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/694061f5 Branch: refs/heads/ignite-release-test Commit: 694061f5e5678451f74d8bf9d106236a57b39e32 Parents: 457d64b Author: avinogradov Authored: Tue Mar 3 18:58:07 2015 +0300 Committer: avinogradov Committed: Tue Mar 3 18:58:07 2015 +0300 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/694061f5/pom.xml -- diff --git a/pom.xml b/pom.xml index 07b4f88..591a8da 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,7 @@ https://git-wip-us.apache.org/repos/asf/incubator-ignite scm:git:git://git-wip-us.apache.org/repos/asf/incubator-ignite + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ignite
[2/7] incubator-ignite git commit: ignite-release-test
ignite-release-test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1640ab7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1640ab7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1640ab7e
Branch: refs/heads/ignite-release-test
Commit: 1640ab7e0c9cb5ad453bf13d378ed3b2141a250c
Parents: c847e88
Author: avinogradov
Authored: Mon Mar 2 18:42:44 2015 +0300
Committer: avinogradov
Committed: Mon Mar 2 18:42:44 2015 +0300
--
assembly/dependencies-fabric.xml | 2 +
assembly/modules/package/pom.xml | 915 ++
pom.xml | 768 +---
3 files changed, 927 insertions(+), 758 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1640ab7e/assembly/dependencies-fabric.xml
--
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index 19fd4c4..bdbc2a1 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -31,6 +31,7 @@
+true
org.apache.ignite:ignite-spring
org.apache.ignite:ignite-indexing
@@ -67,6 +68,7 @@
+true
org.apache.ignite:ignite-core
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1640ab7e/assembly/modules/package/pom.xml
--
diff --git a/assembly/modules/package/pom.xml b/assembly/modules/package/pom.xml
new file mode 100644
index 000..7e623b9
--- /dev/null
+++ b/assembly/modules/package/pom.xml
@@ -0,0 +1,915 @@
+
+
+
+
+
+http://maven.apache.org/POM/4.0.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+
+org.apache.ignite
+ignite
+${ignite.version}
+../../..
+
+
+ignite-assembly
+pom
+
+
+
+org.apache.ignite
+ignite-spring
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-indexing
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-aop
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-aws
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-hibernate
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-jcl
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-jta
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-log4j
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-rest-http
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-schedule
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-slf4j
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-urideploy
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-web
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-scalar
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-visor-plugins
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-visor-console
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-ssh
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-schema-load
+${ignite.version}
+
+
+
+org.apache.ignite
+ignite-hadoop
+${ignite.version}
+
+
+
+
+
+release
+
+true
+
+
+
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+2.9.1
+
+
+module-javadoc
+
+jar
+
+package
[1/7] incubator-ignite git commit: ignite-release-test
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-release-test [created] 3b9e30879
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1640ab7e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 98f649d..1364627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,7 @@
modules/jcl
modules/schema-load
modules/codegen
+assembly/modules/package
@@ -324,82 +325,6 @@
-maven-dependency-plugin
-
-
-copy-libs
-test-compile
-
-copy-dependencies
-
-
-
org.apache.ignite
-target/libs
-runtime
-true
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-assembly-plugin
-2.4
-false
-
-
-dependencies
-prepare-package
-
-single
-
-
-
-
${basedir}/assembly/dependencies-${ignite.edition}.xml
-
-${basedir}
-libs
-false
-
-
-
-
-dependencies-optional
-prepare-package
-
-single
-
-
-
-
${basedir}/assembly/dependencies-optional-${ignite.edition}.xml
-
-${basedir}/libs
-optional
-false
-
-
-
-
-dependencies-schema-load
-prepare-package
-
-single
-
-
-
-
assembly/dependencies-schema-load.xml
-
-
target/release-package/bin
-include
-false
-
true
-
-
-
-
-
-
org.apache.maven.plugins
maven-source-plugin
2.2.1
@@ -574,7 +499,7 @@
-
+
test
@@ -671,582 +596,19 @@
-org.apache.maven.plugins
-maven-javadoc-plugin
-2.9.1
-
-
-module-javadoc
-
-jar
-
-package
-
-
-
-
org.apache.ignite.tools.javadoc.IgniteLinkTaglet
-
-
org.apache.ignite
-
ignite-tools
-
${ignite.version}
-
-
-
-Ignite
${ignite.version}
-Ignite
${ignite.version}
-true
-true
-protected
-true
-false
-false
-1.7
-
-
http://docs.oracle.com/javase/7/docs/api/
-
http://hadoop.apache.org/docs/current/api/
-
-
${project.basedir}/${parent.relativePath}/assembly/docfiles/javadoc.css
-
-
incubator-ignite git commit: # IGNITE-312 Bug fix: custom event must be performed in same order in each nodes.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 893d0fe08 -> 38ebb3e3a
# IGNITE-312 Bug fix: custom event must be performed in same order in each
nodes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38ebb3e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38ebb3e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38ebb3e3
Branch: refs/heads/ignite-45
Commit: 38ebb3e3aeb242efda79d652e83a41ed7b53cd6c
Parents: 893d0fe
Author: sevdokimov
Authored: Tue Mar 3 18:25:19 2015 +0300
Committer: sevdokimov
Committed: Tue Mar 3 18:25:19 2015 +0300
--
.../eventstorage/GridEventStorageManager.java | 3 +-
.../ignite/internal/util/IgniteUtils.java | 30 ++
.../spi/discovery/tcp/TcpDiscoverySpi.java | 33
.../TcpDiscoveryCustomEventMessage.java | 1 +
4 files changed, 40 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38ebb3e3/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 82af8bf..36ea7e4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.events.*;
import org.apache.ignite.internal.managers.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.managers.deployment.*;
@@ -434,7 +435,7 @@ public class GridEventStorageManager extends
GridManagerAdapter
* @return {@code true} if this is an internal event.
*/
private boolean isInternalEvent(int type) {
-return F.contains(EVTS_DISCOVERY_ALL, type);
+return type == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT ||
F.contains(EVTS_DISCOVERY_ALL, type);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38ebb3e3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index de71f59..7412ba2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -26,6 +26,7 @@ import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.cluster.*;
import org.apache.ignite.internal.compute.*;
+import org.apache.ignite.internal.events.*;
import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.mxbean.*;
import org.apache.ignite.internal.processors.cache.*;
@@ -452,22 +453,25 @@ public abstract class IgniteUtils {
}
// Event names initialization.
-for (Field field : EventType.class.getFields()) {
-if (field.getType().equals(int.class)) {
-try {
-assert field.getName().startsWith("EVT_") : "Invalid event
name (should start with 'EVT_': " +
-field.getName();
+Class[] evtHolderClasses = new Class[]{EventType.class,
DiscoveryCustomEvent.class};
-int type = field.getInt(null);
+for (Class cls : evtHolderClasses) {
+for (Field field : cls.getFields()) {
+if (Modifier.isStatic(field.getModifiers()) &&
field.getType().equals(int.class)) {
+if (field.getName().startsWith("EVT_")) {
+try {
+int type = field.getInt(null);
-String prev = GRID_EVT_NAMES.put(type,
field.getName().substring(4));
+String prev = GRID_EVT_NAMES.put(type,
field.getName().substring("EVT_".length()));
-// Check for duplicate event types.
-assert prev == null : "Duplicate event [type=" + type + ",
name1=" + prev +
-", name2=" + field.getName() + ']';
-}
-catch (IllegalAcce
[7/7] incubator-ignite git commit: [maven-release-plugin] prepare branch ignite-release-test-branch-3
[maven-release-plugin] prepare branch ignite-release-test-branch-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3b9e3087 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b9e3087 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b9e3087 Branch: refs/heads/ignite-release-test Commit: 3b9e30879b3e5621e856dc51960c3dfad7a3e1b7 Parents: 694061f Author: avinogradov Authored: Tue Mar 3 18:58:22 2015 +0300 Committer: avinogradov Committed: Tue Mar 3 18:58:22 2015 +0300 -- examples/pom.xml | 5 +- modules/aop/pom.xml | 5 +- modules/assembly/pom.xml | 139 + modules/aws/pom.xml | 5 +- modules/clients/pom.xml | 5 +- modules/codegen/pom.xml | 4 +- modules/core/pom.xml | 41 +-- modules/extdata/p2p/pom.xml | 12 +--- modules/extdata/uri/pom.xml | 14 ++-- modules/geospatial/pom.xml| 5 +- modules/hadoop/pom.xml| 5 +- modules/hibernate/pom.xml | 5 +- modules/indexing/pom.xml | 5 +- modules/jcl/pom.xml | 5 +- modules/jta/pom.xml | 5 +- modules/log4j/pom.xml | 5 +- modules/rest-http/pom.xml | 5 +- modules/scalar/pom.xml| 30 modules/schedule/pom.xml | 5 +- modules/schema-load/pom.xml | 5 +- modules/slf4j/pom.xml | 5 +- modules/spring/pom.xml| 5 +- modules/ssh/pom.xml | 5 +- modules/tools/pom.xml | 4 +- modules/urideploy/pom.xml | 5 +- modules/visor-console/pom.xml | 9 +-- modules/visor-plugins/pom.xml | 5 +- modules/web/pom.xml | 5 +- pom.xml | 29 29 files changed, 137 insertions(+), 245 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b9e3087/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 633abfe..aa46c95 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,10 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b9e3087/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 14d1922..6e041d1 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -20,10 +20,7 @@ -http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b9e3087/modules/assembly/pom.xml -- diff --git a/modules/assembly/pom.xml b/modules/assembly/pom.xml index 35c3363..f8d6590 100644 --- a/modules/assembly/pom.xml +++ b/modules/assembly/pom.xml @@ -20,10 +20,7 @@ -http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 @@ -186,105 +183,101 @@ - - + + - + - - +
[3/7] incubator-ignite git commit: ignite-release-test Ignite assembly using assembly module
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb5ae85/modules/indexing/pom.xml
--
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index bd807f9..3bac251 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -29,7 +29,7 @@
org.apache.ignite
ignite
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
../../
@@ -39,7 +39,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
@@ -63,7 +63,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
test-jar
test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb5ae85/modules/jcl/pom.xml
--
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index fecb864..bea54c5 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -29,7 +29,7 @@
org.apache.ignite
ignite
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
../../
@@ -39,7 +39,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
@@ -51,7 +51,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
test-jar
test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb5ae85/modules/jta/pom.xml
--
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index e767b9f..ccf33ca 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -29,7 +29,7 @@
org.apache.ignite
ignite
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
../../
@@ -39,7 +39,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
@@ -65,7 +65,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
test-jar
test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb5ae85/modules/log4j/pom.xml
--
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 3c7007b..a63a5d5 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -29,7 +29,7 @@
org.apache.ignite
ignite
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
../../
@@ -39,7 +39,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
@@ -50,7 +50,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
test-jar
test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb5ae85/modules/rest-http/pom.xml
--
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 5d39818..e73c3cb 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -29,7 +29,7 @@
org.apache.ignite
ignite
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
../../
@@ -39,7 +39,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb5ae85/modules/scalar/pom.xml
--
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index d88d7ec..6c490c7 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -29,7 +29,7 @@
org.apache.ignite
ignite
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
../..
@@ -39,7 +39,7 @@
org.apache.ignite
ignite-core
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
@@ -51,14 +51,14 @@
org.apache.ignite
ignite-spring
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
test
org.apache.ignite
ignite-indexing
-${ignite.version}
+1.0.1-RC1-SNAPSHOT
test
@@ -104,7 +104,7 @@
org.apache.ignite
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-branch-3 [created] 3b9e30879
incubator-ignite git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test 3b9e30879 -> 067ce8140 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/067ce814 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/067ce814 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/067ce814 Branch: refs/heads/ignite-release-test Commit: 067ce8140f56c08e80c492adc6483cb4f2fab621 Parents: 3b9e308 Author: avinogradov Authored: Tue Mar 3 18:58:35 2015 +0300 Committer: avinogradov Committed: Tue Mar 3 18:58:35 2015 +0300 -- examples/pom.xml | 18 modules/aop/pom.xml | 8 +++ modules/assembly/pom.xml | 44 +++--- modules/aws/pom.xml | 6 +++--- modules/clients/pom.xml | 12 +-- modules/codegen/pom.xml | 4 ++-- modules/core/pom.xml | 4 ++-- modules/extdata/p2p/pom.xml | 6 +++--- modules/extdata/uri/pom.xml | 6 +++--- modules/geospatial/pom.xml| 6 +++--- modules/hadoop/pom.xml| 10 - modules/hibernate/pom.xml | 8 +++ modules/indexing/pom.xml | 6 +++--- modules/jcl/pom.xml | 6 +++--- modules/jta/pom.xml | 6 +++--- modules/log4j/pom.xml | 6 +++--- modules/rest-http/pom.xml | 4 ++-- modules/scalar/pom.xml| 10 - modules/schedule/pom.xml | 6 +++--- modules/schema-load/pom.xml | 4 ++-- modules/slf4j/pom.xml | 4 ++-- modules/spring/pom.xml| 10 - modules/ssh/pom.xml | 10 - modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 8 +++ modules/visor-console/pom.xml | 10 - modules/visor-plugins/pom.xml | 4 ++-- modules/web/pom.xml | 10 - pom.xml | 6 +++--- 29 files changed, 122 insertions(+), 122 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/067ce814/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index aa46c95..56efd5d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -23,7 +23,7 @@ org.apache.ignite ignite -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT .. @@ -39,31 +39,31 @@ org.apache.ignite ignite-core -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-hibernate -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-spring -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-log4j -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT org.apache.ignite ignite-indexing -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT @@ -153,7 +153,7 @@ org.apache.ignite ignite-core -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT test-jar test @@ -161,7 +161,7 @@ org.apache.ignite ignite-schedule -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT test @@ -188,7 +188,7 @@ org.apache.ignite ignite-scalar -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/067ce814/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 6e041d1..6971ab8 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -26,7 +26,7 @@ org.apache.ignite ignite -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT ../../ @@ -36,7 +36,7 @@ org.apache.ignite ignite-core -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT @@ -72,14 +72,14 @@ org.apache.ignite ignite-log4j -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT test org.apache.ignite ignite-core -1.0.1-RC1-SNAPSHOT +1.1.0-SNAPSHOT test-jar test http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/067ce814/modul
[5/7] incubator-ignite git commit: ignite-release-test ignite.version to project.version, assembly module migration
ignite-release-test ignite.version to project.version, assembly module migration
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/457d64b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/457d64b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/457d64b2
Branch: refs/heads/ignite-release-test
Commit: 457d64b2cd2381ca73c1fc448ce4ab13ca9d3128
Parents: 5cb5ae8
Author: avinogradov
Authored: Tue Mar 3 18:53:40 2015 +0300
Committer: avinogradov
Committed: Tue Mar 3 18:53:40 2015 +0300
--
assembly/modules/package/pom.xml | 486 --
examples/pom-standalone.xml | 1 -
modules/assembly/pom.xml | 486 ++
modules/core/pom.xml | 4 +-
modules/scalar/pom.xml | 2 +-
modules/visor-console/pom.xml| 2 +-
pom.xml | 15 +-
7 files changed, 497 insertions(+), 499 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/457d64b2/assembly/modules/package/pom.xml
--
diff --git a/assembly/modules/package/pom.xml b/assembly/modules/package/pom.xml
deleted file mode 100644
index ca0eec1..000
--- a/assembly/modules/package/pom.xml
+++ /dev/null
@@ -1,486 +0,0 @@
-
-
-
-
-
-http://maven.apache.org/POM/4.0.0";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-4.0.0
-
-
-org.apache.ignite
-ignite
-1.0.1-RC1-SNAPSHOT
-../../..
-
-
-ignite-assembly
-pom
-
-
-${project.basedir}/${parent.relativePath}
-
-
-
-
-org.apache.ignite
-ignite-spring
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-indexing
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-aop
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-aws
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-hibernate
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-jcl
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-jta
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-log4j
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-rest-http
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-schedule
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-slf4j
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-urideploy
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-web
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-scalar
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-visor-plugins
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-visor-console
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-ssh
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-schema-load
-1.0.1-RC1-SNAPSHOT
-
-
-
-org.apache.ignite
-ignite-hadoop
-1.0.1-RC1-SNAPSHOT
-
-
-
-
-
-release
-
-true
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-1.7
-false
-
-
-org.apache.ignite
-ignite-tools
-1.0.1-RC1-SNAPSHOT
-
-
-
-
-release-postprocessing
-
-run
-
-package
-
-
[4/7] incubator-ignite git commit: ignite-release-test Ignite assembly using assembly module
ignite-release-test Ignite assembly using assembly module Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5cb5ae85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5cb5ae85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5cb5ae85 Branch: refs/heads/ignite-release-test Commit: 5cb5ae852a322a364711b1df759f04310bfbf809 Parents: 1640ab7 Author: avinogradov Authored: Tue Mar 3 18:33:39 2015 +0300 Committer: avinogradov Committed: Tue Mar 3 18:33:39 2015 +0300 -- assembly/dependencies-hadoop.xml | 3 + assembly/dependencies-optional-fabric.xml | 2 + assembly/dependencies-optional-hadoop.xml | 2 + assembly/dependencies-schema-load.xml | 1 + assembly/dependencies-visor-console.xml | 2 + assembly/modules/package/pom.xml | 537 +++-- assembly/release-base.xml | 18 +- assembly/release-fabric.xml | 20 +- assembly/release-hadoop.xml | 14 +- assembly/release-scala.xml| 4 +- examples/pom-standalone.xml | 16 +- examples/pom.xml | 18 +- modules/aop/pom.xml | 8 +- modules/aws/pom.xml | 6 +- modules/clients/pom.xml | 12 +- modules/codegen/pom.xml | 4 +- modules/core/pom.xml | 4 +- modules/extdata/p2p/pom.xml | 6 +- modules/extdata/uri/pom.xml | 6 +- modules/geospatial/pom.xml| 6 +- modules/hadoop/pom.xml| 10 +- modules/hibernate/pom.xml | 8 +- modules/indexing/pom.xml | 6 +- modules/jcl/pom.xml | 6 +- modules/jta/pom.xml | 6 +- modules/log4j/pom.xml | 6 +- modules/rest-http/pom.xml | 4 +- modules/scalar/pom.xml| 10 +- modules/schedule/pom.xml | 6 +- modules/schema-load/pom.xml | 4 +- modules/slf4j/pom.xml | 4 +- modules/spring/pom.xml| 10 +- modules/ssh/pom.xml | 10 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 8 +- modules/visor-console/pom.xml | 10 +- modules/visor-plugins/pom.xml | 4 +- modules/web/pom.xml | 10 +- modules/yardstick/pom.xml | 8 +- pom.xml | 446 +++- 40 files changed, 646 insertions(+), 621 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb5ae85/assembly/dependencies-hadoop.xml -- diff --git a/assembly/dependencies-hadoop.xml b/assembly/dependencies-hadoop.xml index ee49731..de11c55 100644 --- a/assembly/dependencies-hadoop.xml +++ b/assembly/dependencies-hadoop.xml @@ -31,6 +31,7 @@ +true org.apache.ignite:ignite-spring org.apache.ignite:ignite-log4j @@ -67,6 +68,7 @@ +true org.apache.ignite:ignite-core @@ -102,6 +104,7 @@ +true org.apache.ignite:ignite-hadoop http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb5ae85/assembly/dependencies-optional-fabric.xml -- diff --git a/assembly/dependencies-optional-fabric.xml b/assembly/dependencies-optional-fabric.xml index db5489d..db57a41 100644 --- a/assembly/dependencies-optional-fabric.xml +++ b/assembly/dependencies-optional-fabric.xml @@ -31,6 +31,7 @@ +true true org.apache.ignite:ignite-core @@ -46,6 +47,7 @@ org.apache.ignite:ignite-visor-trial org.apache.ignite:ignite-hadoop org.apache.ignite:ignite-schema-load +org.apache.ignite:ignite-assembly true http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cb5ae85/assembly/dependencies-optional-hadoop.xml -- diff --git a/assembly/dependencies-optional-hadoop.xml b/assembly/dependencies-optional-hadoop.xml index 7f79310..70d12ae 100644 --- a/assembly/dependencies-optional-hadoop.xml +++ b/assembly/dependencies-optional-hadoop.xml @@ -31,6 +31,7 @@ +true
incubator-ignite git commit: # ignite-293: remove the rest of 'os/'
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-293 [created] a582ceca9
# ignite-293: remove the rest of 'os/'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a582ceca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a582ceca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a582ceca
Branch: refs/heads/ignite-293
Commit: a582ceca93495bcf5069bfb906e30e34b280c4b8
Parents: 2a68e64
Author: Artem Shutak
Authored: Tue Mar 3 20:06:36 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 20:06:36 2015 +0300
--
bin/include/target-classpath.sh | 2 +-
.../ignite/internal/util/IgniteUtils.java | 20 +---
.../ignite/testframework/GridTestUtils.java | 13 +
pom.xml | 2 +-
4 files changed, 8 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a582ceca/bin/include/target-classpath.sh
--
diff --git a/bin/include/target-classpath.sh b/bin/include/target-classpath.sh
index 62c9ffa..871d517 100644
--- a/bin/include/target-classpath.sh
+++ b/bin/include/target-classpath.sh
@@ -19,7 +19,7 @@
# Target class path resolver.
#
# Can be used like:
-# . "${IGNITE_HOME}"/os/bin/include/target-classpath.sh
+# . "${IGNITE_HOME}"/bin/include/target-classpath.sh
# in other scripts to set classpath using libs from target folder.
#
# Will be excluded in release.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a582ceca/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index de71f59..1c33fe4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -30,10 +30,6 @@ import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.mxbean.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
import org.apache.ignite.internal.processors.streamer.*;
import org.apache.ignite.internal.transactions.*;
import org.apache.ignite.internal.util.io.*;
@@ -41,6 +37,10 @@ import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.worker.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.plugin.extensions.communication.*;
+import org.apache.ignite.spi.*;
import org.apache.ignite.spi.discovery.*;
import org.apache.ignite.transactions.*;
import org.jdk8.backport.*;
@@ -3149,14 +3149,7 @@ public abstract class IgniteUtils {
if (file.exists())
return file;
-/*
- * 3. Check development path.
- */
-
-if (home != null)
-file = new File(home, "os/" + path);
-
-return file.exists() ? file : null;
+return null;
}
/**
@@ -3194,9 +3187,6 @@ public abstract class IgniteUtils {
@Nullable public static URL resolveIgniteUrl(String path, boolean metaInf)
{
File f = resolveIgnitePath(path);
-if (f == null)
-f = resolveIgnitePath("os/" + path);
-
if (f != null) {
try {
// Note: we use that method's chain instead of File.getURL()
with due
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a582ceca/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 0449e48..ffd890e 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -806,18 +806,7 @@ public final class GridTestUtils {
* @see #getIgniteHome()
*/
@Nullable public static File resolveIgnitePath(String path) {
-return resolveIgnitePath(null, path);
-}
-
-/**
- * @param i
[4/4] incubator-ignite git commit: [IGNITE-349]: corrected class references in java docs.
[IGNITE-349]: corrected class references in java docs. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/83dabe67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83dabe67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83dabe67 Branch: refs/heads/ignite-349 Commit: 83dabe67ddf5b6d09aa7ef01b4f76ddaf7d70307 Parents: 17a1796 Author: iveselovskiy Authored: Tue Mar 3 20:06:44 2015 +0300 Committer: iveselovskiy Committed: Tue Mar 3 20:06:44 2015 +0300 -- .../org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java | 2 +- .../org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83dabe67/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java index 6c032ff..2f5278e 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java @@ -58,7 +58,7 @@ import static org.apache.ignite.internal.processors.igfs.IgfsEx.*; * ** * * You should also add Ignite JAR and all libraries to Hadoop classpath. To http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83dabe67/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java -- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java index 84accb1..81585ff 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java @@ -58,7 +58,7 @@ import static org.apache.ignite.internal.processors.igfs.IgfsEx.*; * *fs.igfs.impl - *org.apache.ignite.igfs.hadoop.IgfsHadoopFileSystem + *org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem ** * * You should also add Ignite JAR and all libraries to Hadoop classpath. Tofs.igfs.impl - *org.apache.ignite.igfs.hadoop.IgfsHadoopFileSystem + *org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem *
[1/4] incubator-ignite git commit: Make IgniteEvents.withAsync() public (all method in the interfaces must be public)
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-349 bbaf2a7e8 -> 83dabe67d
Make IgniteEvents.withAsync() public (all method in the interfaces must be
public)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6909cc4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6909cc4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6909cc4b
Branch: refs/heads/ignite-349
Commit: 6909cc4b45f78dc6ab649462b075bf12a9047eb5
Parents: 2a68e64
Author: sevdokimov
Authored: Tue Mar 3 16:36:00 2015 +0300
Committer: sevdokimov
Committed: Tue Mar 3 16:36:00 2015 +0300
--
modules/core/src/main/java/org/apache/ignite/IgniteEvents.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6909cc4b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
index f6adecb..5a92900 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
@@ -257,5 +257,5 @@ public interface IgniteEvents extends IgniteAsyncSupport {
public boolean isEnabled(int type);
/** {@inheritDoc} */
-@Override IgniteEvents withAsync();
+@Override public IgniteEvents withAsync();
}
[2/4] incubator-ignite git commit: [IGNITE-349]: Some more corrections.
[IGNITE-349]: Some more corrections.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be4cd29a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be4cd29a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be4cd29a
Branch: refs/heads/ignite-349
Commit: be4cd29a4f504d6cf90e2ef345d8a4c2fe5499ef
Parents: bbaf2a7
Author: iveselovskiy
Authored: Tue Mar 3 16:54:17 2015 +0300
Committer: iveselovskiy
Committed: Tue Mar 3 16:54:17 2015 +0300
--
.../ignite/internal/processors/igfs/IgfsEx.java | 8 ++---
.../visor/node/VisorIgfsConfiguration.java | 7 ++--
.../hadoop/IgfsHadoopFileSystemWrapper.java | 11 +++---
.../igfs/hadoop/v1/IgfsHadoopFileSystem.java| 11 +++---
.../igfs/hadoop/v2/IgfsHadoopFileSystem.java| 11 +++---
.../hadoop/SecondaryFileSystemProvider.java | 38 +---
6 files changed, 39 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be4cd29a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
index f247fba..a380a6d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
@@ -29,14 +29,10 @@ import java.net.*;
* Internal API extension for {@link org.apache.ignite.IgniteFs}.
*/
public interface IgfsEx extends IgniteFs {
-/**
- * Property name for path to Hadoop configuration.
- */
+/** Property name for path to Hadoop configuration. */
String SECONDARY_FS_CONFIG_PATH = "SECONDARY_FS_CONFIG_PATH";
-/**
- * Property name for URI of file system.
- */
+/** Property name for URI of file system. */
String SECONDARY_FS_URI = "SECONDARY_FS_URI";
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be4cd29a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
index b8fa57c..78943a2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
@@ -19,9 +19,9 @@ package org.apache.ignite.internal.visor.node;
import org.apache.ignite.configuration.*;
import org.apache.ignite.igfs.*;
-import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
+import static org.apache.ignite.internal.processors.igfs.IgfsEx.*;
import java.io.*;
import java.util.*;
@@ -32,7 +32,6 @@ import static
org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
* Data transfer object for IGFS configuration properties.
*/
public class VisorIgfsConfiguration implements Serializable {
-
/** */
private static final long serialVersionUID = 0L;
@@ -138,8 +137,8 @@ public class VisorIgfsConfiguration implements Serializable
{
if (secFs != null) {
Map props = secFs.properties();
-cfg.secondaryHadoopFileSysUri = props.get(IgfsEx.SECONDARY_FS_URI);
-cfg.secondaryHadoopFileSysCfgPath =
props.get(IgfsEx.SECONDARY_FS_CONFIG_PATH);
+cfg.secondaryHadoopFileSysUri = props.get(SECONDARY_FS_URI);
+cfg.secondaryHadoopFileSysCfgPath =
props.get(SECONDARY_FS_CONFIG_PATH);
}
cfg.dfltMode = igfs.getDefaultMode();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be4cd29a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
index 00aa372..6b3de5d 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopFileSystemWrapper.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.processors.hadoop.*;
import org.apache.ignite.internal.processors.igfs.*;
imp
[3/4] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-349
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-349 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17a17965 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17a17965 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17a17965 Branch: refs/heads/ignite-349 Commit: 17a17965e2e10951538118446f20e483b7e88a78 Parents: be4cd29 6909cc4 Author: iveselovskiy Authored: Tue Mar 3 16:59:26 2015 +0300 Committer: iveselovskiy Committed: Tue Mar 3 16:59:26 2015 +0300 -- modules/core/src/main/java/org/apache/ignite/IgniteEvents.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
incubator-ignite git commit: ignite-release-test Correct plugin dependency versions
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-release-test 067ce8140 -> abe0e6347
ignite-release-test Correct plugin dependency versions
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/abe0e634
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/abe0e634
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/abe0e634
Branch: refs/heads/ignite-release-test
Commit: abe0e6347d809afa47995e4b3fcbf5ce918e0565
Parents: 067ce81
Author: avinogradov
Authored: Tue Mar 3 20:06:49 2015 +0300
Committer: avinogradov
Committed: Tue Mar 3 20:06:49 2015 +0300
--
pom.xml | 408 +--
1 file changed, 204 insertions(+), 204 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/abe0e634/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0029415..b6d5666 100644
--- a/pom.xml
+++ b/pom.xml
@@ -630,7 +630,7 @@
org.apache.ignite
ignite-tools
-
1.0.1-RC1-SNAPSHOT
+RELEASE
@@ -809,208 +809,208 @@
-
-core-javadoc
-
-aggregate
-
-process-test-classes
-
-
-
-
org.apache.ignite.tools.javadoc.IgniteLinkTaglet
-
-
org.apache.ignite
-
ignite-tools
-
1.0.1-RC1-SNAPSHOT
-
-
-
-
${basedir}/target/javadoc
-core
-Ignite
${project.version}
-Ignite
${project.version}
-true
-true
-protected
-true
-false
-false
-1.7
-
-
http://docs.oracle.com/javase/7/docs/api/
-
http://hadoop.apache.org/docs/current/api/
-
-
${project.basedir}/${parent.relativePath}/assembly/docfiles/javadoc.css
-
com.*:org.jetbrains.*:org.pcollections:*.jdk8:*.tests:*.tools:*.typedef:*.examples:*.client:*.kernal:*.internal:*.util:*.dr:*.spi.discovery.tcp.messages:*.spi.discovery.tcp.internal:*.spi.deployment.uri.scanners:*.spi.deployment.uri.tasks:*.spi.indexing.h2.opt:org.apache.ignite.portables:org.apache.ignite.yardstick:org.apache.ignite.schema.*:org.apache.ignite.codegen
-
-
-Common Grid APIs
-
org.apache.ignite:org.apache.ignite.cluster:org.apache.ignite.lifecycle:org.apache.ignite.configuration:org.apache.ignite.spi:org.apache.ignite.lang:org.apache.ignite.resources:org.apache.ignite.thread:org.apache.ignite.scheduler
-
-
-Messaging APIs
-
org.apache.ignite.messaging
-
-
-Event Notification
APIs
-
org.apache.ignite.events
-
-
-Compute Grid APIs
-
org.apache.ignite.compute:org.apache.ignite.compute.gridify:org.apache.ignit
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-394 [deleted] b27e1f3db
[3/3] incubator-ignite git commit: # ignite-394: IgniteDataLoader -> IgniteDataStreamer.java + impl
# ignite-394: IgniteDataLoader -> IgniteDataStreamer.java + impl
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b33b651
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b33b651
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b33b651
Branch: refs/heads/ignite-394
Commit: 9b33b6510f5b82c30c8e75a66eb328b00bc425e4
Parents: 6909cc4
Author: Artem Shutak
Authored: Tue Mar 3 21:40:19 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 21:40:19 2015 +0300
--
.../datagrid/CacheDataLoaderExample.java|6 +-
.../datagrid/CachePopularNumbersExample.java|4 +-
.../src/main/java/org/apache/ignite/Ignite.java |6 +-
.../org/apache/ignite/IgniteDataLoader.java | 379 -
.../org/apache/ignite/IgniteDataStreamer.java | 379 +
.../apache/ignite/internal/IgniteKernal.java|2 +-
.../processors/cache/GridCacheAdapter.java | 10 +-
.../GridDistributedCacheAdapter.java|4 +-
.../dataload/GridDataLoadCacheUpdaters.java | 18 +-
.../dataload/GridDataLoadUpdateJob.java |4 +-
.../dataload/GridDataLoaderFuture.java |4 +-
.../dataload/GridDataLoaderProcessor.java | 16 +-
.../dataload/IgniteDataLoaderImpl.java | 1453 --
.../dataload/IgniteDataStreamerImpl.java| 1453 ++
.../dr/GridDrDataLoadCacheUpdater.java |2 +-
.../processors/igfs/IgfsDataManager.java| 10 +-
...iteTxConsistencyRestartAbstractSelfTest.java |2 +-
...idCachePartitionedHitsAndMissesSelfTest.java |4 +-
.../GridCacheLruNearEvictionPolicySelfTest.java |2 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java |2 +-
.../dataload/GridDataLoaderImplSelfTest.java|5 +-
.../dataload/GridDataLoaderPerformanceTest.java |2 +-
.../GridDataLoaderProcessorSelfTest.java| 27 +-
.../loadtests/colocation/GridTestMain.java |2 +-
.../loadtests/discovery/GridGcTimeoutTest.java |2 +-
.../mapper/GridContinuousMapperLoadTest1.java |2 +-
.../mapper/GridContinuousMapperLoadTest2.java |2 +-
.../ignite/testframework/junits/IgniteMock.java |4 +-
.../scala/org/apache/ignite/scalar/scalar.scala |8 +-
.../org/apache/ignite/IgniteSpringBean.java |2 +-
.../cache/IgniteSqlQueryBenchmark.java |2 +-
.../cache/IgniteSqlQueryJoinBenchmark.java |2 +-
32 files changed, 1909 insertions(+), 1911 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b33b651/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
index 57b0cd2..4cdbfd4 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
@@ -21,8 +21,8 @@ import org.apache.ignite.*;
import org.apache.ignite.examples.*;
/**
- * Demonstrates how cache can be populated with data utilizing {@link
IgniteDataLoader} API.
- * {@link IgniteDataLoader} is a lot more efficient to use than standard
+ * Demonstrates how cache can be populated with data utilizing {@link
IgniteDataStreamer} API.
+ * {@link IgniteDataStreamer} is a lot more efficient to use than standard
* {@code put(...)} operation as it properly buffers cache requests
* together and properly manages load on remote nodes.
*
@@ -63,7 +63,7 @@ public class CacheDataLoaderExample {
long start = System.currentTimeMillis();
-try (IgniteDataLoader ldr =
ignite.dataLoader(CACHE_NAME)) {
+try (IgniteDataStreamer ldr =
ignite.dataLoader(CACHE_NAME)) {
// Configure loader.
ldr.perNodeBufferSize(1024);
ldr.perNodeParallelLoadOperations(8);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b33b651/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
index 0f71681..1fc737b 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
@@ -92,7 +92
[2/3] incubator-ignite git commit: # ignite-394: IgniteDataLoader -> IgniteDataStreamer.java + impl
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b33b651/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
deleted file mode 100644
index ed3bbcb..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++ /dev/null
@@ -1,1453 +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.processors.dataload;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.processors.affinity.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.processors.dr.*;
-import org.apache.ignite.internal.processors.portable.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.Map.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-
-/**
- * Data loader implementation.
- */
-@SuppressWarnings("unchecked")
-public class IgniteDataLoaderImpl implements IgniteDataLoader,
Delayed {
-/** Isolated updater. */
-private static final Updater ISOLATED_UPDATER = new IsolatedUpdater();
-
-/** Cache updater. */
-private Updater updater = ISOLATED_UPDATER;
-
-/** */
-private byte[] updaterBytes;
-
-/** Max remap count before issuing an error. */
-private static final int DFLT_MAX_REMAP_CNT = 32;
-
-/** Log reference. */
-private static final AtomicReference logRef = new
AtomicReference<>();
-
-/** Cache name ({@code null} for default cache). */
-private final String cacheName;
-
-/** Portable enabled flag. */
-private final boolean portableEnabled;
-
-/**
- * If {@code true} then data will be transferred in compact format (only
keys and values).
- * Otherwise full map entry will be transferred (this is requires by DR
internal logic).
- */
-private final boolean compact;
-
-/** Per-node buffer size. */
-@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
-private int bufSize = DFLT_PER_NODE_BUFFER_SIZE;
-
-/** */
-private int parallelOps = DFLT_MAX_PARALLEL_OPS;
-
-/** */
-private long autoFlushFreq;
-
-/** Mapping. */
-@GridToStringInclude
-private ConcurrentMap bufMappings = new
ConcurrentHashMap8<>();
-
-/** Logger. */
-private IgniteLogger log;
-
-/** Discovery listener. */
-private final GridLocalEventListener discoLsnr;
-
-/** Context. */
-private final GridKernalContext ctx;
-
-/** Communication topic for responses. */
-private final Object topic;
-
-/** */
-private byte[] topicBytes;
-
-/** {@code True} if data loader has been cancelled. */
-private volatile boolean cancelled;
-
-/** Active futures of this data loader. */
-@GridToStringInclude
-private final Collection> activeFuts = new
GridConcurrentHashSet<>();
-
-/**
[1/3] incubator-ignite git commit: # ignite-394: IgniteDataLoader -> IgniteDataStreamer.java + impl
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-394 [created] 9b33b6510
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b33b651/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
new file mode 100644
index 000..3f94752
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerImpl.java
@@ -0,0 +1,1453 @@
+/*
+ * 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.processors.dataload;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.cluster.*;
+import org.apache.ignite.internal.managers.communication.*;
+import org.apache.ignite.internal.managers.deployment.*;
+import org.apache.ignite.internal.managers.eventstorage.*;
+import org.apache.ignite.internal.processors.affinity.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
+import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.dr.*;
+import org.apache.ignite.internal.processors.portable.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.future.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.Map.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.internal.GridTopic.*;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+
+/**
+ * Data loader implementation.
+ */
+@SuppressWarnings("unchecked")
+public class IgniteDataStreamerImpl implements IgniteDataStreamer,
Delayed {
+/** Isolated updater. */
+private static final Updater ISOLATED_UPDATER = new IsolatedUpdater();
+
+/** Cache updater. */
+private Updater updater = ISOLATED_UPDATER;
+
+/** */
+private byte[] updaterBytes;
+
+/** Max remap count before issuing an error. */
+private static final int DFLT_MAX_REMAP_CNT = 32;
+
+/** Log reference. */
+private static final AtomicReference logRef = new
AtomicReference<>();
+
+/** Cache name ({@code null} for default cache). */
+private final String cacheName;
+
+/** Portable enabled flag. */
+private final boolean portableEnabled;
+
+/**
+ * If {@code true} then data will be transferred in compact format (only
keys and values).
+ * Otherwise full map entry will be transferred (this is requires by DR
internal logic).
+ */
+private final boolean compact;
+
+/** Per-node buffer size. */
+@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+private int bufSize = DFLT_PER_NODE_BUFFER_SIZE;
+
+/** */
+private int parallelOps = DFLT_MAX_PARALLEL_OPS;
+
+/** */
+private long autoFlushFreq;
+
+/** Mapping. */
+@GridToStringInclude
+private ConcurrentMap bufMappings = new
ConcurrentHashMap8<>();
+
+/** Logger. */
+private IgniteLogger log;
+
+/** Discovery listener. */
+private final GridLocalEventListener discoLsnr;
+
+/** Context. */
+private final GridKernalContext ctx;
+
+/** Communication topic for responses. */
+private final Object topic;
+
+/** */
+private byte[] topicBytes;
+
+/** {@code True} if data loader has been cancelled. */
+private volatile boolean cancelled;
+
+/** Active futures of this data loader. */
+@GridT
incubator-ignite git commit: # ignite-394: GridDataLoaderProcessor -> IgniteDataStreamerProcessor.java + test
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-394 9b33b6510 -> 36b7c8f74
# ignite-394: GridDataLoaderProcessor -> IgniteDataStreamerProcessor.java + test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36b7c8f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36b7c8f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36b7c8f7
Branch: refs/heads/ignite-394
Commit: 36b7c8f74445ccff81c6370685d85beeddfee76b
Parents: 9b33b65
Author: Artem Shutak
Authored: Tue Mar 3 21:43:02 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 21:43:02 2015 +0300
--
.../org/apache/ignite/IgniteDataStreamer.java | 2 +-
.../ignite/internal/GridKernalContext.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 10 +-
.../apache/ignite/internal/IgniteKernal.java| 2 +-
.../dataload/GridDataLoaderProcessor.java | 316 ---
.../dataload/IgniteDataStreamerProcessor.java | 316 +++
.../GridDataLoaderProcessorSelfTest.java| 924 ---
.../IgniteDataStreamerProcessorSelfTest.java| 924 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +-
9 files changed, 1249 insertions(+), 1249 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36b7c8f7/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
index c48d61a..519a0a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -41,7 +41,7 @@ import java.util.*;
* data can be loaded from underlying data store on demand, whenever it is
accessed -
* for this no explicit data loading step is needed.
*
- * {@code IgniteDataLoader} supports the following configuration properties:
+ * {@code IgniteDataStreamer} supports the following configuration properties:
*
*
* {@link #perNodeBufferSize(int)} - when entries are added to data
loader via
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36b7c8f7/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index cb9ffa1..c497c06 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -247,7 +247,7 @@ public interface GridKernalContext extends
Iterable {
*
* @return Data loader processor.
*/
-public GridDataLoaderProcessor dataLoad();
+public IgniteDataStreamerProcessor dataLoad();
/**
* Gets file system processor.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36b7c8f7/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 756c16a..71a357e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -202,7 +202,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
/** */
@GridToStringInclude
-private GridDataLoaderProcessor dataLdrProc;
+private IgniteDataStreamerProcessor dataLdrProc;
/** */
@GridToStringInclude
@@ -446,8 +446,8 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
affProc = (GridAffinityProcessor)comp;
else if (comp instanceof GridRestProcessor)
restProc = (GridRestProcessor)comp;
-else if (comp instanceof GridDataLoaderProcessor)
-dataLdrProc = (GridDataLoaderProcessor)comp;
+else if (comp instanceof IgniteDataStreamerProcessor)
+dataLdrProc = (IgniteDataStreamerProcessor)comp;
else if (comp instanceof IgfsProcessorAdapter)
igfsProc = (IgfsProcessorAdapter)comp;
else if (comp instanceof GridOffHeapProcessor)
@@ -660,8 +660,8 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
/** {@inhe
incubator-ignite git commit: # ignite-394: dataLoad -> dataStream methods renaming
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-394 36b7c8f74 -> 43e533eb8
# ignite-394: dataLoad -> dataStream methods renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/43e533eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/43e533eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/43e533eb
Branch: refs/heads/ignite-394
Commit: 43e533eb81290286514fe9f1a8866d6d6b6ca8f9
Parents: 36b7c8f
Author: Artem Shutak
Authored: Tue Mar 3 21:49:12 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 21:49:12 2015 +0300
--
.../datagrid/CacheDataLoaderExample.java| 2 +-
.../datagrid/CachePopularNumbersExample.java| 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 2 +-
.../ignite/internal/GridKernalContext.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java| 4 +--
.../processors/cache/GridCacheAdapter.java | 6 ++---
.../GridDistributedCacheAdapter.java| 2 +-
.../dataload/IgniteDataStreamerProcessor.java | 6 ++---
.../processors/igfs/IgfsDataManager.java| 2 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 2 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 2 +-
.../GridCacheLruNearEvictionPolicySelfTest.java | 2 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +-
.../dataload/GridDataLoaderImplSelfTest.java| 4 +--
.../dataload/GridDataLoaderPerformanceTest.java | 2 +-
.../IgniteDataStreamerProcessorSelfTest.java| 28 ++--
.../loadtests/colocation/GridTestMain.java | 2 +-
.../loadtests/discovery/GridGcTimeoutTest.java | 2 +-
.../mapper/GridContinuousMapperLoadTest1.java | 2 +-
.../mapper/GridContinuousMapperLoadTest2.java | 2 +-
.../ignite/testframework/junits/IgniteMock.java | 2 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 2 +-
.../org/apache/ignite/IgniteSpringBean.java | 4 +--
.../cache/IgniteSqlQueryBenchmark.java | 2 +-
.../cache/IgniteSqlQueryJoinBenchmark.java | 2 +-
26 files changed, 46 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
index 4cdbfd4..8984fdd 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
@@ -63,7 +63,7 @@ public class CacheDataLoaderExample {
long start = System.currentTimeMillis();
-try (IgniteDataStreamer ldr =
ignite.dataLoader(CACHE_NAME)) {
+try (IgniteDataStreamer ldr =
ignite.dataStreamer(CACHE_NAME)) {
// Configure loader.
ldr.perNodeBufferSize(1024);
ldr.perNodeParallelLoadOperations(8);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
index 1fc737b..7cf4ef9 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
@@ -92,7 +92,7 @@ public class CachePopularNumbersExample {
* @throws IgniteException If failed.
*/
private static void streamData(final Ignite ignite) throws IgniteException
{
-try (IgniteDataStreamer ldr =
ignite.dataLoader(CACHE_NAME)) {
+try (IgniteDataStreamer ldr =
ignite.dataStreamer(CACHE_NAME)) {
// Set larger per-node buffer size since our state is relatively
small.
ldr.perNodeBufferSize(2048);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e533eb/modules/core/src/main/java/org/apache/ignite/Ignite.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java
b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index 44d4ba9..343d65d 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/module
[2/2] incubator-ignite git commit: # ignite-394: "Data loader" -> "Data streamer" + fix names of some tests
# ignite-394: "Data loader" -> "Data streamer" + fix names of some tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/350ec49d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/350ec49d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/350ec49d
Branch: refs/heads/ignite-394
Commit: 350ec49d819eb0ba1fd75604a3665f610b1f4e69
Parents: b33ab6a
Author: Artem Shutak
Authored: Tue Mar 3 22:00:13 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 22:00:13 2015 +0300
--
.../datagrid/CacheDataLoaderExample.java| 85
.../datagrid/CacheDataStreamerExample.java | 85
.../ignite/examples/CacheExamplesSelfTest.java | 4 +-
.../src/main/java/org/apache/ignite/Ignite.java | 4 +-
.../org/apache/ignite/IgniteDataStreamer.java | 4 +-
.../ignite/internal/GridKernalContext.java | 2 +-
.../dataload/IgniteDataStreamerFuture.java | 6 +-
.../dataload/IgniteDataStreamerImpl.java| 12 +-
.../dataload/IgniteDataStreamerProcessor.java | 6 +-
.../internal/processors/dataload/package.html | 2 +-
.../processors/streamer/IgniteStreamerImpl.java | 2 +-
.../dataload/GridDataLoaderImplSelfTest.java| 214 ---
.../dataload/GridDataLoaderPerformanceTest.java | 199 -
.../IgniteDataStreamerImplSelfTest.java | 214 +++
.../IgniteDataStreamerPerformanceTest.java | 199 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +-
16 files changed, 520 insertions(+), 520 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/350ec49d/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
deleted file mode 100644
index 8984fdd..000
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
+++ /dev/null
@@ -1,85 +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.examples.datagrid;
-
-import org.apache.ignite.*;
-import org.apache.ignite.examples.*;
-
-/**
- * Demonstrates how cache can be populated with data utilizing {@link
IgniteDataStreamer} API.
- * {@link IgniteDataStreamer} is a lot more efficient to use than standard
- * {@code put(...)} operation as it properly buffers cache requests
- * together and properly manages load on remote nodes.
- *
- * Remote nodes should always be started with special configuration file which
- * enables P2P class loading: {@code 'ignite.{sh|bat}
examples/config/example-cache.xml'}.
- *
- * Alternatively you can run {@link CacheNodeStartup} in another JVM which will
- * start node with {@code examples/config/example-cache.xml} configuration.
- */
-public class CacheDataLoaderExample {
-/** Cache name. */
-private static final String CACHE_NAME = "partitioned";
-
-/** Number of entries to load. */
-private static final int ENTRY_COUNT = 50;
-
-/** Heap size required to run this example. */
-public static final int MIN_MEMORY = 512 * 1024 * 1024;
-
-/**
- * Executes example.
- *
- * @param args Command line arguments, none required.
- * @throws IgniteException If example execution failed.
- */
-public static void main(String[] args) throws IgniteException {
-ExamplesUtils.checkMinMemory(MIN_MEMORY);
-
-try (Ignite ignite =
Ignition.start("examples/config/example-cache.xml")) {
-System.out.println();
-System.out.println(">>> Cache data loader example started.");
-
-// Clean up caches on all nodes before run.
-ignite.jcache(CACHE_NAME).clear();
-
-System.out.println();
-System.out.println(">>> Cache cl
[1/2] incubator-ignite git commit: # ignite-394: GridDataLoaderFuture -> IgniteDataStreamerFuture
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-394 43e533eb8 -> 350ec49d8
# ignite-394: GridDataLoaderFuture -> IgniteDataStreamerFuture
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b33ab6a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b33ab6a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b33ab6a2
Branch: refs/heads/ignite-394
Commit: b33ab6a2367e533d452cab278266e6ef4064f633
Parents: 43e533e
Author: Artem Shutak
Authored: Tue Mar 3 21:54:24 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 21:54:24 2015 +0300
--
.../dataload/GridDataLoaderFuture.java | 75
.../dataload/IgniteDataStreamerFuture.java | 75
.../dataload/IgniteDataStreamerImpl.java| 2 +-
3 files changed, 76 insertions(+), 76 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b33ab6a2/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderFuture.java
deleted file mode 100644
index dffa862..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderFuture.java
+++ /dev/null
@@ -1,75 +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.processors.dataload;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Data loader future.
- */
-class GridDataLoaderFuture extends GridFutureAdapter {
-/** */
-private static final long serialVersionUID = 0L;
-
-/** Data loader. */
-@GridToStringExclude
-private IgniteDataStreamerImpl dataLdr;
-
-/**
- * Default constructor for {@link Externalizable} support.
- */
-public GridDataLoaderFuture() {
-// No-op.
-}
-
-/**
- * @param ctx Context.
- * @param dataLdr Data loader.
- */
-GridDataLoaderFuture(GridKernalContext ctx, IgniteDataStreamerImpl
dataLdr) {
-super(ctx);
-
-assert dataLdr != null;
-
-this.dataLdr = dataLdr;
-}
-
-/** {@inheritDoc} */
-@Override public boolean cancel() throws IgniteCheckedException {
-checkValid();
-
-if (onCancelled()) {
-dataLdr.closeEx(true);
-
-return true;
-}
-
-return false;
-}
-
-/** {@inheritDoc} */
-@Override public String toString() {
-return S.toString(GridDataLoaderFuture.class, this, super.toString());
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b33ab6a2/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerFuture.java
new file mode 100644
index 000..e093b37
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataStreamerFuture.java
@@ -0,0 +1,75 @@
+/*
+ * 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 Licens
incubator-ignite git commit: # ignite-394: "data loader" -> "data streamer"
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-394 350ec49d8 -> 9f63999a2
# ignite-394: "data loader" -> "data streamer"
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f63999a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f63999a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f63999a
Branch: refs/heads/ignite-394
Commit: 9f63999a2a5ebe3e6b140dd3cd806f5c46fe8b83
Parents: 350ec49
Author: Artem Shutak
Authored: Tue Mar 3 22:09:15 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 22:09:15 2015 +0300
--
.../datagrid/CacheDataStreamerExample.java | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 2 +-
.../org/apache/ignite/IgniteDataStreamer.java | 22 ++--
.../ignite/internal/GridKernalContext.java | 2 +-
.../dataload/IgniteDataStreamerImpl.java| 8 +++
.../dataload/IgniteDataStreamerProcessor.java | 14 ++---
.../dr/GridDrDataLoadCacheUpdater.java | 2 +-
.../processors/igfs/IgfsDataManager.java| 14 ++---
.../internal/processors/igfs/IgfsImpl.java | 4 ++--
.../processors/streamer/IgniteStreamerImpl.java | 2 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 2 +-
.../IgniteDataStreamerImplSelfTest.java | 4 ++--
.../IgniteDataStreamerPerformanceTest.java | 2 +-
.../IgniteDataStreamerProcessorSelfTest.java| 4 ++--
.../loadtests/colocation/GridTestMain.java | 2 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 4 ++--
16 files changed, 45 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
index fc1ef78..e5db76d 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java
@@ -53,7 +53,7 @@ public class CacheDataStreamerExample {
try (Ignite ignite =
Ignition.start("examples/config/example-cache.xml")) {
System.out.println();
-System.out.println(">>> Cache data loader example started.");
+System.out.println(">>> Cache data streamer example started.");
// Clean up caches on all nodes before run.
ignite.jcache(CACHE_NAME).clear();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/modules/core/src/main/java/org/apache/ignite/Ignite.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java
b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index f13def0..fa73464 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -203,7 +203,7 @@ public interface Ignite extends AutoCloseable {
public IgniteTransactions transactions();
/**
- * Gets a new instance of data loader associated with given cache name.
Data streamer
+ * Gets a new instance of data streamer associated with given cache name.
Data streamer
* is responsible for loading external data into in-memory data grid. For
more information
* refer to {@link IgniteDataStreamer} documentation.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f63999a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
index ca9726d..22aa0c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -44,7 +44,7 @@ import java.util.*;
* {@code IgniteDataStreamer} supports the following configuration properties:
*
*
- * {@link #perNodeBufferSize(int)} - when entries are added to data
loader via
+ * {@link #perNodeBufferSize(int)} - when entries are added to data
streamer via
* {@link #addData(Object, Object)} method, they are not sent to
in-memory data grid right
* away and are buffered internally for better performance and network
utilization.
* This setting controls the size of internal per-node buffer before
b
incubator-ignite git commit: # ignite-394: "data loader" -> "data streamer" at scala
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-394 9f63999a2 -> de3dcf011
# ignite-394: "data loader" -> "data streamer" at scala
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de3dcf01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de3dcf01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de3dcf01
Branch: refs/heads/ignite-394
Commit: de3dcf011a1ef9c872fb44317f00550ff6a4abe5
Parents: 9f63999
Author: Artem Shutak
Authored: Tue Mar 3 22:10:36 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 22:10:36 2015 +0300
--
.../scalar/examples/ScalarCachePopularNumbersExample.scala | 8
.../src/main/scala/org/apache/ignite/scalar/scalar.scala | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de3dcf01/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
--
diff --git
a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
index 98d9637..69b67c2 100644
---
a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
+++
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
@@ -17,15 +17,15 @@
package org.apache.ignite.scalar.examples
-import java.util.Timer
-
import org.apache.ignite.IgniteException
import org.apache.ignite.examples.datagrid.CacheNodeStartup
import org.apache.ignite.scalar.scalar
import org.apache.ignite.scalar.scalar._
+import java.util.Timer
+
+import scala.collection.JavaConversions._
import scala.util.Random
-import collection.JavaConversions._
/**
* Real time popular number counter.
@@ -92,7 +92,7 @@ object ScalarCachePopularNumbersExample extends App {
def streamData() {
// Set larger per-node buffer size since our state is relatively small.
// Reduce parallel operations since we running the whole ignite
cluster locally under heavy load.
-val ldr = dataLoader$[Int, Long](CACHE_NAME, 2048)
+val ldr = dataStreamer$[Int, Long](CACHE_NAME, 2048)
// TODO IGNITE-44: restore invoke.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de3dcf01/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
--
diff --git
a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
index b12c679..cdbf574 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
@@ -292,7 +292,7 @@ object scalar extends ScalarConversions {
* @param bufSize Per node buffer size.
* @return New instance of data streamer.
*/
-@inline def dataLoader$[K, V](
+@inline def dataStreamer$[K, V](
@Nullable cacheName: String,
bufSize: Int): IgniteDataStreamer[K, V] = {
val dl = ignite$.dataStreamer[K, V](cacheName)
incubator-ignite git commit: # ignite-394
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-394 de3dcf011 -> e5f686239
# ignite-394
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e5f68623
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e5f68623
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e5f68623
Branch: refs/heads/ignite-394
Commit: e5f686239d6e98b6b9cbbf754c21b6b3b44e4bf8
Parents: de3dcf0
Author: Artem Shutak
Authored: Tue Mar 3 22:15:42 2015 +0300
Committer: Artem Shutak
Committed: Tue Mar 3 22:15:42 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 4 +-
.../dr/GridDrDataLoadCacheUpdater.java | 85
.../dr/IgniteDrDataStreamerCacheUpdater.java| 85
3 files changed, 87 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5f68623/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 61fa262..83118c4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3880,7 +3880,7 @@ public abstract class GridCacheAdapter implements
GridCache,
IgniteDataStreamerImpl ldr = ctx.kernalContext().dataStream().dataStreamer(ctx.namex(), false);
try {
-ldr.updater(new GridDrDataLoadCacheUpdater());
+ldr.updater(new IgniteDrDataStreamerCacheUpdater());
LocalStoreLoadClosure c = new LocalStoreLoadClosure(p, ldr,
plc);
@@ -4089,7 +4089,7 @@ public abstract class GridCacheAdapter implements
GridCache,
IgniteDataStreamerImpl ldr = ctx.kernalContext().dataStream().dataStreamer(ctx.namex(), false);
try {
-ldr.updater(new GridDrDataLoadCacheUpdater());
+ldr.updater(new IgniteDrDataStreamerCacheUpdater());
LocalStoreLoadClosure c = new LocalStoreLoadClosure(null, ldr,
plc0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5f68623/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
deleted file mode 100644
index 95f7ccb..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/GridDrDataLoadCacheUpdater.java
+++ /dev/null
@@ -1,85 +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.processors.dr;
-
-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.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-
-/**
- * Data center replication cache updater for data streamer.
- */
-public class GridDrDataLoadCacheUpdater implements
IgniteDataStreamer.Updater {
-/** */
-private static final long serialVersionUID = 0L;
-
-/** {@inheritDoc} */
-@Override public void update(IgniteCache cache0,
Collection> col) {
-try {
-String cacheName =
cache0.getConfiguration(CacheConfiguration.class).getName();
-
-GridKernalContext ctx =
(
incubator-ignite git commit: IGNITE-141 - Fixed data structures tests
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-141 7aad6a484 -> 0fb139ebd
IGNITE-141 - Fixed data structures tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0fb139eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0fb139eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0fb139eb
Branch: refs/heads/ignite-141
Commit: 0fb139ebdc7ac38127a7f6a94f24a71a6400d087
Parents: 7aad6a4
Author: Alexey Goncharuk
Authored: Tue Mar 3 11:31:44 2015 -0800
Committer: Alexey Goncharuk
Committed: Tue Mar 3 11:31:44 2015 -0800
--
.../processors/cache/transactions/IgniteTransactionsImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0fb139eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
index b43b541..350eae2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
@@ -121,7 +121,7 @@ public class IgniteTransactionsImpl implements
IgniteTransactionsEx {
isolation,
cfg.getDefaultTxTimeout(),
0,
-ctx);
+ctx.system() ? ctx : null);
}
/**
[24/50] incubator-ignite git commit: # ignite-237
# ignite-237
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e50d1ead
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e50d1ead
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e50d1ead
Branch: refs/heads/ignite-141
Commit: e50d1eadc11651c9029b81ccd0636ea003f5b1a7
Parents: bcf802d
Author: sboikov
Authored: Fri Feb 27 17:12:25 2015 +0300
Committer: sboikov
Committed: Fri Feb 27 17:12:25 2015 +0300
--
.../apache/ignite/GridCacheAffinityBackupsSelfTest.java | 8
.../GridCacheContinuousQueryAbstractSelfTest.java | 12 ++--
2 files changed, 6 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50d1ead/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
index 88a3cc1..0758993 100644
---
a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
@@ -58,14 +58,6 @@ public class GridCacheAffinityBackupsSelfTest extends
GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
-public void testConsistentHashBackups() throws Exception {
-for (int i = 0; i < nodesCnt; i++)
-checkBackups(i, new CacheRendezvousAffinityFunction());
-}
-
-/**
- * @throws Exception If failed.
- */
public void testRendezvousBackups() throws Exception {
for (int i = 0; i < nodesCnt; i++)
checkBackups(i, new CacheRendezvousAffinityFunction());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e50d1ead/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 0d9e189..d2b1786 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -165,12 +165,14 @@ public abstract class
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
Set> entries = ((IgniteKernal)
grid(i)).cache(null).entrySet();
for (Cache.Entry entry : entries) {
-info("Not removed entry " +
grid(i).affinity(null).isPrimary(grid(i).localNode(), entry.getKey()));
-info("Not removed entry " +
grid(i).affinity(null).isBackup(grid(i).localNode(), entry.getKey()));
+boolean primary =
grid(i).affinity(null).isPrimary(grid(i).localNode(), entry.getKey());
+
+boolean backup =
grid(i).affinity(null).isBackup(grid(i).localNode(), entry.getKey());
+
+info("Not removed entry [grid=" + i + ", primary=" + primary +
", backup=" + backup + ']');
+
allEmpty = false;
}
-
-info("Cache is not empty: " + ((IgniteKernal)
grid(i)).cache(null).entrySet());
}
assertTrue(allEmpty);
@@ -844,8 +846,6 @@ public abstract class
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
finally {
stopGrid("anotherGrid");
}
-
-awaitPartitionMapExchange();
}
/**
[02/50] incubator-ignite git commit: #ignite-237: change affinity function in HibernateL2CacheSelfTest.
#ignite-237: change affinity function in HibernateL2CacheSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a5b42f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a5b42f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a5b42f5
Branch: refs/heads/ignite-141
Commit: 6a5b42f5d9fd0523c9203389cfcce4829ddc0df1
Parents: 02d46d7
Author: ivasilinets
Authored: Thu Feb 26 15:49:42 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 26 15:49:42 2015 +0300
--
.../ignite/cache/hibernate/HibernateL2CacheSelfTest.java | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a5b42f5/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
--
diff --git
a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index 38146af..35f0c93 100644
---
a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++
b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -18,7 +18,7 @@
package org.apache.ignite.cache.hibernate;
import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.consistenthash.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -46,8 +46,6 @@ import static
org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.*;
import static org.hibernate.cfg.Environment.*;
-import org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.Entity;
-
/**
*
* Tests Hibernate L2 cache.
@@ -425,7 +423,7 @@ public class HibernateL2CacheSelfTest extends
GridCommonAbstractTest {
cfg.setBackups(1);
-cfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10));
+cfg.setAffinity(new CacheRendezvousAffinityFunction(false, 10));
return cfg;
}
@@ -447,7 +445,7 @@ public class HibernateL2CacheSelfTest extends
GridCommonAbstractTest {
cfg.setBackups(1);
-cfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10));
+cfg.setAffinity(new CacheRendezvousAffinityFunction(false, 10));
return cfg;
}
[46/50] incubator-ignite git commit: # minor cleanup of unused code.
# minor cleanup of unused code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a68e64e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a68e64e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a68e64e
Branch: refs/heads/ignite-141
Commit: 2a68e64eb50460b4709a7bc4b8e88be3db0604e8
Parents: d33abdb
Author: AKuznetsov
Authored: Tue Mar 3 16:25:25 2015 +0700
Committer: AKuznetsov
Committed: Tue Mar 3 16:25:25 2015 +0700
--
.../visor/cache/VisorCacheAffinityConfiguration.java | 10 --
.../ignite/visor/commands/cache/VisorCacheCommand.scala | 1 -
2 files changed, 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a68e64e/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
index 6ff2d2d..613b034 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
@@ -46,9 +46,6 @@ public class VisorCacheAffinityConfiguration implements
Serializable {
/** Cache affinity partitions. */
private Integer partitions;
-/** Cache partitioned affinity default replicas. */
-private Integer dfltReplicas;
-
/** Cache partitioned affinity exclude neighbors. */
private Boolean excludeNeighbors;
@@ -107,13 +104,6 @@ public class VisorCacheAffinityConfiguration implements
Serializable {
}
/**
- * @return Cache partitioned affinity default replicas.
- */
-@Nullable public Integer defaultReplicas() {
-return dfltReplicas;
-}
-
-/**
* @return Cache partitioned affinity exclude neighbors.
*/
@Nullable public Boolean excludeNeighbors() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a68e64e/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 2db43dc..69da6f5 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -805,7 +805,6 @@ object VisorCacheCommand {
cacheT += ("Affinity Function", safe(affinityCfg.function()))
cacheT += ("Affinity Backups", affinityCfg.partitionedBackups())
cacheT += ("Affinity Partitions", safe(affinityCfg.partitions()))
-cacheT += ("Affinity Default Replicas",
safe(affinityCfg.defaultReplicas()))
cacheT += ("Affinity Exclude Neighbors",
safe(affinityCfg.excludeNeighbors()))
cacheT += ("Affinity Mapper", safe(affinityCfg.mapper()))
[36/50] incubator-ignite git commit: #ignite-239: remove replicaCount from GridClientNode and GridClientNodeBean.
#ignite-239: remove replicaCount from GridClientNode and GridClientNodeBean.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5f620d62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f620d62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f620d62
Branch: refs/heads/ignite-141
Commit: 5f620d62191188ff4dcbe55c5d0399603e494b45
Parents: 6c67bdf
Author: ivasilinets
Authored: Mon Mar 2 12:40:13 2015 +0300
Committer: ivasilinets
Committed: Mon Mar 2 12:40:13 2015 +0300
--
.../impl/ClientPartitionAffinitySelfTest.java | 4 +---
.../ClientTcpUnreachableMultiNodeSelfTest.java | 4
.../ignite/internal/client/GridClientNode.java | 8 ---
.../client/GridClientPartitionAffinity.java | 2 +-
.../client/impl/GridClientNodeImpl.java | 22 ---
.../connection/GridClientNioTcpConnection.java | 3 +--
.../rest/client/message/GridClientNodeBean.java | 23
7 files changed, 3 insertions(+), 63 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
index 7ece534..6af1c4c 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
@@ -152,7 +152,7 @@ public class ClientPartitionAffinitySelfTest extends
GridCommonAbstractTest {
aff.setHashIdResolver(new GridClientPartitionAffinity.HashIdResolver()
{
@Override public Object getHashId(GridClientNode node) {
-return node.replicaCount();
+return 1;
}
});
@@ -258,7 +258,6 @@ public class ClientPartitionAffinitySelfTest extends
GridCommonAbstractTest {
private GridClientNode createNode(String nodeId, int replicaCnt) {
return GridClientNodeImpl.builder()
.nodeId(UUID.fromString(nodeId))
-.replicaCount(replicaCnt)
.build();
}
@@ -276,7 +275,6 @@ public class ClientPartitionAffinitySelfTest extends
GridCommonAbstractTest {
nodes.add(GridClientNodeImpl.builder()
.nodeId(nodeId)
-.replicaCount(replicaCnt)
.build());
ClusterNode srvNode = new TestRichNode(nodeId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
index bb3710e..fda7e99 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
@@ -85,10 +85,6 @@ public class ClientTcpUnreachableMultiNodeSelfTest extends
ClientTcpMultiNodeSel
return node.caches();
}
-@Override public int replicaCount() {
-return node.replicaCount();
-}
-
@Override public List tcpAddresses() {
return node.tcpAddresses();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f620d62/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
index ac2fe86..74e612d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientNode.java
@@ -99,14 +99,6 @@ public interface GridClientNode {
public Map caches();
/**
- * Gets node replica count for consistent hash ring (valid only for
- * {@code PARTITIONED}
[41/50] incubator-ignite git commit: #ignite-237: change client test.
#ignite-237: change client test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f144a892
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f144a892
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f144a892
Branch: refs/heads/ignite-141
Commit: f144a892e9747b297610f7d9d19c44f362dd4b1f
Parents: 9efcd80
Author: ivasilinets
Authored: Mon Mar 2 19:29:55 2015 +0300
Committer: ivasilinets
Committed: Mon Mar 2 19:29:55 2015 +0300
--
.../client/integration/ClientAbstractMultiNodeSelfTest.java| 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f144a892/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
index e73f06d..9257b71 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -403,8 +403,6 @@ public abstract class ClientAbstractMultiNodeSelfTest
extends GridCommonAbstract
if (affinity(cache).isPrimaryOrBackup(g.cluster().localNode(),
key))
assertEquals("zzz", cache.localPeek(key,
CachePeekMode.ONHEAP));
-else
-assertNull(cache.localPeek(key, CachePeekMode.ONHEAP));
}
}
[48/50] incubator-ignite git commit: Merge branches 'ignite-141' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141
Merge branches 'ignite-141' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a44468fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a44468fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a44468fd Branch: refs/heads/ignite-141 Commit: a44468fda6d4a89f5a5343ac20a97747f44ec2d9 Parents: 7aad6a4 6909cc4 Author: Valentin Kulichenko Authored: Tue Mar 3 10:37:49 2015 -0800 Committer: Valentin Kulichenko Committed: Tue Mar 3 10:37:49 2015 -0800 -- .../ClientAbstractMultiThreadedSelfTest.java| 37 +- .../impl/ClientPartitionAffinitySelfTest.java | 406 --- .../ClientAbstractMultiNodeSelfTest.java| 54 +- .../integration/ClientAbstractSelfTest.java | 8 - .../ClientTcpUnreachableMultiNodeSelfTest.java | 4 - .../client/suite/IgniteClientTestSuite.java | 1 - .../src/test/resources/spring-server-node.xml | 2 +- .../test/resources/spring-server-ssl-node.xml | 2 +- .../java/org/apache/ignite/IgniteEvents.java| 2 +- .../ignite/cache/CacheTypeFieldMetadata.java| 2 +- .../apache/ignite/cache/CacheTypeMetadata.java | 18 +- .../java/org/apache/ignite/cache/GridCache.java | 2 +- .../CacheConsistentHashAffinityFunction.java| 702 --- .../cache/affinity/consistenthash/package.html | 24 - .../CacheRendezvousAffinityFunction.java| 2 +- .../configuration/CacheConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 6 +- .../ignite/internal/client/GridClientNode.java | 8 - .../client/GridClientPartitionAffinity.java | 2 +- .../client/impl/GridClientNodeImpl.java | 22 - .../connection/GridClientNioTcpConnection.java | 3 +- .../processors/cache/GridCacheAttributes.java | 32 +- .../processors/cache/GridCacheProcessor.java| 29 +- .../rest/client/message/GridClientNodeBean.java | 23 - .../top/GridTopologyCommandHandler.java | 8 - .../cache/VisorCacheAffinityConfiguration.java | 19 +- .../config/load/dsi-49-server-production.xml| 2 +- .../GridCacheAffinityBackupsSelfTest.java | 9 - .../ignite/IgniteCacheAffinitySelfTest.java | 30 +- ...AffinityProcessorConsistentHashSelfTest.java | 31 - ...idCacheConfigurationConsistencySelfTest.java | 46 +- ...ridCacheConfigurationValidationSelfTest.java | 8 +- .../cache/GridCacheOffHeapSelfTest.java | 12 +- .../GridCachePartitionedAffinitySpreadTest.java | 16 +- .../IgniteClientAffinityAssignmentSelfTest.java | 16 +- .../GridCacheClientModesAbstractSelfTest.java | 4 +- ...dCachePartitionedAffinityFilterSelfTest.java | 6 +- ...GridCachePreloadRestartAbstractSelfTest.java | 4 +- .../dht/GridCacheColocatedDebugTest.java| 4 +- .../dht/GridCacheDhtEntrySelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 13 +- .../dht/GridCacheDhtEvictionSelfTest.java | 13 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +- .../GridCacheDhtPreloadDisabledSelfTest.java| 4 +- .../GridCacheDhtPreloadMessageCountTest.java| 4 +- ...ridCacheDhtPreloadMultiThreadedSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadSelfTest.java| 4 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +- .../distributed/dht/GridCacheDhtTestUtils.java | 6 +- ...dCachePartitionedTopologyChangeSelfTest.java | 7 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 5 +- ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 - ...AffinityExcludeNeighborsPerformanceTest.java | 4 +- ...rtitionedAffinityHashIdResolverSelfTest.java | 4 +- .../GridCachePartitionedAffinitySelfTest.java | 226 -- .../GridCachePartitionedFullApiSelfTest.java| 11 +- .../GridCachePartitionedNodeRestartTest.java| 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 4 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 4 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +- ...apPartitionedMapPerformanceAbstractTest.java | 4 +- ...GridUnsafePartitionedMapPerformanceTest.java | 4 +- .../capacity/spring-capacity-cache.xml | 2 +- .../loadtests/colocation/spring-colocation.xml | 2 +- .../GridCachePartitionedAtomicLongLoadTest.java | 4 +- ...apPartitionedMapPerformanceAbstractTest.java | 4 +- ...GridUnsafePartitionedMapPerformanceTest.java | 4 +- .../ignite/testframework/GridTestUtils.java | 11 +- ..
[45/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-237' into sprint-2
Merge remote-tracking branch 'remotes/origin/ignite-237' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d33abdba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d33abdba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d33abdba Branch: refs/heads/ignite-141 Commit: d33abdba733987609f592b046d87209e976ba616 Parents: e5e2a8e f144a89 Author: ivasilinets Authored: Tue Mar 3 11:49:54 2015 +0300 Committer: ivasilinets Committed: Tue Mar 3 11:49:54 2015 +0300 -- .../ClientAbstractMultiThreadedSelfTest.java| 37 +- .../impl/ClientPartitionAffinitySelfTest.java | 406 --- .../ClientAbstractMultiNodeSelfTest.java| 54 +- .../integration/ClientAbstractSelfTest.java | 8 - .../ClientTcpUnreachableMultiNodeSelfTest.java | 4 - .../client/suite/IgniteClientTestSuite.java | 1 - .../src/test/resources/spring-server-node.xml | 2 +- .../test/resources/spring-server-ssl-node.xml | 2 +- .../java/org/apache/ignite/cache/GridCache.java | 2 +- .../CacheConsistentHashAffinityFunction.java| 702 --- .../cache/affinity/consistenthash/package.html | 24 - .../CacheRendezvousAffinityFunction.java| 2 +- .../configuration/CacheConfiguration.java | 2 +- .../ignite/internal/client/GridClientNode.java | 8 - .../client/GridClientPartitionAffinity.java | 2 +- .../client/impl/GridClientNodeImpl.java | 22 - .../connection/GridClientNioTcpConnection.java | 3 +- .../processors/cache/GridCacheAttributes.java | 32 +- .../processors/cache/GridCacheProcessor.java| 29 +- .../rest/client/message/GridClientNodeBean.java | 23 - .../top/GridTopologyCommandHandler.java | 8 - .../cache/VisorCacheAffinityConfiguration.java | 9 +- .../config/load/dsi-49-server-production.xml| 2 +- .../GridCacheAffinityBackupsSelfTest.java | 9 - .../ignite/IgniteCacheAffinitySelfTest.java | 30 +- ...AffinityProcessorConsistentHashSelfTest.java | 31 - ...idCacheConfigurationConsistencySelfTest.java | 46 +- ...ridCacheConfigurationValidationSelfTest.java | 8 +- .../cache/GridCacheOffHeapSelfTest.java | 12 +- .../GridCachePartitionedAffinitySpreadTest.java | 16 +- .../IgniteClientAffinityAssignmentSelfTest.java | 16 +- .../GridCacheClientModesAbstractSelfTest.java | 4 +- ...dCachePartitionedAffinityFilterSelfTest.java | 6 +- ...GridCachePreloadRestartAbstractSelfTest.java | 4 +- .../dht/GridCacheColocatedDebugTest.java| 4 +- .../dht/GridCacheDhtEntrySelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 13 +- .../dht/GridCacheDhtEvictionSelfTest.java | 13 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +- .../GridCacheDhtPreloadDisabledSelfTest.java| 4 +- .../GridCacheDhtPreloadMessageCountTest.java| 4 +- ...ridCacheDhtPreloadMultiThreadedSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadSelfTest.java| 4 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +- .../distributed/dht/GridCacheDhtTestUtils.java | 6 +- ...dCachePartitionedTopologyChangeSelfTest.java | 7 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 5 +- ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 - ...AffinityExcludeNeighborsPerformanceTest.java | 4 +- ...rtitionedAffinityHashIdResolverSelfTest.java | 4 +- .../GridCachePartitionedAffinitySelfTest.java | 226 -- .../GridCachePartitionedFullApiSelfTest.java| 11 +- .../GridCachePartitionedNodeRestartTest.java| 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 4 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 4 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +- ...apPartitionedMapPerformanceAbstractTest.java | 4 +- ...GridUnsafePartitionedMapPerformanceTest.java | 4 +- .../capacity/spring-capacity-cache.xml | 2 +- .../loadtests/colocation/spring-colocation.xml | 2 +- .../GridCachePartitionedAtomicLongLoadTest.java | 4 +- ...apPartitionedMapPerformanceAbstractTest.java | 4 +- ...GridUnsafePartitionedMapPerformanceTest.java | 4 +- .../ignite/testframework/GridTestUtils.java | 11 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - .../hibernate/HibernateL2CacheSelfTest.java | 8 +- .../processors/cache/GridCacheSwapSelfTest.java | 12 +- 73 files changed, 160 insertions(+), 1852 deletions(-) --
[40/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-334
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-334 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5776850 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5776850 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5776850 Branch: refs/heads/ignite-141 Commit: c577685022f9b59342acd2335efeb9149e81049d Parents: 4df7c85 b2675bc Author: ivasilinets Authored: Mon Mar 2 18:12:06 2015 +0300 Committer: ivasilinets Committed: Mon Mar 2 18:12:06 2015 +0300 -- examples/pom-standalone.xml | 2 +- .../java/org/apache/ignite/IgniteCluster.java | 8 +- .../configuration/IgniteConfiguration.java | 5 +- .../ignite/internal/GridKernalContext.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 14 +- .../apache/ignite/internal/IgniteKernal.java| 23 +- .../org/apache/ignite/internal/IgnitionEx.java | 592 +-- .../affinity/GridAffinityAssignmentCache.java | 13 +- .../processors/cache/CacheMetricsImpl.java | 4 + .../processors/cache/GridCacheContext.java | 19 + .../processors/cache/GridCacheMapEntry.java | 9 + .../processors/cache/GridCacheProcessor.java| 15 + .../processors/cache/GridCacheStoreManager.java | 12 +- .../GridDistributedCacheAdapter.java| 2 + .../distributed/dht/GridDhtCacheEntry.java | 3 + .../distributed/dht/GridDhtLocalPartition.java | 5 + .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java| 2 +- .../cache/transactions/IgniteTxManager.java | 7 +- .../processors/cluster/ClusterProcessor.java| 46 ++ .../dataload/IgniteDataLoaderImpl.java | 29 +- .../core/src/main/resources/ignite.properties | 2 +- .../GridCacheAbstractLocalStoreSelfTest.java| 440 ++ .../cache/GridCacheAbstractMetricsSelfTest.java | 42 ++ ...acheAbstractUsersAffinityMapperSelfTest.java | 207 +++ ...dCacheAtomicUsersAffinityMapperSelfTest.java | 45 ++ .../GridCachePartitionedLocalStoreSelfTest.java | 51 ++ ...chePartitionedOffHeapLocalStoreSelfTest.java | 56 ++ .../GridCacheReplicatedLocalStoreSelfTest.java | 51 ++ ...heReplicatedUsersAffinityMapperSelfTest.java | 45 ++ ...ridCacheTxPartitionedLocalStoreSelfTest.java | 51 ++ .../GridCacheTxUsersAffinityMapperSelfTest.java | 45 ++ .../GridCacheQueueCleanupSelfTest.java | 1 - .../IgniteCacheExpiryPolicyAbstractTest.java| 38 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 4 + modules/scalar/pom.xml | 6 + pom.xml | 4 +- 37 files changed, 1503 insertions(+), 407 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5776850/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java --
[39/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9efcd803 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9efcd803 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9efcd803 Branch: refs/heads/ignite-141 Commit: 9efcd8035dd74977f44ce7ab6ebd989b57e57482 Parents: 5a76d70 b2675bc Author: ivasilinets Authored: Mon Mar 2 18:03:07 2015 +0300 Committer: ivasilinets Committed: Mon Mar 2 18:03:07 2015 +0300 -- examples/pom-standalone.xml | 2 +- .../java/org/apache/ignite/IgniteCluster.java | 8 +- .../configuration/IgniteConfiguration.java | 5 +- .../ignite/internal/GridKernalContext.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 14 +- .../apache/ignite/internal/IgniteKernal.java| 23 +- .../org/apache/ignite/internal/IgnitionEx.java | 592 +-- .../affinity/GridAffinityAssignmentCache.java | 13 +- .../processors/cache/CacheMetricsImpl.java | 4 + .../processors/cache/GridCacheContext.java | 19 + .../processors/cache/GridCacheMapEntry.java | 9 + .../processors/cache/GridCacheProcessor.java| 15 + .../processors/cache/GridCacheStoreManager.java | 12 +- .../GridDistributedCacheAdapter.java| 2 + .../distributed/dht/GridDhtCacheEntry.java | 3 + .../distributed/dht/GridDhtLocalPartition.java | 5 + .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java| 2 +- .../cache/transactions/IgniteTxManager.java | 7 +- .../processors/cluster/ClusterProcessor.java| 46 ++ .../dataload/IgniteDataLoaderImpl.java | 29 +- .../ignite/internal/visor/cache/VisorCache.java | 190 ++ .../cache/VisorCacheAffinityConfiguration.java | 51 +- .../visor/cache/VisorCacheConfiguration.java| 484 +++ .../cache/VisorCacheDefaultConfiguration.java | 27 +- .../cache/VisorCacheEvictionConfiguration.java | 81 +-- .../cache/VisorCacheNearConfiguration.java | 42 +- .../cache/VisorCachePreloadConfiguration.java | 54 +- .../cache/VisorCacheStoreConfiguration.java | 148 - .../VisorCacheWriteBehindConfiguration.java | 137 - .../visor/node/VisorAtomicConfiguration.java| 27 +- .../visor/node/VisorBasicConfiguration.java | 180 +- .../node/VisorCacheQueryConfiguration.java | 45 +- .../node/VisorExecutorServiceConfiguration.java | 54 +- .../visor/node/VisorGridConfiguration.java | 177 +- .../visor/node/VisorIgfsConfiguration.java | 244 +--- .../visor/node/VisorLifecycleConfiguration.java | 9 +- .../visor/node/VisorMetricsConfiguration.java | 29 +- .../node/VisorPeerToPeerConfiguration.java | 28 +- .../visor/node/VisorQueryConfiguration.java | 65 +- .../visor/node/VisorRestConfiguration.java | 80 +-- .../node/VisorSegmentationConfiguration.java| 45 +- .../visor/node/VisorSpisConfiguration.java | 92 +-- .../node/VisorTransactionConfiguration.java | 62 +- .../internal/visor/util/VisorTaskUtils.java | 4 +- .../core/src/main/resources/ignite.properties | 2 +- .../core/src/test/config/store/jdbc/Ignite.xml | 63 +- .../GridCacheAbstractLocalStoreSelfTest.java| 440 ++ .../cache/GridCacheAbstractMetricsSelfTest.java | 42 ++ ...acheAbstractUsersAffinityMapperSelfTest.java | 207 +++ ...dCacheAtomicUsersAffinityMapperSelfTest.java | 45 ++ .../GridCachePartitionedLocalStoreSelfTest.java | 51 ++ ...chePartitionedOffHeapLocalStoreSelfTest.java | 56 ++ .../GridCacheReplicatedLocalStoreSelfTest.java | 51 ++ ...heReplicatedUsersAffinityMapperSelfTest.java | 45 ++ ...ridCacheTxPartitionedLocalStoreSelfTest.java | 51 ++ .../GridCacheTxUsersAffinityMapperSelfTest.java | 45 ++ .../GridCacheQueueCleanupSelfTest.java | 1 - .../IgniteCacheExpiryPolicyAbstractTest.java| 38 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 4 + modules/scalar/pom.xml | 6 + .../ignite/schema/generator/XmlGenerator.java | 8 +- .../apache/ignite/schema/model/PojoField.java | 11 +- .../apache/ignite/schema/load/model/Ignite.xml | 133 +++-- .../commands/cache/VisorCacheCommand.scala | 25 +- .../yardstick/config/ignite-store-config.xml| 15 +- pom.xml | 4 +- 67 files changed, 2105 insertions(+), 2415 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9efcd803/modules/core/src/main/java/org/apache/ignite
[15/50] incubator-ignite git commit: #ignite-237: remove unused imports.
#ignite-237: remove unused imports. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb14f3bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb14f3bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb14f3bb Branch: refs/heads/ignite-141 Commit: eb14f3bbb96865ce656e8facb747e35ff15fbf33 Parents: 75d960e Author: ivasilinets Authored: Thu Feb 26 18:32:08 2015 +0300 Committer: ivasilinets Committed: Thu Feb 26 18:32:08 2015 +0300 -- .../java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java | 1 - .../cache/distributed/GridCacheClientModesAbstractSelfTest.java| 1 - .../distributed/GridCachePartitionedAffinityFilterSelfTest.java| 1 - .../cache/distributed/dht/GridCacheColocatedDebugTest.java | 1 - .../cache/distributed/dht/GridCacheDhtEntrySelfTest.java | 1 - .../cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java | 1 - .../cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java | 1 - .../cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java | 1 - .../cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java | 1 - .../cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java | 1 - .../distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java | 1 - .../cache/distributed/dht/GridCacheDhtPreloadSelfTest.java | 1 - .../distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java | 1 - .../cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java | 1 - .../processors/cache/distributed/dht/GridCacheDhtTestUtils.java| 2 -- ...ridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java | 1 - 16 files changed, 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb14f3bb/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java index 6e34229..88a3cc1 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cache.affinity.fair.*; import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cluster.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb14f3bb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index 170c3d5..a54f73b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb14f3bb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java index 4ccb0be..9e0e360 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed; impo
[49/50] incubator-ignite git commit: Merge branch 'ignite-141' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141
Merge branch 'ignite-141' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8c0875f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c0875f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c0875f8 Branch: refs/heads/ignite-141 Commit: 8c0875f8ab4b14cd62817bd47cf58c4b82c80975 Parents: a44468f 0fb139e Author: Valentin Kulichenko Authored: Tue Mar 3 11:36:06 2015 -0800 Committer: Valentin Kulichenko Committed: Tue Mar 3 11:36:06 2015 -0800 -- .../processors/cache/transactions/IgniteTransactionsImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[06/50] incubator-ignite git commit: #ignite-237: change affinity function in tests.
#ignite-237: change affinity function in tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f358766f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f358766f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f358766f Branch: refs/heads/ignite-141 Commit: f358766f944714acb29a9df313db70dd4ff01f8e Parents: 7d8b54f Author: ivasilinets Authored: Thu Feb 26 16:09:03 2015 +0300 Committer: ivasilinets Committed: Thu Feb 26 16:09:03 2015 +0300 -- .../distributed/GridCachePreloadRestartAbstractSelfTest.java | 4 ++-- .../dht/GridCachePartitionedTopologyChangeSelfTest.java | 7 +++ .../dht/GridCachePartitionedUnloadEventsSelfTest.java | 5 ++--- .../distributed/near/GridCachePartitionedNodeRestartTest.java | 4 ++-- .../near/GridCachePartitionedOptimisticTxNodeRestartTest.java | 4 ++-- .../near/GridCachePartitionedTxSalvageSelfTest.java | 4 ++-- .../GridCacheSynchronousEvictionsFailoverSelfTest.java| 4 ++-- .../offheap/GridOffHeapPartitionedMapAbstractSelfTest.java| 4 ++-- .../GridOffHeapPartitionedMapPerformanceAbstractTest.java | 4 ++-- .../GridCachePartitionedAtomicLongLoadTest.java | 4 ++-- .../GridOffHeapPartitionedMapPerformanceAbstractTest.java | 4 ++-- .../unsafe/GridUnsafePartitionedMapPerformanceTest.java | 4 ++-- 12 files changed, 25 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java index da111a6..f3ba5c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -114,7 +114,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon cc.setStartSize(20); cc.setPreloadMode(preloadMode); cc.setPreloadBatchSize(preloadBatchSize); -cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); +cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions)); cc.setBackups(backups); cc.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index c64f9a5..8a2cfa0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -75,7 +75,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); -cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18)); +cc.setAffinity(new CacheR
[30/50] incubator-ignite git commit: #ignite-237: remove unused imports.
#ignite-237: remove unused imports. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e587386 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e587386 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e587386 Branch: refs/heads/ignite-141 Commit: 8e587386d284373dbd6ac310dfcb2a9369236867 Parents: 5692d7e Author: ivasilinets Authored: Fri Feb 27 19:46:58 2015 +0300 Committer: ivasilinets Committed: Fri Feb 27 19:46:58 2015 +0300 -- .../internal/client/impl/ClientPartitionAffinitySelfTest.java| 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e587386/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java index dde345e..7ece534 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*;
[28/50] incubator-ignite git commit: #ignite-237: move CacheConsistentHashAffinityFunction.
#ignite-237: move CacheConsistentHashAffinityFunction.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e3782644
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e3782644
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e3782644
Branch: refs/heads/ignite-141
Commit: e3782644789c565162870fb2a41bd753e7631922
Parents: 414410b
Author: ivasilinets
Authored: Fri Feb 27 19:36:34 2015 +0300
Committer: ivasilinets
Committed: Fri Feb 27 19:36:34 2015 +0300
--
.../CacheConsistentHashAffinityFunction.java| 703 ---
1 file changed, 703 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3782644/modules/core/src/main/java/org/gridgain/benchmarks/risk/affinity/CacheConsistentHashAffinityFunction.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/benchmarks/risk/affinity/CacheConsistentHashAffinityFunction.java
b/modules/core/src/main/java/org/gridgain/benchmarks/risk/affinity/CacheConsistentHashAffinityFunction.java
deleted file mode 100644
index 35be9b8..000
---
a/modules/core/src/main/java/org/gridgain/benchmarks/risk/affinity/CacheConsistentHashAffinityFunction.java
+++ /dev/null
@@ -1,703 +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.gridgain.benchmarks.risk.affinity;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-/**
- * Affinity function for partitioned cache. This function supports the
following
- * configuration:
- *
- *
- * {@code backups} - Use this flag to control how many back up nodes will
be
- * assigned to every key. The default value is {@code 0}.
- *
- *
- * {@code replicas} - Generally the more replicas a node gets, the more
key assignments
- * it will receive. You can configure different number of replicas for a
node by
- * setting user attribute with name {@link
#getReplicaCountAttributeName()} to some
- * number. Default value is {@code 512} defined by {@link
#DFLT_REPLICA_COUNT} constant.
- *
- *
- * {@code backupFilter} - Optional filter for back up nodes. If provided,
then only
- * nodes that pass this filter will be selected as backup nodes. If not
provided, then
- * primary and backup nodes will be selected out of all nodes available
for this cache.
- *
- *
- *
- * Cache affinity can be configured for individual caches via {@link
org.apache.ignite.configuration.CacheConfiguration#getAffinity()} method.
- */
-@Deprecated
-public class CacheConsistentHashAffinityFunction implements
CacheAffinityFunction {
-/** */
-private static final long serialVersionUID = 0L;
-
-/** Flag to enable/disable consistency check (for internal use only). */
-private static final boolean AFFINITY_CONSISTENCY_CHECK =
Boolean.getBoolean("IGNITE_AFFINITY_CONSISTENCY_CHECK");
-
-/** Default number of partitions. */
-public static final int DFLT_PARTITION_COUNT = 1;
-
-/** Default replica count for partitioned caches. */
-public static final int DFLT_REPLICA_COUNT = 128;
-
-/**
- * Name of node attribute to specify number of replicas for a node.
- * Default value is {@code gg:affinity:node:replicas}.
- */
-public static final String DFLT_REPLICA_COUNT_ATTR_NAME =
"gg:affinity:node:replicas";
-
-/** Node hash. */
-private transient GridConsistentHash nodeHash;
-
-/** Total number
[14/50] incubator-ignite git commit: #ignite-237: remove unused imports.
#ignite-237: remove unused imports. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75d960eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75d960eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75d960eb Branch: refs/heads/ignite-141 Commit: 75d960eb9b16d587193deb20d1347aefdb9cc4d9 Parents: d07931d Author: ivasilinets Authored: Thu Feb 26 18:30:35 2015 +0300 Committer: ivasilinets Committed: Thu Feb 26 18:30:35 2015 +0300 -- .../ignite/internal/processors/cache/GridCacheAttributes.java | 1 - .../apache/ignite/internal/processors/cache/GridCacheProcessor.java | 1 - .../processors/rest/handlers/top/GridTopologyCommandHandler.java| 1 - .../internal/visor/cache/VisorCacheAffinityConfiguration.java | 1 - 4 files changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75d960eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java index 1f8b0b4..571ae25 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75d960eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 66a751c..f00a853 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cache.affinity.fair.*; import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cache.store.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75d960eb/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java index 4bcc566..7c2a15b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/top/GridTopologyCommandHandler.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.rest.handlers.top; import org.apache.ignite.*; -import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75d960eb/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java index 7aae6f3..c43dc1c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.
[03/50] incubator-ignite git commit: #ignite-237: remove consistent hash from IgniteClientAffinityAssignmentSelfTest.
#ignite-237: remove consistent hash from IgniteClientAffinityAssignmentSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fecb680d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fecb680d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fecb680d
Branch: refs/heads/ignite-141
Commit: fecb680da583d27fc8feb292da7176f7ec8304ae
Parents: 6a5b42f
Author: ivasilinets
Authored: Thu Feb 26 15:51:33 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 26 15:51:33 2015 +0300
--
.../IgniteClientAffinityAssignmentSelfTest.java | 16 ++--
1 file changed, 2 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fecb680d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
index 719a8aa..0f1a049 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.consistenthash.*;
import org.apache.ignite.cache.affinity.fair.*;
import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.configuration.*;
@@ -58,8 +57,6 @@ public class IgniteClientAffinityAssignmentSelfTest extends
GridCommonAbstractTe
ccfg.setDistributionMode(client ? CLIENT_ONLY : PARTITIONED_ONLY);
if (aff == 0)
-ccfg.setAffinity(new
CacheConsistentHashAffinityFunction(false, PARTS));
-else if (aff == 1)
ccfg.setAffinity(new CacheRendezvousAffinityFunction(false,
PARTS));
else
ccfg.setAffinity(new CachePartitionFairAffinity(PARTS));
@@ -73,17 +70,8 @@ public class IgniteClientAffinityAssignmentSelfTest extends
GridCommonAbstractTe
/**
* @throws Exception If failed.
*/
-public void testConsistentHashAssignment() throws Exception {
-aff = 0;
-
-checkAffinityFunction();
-}
-
-/**
- * @throws Exception If failed.
- */
public void testRendezvousAssignment() throws Exception {
-aff = 1;
+aff = 0;
checkAffinityFunction();
}
@@ -92,7 +80,7 @@ public class IgniteClientAffinityAssignmentSelfTest extends
GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testFairAssignment() throws Exception {
-aff = 2;
+aff = 1;
checkAffinityFunction();
}
[32/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b378307e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b378307e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b378307e Branch: refs/heads/ignite-141 Commit: b378307eaef5e41a5de0cff33c7265cec9729d61 Parents: f27e9d2 036bd71 Author: ivasilinets Authored: Sun Mar 1 21:22:32 2015 +0300 Committer: ivasilinets Committed: Sun Mar 1 21:22:32 2015 +0300 -- config/hadoop/default-config.xml| 12 + config/ignite-log4j.xml |2 +- .../ComputeFibonacciContinuationExample.java| 15 +- .../datagrid/CacheContinuousQueryExample.java |2 +- .../store/CacheNodeWithStoreStartup.java|6 +- .../store/jdbc/CacheJdbcPersonStore.java| 115 +- .../examples/ScalarContinuationExample.scala| 15 +- ipc/shmem/Makefile.am | 15 + ipc/shmem/igniteshmem/Makefile.am | 15 + ipc/shmem/include/Makefile.am | 15 + modules/clients/src/test/keystore/generate.sh | 15 +- .../src/main/java/org/apache/ignite/Ignite.java |4 +- .../main/java/org/apache/ignite/IgniteFs.java |2 +- .../ignite/cache/query/ContinuousQuery.java | 18 +- .../apache/ignite/cache/store/CacheStore.java |4 +- .../ignite/cache/store/CacheStoreAdapter.java |2 +- .../ignite/cache/store/CacheStoreSession.java | 17 +- .../apache/ignite/cluster/ClusterMetrics.java |2 +- .../configuration/QueryConfiguration.java | 37 +- .../ignite/events/DiscoveryCustomEvent.java | 56 - .../org/apache/ignite/events/EventType.java | 14 +- .../java/org/apache/ignite/igfs/IgfsMode.java |6 +- .../java/org/apache/ignite/igfs/package.html|2 +- .../apache/ignite/internal/GridProperties.java | 78 - .../ignite/internal/GridUpdateNotifier.java |2 +- .../apache/ignite/internal/IgniteKernal.java| 18 +- .../ignite/internal/IgniteProperties.java | 79 + .../ignite/internal/IgniteVersionUtils.java |8 +- .../internal/events/DiscoveryCustomEvent.java | 71 + .../discovery/GridDiscoveryManager.java |7 +- .../processors/cache/GridCacheStoreManager.java |6 +- .../processors/cache/IgniteCacheProxy.java |6 +- .../plugin/IgnitePluginProcessor.java | 24 + .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../visor/node/VisorBasicConfiguration.java | 17 - .../node/VisorNodeEventsCollectorTask.java | 10 +- .../internal/visor/node/VisorNodeGcTask.java| 10 +- .../internal/visor/node/VisorNodePingTask.java | 10 +- .../optimized-classnames.previous.properties| 15 + .../optimized/optimized-classnames.properties | 1565 +- .../apache/ignite/plugin/PluginProvider.java|5 + .../spi/discovery/tcp/TcpDiscoverySpi.java |9 +- .../TcpDiscoveryCustomEventMessage.java |3 + .../internal/GridDiscoveryEventSelfTest.java|9 +- .../internal/GridUpdateNotifierSelfTest.java|2 +- ...ridCacheContinuousQueryAbstractSelfTest.java |8 +- ...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 ++ .../config/GridTestProperties.java | 10 +- .../junits/cache/TestCacheSession.java |5 + .../cache/TestThreadLocalCacheSession.java |5 + .../testsuites/IgniteKernalSelfTestSuite.java |1 + modules/extdata/p2p/pom.xml |6 - modules/hadoop/pom.xml | 10 - .../client/hadoop/GridHadoopClientProtocol.java |6 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 412 + .../igfs/hadoop/v1/IgfsHadoopFileSystem.java|3 +- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java|3 +- .../java/org/apache/ignite/igfs/package.html|2 +- .../igfs/hadoop/IgfsHadoopFSProperties.java | 10 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 413 - .../internal/igfs/hadoop/IgfsHadoopReader.java |2 +- .../internal/igfs/hadoop/IgfsHadoopUtils.java |4 +- .../hadoop/GridHadoopClassLoader.java | 12 +- .../processors/hadoop/GridHadoopSetup.java |8 +- .../processors/hadoop/GridHadoopUtils.java |4 +- .../collections/GridHadoopHashMultimapBase.java |2 +- .../GridHadoopExternalCommunication.java| 14 +- .../hadoop/v1/GridHadoopV1MapTask.java |6 +- .../v2/GridHadoopV2JobResourceManager.java |2 +- .../GridHadoopClientProtocolSelfTest.java |6 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java |2 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java |2 +- .../igfs/IgfsHadoopDualAbstractSelfTest.java|2 +- .../IgfsH
[23/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bcf802d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bcf802d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bcf802d9 Branch: refs/heads/ignite-141 Commit: bcf802d9a235b0a0e451bd2ac50ec0369e02f76b Parents: 148ca09 dd66167 Author: sboikov Authored: Fri Feb 27 16:56:52 2015 +0300 Committer: sboikov Committed: Fri Feb 27 16:56:52 2015 +0300 -- config/hadoop/default-config.xml| 12 + .../src/main/java/org/apache/ignite/Ignite.java | 4 +- .../configuration/QueryConfiguration.java | 37 +- .../java/org/apache/ignite/igfs/IgfsMode.java | 6 +- .../config/GridTestProperties.java | 10 +- .../client/hadoop/GridHadoopClientProtocol.java | 6 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 412 ++ .../igfs/hadoop/v1/IgfsHadoopFileSystem.java| 3 +- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java| 3 +- .../igfs/hadoop/IgfsHadoopFSProperties.java | 10 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 413 --- .../internal/igfs/hadoop/IgfsHadoopReader.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopUtils.java | 4 +- .../hadoop/GridHadoopClassLoader.java | 12 +- .../processors/hadoop/GridHadoopSetup.java | 8 +- .../processors/hadoop/GridHadoopUtils.java | 4 +- .../collections/GridHadoopHashMultimapBase.java | 2 +- .../GridHadoopExternalCommunication.java| 14 +- .../hadoop/v1/GridHadoopV1MapTask.java | 6 +- .../v2/GridHadoopV2JobResourceManager.java | 2 +- .../GridHadoopClientProtocolSelfTest.java | 6 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 2 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- .../igfs/IgfsHadoopDualAbstractSelfTest.java| 2 +- .../IgfsHadoopFileSystemAbstractSelfTest.java | 1 + ...fsHadoopFileSystemSecondaryModeSelfTest.java | 2 +- .../hadoop/GridHadoopGroupingTest.java | 4 +- .../igfs/IgfsPerformanceBenchmark.java | 9 +- 28 files changed, 530 insertions(+), 468 deletions(-) --
[43/50] incubator-ignite git commit: # IGNITE-298 Escape cache and grid names.
# IGNITE-298 Escape cache and grid names.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b81c6a25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b81c6a25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b81c6a25
Branch: refs/heads/ignite-141
Commit: b81c6a25ba2ed743c251a34eb044123667d4be44
Parents: 7488edd
Author: AKuznetsov
Authored: Tue Mar 3 15:31:35 2015 +0700
Committer: AKuznetsov
Committed: Tue Mar 3 15:31:35 2015 +0700
--
.../commands/cache/VisorCacheCommand.scala | 17 +++-
.../commands/cache/VisorCacheScanCommand.scala | 7 +++--
.../config/VisorConfigurationCommand.scala | 5 ++--
.../visor/commands/node/VisorNodeCommand.scala | 6 ++---
.../scala/org/apache/ignite/visor/visor.scala | 27 +++-
5 files changed, 35 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b81c6a25/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index e2ca05b..2db43dc 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -22,6 +22,7 @@ import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.internal.util.typedef._
import org.apache.ignite.internal.visor.cache._
import org.apache.ignite.internal.visor.node.{VisorGridConfiguration,
VisorNodeConfigurationCollectorTask}
+import org.apache.ignite.internal.visor.util.VisorTaskUtils._
import org.apache.ignite.lang.IgniteBiTuple
import org.jetbrains.annotations._
@@ -243,10 +244,11 @@ class VisorCacheCommand {
}
val cacheName = argValue("c", argLst) match {
-case Some("") | Some(CACHE_DFLT) =>
+case Some(dfltName) if dfltName == DFLT_CACHE_KEY ||
dfltName == DFLT_CACHE_NAME =>
argLst = argLst.filter(_._1 != "c") ++ Seq("c" -> null)
Some(null)
+
case cn => cn
}
@@ -422,9 +424,9 @@ class VisorCacheCommand {
*/
private def mkCacheName(@Nullable s: String): String = {
if (s == null) {
-val v = mfind(CACHE_DFLT)
+val v = mfind(DFLT_CACHE_KEY)
-"" + (if (v.isDefined) "(@" + v.get._1 + ')' else "")
+DFLT_CACHE_NAME + (if (v.isDefined) "(@" + v.get._1 + ')' else "")
}
else {
val v = mfind(s)
@@ -438,7 +440,7 @@ class VisorCacheCommand {
*
* @param s Cache host.
*/
-private def registerCacheName(@Nullable s: String) = setVarIfAbsent(if (s
!= null) s else CACHE_DFLT, "c")
+private def registerCacheName(@Nullable s: String) = setVarIfAbsent(if (s
!= null) s else DFLT_CACHE_KEY, "c")
/**
* ===Command===
@@ -744,8 +746,11 @@ object VisorCacheCommand {
ref = VisorConsoleCommand(cmd.cache, cmd.cache)
)
+/** Default cache name to show on screen. */
+private final val DFLT_CACHE_NAME = escapeName(null)
+
/** Default cache key. */
-protected val CACHE_DFLT = "-" + UUID.randomUUID().toString
+protected val DFLT_CACHE_KEY = DFLT_CACHE_NAME + "-" +
UUID.randomUUID().toString
/** Singleton command */
private val cmd = new VisorCacheCommand
@@ -852,7 +857,7 @@ object VisorCacheCommand {
cacheT += ("Concurrent Asynchronous Operations Number",
cfg.maxConcurrentAsyncOperations())
cacheT += ("Memory Mode", cfg.memoryMode())
cacheT += ("Keep Values Bytes", cfg.valueBytes())
-cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory())
+cacheT += ("Off-Heap Size", if (cfg.offsetHeapMaxMemory() >= 0)
cfg.offsetHeapMaxMemory() else NA)
cacheT += ("Loader Factory Class Name", safe(cfg.loaderFactory()))
cacheT += ("Writer Factory Class Name", safe(cfg.writerFactory()))
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b81c6a25/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanC
[27/50] incubator-ignite git commit: #ignite-237: return to Visor excludeNeighbors attribute.
#ignite-237: return to Visor excludeNeighbors attribute.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/414410be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/414410be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/414410be
Branch: refs/heads/ignite-141
Commit: 414410bea39a7d8bdc46b1b63c5f506ec96d653e
Parents: 936b879
Author: ivasilinets
Authored: Fri Feb 27 18:34:08 2015 +0300
Committer: ivasilinets
Committed: Fri Feb 27 18:34:08 2015 +0300
--
.../visor/cache/VisorCacheAffinityConfiguration.java| 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414410be/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
index c43dc1c..47a2cf4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.visor.cache;
import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -58,15 +59,19 @@ public class VisorCacheAffinityConfiguration implements
Serializable {
public static VisorCacheAffinityConfiguration from(CacheConfiguration
ccfg) {
CacheAffinityFunction aff = ccfg.getAffinity();
-Integer dfltReplicas = null;
Boolean excludeNeighbors = null;
+if (aff instanceof CacheRendezvousAffinityFunction) {
+CacheRendezvousAffinityFunction hashAffFunc =
(CacheRendezvousAffinityFunction)aff;
+
+excludeNeighbors = hashAffFunc.isExcludeNeighbors();
+}
+
VisorCacheAffinityConfiguration cfg = new
VisorCacheAffinityConfiguration();
cfg.function(compactClass(aff));
cfg.mapper(compactClass(ccfg.getAffinityMapper()));
cfg.partitionedBackups(ccfg.getBackups());
-cfg.defaultReplicas(dfltReplicas);
cfg.excludeNeighbors(excludeNeighbors);
return cfg;
[11/50] incubator-ignite git commit: #ignite-237: change affinity function in tests.
#ignite-237: change affinity function in tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96ad6c16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96ad6c16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96ad6c16 Branch: refs/heads/ignite-141 Commit: 96ad6c16cd35a1552d54a515034f1e57edfbffa4 Parents: 81fb145 Author: ivasilinets Authored: Thu Feb 26 16:25:53 2015 +0300 Committer: ivasilinets Committed: Thu Feb 26 16:25:53 2015 +0300 -- modules/core/src/test/config/load/dsi-49-server-production.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96ad6c16/modules/core/src/test/config/load/dsi-49-server-production.xml -- diff --git a/modules/core/src/test/config/load/dsi-49-server-production.xml b/modules/core/src/test/config/load/dsi-49-server-production.xml index 07fc164..316d889 100644 --- a/modules/core/src/test/config/load/dsi-49-server-production.xml +++ b/modules/core/src/test/config/load/dsi-49-server-production.xml @@ -53,7 +53,7 @@ - +
[08/50] incubator-ignite git commit: #ignite-237: change affinity function in tests.
#ignite-237: change affinity function in tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13d06271
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13d06271
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13d06271
Branch: refs/heads/ignite-141
Commit: 13d0627183b6b65a8696a9f3b45765c3489480eb
Parents: d998925
Author: ivasilinets
Authored: Thu Feb 26 16:12:28 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 26 16:12:28 2015 +0300
--
.../java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13d06271/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 4cfeaff..6091338 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -57,7 +57,6 @@ public class IgniteBasicTestSuite extends TestSuite {
suite.addTestSuite(GridReleaseTypeSelfTest.class);
suite.addTestSuite(GridProductVersionSelfTest.class);
-suite.addTestSuite(GridAffinityProcessorConsistentHashSelfTest.class);
suite.addTestSuite(GridAffinityProcessorRendezvousSelfTest.class);
suite.addTestSuite(GridClosureProcessorSelfTest.class);
suite.addTestSuite(GridStartStopSelfTest.class);
[42/50] incubator-ignite git commit: # IGNITE-380 Added snippet generation.
# IGNITE-380 Added snippet generation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7488eddd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7488eddd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7488eddd
Branch: refs/heads/ignite-141
Commit: 7488eddd6e0224d18ecdd9b7fb51566e926ead5d
Parents: b2675bc
Author: AKuznetsov
Authored: Tue Mar 3 14:49:27 2015 +0700
Committer: AKuznetsov
Committed: Tue Mar 3 14:49:27 2015 +0700
--
.../ignite/cache/CacheTypeFieldMetadata.java| 2 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 18 +--
.../ignite/schema/generator/PojoGenerator.java | 3 +-
.../schema/generator/SnippetGenerator.java | 138 +++
.../apache/ignite/schema/ui/SchemaLoadApp.java | 2 +
5 files changed, 151 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7488eddd/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
index 0041f10..625873b 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java
@@ -50,7 +50,7 @@ public class CacheTypeFieldMetadata {
* @param javaName Field name in java object.
* @param javaType Field java type.
*/
-public CacheTypeFieldMetadata(String javaName, Class javaType, String
dbName, int dbType) {
+public CacheTypeFieldMetadata(String dbName, int dbType, String javaName,
Class javaType) {
this.dbName = dbName;
this.dbType = dbType;
this.javaName = javaName;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7488eddd/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
index 1e502c9..f25d9f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
@@ -230,6 +230,15 @@ public class CacheTypeMetadata {
}
/**
+ * Sets value fields.
+ *
+ * @param valFields New value fields.
+ */
+public void setValueFields(Collection valFields) {
+this.valFields = valFields;
+}
+
+/**
* Gets query-enabled fields.
*
* @return Collection of fields available for query.
@@ -318,13 +327,4 @@ public class CacheTypeMetadata {
public void setGroups(Map, Boolean>>> grps) {
this.grps = grps;
}
-
-/**
- * Sets value fields.
- *
- * @param valFields New value fields.
- */
-public void setValueFields(Collection valFields) {
-this.valFields = valFields;
-}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7488eddd/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java
--
diff --git
a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java
b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java
index 7d12e2c..500aa9a 100644
---
a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java
+++
b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/PojoGenerator.java
@@ -401,8 +401,7 @@ public class PojoGenerator {
* @throws IOException If failed to write generated code into file.
*/
public static void generate(PojoDescriptor pojo, String outFolder, String
pkg, boolean constructor,
-boolean includeKeys, ConfirmCallable askOverwrite)
-throws IOException {
+boolean includeKeys, ConfirmCallable askOverwrite) throws IOException {
File pkgFolder = new File(outFolder, pkg.replace('.',
File.separatorChar));
if (!pkgFolder.exists() && !pkgFolder.mkdirs())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7488eddd/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java
--
diff --git
a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java
b/modules/schema-load/src/main/java/org/apache/ignite/schema/ge
[26/50] incubator-ignite git commit: #ignite-237: remove old GridCacheAttributes.
#ignite-237: remove old GridCacheAttributes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/936b8792
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/936b8792
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/936b8792
Branch: refs/heads/ignite-141
Commit: 936b8792b9bd6839c7620f8f1021dcd82952aef4
Parents: 0d70de8
Author: ivasilinets
Authored: Fri Feb 27 18:31:48 2015 +0300
Committer: ivasilinets
Committed: Fri Feb 27 18:31:48 2015 +0300
--
.../processors/cache/GridCacheAttributes.java | 24
.../processors/cache/GridCacheProcessor.java| 8 ---
2 files changed, 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/936b8792/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 8ecd84c..94ae1fa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -119,12 +119,6 @@ public class GridCacheAttributes implements Externalizable
{
private int affKeyBackups = -1;
/** */
-private int affReplicas = -1;
-
-/** */
-private String affReplicaCntAttrName;
-
-/** */
private String affHashIdRslvrClsName;
/** */
@@ -294,13 +288,6 @@ public class GridCacheAttributes implements Externalizable
{
}
/**
- * @return Affinity replicas.
- */
-public int affinityReplicas() {
-return affReplicas;
-}
-
-/**
* @return Affinity partitions count.
*/
public int affinityPartitionsCount() {
@@ -308,13 +295,6 @@ public class GridCacheAttributes implements Externalizable
{
}
/**
- * @return Aff replicas count attr name.
- */
-public String affinityReplicaCountAttrName() {
-return affReplicaCntAttrName;
-}
-
-/**
* @return Affinity hash ID resolver class name.
*/
public String affinityHashIdResolverClassName() {
@@ -537,8 +517,6 @@ public class GridCacheAttributes implements Externalizable {
out.writeBoolean(affInclNeighbors);
out.writeInt(affKeyBackups);
out.writeInt(affPartsCnt);
-out.writeInt(affReplicas);
-U.writeString(out, affReplicaCntAttrName);
U.writeString(out, affHashIdRslvrClsName);
U.writeString(out, evictFilterClsName);
@@ -581,8 +559,6 @@ public class GridCacheAttributes implements Externalizable {
affInclNeighbors = in.readBoolean();
affKeyBackups = in.readInt();
affPartsCnt = in.readInt();
-affReplicas = in.readInt();
-affReplicaCntAttrName = U.readString(in);
affHashIdRslvrClsName = U.readString(in);
evictFilterClsName = U.readString(in);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/936b8792/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index f00a853..3e5e124 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1186,14 +1186,6 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
"Affinity key backups",
locAttr.affinityKeyBackups(),
rmtAttr.affinityKeyBackups(), true);
-CU.checkAttributeMismatch(log,
rmtAttr.cacheName(), rmt, "affinityReplicas",
-"Affinity replicas",
locAttr.affinityReplicas(),
-rmtAttr.affinityReplicas(), true);
-
-CU.checkAttributeMismatch(log,
rmtAttr.cacheName(), rmt, "affinityReplicaCountAttrName",
-"Affinity replica count attribute name",
locAttr.affinityReplicaCountAttrName(),
-rmtAttr.affinityReplicaCountAttrName(), true);
-
CU.checkAttributeMismatch(log,
rmtAttr.cacheName(), rmt, "cacheAffinity.hashIdResolver",
[33/50] incubator-ignite git commit: Merge branch 'ignite-237' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-237
Merge branch 'ignite-237' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-237 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6531cbd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6531cbd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6531cbd1 Branch: refs/heads/ignite-141 Commit: 6531cbd1d7e6fa937f8536e349c8e8dd9631c17c Parents: b378307 10ac88a Author: ivasilinets Authored: Sun Mar 1 21:23:31 2015 +0300 Committer: ivasilinets Committed: Sun Mar 1 21:23:31 2015 +0300 -- .../ClientAbstractMultiThreadedSelfTest.java| 38 +- .../impl/ClientPartitionAffinitySelfTest.java | 87 +-- .../ClientAbstractMultiNodeSelfTest.java| 53 +- .../integration/ClientAbstractSelfTest.java | 8 - .../src/test/resources/spring-server-node.xml | 2 +- .../test/resources/spring-server-ssl-node.xml | 2 +- .../java/org/apache/ignite/cache/GridCache.java | 2 +- .../CacheConsistentHashAffinityFunction.java| 703 --- .../cache/affinity/consistenthash/package.html | 24 - .../CacheRendezvousAffinityFunction.java| 2 +- .../configuration/CacheConfiguration.java | 2 +- .../processors/cache/GridCacheAttributes.java | 32 +- .../processors/cache/GridCacheProcessor.java| 21 +- .../top/GridTopologyCommandHandler.java | 8 - .../cache/VisorCacheAffinityConfiguration.java | 9 +- .../config/load/dsi-49-server-production.xml| 2 +- .../GridCacheAffinityBackupsSelfTest.java | 9 - .../ignite/IgniteCacheAffinitySelfTest.java | 30 +- ...AffinityProcessorConsistentHashSelfTest.java | 31 - ...idCacheConfigurationConsistencySelfTest.java | 46 +- ...ridCacheConfigurationValidationSelfTest.java | 8 +- .../GridCachePartitionedAffinitySpreadTest.java | 16 +- .../IgniteClientAffinityAssignmentSelfTest.java | 16 +- .../GridCacheClientModesAbstractSelfTest.java | 4 +- ...dCachePartitionedAffinityFilterSelfTest.java | 6 +- ...GridCachePreloadRestartAbstractSelfTest.java | 4 +- .../dht/GridCacheColocatedDebugTest.java| 4 +- .../dht/GridCacheDhtEntrySelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 6 +- .../dht/GridCacheDhtEvictionSelfTest.java | 14 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +- .../GridCacheDhtPreloadDisabledSelfTest.java| 4 +- .../GridCacheDhtPreloadMessageCountTest.java| 4 +- ...ridCacheDhtPreloadMultiThreadedSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadSelfTest.java| 4 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +- .../distributed/dht/GridCacheDhtTestUtils.java | 6 +- ...dCachePartitionedTopologyChangeSelfTest.java | 7 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 5 +- ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 - ...AffinityExcludeNeighborsPerformanceTest.java | 4 +- ...rtitionedAffinityHashIdResolverSelfTest.java | 4 +- .../GridCachePartitionedAffinitySelfTest.java | 226 -- .../GridCachePartitionedFullApiSelfTest.java| 6 +- .../GridCachePartitionedNodeRestartTest.java| 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 4 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 4 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 19 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +- ...apPartitionedMapPerformanceAbstractTest.java | 4 +- ...GridUnsafePartitionedMapPerformanceTest.java | 4 +- .../capacity/spring-capacity-cache.xml | 2 +- .../loadtests/colocation/spring-colocation.xml | 2 +- .../GridCachePartitionedAtomicLongLoadTest.java | 4 +- ...apPartitionedMapPerformanceAbstractTest.java | 4 +- ...GridUnsafePartitionedMapPerformanceTest.java | 4 +- .../ignite/testframework/GridTestUtils.java | 11 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - .../hibernate/HibernateL2CacheSelfTest.java | 8 +- 64 files changed, 149 insertions(+), 1454 deletions(-) --
[20/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7fb3890c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7fb3890c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7fb3890c Branch: refs/heads/ignite-141 Commit: 7fb3890c609f4c04af9b057686dfc3706a50e59d Parents: 3bab015 4e7463d Author: ivasilinets Authored: Fri Feb 27 13:27:20 2015 +0300 Committer: ivasilinets Committed: Fri Feb 27 13:27:20 2015 +0300 -- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../visor/node/VisorBasicConfiguration.java | 17 --- .../node/VisorNodeEventsCollectorTask.java | 10 +- .../internal/visor/node/VisorNodeGcTask.java| 10 +- .../internal/visor/node/VisorNodePingTask.java | 10 +- .../commands/alert/VisorAlertCommand.scala | 8 +- .../commands/cache/VisorCacheCommand.scala | 82 +++ .../config/VisorConfigurationCommand.scala | 140 ++- .../commands/disco/VisorDiscoveryCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 64 ++--- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- 11 files changed, 193 insertions(+), 162 deletions(-) --
[07/50] incubator-ignite git commit: #ignite-237: change affinity function in tests.
#ignite-237: change affinity function in tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d9989259
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d9989259
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d9989259
Branch: refs/heads/ignite-141
Commit: d99892590d857c7a9b954cfaff747a0c46b339c8
Parents: f358766
Author: ivasilinets
Authored: Thu Feb 26 16:12:03 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 26 16:12:03 2015 +0300
--
...dCachePartitionedAffinityFilterSelfTest.java | 5 +--
.../dht/GridCacheDhtEntrySelfTest.java | 3 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 3 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 3 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 3 +-
.../GridCacheDhtPreloadDisabledSelfTest.java| 3 +-
.../GridCacheDhtPreloadMessageCountTest.java| 3 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 3 +-
.../dht/GridCacheDhtPreloadSelfTest.java| 3 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 3 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 3 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 6 ++--
...ffinityFunctionExcludeNeighborsSelfTest.java | 32
...AffinityExcludeNeighborsPerformanceTest.java | 3 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 4 +--
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
16 files changed, 29 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9989259/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
index b78857d..4ccb0be 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cache.affinity.consistenthash.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -67,7 +68,7 @@ public class GridCachePartitionedAffinityFilterSelfTest
extends GridCommonAbstra
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
-CacheConsistentHashAffinityFunction aff = new
CacheConsistentHashAffinityFunction();
+CacheRendezvousAffinityFunction aff = new
CacheRendezvousAffinityFunction();
aff.setBackupFilter(backupFilter);
@@ -123,7 +124,7 @@ public class GridCachePartitionedAffinityFilterSelfTest
extends GridCommonAbstra
* @throws Exception If failed.
*/
private void checkPartitions() throws Exception {
-int partCnt = CacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT;
+int partCnt = CacheRendezvousAffinityFunction.DFLT_PARTITION_COUNT;
CacheAffinityFunction aff =
cacheConfiguration(grid(0).configuration(), null).getAffinity();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9989259/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
index a1eb4e3..b482165 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.cache.affinity.consistenthash.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite
[04/50] incubator-ignite git commit: #ignite-237: remove consistent hash from IgniteCacheAffinitySelfTest.
#ignite-237: remove consistent hash from IgniteCacheAffinitySelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/df3c76e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df3c76e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df3c76e4
Branch: refs/heads/ignite-141
Commit: df3c76e4a353c599832a105ce0fc22f73104edf1
Parents: fecb680
Author: ivasilinets
Authored: Thu Feb 26 15:53:43 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 26 15:53:43 2015 +0300
--
.../ignite/IgniteCacheAffinitySelfTest.java | 30 +++-
1 file changed, 11 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df3c76e4/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
index 7186ae1..c3e76a6 100644
---
a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.consistenthash.*;
import org.apache.ignite.cache.affinity.fair.*;
import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cluster.*;
@@ -40,13 +39,10 @@ public class IgniteCacheAffinitySelfTest extends
IgniteCacheAbstractTest {
private int GRID_COUNT = 3;
/** Cache name */
-private final String CACHE1 = "ConsistentHash";
+private final String CACHE1 = "Fair";
/** Cache name */
-private final String CACHE2 = "Fair";
-
-/** Cache name */
-private final String CACHE3 = "Rendezvous";
+private final String CACHE2 = "Rendezvous";
/** {@inheritDoc} */
@Override protected int gridCount() {
@@ -61,20 +57,16 @@ public class IgniteCacheAffinitySelfTest extends
IgniteCacheAbstractTest {
CacheConfiguration cache1 = cacheConfiguration(null);
cache1.setName(CACHE1);
-cache1.setAffinity(new CacheConsistentHashAffinityFunction());
+cache1.setAffinity(new CachePartitionFairAffinity());
CacheConfiguration cache2 = cacheConfiguration(null);
cache2.setName(CACHE2);
-cache2.setAffinity(new CachePartitionFairAffinity());
-
-CacheConfiguration cache3 = cacheConfiguration(null);
-cache3.setName(CACHE3);
-cache3.setAffinity(new CacheRendezvousAffinityFunction());
+cache2.setAffinity(new CacheRendezvousAffinityFunction());
if (gridName.contains("0"))
cfg.setCacheConfiguration(cache0);
else
-cfg.setCacheConfiguration(cache0, cache1, cache2, cache3);
+cfg.setCacheConfiguration(cache0, cache1, cache2);
return cfg;
}
@@ -116,8 +108,8 @@ public class IgniteCacheAffinitySelfTest extends
IgniteCacheAbstractTest {
private void checkAffinity() {
checkAffinity(grid(0).affinity(null), cache(1, null).affinity());
checkAffinity(grid(0).affinity(CACHE1), cache(1, CACHE1).affinity());
+checkAffinity(grid(0).affinity(CACHE1), cache(1, CACHE1).affinity());
checkAffinity(grid(0).affinity(CACHE2), cache(1, CACHE2).affinity());
-checkAffinity(grid(0).affinity(CACHE3), cache(1, CACHE3).affinity());
}
/**
@@ -226,13 +218,13 @@ public class IgniteCacheAffinitySelfTest extends
IgniteCacheAbstractTest {
Collection col1 = new HashSet<>();
-for (int i = 0; i < arr1.length; ++i)
-col1.add(arr1[i]);
+for (int anArr1 : arr1)
+col1.add(anArr1);
-for (int i = 0; i < arr2.length; ++i) {
-assertTrue(col1.contains(arr2[i]));
+for (int anArr2 : arr2) {
+assertTrue(col1.contains(anArr2));
-col1.remove(arr2[i]);
+col1.remove(anArr2);
}
assertEquals(0, col1.size());
[29/50] incubator-ignite git commit: #ignite-237: remove tests for consistent hash.
#ignite-237: remove tests for consistent hash.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5692d7e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5692d7e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5692d7e3
Branch: refs/heads/ignite-141
Commit: 5692d7e39a4600b17dd9fafb2003a96a2fb51489
Parents: e378264
Author: ivasilinets
Authored: Fri Feb 27 19:44:08 2015 +0300
Committer: ivasilinets
Committed: Fri Feb 27 19:44:08 2015 +0300
--
.../GridCachePartitionedAffinitySelfTest.java | 181 ---
1 file changed, 181 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5692d7e3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index 1559a24..069ffb6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@ -20,7 +20,6 @@ package
org.apache.ignite.internal.processors.cache.distributed.near;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
@@ -110,186 +109,6 @@ public class GridCachePartitionedAffinitySelfTest extends
GridCommonAbstractTest
return aff.mapKeyToPrimaryAndBackups(key);
}
-/** Test predefined affinity - must be ported to all clients. */
-@SuppressWarnings("UnaryPlus")
-public void testPredefined() throws IgniteCheckedException {
-CacheRendezvousAffinityFunction aff = new
CacheRendezvousAffinityFunction();
-
-getTestResources().inject(aff);
-
-aff.setHashIdResolver(new CacheAffinityNodeIdHashResolver());
-
-List nodes = new ArrayList<>();
-
-nodes.add(createNode("000ea4cd-f449-4dcb-869a-5317c63bd619", 50));
-nodes.add(createNode("010ea4cd-f449-4dcb-869a-5317c63bd62a", 60));
-nodes.add(createNode("0209ec54-ff53-4fdb-8239-5a3ac1fb31bd", 70));
-nodes.add(createNode("0309ec54-ff53-4fdb-8239-5a3ac1fb31ef", 80));
-nodes.add(createNode("040c9b94-02ae-45a6-9d5c-a066dbdf2636", 90));
-nodes.add(createNode("050c9b94-02ae-45a6-9d5c-a066dbdf2747", 100));
-nodes.add(createNode("0601f916-4357-4cfe-a7df-49d4721690bf", 110));
-nodes.add(createNode("0702f916-4357-4cfe-a7df-49d4721691c0", 120));
-
-Map data = new LinkedHashMap<>();
-
-data.put("", 4);
-data.put("asdf", 4);
-data.put("224ea4cd-f449-4dcb-869a-5317c63bd619", 5);
-data.put("fdc9ec54-ff53-4fdb-8239-5a3ac1fb31bd", 2);
-data.put("0f9c9b94-02ae-45a6-9d5c-a066dbdf2636", 2);
-data.put("d8f1f916-4357-4cfe-a7df-49d4721690bf", 7);
-data.put("c77ffeae-78a1-4ee6-a0fd-8d197a794412", 3);
-data.put("35de9f21-3c9b-4f4a-a7d5-3e2c6cb01564", 1);
-data.put("d67eb652-4e76-47fb-ad4e-cd902d9b868a", 7);
-
-data.put(0, 4);
-data.put(1, 7);
-data.put(12, 5);
-data.put(123, 6);
-data.put(1234, 4);
-data.put(12345, 6);
-data.put(123456, 6);
-data.put(1234567, 6);
-data.put(12345678, 0);
-data.put(123456789, 7);
-data.put(1234567890, 7);
-data.put(1234567890L, 7);
-data.put(12345678901L, 2);
-data.put(123456789012L, 1);
-data.put(1234567890123L, 0);
-data.put(12345678901234L, 1);
-data.put(123456789012345L, 6);
-data.put(1234567890123456L, 7);
-data.put(-23456789012345L, 4);
-data.put(-2345678901234L, 1);
-data.put(-234567890123L, 5);
-data.put(-23456789012L, 5);
-data.put(-2345678901L, 7);
-data.put(-234567890L, 4);
-data.put(-234567890, 7);
-data.put(-23456789, 7);
-data.put(-2345678, 0);
-data.put(-234567, 6);
-data.put(-23456, 6);
-data.put(-2345, 6);
-data.put(-234, 7);
-data.put(-23, 5);
-data.put(-2, 4);
-
-data.put(0x8000, 4);
-data.put(0x7fff, 7);
-data.put(0x8000L, 4);
-data.put(0
[01/50] incubator-ignite git commit: #ignite-237: remove GridAffinityProcessorConsistentHashSelfTest.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-141 0fb139ebd -> 39c7f542d
#ignite-237: remove GridAffinityProcessorConsistentHashSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02d46d7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02d46d7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02d46d7b
Branch: refs/heads/ignite-141
Commit: 02d46d7bcae3d1576cbcdf43413118c4dd9f1056
Parents: 399d2b9
Author: ivasilinets
Authored: Thu Feb 26 15:48:54 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 26 15:48:54 2015 +0300
--
...AffinityProcessorConsistentHashSelfTest.java | 31
1 file changed, 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d46d7b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorConsistentHashSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorConsistentHashSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorConsistentHashSelfTest.java
deleted file mode 100644
index f1a2cde..000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorConsistentHashSelfTest.java
+++ /dev/null
@@ -1,31 +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.processors.affinity;
-
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.consistenthash.*;
-
-/**
- * Tests consistent hash affinity function.
- */
-public class GridAffinityProcessorConsistentHashSelfTest extends
GridAffinityProcessorAbstractSelfTest {
-/** {@inheritDoc} */
-@Override protected CacheAffinityFunction affinityFunction() {
-return new CacheConsistentHashAffinityFunction();
-}
-}
[13/50] incubator-ignite git commit: #ignite-237: move CacheConsistentHashAffinityFunction to org.gridgain.benchmarks.risk.affinity.
#ignite-237: move CacheConsistentHashAffinityFunction to
org.gridgain.benchmarks.risk.affinity.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d07931d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d07931d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d07931d2
Branch: refs/heads/ignite-141
Commit: d07931d2ddd8d4798c1ca2b7bc9620036ff59ae9
Parents: 87586da
Author: ivasilinets
Authored: Thu Feb 26 18:23:27 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 26 18:23:27 2015 +0300
--
.../ClientAbstractMultiThreadedSelfTest.java| 4 +-
.../impl/ClientPartitionAffinitySelfTest.java | 21 +-
.../ClientAbstractMultiNodeSelfTest.java| 4 +-
.../integration/ClientAbstractSelfTest.java | 8 -
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
.../CacheConsistentHashAffinityFunction.java| 703 ---
.../cache/affinity/consistenthash/package.html | 24 -
.../processors/cache/GridCacheAttributes.java | 9 -
.../processors/cache/GridCacheProcessor.java| 12 +-
.../top/GridTopologyCommandHandler.java | 7 -
.../cache/VisorCacheAffinityConfiguration.java | 7 -
.../optimized/optimized-classnames.properties | 12 +-
.../CacheConsistentHashAffinityFunction.java| 703 +++
.../GridCachePartitionedAffinitySpreadTest.java | 16 +-
.../GridCachePartitionedAffinitySelfTest.java | 53 +-
16 files changed, 731 insertions(+), 856 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d07931d2/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index 6264276..4ab2679 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.client;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.affinity.consistenthash.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
@@ -193,7 +193,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest
extends GridCommonAbst
private CacheConfiguration cacheConfiguration(@Nullable String cacheName)
throws Exception {
CacheConfiguration cfg = defaultCacheConfiguration();
-cfg.setAffinity(new CacheConsistentHashAffinityFunction());
+cfg.setAffinity(new CacheRendezvousAffinityFunction());
cfg.setDistributionMode(NEAR_PARTITIONED);
cfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d07931d2/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
index 3a45615..444a84c 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.client.impl;
import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.consistenthash.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.client.*;
import org.apache.ignite.internal.processors.affinity.*;
@@ -28,8 +28,6 @@ import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
-import static
org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction.*;
-
/**
* Client's partitioned affinity tests.
*/
@@ -285,7 +283,7 @@ public class ClientPartitionAffinitySelfTest extends
GridCommonAbstractTest {
aff.setHashIdResolver(HASH_ID_RSLVR);
-CacheConsistentHashAffinityFunction srvAff = new
CacheConsistentHashAffinityFunction();
+CacheRendezvousAf
[50/50] incubator-ignite git commit: # IGNITE-141 - Marshallers refactoring
# IGNITE-141 - Marshallers refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39c7f542
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39c7f542
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39c7f542
Branch: refs/heads/ignite-141
Commit: 39c7f542dac62efc3922167671295b3f49b9bc5e
Parents: 8c0875f
Author: Valentin Kulichenko
Authored: Tue Mar 3 12:28:45 2015 -0800
Committer: Valentin Kulichenko
Committed: Tue Mar 3 12:28:45 2015 -0800
--
.../ignite/internal/GridKernalContextImpl.java | 2 +-
.../ignite/internal/MarshallerContextImpl.java | 58
.../deployment/GridDeploymentLocalStore.java| 1 -
.../GridDeploymentPerLoaderStore.java | 1 -
.../GridDeploymentPerVersionStore.java | 1 -
.../internal/util/nio/GridNioSelfTest.java | 18 --
.../marshaller/MarshallerContextTestImpl.java | 17 --
7 files changed, 37 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39c7f542/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 2b83df3..8544c60 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -360,7 +360,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
this.igfsExecSvc = igfsExecSvc;
this.restExecSvc = restExecSvc;
-marshCtx = new MarshallerContextImpl(log);
+marshCtx = new MarshallerContextImpl();
try {
spring = SPRING.create(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39c7f542/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 408e70d..f06896d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -19,14 +19,11 @@ package org.apache.ignite.internal;
import org.apache.ignite.*;
import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.*;
import org.jdk8.backport.*;
import java.io.*;
-import java.util.*;
import java.util.concurrent.*;
/**
@@ -37,7 +34,7 @@ public class MarshallerContextImpl implements
MarshallerContext {
private static final String CLS_NAMES_FILE =
"org/apache/ignite/internal/classnames.properties";
/** */
-private final ConcurrentMap>
clsById = new ConcurrentHashMap8<>();
+private final ConcurrentMap clsNameById = new
ConcurrentHashMap8<>();
/** */
private final CountDownLatch latch = new CountDownLatch(1);
@@ -46,9 +43,9 @@ public class MarshallerContextImpl implements
MarshallerContext {
private volatile GridCacheAdapter cache;
/**
- * @param log Logger.
+ * Constructor.
*/
-MarshallerContextImpl(IgniteLogger log) {
+MarshallerContextImpl() {
try {
ClassLoader ldr = getClass().getClassLoader();
@@ -56,17 +53,8 @@ public class MarshallerContextImpl implements
MarshallerContext {
String clsName;
-while ((clsName = rdr.readLine()) != null) {
-try {
-Class cls = U.forName(clsName, ldr);
-
-clsById.put(cls.getName().hashCode(), F.t(cls, true));
-}
-catch (ClassNotFoundException | NoClassDefFoundError ignored) {
-if (log.isDebugEnabled())
-log.debug("Class defined in classnames.properties
doesn't exist (ignoring): " + clsName);
-}
-}
+while ((clsName = rdr.readLine()) != null)
+clsNameById.put(clsName.hashCode(), clsName);
}
catch (IOException e) {
throw new IllegalStateException("Failed to initialize marshaller
context.", e);
@@ -84,29 +72,9 @@ public class MarshallerContextImpl implements
MarshallerContext {
latch.countDown();
}
[31/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/10ac88a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/10ac88a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/10ac88a7 Branch: refs/heads/ignite-141 Commit: 10ac88a701618249f4e23ecb467fe0099c034a4e Parents: 8e58738 a792c99 Author: ivasilinets Authored: Fri Feb 27 20:03:24 2015 +0300 Committer: ivasilinets Committed: Fri Feb 27 20:03:24 2015 +0300 -- .../apache/ignite/internal/GridProperties.java | 78 --- .../ignite/internal/GridUpdateNotifier.java | 2 +- .../apache/ignite/internal/IgniteKernal.java| 18 ++--- .../ignite/internal/IgniteProperties.java | 79 .../ignite/internal/IgniteVersionUtils.java | 8 +- .../plugin/IgnitePluginProcessor.java | 24 ++ .../apache/ignite/plugin/PluginProvider.java| 5 ++ .../internal/GridUpdateNotifierSelfTest.java| 2 +- 8 files changed, 123 insertions(+), 93 deletions(-) --
[10/50] incubator-ignite git commit: #ignite-237: change affinity function in tests.
#ignite-237: change affinity function in tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/81fb145d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/81fb145d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/81fb145d
Branch: refs/heads/ignite-141
Commit: 81fb145dfbe02268d7cba49915fae5861752838a
Parents: 262aba5
Author: ivasilinets
Authored: Thu Feb 26 16:16:57 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 26 16:16:57 2015 +0300
--
.../java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java | 2 +-
.../cache/distributed/GridCacheClientModesAbstractSelfTest.java | 3 ++-
.../cache/distributed/dht/GridCacheColocatedDebugTest.java| 3 ++-
.../apache/ignite/loadtests/capacity/spring-capacity-cache.xml| 2 +-
.../org/apache/ignite/loadtests/colocation/spring-colocation.xml | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81fb145d/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
index 581f22a..6e34229 100644
---
a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java
@@ -61,7 +61,7 @@ public class GridCacheAffinityBackupsSelfTest extends
GridCommonAbstractTest {
*/
public void testConsistentHashBackups() throws Exception {
for (int i = 0; i < nodesCnt; i++)
-checkBackups(i, new CacheConsistentHashAffinityFunction());
+checkBackups(i, new CacheRendezvousAffinityFunction());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81fb145d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
index 7cb50b8..170c3d5 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
@@ -20,6 +20,7 @@ package
org.apache.ignite.internal.processors.cache.distributed;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.consistenthash.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
@@ -71,7 +72,7 @@ public abstract class GridCacheClientModesAbstractSelfTest
extends GridCacheAbst
cfg.setCacheStoreFactory(null);
cfg.setReadThrough(false);
cfg.setWriteThrough(false);
-cfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 32));
+cfg.setAffinity(new CacheRendezvousAffinityFunction(false, 32));
cfg.setBackups(1);
return cfg;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81fb145d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
index 21f2c52..9cd036f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
@@ -19,6 +19,7 @@ package
org.apache.ignite.internal.processors.cache.distributed.dht;
import org.apache.ignite.*;
import org.apache.ignite.cache.affinity.consistenthash.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
@@ -71,7 +72,7 @@ public class GridCacheColocatedDebugTest extends
GridC
[18/50] incubator-ignite git commit: #ignite-237: remove test validating that client partitioned affinity and cache partitioned affinity produce the same result
#ignite-237: remove test validating that client partitioned affinity and cache
partitioned affinity produce the same result
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d54c502
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d54c502
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d54c502
Branch: refs/heads/ignite-141
Commit: 4d54c502fcc48896fd2e4321f18ffa6ad1611656
Parents: 120711b
Author: ivasilinets
Authored: Fri Feb 27 12:53:00 2015 +0300
Committer: ivasilinets
Committed: Fri Feb 27 12:53:00 2015 +0300
--
.../impl/ClientPartitionAffinitySelfTest.java | 66
1 file changed, 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d54c502/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
index 444a84c..dde345e 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
@@ -267,45 +267,6 @@ public class ClientPartitionAffinitySelfTest extends
GridCommonAbstractTest {
}
/**
- * Validate client partitioned affinity and cache partitioned affinity
produce the same result.
- *
- * @throws Exception On any exception.
- */
-public void testReplicas() throws Exception {
-// Emulate nodes in topology.
-Collection nodes = new ArrayList<>();
-Collection srvNodes = new ArrayList<>();
-
-// Define affinities to test.
-GridClientPartitionAffinity aff = new GridClientPartitionAffinity();
-
-getTestResources().inject(aff);
-
-aff.setHashIdResolver(HASH_ID_RSLVR);
-
-CacheRendezvousAffinityFunction srvAff = new
CacheRendezvousAffinityFunction();
-
-getTestResources().inject(srvAff);
-
-srvAff.setHashIdResolver(new CacheAffinityNodeIdHashResolver());
-
-// Define keys to test affinity for.
-Collection keys = new ArrayList<>(
-Arrays.asList("", "1", "12", "asdf", "Hadoop\u3092\u6bba\u3059"));
-
-for (int i = 0; i < 10; i++)
-keys.add(UUID.randomUUID().toString());
-
-// Test affinity behaviour on different topologies.
-for (int i = 0; i < 20; i++) {
-addNodes(1 + (int)Math.round(Math.random() * 50), nodes, srvNodes);
-
-for (String key : keys)
-assertSameAffinity(key, aff, srvAff, nodes, srvNodes);
-}
-}
-
-/**
* Add {@code cnt} nodes into emulated topology.
*
* @param cnt Number of nodes to add into emulated topology.
@@ -329,33 +290,6 @@ public class ClientPartitionAffinitySelfTest extends
GridCommonAbstractTest {
}
/**
- * Compare server and client affinity for specified key in current
topology.
- *
- * @param key Key to validate affinity for.
- * @param aff Client affinity.
- * @param srvAff Server affinity.
- * @param nodes Client topology.
- * @param srvNodes Server topology.
- */
-private void assertSameAffinity(Object key, GridClientDataAffinity aff,
CacheAffinityFunction srvAff,
-Collection nodes, Collection
srvNodes) {
-GridClientNode node = aff.node(key, nodes);
-int part = srvAff.partition(key);
-
-CacheAffinityFunctionContext ctx = new
GridCacheAffinityFunctionContextImpl(new ArrayList<>(srvNodes),
-null, null, 1, 0);
-
-ClusterNode srvNode = F.first(srvAff.assignPartitions(ctx).get(part));
-
-if (node == null)
-assertNull(srvNode);
-else {
-assertNotNull(srvNode);
-assertEquals(node.nodeId(), srvNode.id());
-}
-}
-
-/**
* Rich node stub to use in emulated server topology.
*/
private static class TestRichNode extends GridTestNode {
