Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 53d1b8051 -> 822deaa70
ignite-132 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/260e1a25 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/260e1a25 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/260e1a25 Branch: refs/heads/sprint-1 Commit: 260e1a25f7a7f6fd1377664b9d314109aa0c4511 Parents: 0acd2d4 Author: S.Vladykin <[email protected]> Authored: Mon Jan 26 23:25:58 2015 +0300 Committer: S.Vladykin <[email protected]> Committed: Mon Jan 26 23:25:58 2015 +0300 ---------------------------------------------------------------------- modules/core/src/main/java/org/apache/ignite/Ignite.java | 8 -------- .../src/main/java/org/apache/ignite/internal/GridEx.java | 8 ++++++++ .../apache/ignite/testframework/junits/GridTestIgnite.java | 6 ------ .../hadoop/proto/GridHadoopProtocolTaskAdapter.java | 3 ++- .../hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java | 5 +++++ .../src/main/java/org/apache/ignite/IgniteSpringBean.java | 8 -------- 6 files changed, 15 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260e1a25/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 7340da1..55dbd5e 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -23,7 +23,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.fs.IgniteFsConfiguration; import org.apache.ignite.plugin.*; import org.apache.ignite.internal.product.*; -import org.apache.ignite.hadoop.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; @@ -277,13 +276,6 @@ public interface Ignite extends AutoCloseable { public Collection<IgniteFs> fileSystems(); /** - * Gets an instance of Hadoop. - * - * @return Hadoop instance. - */ - public GridHadoop hadoop(); - - /** * Gets an instance of streamer by name, if one does not exist then * {@link IllegalArgumentException} will be thrown. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260e1a25/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java index 1eea09a..3756b40 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEx.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.interop.*; @@ -140,4 +141,11 @@ public interface GridEx extends Ignite, ClusterGroupEx, IgniteCluster { * @return Interop processor. */ public GridInteropProcessor interop(); + + /** + * Gets an instance of Hadoop. + * + * @return Hadoop instance. + */ + public GridHadoop hadoop(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260e1a25/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java index fe4d4ed..65b3276 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.hadoop.*; import org.apache.ignite.marshaller.IgniteMarshaller; import org.apache.ignite.plugin.*; import org.apache.ignite.plugin.security.*; @@ -200,11 +199,6 @@ public class GridTestIgnite implements Ignite { } /** {@inheritDoc} */ - @Override public GridHadoop hadoop() { - return null; - } - - /** {@inheritDoc} */ @Override public IgniteStreamer streamer(@Nullable String name) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260e1a25/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java index bb7b593..c06f6a0 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.hadoop.proto; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; +import org.apache.ignite.internal.*; import org.apache.ignite.resources.*; import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.util.typedef.*; @@ -87,7 +88,7 @@ public abstract class GridHadoopProtocolTaskAdapter<R> implements ComputeTask<Gr /** {@inheritDoc} */ @Nullable @Override public Object execute() throws IgniteCheckedException { - return run(jobCtx, ignite.hadoop(), args); + return run(jobCtx, ((GridEx)ignite).hadoop(), args); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260e1a25/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index d1932d8..0782c7b 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -1016,6 +1016,11 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ + @Override public GridHadoop hadoop() { + return null; + } + + /** {@inheritDoc} */ @Override public ClusterNode localNode() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260e1a25/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java index 2c9d2e8..a69cfd4 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.plugin.*; import org.apache.ignite.internal.product.*; -import org.apache.ignite.hadoop.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -298,13 +297,6 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea } /** {@inheritDoc} */ - @Override public GridHadoop hadoop() { - assert g != null; - - return g.hadoop(); - } - - /** {@inheritDoc} */ @Nullable @Override public IgniteStreamer streamer(@Nullable String name) { assert g != null;
