You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/01/22 07:13:08 UTC
[1/2] ignite git commit: IGNITE-2343: workable fix for the customer
issue.
Repository: ignite
Updated Branches:
refs/heads/ignite-hunk-perf b25affa22 -> 73e7672c6
IGNITE-2343: workable fix for the customer issue.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a8ba90a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a8ba90a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a8ba90a
Branch: refs/heads/ignite-hunk-perf
Commit: 9a8ba90abc9737c0e0ea7e3dc2aa5ce240f66d5b
Parents: 86740ce
Author: iveselovskiy <iv...@gridgain.com>
Authored: Tue Jan 12 19:22:31 2016 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Tue Jan 12 19:22:31 2016 +0300
----------------------------------------------------------------------
.../processors/hadoop/v2/HadoopV2Context.java | 5 ++--
.../processors/hadoop/v2/HadoopV2MapTask.java | 27 +++++++-------------
2 files changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a8ba90a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Context.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Context.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Context.java
index 5108e2d..e2ee6d4 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Context.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Context.java
@@ -93,7 +93,7 @@ public class HadoopV2Context extends JobContextImpl implements MapContext, Reduc
HadoopInputSplit split = ctx.taskInfo().inputSplit();
if (split == null)
- return null;
+ throw new IllegalStateException("Failed to get input split.");
if (split instanceof HadoopFileBlock) {
HadoopFileBlock fileBlock = (HadoopFileBlock)split;
@@ -103,7 +103,8 @@ public class HadoopV2Context extends JobContextImpl implements MapContext, Reduc
else
try {
inputSplit = (InputSplit) ((HadoopV2TaskContext)ctx).getNativeSplit(split);
- } catch (IgniteCheckedException e) {
+ }
+ catch (IgniteCheckedException e) {
throw new IllegalStateException(e);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a8ba90a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2MapTask.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2MapTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2MapTask.java
index 989260c..d7ff60a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2MapTask.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2MapTask.java
@@ -17,20 +17,16 @@
package org.apache.ignite.internal.processors.hadoop.v2;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobContextImpl;
import org.apache.hadoop.mapreduce.InputFormat;
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.Mapper;
import org.apache.hadoop.mapreduce.OutputFormat;
import org.apache.hadoop.mapreduce.RecordReader;
-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
import org.apache.hadoop.mapreduce.lib.map.WrappedMapper;
import org.apache.hadoop.util.ReflectionUtils;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.processors.hadoop.HadoopFileBlock;
-import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit;
import org.apache.ignite.internal.processors.hadoop.HadoopJobInfo;
import org.apache.ignite.internal.processors.hadoop.HadoopTaskInfo;
@@ -48,26 +44,16 @@ public class HadoopV2MapTask extends HadoopV2Task {
/** {@inheritDoc} */
@SuppressWarnings({"ConstantConditions", "unchecked"})
@Override public void run0(HadoopV2TaskContext taskCtx) throws IgniteCheckedException {
- HadoopInputSplit split = info().inputSplit();
-
- InputSplit nativeSplit;
-
- if (split instanceof HadoopFileBlock) {
- HadoopFileBlock block = (HadoopFileBlock)split;
-
- nativeSplit = new FileSplit(new Path(block.file().toString()), block.start(), block.length(), null);
- }
- else
- nativeSplit = (InputSplit)taskCtx.getNativeSplit(split);
-
- assert nativeSplit != null;
-
OutputFormat outputFormat = null;
Exception err = null;
JobContextImpl jobCtx = taskCtx.jobContext();
try {
+ InputSplit nativeSplit = hadoopContext().getInputSplit();
+
+ assert nativeSplit != null;
+
InputFormat inFormat = ReflectionUtils.newInstance(jobCtx.getInputFormatClass(),
hadoopContext().getConfiguration());
@@ -102,6 +88,11 @@ public class HadoopV2MapTask extends HadoopV2Task {
catch (Exception e) {
err = e;
+ // org.apache.ignite.internal.processors.hadoop.v2.HadoopV2Context.getInputSplit
+ // throws IgniteCheckedException wrapped into IllegalStateException, so we unwrap it back:
+ if (e.getCause() instanceof IgniteCheckedException)
+ throw (IgniteCheckedException)e.getCause();
+
throw new IgniteCheckedException(e);
}
finally {
[2/2] ignite git commit: Merge branch 'ignite-2343' of
https://github.com/iveselovskiy/ignite into ignite-hunk-perf
Posted by vo...@apache.org.
Merge branch 'ignite-2343' of https://github.com/iveselovskiy/ignite into ignite-hunk-perf
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73e7672c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73e7672c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73e7672c
Branch: refs/heads/ignite-hunk-perf
Commit: 73e7672c6ae405449a5c612cde13541ceb29ff9c
Parents: b25affa 9a8ba90
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 22 09:07:35 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 22 09:07:35 2016 +0300
----------------------------------------------------------------------
.../processors/hadoop/v2/HadoopV2Context.java | 5 ++--
.../processors/hadoop/v2/HadoopV2MapTask.java | 27 +++++++-------------
2 files changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------