ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: # sprint-1 Fixed class names
Date Mon, 26 Jan 2015 06:36:59 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/sprint-1 7f370b87b -> 24c504b82


# sprint-1 Fixed class 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/24c504b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24c504b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24c504b8

Branch: refs/heads/sprint-1
Commit: 24c504b825ce5c45659658b4c3d0bf0cda685fba
Parents: 7f370b8
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jan 26 09:36:37 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jan 26 09:36:37 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCachePartialUpdateException.java  | 64 -------------------
 .../cache/GridCacheDeploymentSelfTest.java      | 12 ++--
 .../tests/p2p/CacheDeploymentTestKey.java       | 63 +++++++++++++++++++
 .../tests/p2p/CacheDeploymentTestTask1.java     | 65 ++++++++++++++++++++
 .../tests/p2p/CacheDeploymentTestTask2.java     | 56 +++++++++++++++++
 .../tests/p2p/CacheDeploymentTestTask3.java     | 61 ++++++++++++++++++
 .../tests/p2p/CacheDeploymentTestValue.java     | 27 ++++++++
 .../tests/p2p/CacheDeploymentTestValue2.java    | 25 ++++++++
 .../tests/p2p/GridCacheDeploymentTestKey.java   | 63 -------------------
 .../tests/p2p/GridCacheDeploymentTestTask1.java | 65 --------------------
 .../tests/p2p/GridCacheDeploymentTestTask2.java | 56 -----------------
 .../tests/p2p/GridCacheDeploymentTestTask3.java | 61 ------------------
 .../tests/p2p/GridCacheDeploymentTestValue.java | 26 --------
 .../p2p/GridCacheDeploymentTestValue2.java      | 24 --------
 14 files changed, 303 insertions(+), 365 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/core/src/main/java/org/apache/ignite/cache/GridCachePartialUpdateException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCachePartialUpdateException.java
