You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/02/02 22:57:16 UTC
[33/50] [abbrv] incubator-ignite git commit: Merge branches
'ignite-132' and 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-132
Merge branches 'ignite-132' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-132
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/GridEx.java
modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.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/dadb9c50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dadb9c50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dadb9c50
Branch: refs/heads/ignite-132
Commit: dadb9c503612909d4e58391a254f64718babe2c0
Parents: 36dc41a
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Feb 3 00:30:23 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Feb 3 00:30:23 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteEx.java | 8 ++++++++
.../hadoop/proto/GridHadoopProtocolTaskAdapter.java | 2 +-
.../hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java | 5 +++++
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dadb9c50/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index aa94560..26b1628 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.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.jetbrains.annotations.*;
@@ -132,4 +133,11 @@ public interface IgniteEx extends Ignite, ClusterGroupEx, IgniteCluster {
* @return GGFS.
*/
@Nullable public IgniteFs ggfsx(@Nullable String name);
+
+ /**
+ * Get Hadoop facade.
+ *
+ * @return Hadoop.
+ */
+ public GridHadoop hadoop();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dadb9c50/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 c06f6a0..01a68e1 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
@@ -88,7 +88,7 @@ public abstract class GridHadoopProtocolTaskAdapter<R> implements ComputeTask<Gr
/** {@inheritDoc} */
@Nullable @Override public Object execute() throws IgniteCheckedException {
- return run(jobCtx, ((GridEx)ignite).hadoop(), args);
+ return run(jobCtx, ((IgniteEx)ignite).hadoop(), args);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dadb9c50/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 514c44f..7b5f76b 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
@@ -938,6 +938,11 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
}
/** {@inheritDoc} */
+ @Override public GridHadoop hadoop() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
@Override public String name() {
return null;
}