b/modules/core/src/main/java/org/apache/ignite/cache/GridCachePartialUpdateException.java
deleted file mode 100644
index aa63677..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cache/GridCachePartialUpdateException.java
+++ /dev/null
@@ -1,64 +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.cache;
-
-import org.apache.ignite.*;
-
-import java.util.*;
-
-/**
- * Exception thrown from non-transactional cache in case when update succeeded only partially.
- * One can get list of keys for which update failed with method {@link #failedKeys()}.
- */
-public class GridCachePartialUpdateException extends IgniteCheckedException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Failed keys. */
-    private final Collection<Object> failedKeys = new ArrayList<>();
-
-    /**
-     * @param msg Error message.
-     */
-    public GridCachePartialUpdateException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Gets collection of failed keys.
-     * @return Collection of failed keys.
-     */
-    public <K> Collection<K> failedKeys() {
-        return (Collection<K>)failedKeys;
-    }
-
-    /**
-     * @param failedKeys Failed keys.
-     * @param err Error.
-     */
-    public void add(Collection<?> failedKeys, Throwable err) {
-        this.failedKeys.addAll(failedKeys);
-
-        addSuppressed(err);
-    }
-
-    /** {@inheritDoc} */
-    @Override public String getMessage() {
-        return super.getMessage() + ": " + failedKeys;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index e6c3e43..78fdd89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -54,22 +54,22 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest
{
     private static final String GRID_NAME = "grid-no-cache";
 
     /** First test task name. */
-    private static final String TEST_TASK_1 = "org.gridgain.grid.tests.p2p.GridCacheDeploymentTestTask1";
+    private static final String TEST_TASK_1 = "org.apache.ignite.tests.p2p.CacheDeploymentTestTask1";
 
     /** Second test task name. */
-    private static final String TEST_TASK_2 = "org.gridgain.grid.tests.p2p.GridCacheDeploymentTestTask2";
+    private static final String TEST_TASK_2 = "org.apache.ignite.tests.p2p.CacheDeploymentTestTask2";
 
     /** Third test task name. */
-    private static final String TEST_TASK_3 = "org.gridgain.grid.tests.p2p.GridCacheDeploymentTestTask3";
+    private static final String TEST_TASK_3 = "org.apache.ignite.tests.p2p.CacheDeploymentTestTask3";
 
     /** Test value 1. */
-    private static final String TEST_KEY = "org.gridgain.grid.tests.p2p.GridCacheDeploymentTestKey";
+    private static final String TEST_KEY = "org.apache.ignite.tests.p2p.CacheDeploymentTestKey";
 
     /** Test value 1. */
-    private static final String TEST_VALUE_1 = "org.gridgain.grid.tests.p2p.GridCacheDeploymentTestValue";
+    private static final String TEST_VALUE_1 = "org.apache.ignite.tests.p2p.CacheDeploymentTestValue";
 
     /** Test value 2. */
-    private static final String TEST_VALUE_2 = "org.gridgain.grid.tests.p2p.GridCacheDeploymentTestValue2";
+    private static final String TEST_VALUE_2 = "org.apache.ignite.tests.p2p.CacheDeploymentTestValue2";
 
     /** */
     private IgniteDeploymentMode depMode;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestKey.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestKey.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestKey.java
new file mode 100644
index 0000000..acbba0e
--- /dev/null
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestKey.java
@@ -0,0 +1,63 @@
+/*
+ * 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.tests.p2p;
+
+/**
+ * Test key for cache deployment tests.
+ */
+public class CacheDeploymentTestKey {
+    /** */
+    private String key;
+
+    /**
+     * Empty constructor.
+     */
+    public CacheDeploymentTestKey() {
+        // No-op.
+    }
+
+    /**
+     * @param key Key.
+     */
+    public CacheDeploymentTestKey(String key) {
+        this.key = key;
+    }
+
+    /**
+     * @param key Key value.
+     */
+    public void key(String key) {
+        this.key = key;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        CacheDeploymentTestKey that = (CacheDeploymentTestKey)o;
+
+        return !(key != null ? !key.equals(that.key) : that.key != null);
+
+    }
+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+        return key != null ? key.hashCode() : 0;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java
new file mode 100644
index 0000000..e09f94f
--- /dev/null
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask1.java
@@ -0,0 +1,65 @@
+/*
+ * 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.tests.p2p;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.compute.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Test task for {@code GridCacheDeploymentSelfTest}.
+ */
+public class CacheDeploymentTestTask1 extends ComputeTaskAdapter<ClusterNode, Object>
{
+    /** Number of puts. */
+    private static final int PUT_CNT = 100;
+
+    /** {@inheritDoc} */
+    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode>
subgrid,
+        @Nullable ClusterNode node) throws IgniteCheckedException {
+        return F.asMap(
+            new ComputeJobAdapter() {
+                @IgniteInstanceResource
+                private Ignite ignite;
+
+                @Override public Object execute() throws IgniteCheckedException {
+                    X.println("Executing CacheDeploymentTestTask1 job on node " +
+                        ignite.cluster().localNode().id());
+
+                    GridCache<String, CacheDeploymentTestValue> cache = ignite.cache(null);
+
+                    for (int i = 0; i < PUT_CNT; i++)
+                        cache.putx("1" + i, new CacheDeploymentTestValue());
+
+                    return null;
+                }
+            },
+            node
+        );
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws
IgniteCheckedException {
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask2.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask2.java
new file mode 100644
index 0000000..4881577
--- /dev/null
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask2.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.tests.p2p;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.compute.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Test task for {@code GridCacheDeploymentSelfTest}.
+ */
+public class CacheDeploymentTestTask2 extends ComputeTaskAdapter<ClusterNode, Object>
{
+    /** {@inheritDoc} */
+    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode>
subgrid,
+        @Nullable ClusterNode node) throws IgniteCheckedException {
+        return F.asMap(
+            new ComputeJobAdapter() {
+                @IgniteInstanceResource
+                private Ignite ignite;
+
+                @Override public Object execute() {
+                    X.println("Executing CacheDeploymentTestTask2 job on node " +
+                        ignite.cluster().localNode().id());
+
+                    return null;
+                }
+            },
+            node
+        );
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws
IgniteCheckedException {
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java
new file mode 100644
index 0000000..5442068
--- /dev/null
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestTask3.java
@@ -0,0 +1,61 @@
+/*
+ * 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.tests.p2p;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.compute.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Test task for {@code GridCacheDeploymentSelfTest}.
+ */
+public class CacheDeploymentTestTask3 extends ComputeTaskAdapter<T2<ClusterNode, String>,
Object> {
+    /** {@inheritDoc} */
+    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode>
subgrid,
+        @Nullable T2<ClusterNode, String> tup) throws IgniteCheckedException {
+        final String val = tup.getValue();
+
+        return F.asMap(
+                new ComputeJobAdapter() {
+                    @IgniteInstanceResource
+                    private Ignite ignite;
+
+                    @Override public Object execute() throws IgniteCheckedException {
+                        X.println("Executing CacheDeploymentTestTask3 job on node " +
+                                ignite.cluster().localNode().id());
+
+                        ignite.<String, CacheDeploymentTestValue>cache(null).putx(val,
+                                new CacheDeploymentTestValue());
+
+                        return null;
+                    }
+                },
+                tup.get1()
+        );
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws
IgniteCheckedException {
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestValue.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestValue.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestValue.java
new file mode 100644
index 0000000..8cffa89
--- /dev/null
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestValue.java
@@ -0,0 +1,27 @@
+/*
+ * 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.tests.p2p;
+
+import java.io.*;
+
+/**
+ * Value object for {@code GridCacheDeploymentSelfTest}.
+ */
+public class CacheDeploymentTestValue implements Serializable {
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestValue2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestValue2.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestValue2.java
new file mode 100644
index 0000000..f045267
--- /dev/null
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentTestValue2.java
@@ -0,0 +1,25 @@
+/*
+ * 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.tests.p2p;
+
+/**
+ * Second test value for deployment.
+ */
+public class CacheDeploymentTestValue2 {
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestKey.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestKey.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestKey.java
deleted file mode 100644
index 6cca646..0000000
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestKey.java
+++ /dev/null
@@ -1,63 +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.tests.p2p;
-
-/**
- * Test key for cache deployment tests.
- */
-public class GridCacheDeploymentTestKey {
-    /** */
-    private String key;
-
-    /**
-     * Empty constructor.
-     */
-    public GridCacheDeploymentTestKey() {
-        // No-op.
-    }
-
-    /**
-     * @param key Key.
-     */
-    public GridCacheDeploymentTestKey(String key) {
-        this.key = key;
-    }
-
-    /**
-     * @param key Key value.
-     */
-    public void key(String key) {
-        this.key = key;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        GridCacheDeploymentTestKey that = (GridCacheDeploymentTestKey)o;
-
-        return !(key != null ? !key.equals(that.key) : that.key != null);
-
-    }
-
-    /** {@inheritDoc} */
-    @Override public int hashCode() {
-        return key != null ? key.hashCode() : 0;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java
deleted file mode 100644
index 4be4c9c..0000000
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask1.java
+++ /dev/null
@@ -1,65 +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.tests.p2p;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Test task for {@code GridCacheDeploymentSelfTest}.
- */
-public class GridCacheDeploymentTestTask1 extends ComputeTaskAdapter<ClusterNode, Object>
{
-    /** Number of puts. */
-    private static final int PUT_CNT = 100;
-
-    /** {@inheritDoc} */
-    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode>
subgrid,
-        @Nullable ClusterNode node) throws IgniteCheckedException {
-        return F.asMap(
-            new ComputeJobAdapter() {
-                @IgniteInstanceResource
-                private Ignite ignite;
-
-                @Override public Object execute() throws IgniteCheckedException {
-                    X.println("Executing GridCacheDeploymentTestTask1 job on node " +
-                        ignite.cluster().localNode().id());
-
-                    GridCache<String, GridCacheDeploymentTestValue> cache = ignite.cache(null);
-
-                    for (int i = 0; i < PUT_CNT; i++)
-                        cache.putx("1" + i, new GridCacheDeploymentTestValue());
-
-                    return null;
-                }
-            },
-            node
-        );
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws
IgniteCheckedException {
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask2.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask2.java
deleted file mode 100644
index cfd97e7..0000000
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask2.java
+++ /dev/null
@@ -1,56 +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.tests.p2p;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Test task for {@code GridCacheDeploymentSelfTest}.
- */
-public class GridCacheDeploymentTestTask2 extends ComputeTaskAdapter<ClusterNode, Object>
{
-    /** {@inheritDoc} */
-    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode>
subgrid,
-        @Nullable ClusterNode node) throws IgniteCheckedException {
-        return F.asMap(
-            new ComputeJobAdapter() {
-                @IgniteInstanceResource
-                private Ignite ignite;
-
-                @Override public Object execute() {
-                    X.println("Executing GridCacheDeploymentTestTask2 job on node " +
-                        ignite.cluster().localNode().id());
-
-                    return null;
-                }
-            },
-            node
-        );
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws
IgniteCheckedException {
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask3.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask3.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask3.java
deleted file mode 100644
index 1aec857..0000000
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestTask3.java
+++ /dev/null
@@ -1,61 +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.tests.p2p;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Test task for {@code GridCacheDeploymentSelfTest}.
- */
-public class GridCacheDeploymentTestTask3 extends ComputeTaskAdapter<T2<ClusterNode,
String>, Object> {
-    /** {@inheritDoc} */
-    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode>
subgrid,
-        @Nullable T2<ClusterNode, String> tup) throws IgniteCheckedException {
-        final String val = tup.getValue();
-
-        return F.asMap(
-                new ComputeJobAdapter() {
-                    @IgniteInstanceResource
-                    private Ignite ignite;
-
-                    @Override public Object execute() throws IgniteCheckedException {
-                        X.println("Executing GridCacheDeploymentTestTask3 job on node " +
-                                ignite.cluster().localNode().id());
-
-                        ignite.<String, GridCacheDeploymentTestValue>cache(null).putx(val,
-                                new GridCacheDeploymentTestValue());
-
-                        return null;
-                    }
-                },
-                tup.get1()
-        );
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws
IgniteCheckedException {
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestValue.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestValue.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestValue.java
deleted file mode 100644
index 0376fd0..0000000
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestValue.java
+++ /dev/null
@@ -1,26 +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.tests.p2p;
-
-import java.io.*;
-
-/**
- * Value object for {@code GridCacheDeploymentSelfTest}.
- */
-public class GridCacheDeploymentTestValue implements Serializable {
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24c504b8/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestValue2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestValue2.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestValue2.java
deleted file mode 100644
index 50bcef1..0000000
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridCacheDeploymentTestValue2.java
+++ /dev/null
@@ -1,24 +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.tests.p2p;
-
-/**
- * Second test value for deployment.
- */
-public class GridCacheDeploymentTestValue2 {
-}


Mime
View raw message