http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopSerializationWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopSerializationWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopSerializationWrapper.java index ebdea12..54abe1a 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopSerializationWrapper.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopSerializationWrapper.java @@ -10,6 +10,7 @@ package org.gridgain.grid.kernal.processors.hadoop.v2; import org.apache.hadoop.io.serializer.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import java.io.*; @@ -62,7 +63,7 @@ public class GridHadoopSerializationWrapper<T> implements GridHadoopSerializatio * @param serialization External serializer to wrap. * @param cls The class to serialize. */ - public GridHadoopSerializationWrapper(Serialization<T> serialization, Class<T> cls) throws GridException { + public GridHadoopSerializationWrapper(Serialization<T> serialization, Class<T> cls) throws IgniteCheckedException { assert cls != null; serializer = serialization.getSerializer(cls); @@ -73,12 +74,12 @@ public class GridHadoopSerializationWrapper<T> implements GridHadoopSerializatio deserializer.open(inStream); } catch (IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } } /** {@inheritDoc} */ - @Override public void write(DataOutput out, Object obj) throws GridException { + @Override public void write(DataOutput out, Object obj) throws IgniteCheckedException { assert out != null; assert obj != null; @@ -90,12 +91,12 @@ public class GridHadoopSerializationWrapper<T> implements GridHadoopSerializatio currOut = null; } catch (IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } } /** {@inheritDoc} */ - @Override public Object read(DataInput in, @Nullable Object obj) throws GridException { + @Override public Object read(DataInput in, @Nullable Object obj) throws IgniteCheckedException { assert in != null; try { @@ -108,18 +109,18 @@ public class GridHadoopSerializationWrapper<T> implements GridHadoopSerializatio return res; } catch (IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } } /** {@inheritDoc} */ - @Override public void close() throws GridException { + @Override public void close() throws IgniteCheckedException { try { serializer.close(); deserializer.close(); } catch (IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } } }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java index c010d22..f64b48a 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.hadoop.v2; import org.apache.hadoop.mapred.JobContextImpl; import org.apache.hadoop.mapreduce.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; @@ -35,7 +36,7 @@ public class GridHadoopV2CleanupTask extends GridHadoopV2Task { /** {@inheritDoc} */ @SuppressWarnings("ConstantConditions") - @Override public void run0(GridHadoopV2TaskContext taskCtx) throws GridException { + @Override public void run0(GridHadoopV2TaskContext taskCtx) throws IgniteCheckedException { JobContextImpl jobCtx = taskCtx.jobContext(); try { @@ -51,7 +52,7 @@ public class GridHadoopV2CleanupTask extends GridHadoopV2Task { } } catch (ClassNotFoundException | IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } catch (InterruptedException e) { Thread.currentThread().interrupt(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Context.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Context.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Context.java index 394b909..3de56c3 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Context.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Context.java @@ -13,6 +13,7 @@ import org.apache.hadoop.fs.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.mapreduce.task.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.*; @@ -126,7 +127,7 @@ public class GridHadoopV2Context extends JobContextImpl implements MapContext, R try { output.write(key, val); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new IOException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java index c9d4ecc..0565c65 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java @@ -114,7 +114,7 @@ public class GridHadoopV2Job implements GridHadoopJob { } /** {@inheritDoc} */ - @Override public Collection<GridHadoopInputSplit> input() throws GridException { + @Override public Collection<GridHadoopInputSplit> input() throws IgniteCheckedException { Thread.currentThread().setContextClassLoader(jobConf.getClassLoader()); try { @@ -135,7 +135,7 @@ public class GridHadoopV2Job implements GridHadoopJob { jobDir); if (F.isEmpty(metaInfos)) - throw new GridException("No input splits found."); + throw new IgniteCheckedException("No input splits found."); Path splitsFile = JobSubmissionFiles.getJobSplitFile(jobDir); @@ -172,7 +172,7 @@ public class GridHadoopV2Job implements GridHadoopJob { } /** {@inheritDoc} */ - @Override public GridHadoopTaskContext getTaskContext(GridHadoopTaskInfo info) throws GridException { + @Override public GridHadoopTaskContext getTaskContext(GridHadoopTaskInfo info) throws IgniteCheckedException { T2<GridHadoopTaskType, Integer> locTaskId = new T2<>(info.type(), info.taskNumber()); GridFutureAdapter<GridHadoopTaskContext> fut = ctxs.get(locTaskId); @@ -217,7 +217,7 @@ public class GridHadoopV2Job implements GridHadoopJob { return res; } catch (Throwable e) { - GridException te = transformException(e); + IgniteCheckedException te = transformException(e); fut.onDone(te); @@ -226,7 +226,7 @@ public class GridHadoopV2Job implements GridHadoopJob { } /** {@inheritDoc} */ - @Override public void initialize(boolean external, UUID locNodeId) throws GridException { + @Override public void initialize(boolean external, UUID locNodeId) throws IgniteCheckedException { this.locNodeId = locNodeId; Thread.currentThread().setContextClassLoader(jobConf.getClassLoader()); @@ -240,7 +240,7 @@ public class GridHadoopV2Job implements GridHadoopJob { } /** {@inheritDoc} */ - @Override public void dispose(boolean external) throws GridException { + @Override public void dispose(boolean external) throws IgniteCheckedException { if (rsrcMgr != null && !external) { File jobLocDir = jobLocalDir(locNodeId, jobId); @@ -250,12 +250,12 @@ public class GridHadoopV2Job implements GridHadoopJob { } /** {@inheritDoc} */ - @Override public void prepareTaskEnvironment(GridHadoopTaskInfo info) throws GridException { + @Override public void prepareTaskEnvironment(GridHadoopTaskInfo info) throws IgniteCheckedException { rsrcMgr.prepareTaskWorkDir(taskLocalDir(locNodeId, info)); } /** {@inheritDoc} */ - @Override public void cleanupTaskEnvironment(GridHadoopTaskInfo info) throws GridException { + @Override public void cleanupTaskEnvironment(GridHadoopTaskInfo info) throws IgniteCheckedException { GridHadoopTaskContext ctx = ctxs.remove(new T2<>(info.type(), info.taskNumber())).get(); taskCtxClsPool.offer(ctx.getClass()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java index f08d0dc..b323948 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java @@ -89,12 +89,12 @@ public class GridHadoopV2JobResourceManager { * * @param download {@code true} If need to download resources. * @param jobLocDir Work directory for the job. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void prepareJobEnvironment(boolean download, File jobLocDir) throws GridException { + public void prepareJobEnvironment(boolean download, File jobLocDir) throws IgniteCheckedException { try { if (jobLocDir.exists()) - throw new GridException("Local job directory already exists: " + jobLocDir.getAbsolutePath()); + throw new IgniteCheckedException("Local job directory already exists: " + jobLocDir.getAbsolutePath()); JobConf cfg = ctx.getJobConf(); @@ -107,11 +107,11 @@ public class GridHadoopV2JobResourceManager { FileSystem fs = FileSystem.get(stagingDir.toUri(), cfg); if (!fs.exists(stagingDir)) - throw new GridException("Failed to find map-reduce submission directory (does not exist): " + + throw new IgniteCheckedException("Failed to find map-reduce submission directory (does not exist): " + stagingDir); if (!FileUtil.copy(fs, stagingDir, jobLocDir, false, cfg)) - throw new GridException("Failed to copy job submission directory contents to local file system " + + throw new IgniteCheckedException("Failed to copy job submission directory contents to local file system " + "[path=" + stagingDir + ", locDir=" + jobLocDir.getAbsolutePath() + ", jobId=" + jobId + ']'); } @@ -136,12 +136,12 @@ public class GridHadoopV2JobResourceManager { } } else if (!jobLocDir.mkdirs()) - throw new GridException("Failed to create local job directory: " + jobLocDir.getAbsolutePath()); + throw new IgniteCheckedException("Failed to create local job directory: " + jobLocDir.getAbsolutePath()); setLocalFSWorkingDirectory(jobLocDir); } catch (URISyntaxException | IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } } @@ -239,9 +239,9 @@ public class GridHadoopV2JobResourceManager { * </ul> * * @param path Path to working directory of the task. - * @throws GridException If fails. + * @throws IgniteCheckedException If fails. */ - public void prepareTaskWorkDir(File path) throws GridException { + public void prepareTaskWorkDir(File path) throws IgniteCheckedException { try { if (path.exists()) throw new IOException("Task local directory already exists: " + path); @@ -268,7 +268,7 @@ public class GridHadoopV2JobResourceManager { } } catch (IOException e) { - throw new GridException("Unable to prepare local working directory for the task " + + throw new IgniteCheckedException("Unable to prepare local working directory for the task " + "[jobId=" + jobId + ", path=" + path+ ']', e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java index 8ba24e5..5bb4a66 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java @@ -15,6 +15,7 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.map.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.util.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; @@ -31,7 +32,7 @@ public class GridHadoopV2MapTask extends GridHadoopV2Task { /** {@inheritDoc} */ @SuppressWarnings({"ConstantConditions", "unchecked"}) - @Override public void run0(GridHadoopV2TaskContext taskCtx) throws GridException { + @Override public void run0(GridHadoopV2TaskContext taskCtx) throws IgniteCheckedException { GridHadoopInputSplit split = info().inputSplit(); InputSplit nativeSplit; @@ -86,7 +87,7 @@ public class GridHadoopV2MapTask extends GridHadoopV2Task { catch (Exception e) { err = e; - throw new GridException(e); + throw new IgniteCheckedException(e); } finally { if (err != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java index 063aece..76942e6 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java @@ -13,6 +13,7 @@ import org.apache.hadoop.mapred.JobContextImpl; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.reduce.*; import org.apache.hadoop.util.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; @@ -37,7 +38,7 @@ public class GridHadoopV2ReduceTask extends GridHadoopV2Task { /** {@inheritDoc} */ @SuppressWarnings({"ConstantConditions", "unchecked"}) - @Override public void run0(GridHadoopV2TaskContext taskCtx) throws GridException { + @Override public void run0(GridHadoopV2TaskContext taskCtx) throws IgniteCheckedException { OutputFormat outputFormat = null; Exception err = null; @@ -68,7 +69,7 @@ public class GridHadoopV2ReduceTask extends GridHadoopV2Task { catch (Exception e) { err = e; - throw new GridException(e); + throw new IgniteCheckedException(e); } finally { if (err != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java index 6be04ca..ae52932 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.hadoop.v2; import org.apache.hadoop.mapred.JobContextImpl; import org.apache.hadoop.mapreduce.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; @@ -31,7 +32,7 @@ public class GridHadoopV2SetupTask extends GridHadoopV2Task { /** {@inheritDoc} */ @SuppressWarnings("ConstantConditions") - @Override protected void run0(GridHadoopV2TaskContext taskCtx) throws GridException { + @Override protected void run0(GridHadoopV2TaskContext taskCtx) throws IgniteCheckedException { try { JobContextImpl jobCtx = taskCtx.jobContext(); @@ -45,7 +46,7 @@ public class GridHadoopV2SetupTask extends GridHadoopV2Task { committer.setupJob(jobCtx); } catch (ClassNotFoundException | IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } catch (InterruptedException e) { Thread.currentThread().interrupt(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java index 581a067..7b201cf 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.hadoop.v2; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.util.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.*; @@ -30,9 +31,9 @@ public class GridHadoopV2Splitter { /** * @param ctx Job context. * @return Collection of mapped splits. - * @throws GridException If mapping failed. + * @throws IgniteCheckedException If mapping failed. */ - public static Collection<GridHadoopInputSplit> splitJob(JobContext ctx) throws GridException { + public static Collection<GridHadoopInputSplit> splitJob(JobContext ctx) throws IgniteCheckedException { try { InputFormat<?, ?> format = ReflectionUtils.newInstance(ctx.getInputFormatClass(), ctx.getConfiguration()); @@ -59,7 +60,7 @@ public class GridHadoopV2Splitter { return res; } catch (IOException | ClassNotFoundException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } catch (InterruptedException e) { Thread.currentThread().interrupt(); @@ -73,10 +74,10 @@ public class GridHadoopV2Splitter { * @param in Input stream. * @param hosts Optional hosts. * @return File block or {@code null} if it is not a {@link FileSplit} instance. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ public static GridHadoopFileBlock readFileBlock(String clsName, DataInput in, @Nullable String[] hosts) - throws GridException { + throws IgniteCheckedException { if (!FileSplit.class.getName().equals(clsName)) return null; @@ -86,7 +87,7 @@ public class GridHadoopV2Splitter { split.readFields(in); } catch (IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } if (hosts == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Task.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Task.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Task.java index 2518704..8a939cf 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Task.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Task.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.hadoop.v2; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.util.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.jetbrains.annotations.*; @@ -34,7 +35,7 @@ public abstract class GridHadoopV2Task extends GridHadoopTask { } /** {@inheritDoc} */ - @Override public void run(GridHadoopTaskContext taskCtx) throws GridException { + @Override public void run(GridHadoopTaskContext taskCtx) throws IgniteCheckedException { GridHadoopV2TaskContext ctx = (GridHadoopV2TaskContext)taskCtx; hadoopCtx = new GridHadoopV2Context(ctx); @@ -46,9 +47,9 @@ public abstract class GridHadoopV2Task extends GridHadoopTask { * Internal task routine. * * @param taskCtx Task context. - * @throws GridException + * @throws IgniteCheckedException */ - protected abstract void run0(GridHadoopV2TaskContext taskCtx) throws GridException; + protected abstract void run0(GridHadoopV2TaskContext taskCtx) throws IgniteCheckedException; /** * @return hadoop context. @@ -73,11 +74,11 @@ public abstract class GridHadoopV2Task extends GridHadoopTask { * * @param jobCtx Job context. * @return Output format. - * @throws GridException In case of Grid exception. + * @throws IgniteCheckedException In case of Grid exception. * @throws InterruptedException In case of interrupt. */ protected OutputFormat prepareWriter(JobContext jobCtx) - throws GridException, InterruptedException { + throws IgniteCheckedException, InterruptedException { try { OutputFormat outputFormat = getOutputFormat(jobCtx); @@ -95,7 +96,7 @@ public abstract class GridHadoopV2Task extends GridHadoopTask { return outputFormat; } catch (IOException | ClassNotFoundException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } } @@ -130,11 +131,11 @@ public abstract class GridHadoopV2Task extends GridHadoopTask { * Commit task. * * @param outputFormat Output format. - * @throws GridException In case of Grid exception. + * @throws IgniteCheckedException In case of Grid exception. * @throws IOException In case of IO exception. * @throws InterruptedException In case of interrupt. */ - protected void commit(@Nullable OutputFormat outputFormat) throws GridException, IOException, InterruptedException { + protected void commit(@Nullable OutputFormat outputFormat) throws IgniteCheckedException, IOException, InterruptedException { if (hadoopCtx.writer() != null) { assert outputFormat != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2TaskContext.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2TaskContext.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2TaskContext.java index 31f4823..eda90ef 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2TaskContext.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2TaskContext.java @@ -11,14 +11,16 @@ package org.gridgain.grid.kernal.processors.hadoop.v2; import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; +import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.io.*; import org.apache.hadoop.io.serializer.*; import org.apache.hadoop.mapred.*; +import org.apache.hadoop.mapred.JobID; +import org.apache.hadoop.mapred.TaskAttemptID; +import org.apache.hadoop.mapred.TaskID; import org.apache.hadoop.mapreduce.JobContext; -import org.apache.hadoop.mapreduce.JobSubmissionFiles; -import org.apache.hadoop.mapreduce.MRJobConfig; -import org.apache.hadoop.mapreduce.TaskType; -import org.gridgain.grid.*; +import org.apache.hadoop.mapreduce.*; +import org.apache.ignite.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.counter.*; @@ -90,7 +92,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { * @param jobConfDataInput DataInput for read JobConf. */ public GridHadoopV2TaskContext(GridHadoopTaskInfo taskInfo, GridHadoopJob job, GridHadoopJobId jobId, - @Nullable UUID locNodeId, DataInput jobConfDataInput) throws GridException { + @Nullable UUID locNodeId, DataInput jobConfDataInput) throws IgniteCheckedException { super(taskInfo, job); this.locNodeId = locNodeId; @@ -104,7 +106,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { jobConf.readFields(jobConfDataInput); } catch (IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } // For map-reduce jobs prefer local writes. @@ -165,7 +167,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { } /** {@inheritDoc} */ - @Override public void run() throws GridException { + @Override public void run() throws IgniteCheckedException { try { Thread.currentThread().setContextClassLoader(jobConf().getClassLoader()); @@ -204,7 +206,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { } /** {@inheritDoc} */ - @Override public void prepareTaskEnvironment() throws GridException { + @Override public void prepareTaskEnvironment() throws IgniteCheckedException { File locDir; switch(taskInfo().type()) { @@ -240,7 +242,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { } /** {@inheritDoc} */ - @Override public void cleanupTaskEnvironment() throws GridException { + @Override public void cleanupTaskEnvironment() throws IgniteCheckedException { job().cleanupTaskEnvironment(taskInfo()); } @@ -298,7 +300,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { } /** {@inheritDoc} */ - @Override public GridHadoopPartitioner partitioner() throws GridException { + @Override public GridHadoopPartitioner partitioner() throws IgniteCheckedException { Class<?> partClsOld = jobConf().getClass("mapred.partitioner.class", null); if (partClsOld != null) @@ -308,7 +310,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { return new GridHadoopV2Partitioner(jobCtx.getPartitionerClass(), jobConf()); } catch (ClassNotFoundException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } } @@ -320,7 +322,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { * @return Appropriate serializer. */ @SuppressWarnings("unchecked") - private GridHadoopSerialization getSerialization(Class<?> cls, Configuration jobConf) throws GridException { + private GridHadoopSerialization getSerialization(Class<?> cls, Configuration jobConf) throws IgniteCheckedException { A.notNull(cls, "cls"); SerializationFactory factory = new SerializationFactory(jobConf); @@ -328,7 +330,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { Serialization<?> serialization = factory.getSerialization(cls); if (serialization == null) - throw new GridException("Failed to find serialization for: " + cls.getName()); + throw new IgniteCheckedException("Failed to find serialization for: " + cls.getName()); if (serialization.getClass() == WritableSerialization.class) return new GridHadoopWritableSerialization((Class<? extends Writable>)cls); @@ -337,12 +339,12 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { } /** {@inheritDoc} */ - @Override public GridHadoopSerialization keySerialization() throws GridException { + @Override public GridHadoopSerialization keySerialization() throws IgniteCheckedException { return getSerialization(jobCtx.getMapOutputKeyClass(), jobConf()); } /** {@inheritDoc} */ - @Override public GridHadoopSerialization valueSerialization() throws GridException { + @Override public GridHadoopSerialization valueSerialization() throws IgniteCheckedException { return getSerialization(jobCtx.getMapOutputValueClass(), jobConf()); } @@ -380,10 +382,10 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { /** * @param split Split. * @return Native Hadoop split. - * @throws GridException if failed. + * @throws IgniteCheckedException if failed. */ @SuppressWarnings("unchecked") - public Object getNativeSplit(GridHadoopInputSplit split) throws GridException { + public Object getNativeSplit(GridHadoopInputSplit split) throws IgniteCheckedException { if (split instanceof GridHadoopExternalSplit) return readExternalSplit((GridHadoopExternalSplit)split); @@ -396,10 +398,10 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { /** * @param split External split. * @return Native input split. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ @SuppressWarnings("unchecked") - private Object readExternalSplit(GridHadoopExternalSplit split) throws GridException { + private Object readExternalSplit(GridHadoopExternalSplit split) throws IgniteCheckedException { Path jobDir = new Path(jobConf().get(MRJobConfig.MAPREDUCE_JOB_DIR)); try (FileSystem fs = FileSystem.get(jobDir.toUri(), jobConf()); @@ -428,7 +430,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { return res; } catch (IOException | ClassNotFoundException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopWritableSerialization.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopWritableSerialization.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopWritableSerialization.java index 00cc708..ad0aa4b 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopWritableSerialization.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopWritableSerialization.java @@ -10,6 +10,7 @@ package org.gridgain.grid.kernal.processors.hadoop.v2; import org.apache.hadoop.io.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.util.typedef.internal.*; @@ -34,26 +35,26 @@ public class GridHadoopWritableSerialization implements GridHadoopSerialization } /** {@inheritDoc} */ - @Override public void write(DataOutput out, Object obj) throws GridException { + @Override public void write(DataOutput out, Object obj) throws IgniteCheckedException { assert cls.isAssignableFrom(obj.getClass()) : cls + " " + obj.getClass(); try { ((Writable)obj).write(out); } catch (IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } } /** {@inheritDoc} */ - @Override public Object read(DataInput in, @Nullable Object obj) throws GridException { + @Override public Object read(DataInput in, @Nullable Object obj) throws IgniteCheckedException { Writable w = obj == null ? U.newInstance(cls) : cls.cast(obj); try { w.readFields(in); } catch (IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } return w; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java index 78c214f..ec90f52 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java @@ -69,7 +69,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { */ public static class ShmemPrivate extends GridGgfsEventsAbstractSelfTest { /** {@inheritDoc} */ - @Override protected IgniteFsConfiguration getGgfsConfiguration() throws GridException { + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap("{type:'shmem', port:" + @@ -84,7 +84,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { */ public static class LoopbackPrivate extends GridGgfsEventsAbstractSelfTest { /** {@inheritDoc} */ - @Override protected IgniteFsConfiguration getGgfsConfiguration() throws GridException { + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap("{type:'tcp', port:" + @@ -102,7 +102,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { private static IgniteFs ggfsSec; /** {@inheritDoc} */ - @Override protected IgniteFsConfiguration getGgfsConfiguration() throws GridException { + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setSecondaryFileSystem(new GridGgfsHadoopFileSystemWrapper( @@ -115,7 +115,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { /** * @return GGFS configuration for secondary file system. */ - protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws GridException { + protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setName("ggfs-secondary"); @@ -170,7 +170,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { */ public static class ShmemDualSync extends PrimarySecondaryTest { /** {@inheritDoc} */ - @Override protected IgniteFsConfiguration getGgfsConfiguration() throws GridException { + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setDefaultMode(DUAL_SYNC); @@ -184,7 +184,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { */ public static class ShmemDualAsync extends PrimarySecondaryTest { /** {@inheritDoc} */ - @Override protected IgniteFsConfiguration getGgfsConfiguration() throws GridException { + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setDefaultMode(DUAL_ASYNC); @@ -198,7 +198,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { */ public abstract static class LoopbackPrimarySecondaryTest extends PrimarySecondaryTest { /** {@inheritDoc} */ - @Override protected IgniteFsConfiguration getGgfsConfiguration() throws GridException { + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setSecondaryFileSystem(new GridGgfsHadoopFileSystemWrapper( @@ -209,7 +209,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { } /** {@inheritDoc} */ - @Override protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws GridException { + @Override protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getSecondaryGgfsConfiguration(); ggfsCfg.setName("ggfs-secondary"); @@ -225,7 +225,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { */ public static class LoopbackDualSync extends LoopbackPrimarySecondaryTest { /** {@inheritDoc} */ - @Override protected IgniteFsConfiguration getGgfsConfiguration() throws GridException { + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setDefaultMode(DUAL_SYNC); @@ -239,7 +239,7 @@ public class GridGgfsEventsTestSuite extends TestSuite { */ public static class LoopbackDualAsync extends LoopbackPrimarySecondaryTest { /** {@inheritDoc} */ - @Override protected IgniteFsConfiguration getGgfsConfiguration() throws GridException { + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setDefaultMode(DUAL_ASYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java index f5cd2c3..65de906 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java @@ -245,7 +245,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf * @param gridName Grid name. * @return GGFS configuration. */ - protected IgniteFsConfiguration ggfsConfiguration(String gridName) throws GridException { + protected IgniteFsConfiguration ggfsConfiguration(String gridName) throws IgniteCheckedException { IgniteFsConfiguration cfg = new IgniteFsConfiguration(); cfg.setDataCacheName("partitioned"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java index 756191e..deb6ba6 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java @@ -309,7 +309,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC * @param gridName Grid name. * @return GGFS configuration. */ - protected IgniteFsConfiguration ggfsConfiguration(String gridName) throws GridException { + protected IgniteFsConfiguration ggfsConfiguration(String gridName) throws IgniteCheckedException { IgniteFsConfiguration cfg = new IgniteFsConfiguration(); cfg.setDataCacheName("partitioned"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java index 7386f31..7f33a9f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java @@ -108,7 +108,7 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends GridGgfsCommonAbstra /** * Test output stream deferred exception (GG-4440). * - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ @SuppressWarnings("ThrowableResultOfMethodCallIgnored") public void testOutputStreamDeferredException() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java index 629d7b9..fabc47f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java @@ -9,6 +9,7 @@ package org.gridgain.grid.ggfs; +import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.util.ipc.*; @@ -50,7 +51,7 @@ public abstract class GridGgfsHadoopFileSystemShmemAbstractSelfTest extends Grid final Collection<GridIpcEndpoint> eps = new LinkedList<>(); try { - GridException e = (GridException)GridTestUtils.assertThrows(log, new Callable<Object>() { + IgniteCheckedException e = (IgniteCheckedException)GridTestUtils.assertThrows(log, new Callable<Object>() { @SuppressWarnings("InfiniteLoopStatement") @Override public Object call() throws Exception { while (true) { @@ -59,7 +60,7 @@ public abstract class GridGgfsHadoopFileSystemShmemAbstractSelfTest extends Grid eps.add(ep); } } - }, GridException.class, null); + }, IgniteCheckedException.class, null); assertNotNull(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index be0404a..19436e2d 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -96,9 +96,9 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void testGgfsOneBlockPerNode() throws GridException { + public void testGgfsOneBlockPerNode() throws IgniteCheckedException { GridHadoopFileBlock split1 = split(true, "/file1", 0, 100, HOST_1); GridHadoopFileBlock split2 = split(true, "/file2", 0, 100, HOST_2); GridHadoopFileBlock split3 = split(true, "/file3", 0, 100, HOST_3); @@ -156,9 +156,9 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void testNonGgfsOneBlockPerNode() throws GridException { + public void testNonGgfsOneBlockPerNode() throws IgniteCheckedException { GridHadoopFileBlock split1 = split(false, "/file1", 0, 100, HOST_1); GridHadoopFileBlock split2 = split(false, "/file2", 0, 100, HOST_2); GridHadoopFileBlock split3 = split(false, "/file3", 0, 100, HOST_3); @@ -212,9 +212,9 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void testGgfsSeveralBlocksPerNode() throws GridException { + public void testGgfsSeveralBlocksPerNode() throws IgniteCheckedException { GridHadoopFileBlock split1 = split(true, "/file1", 0, 100, HOST_1, HOST_2); GridHadoopFileBlock split2 = split(true, "/file2", 0, 100, HOST_1, HOST_2); GridHadoopFileBlock split3 = split(true, "/file3", 0, 100, HOST_1, HOST_3); @@ -258,9 +258,9 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void testNonGgfsSeveralBlocksPerNode() throws GridException { + public void testNonGgfsSeveralBlocksPerNode() throws IgniteCheckedException { GridHadoopFileBlock split1 = split(false, "/file1", 0, 100, HOST_1, HOST_2); GridHadoopFileBlock split2 = split(false, "/file2", 0, 100, HOST_1, HOST_2); GridHadoopFileBlock split3 = split(false, "/file3", 0, 100, HOST_1, HOST_3); @@ -300,9 +300,9 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void testGgfsSeveralComplexBlocksPerNode() throws GridException { + public void testGgfsSeveralComplexBlocksPerNode() throws IgniteCheckedException { GridHadoopFileBlock split1 = split(true, "/file1", 0, 100, HOST_1, HOST_2, HOST_3); GridHadoopFileBlock split2 = split(true, "/file2", 0, 100, HOST_1, HOST_2, HOST_3); @@ -336,9 +336,9 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void testNonGgfsOrphans() throws GridException { + public void testNonGgfsOrphans() throws IgniteCheckedException { GridHadoopFileBlock split1 = split(false, "/file1", 0, 100, INVALID_HOST_1, INVALID_HOST_2); GridHadoopFileBlock split2 = split(false, "/file2", 0, 100, INVALID_HOST_1, INVALID_HOST_3); GridHadoopFileBlock split3 = split(false, "/file3", 0, 100, INVALID_HOST_2, INVALID_HOST_3); @@ -393,9 +393,9 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac * @param reducers Reducers count. * @param splits Splits. * @return Plan. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - private static GridHadoopMapReducePlan plan(int reducers, GridHadoopInputSplit... splits) throws GridException { + private static GridHadoopMapReducePlan plan(int reducers, GridHadoopInputSplit... splits) throws IgniteCheckedException { assert reducers > 0; assert splits != null && splits.length > 0; @@ -614,32 +614,32 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public Collection<GridHadoopInputSplit> input() throws GridException { + @Override public Collection<GridHadoopInputSplit> input() throws IgniteCheckedException { return splitList; } /** {@inheritDoc} */ - @Override public GridHadoopTaskContext getTaskContext(GridHadoopTaskInfo info) throws GridException { + @Override public GridHadoopTaskContext getTaskContext(GridHadoopTaskInfo info) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public void initialize(boolean external, UUID nodeId) throws GridException { + @Override public void initialize(boolean external, UUID nodeId) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void dispose(boolean external) throws GridException { + @Override public void dispose(boolean external) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void prepareTaskEnvironment(GridHadoopTaskInfo info) throws GridException { + @Override public void prepareTaskEnvironment(GridHadoopTaskInfo info) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void cleanupTaskEnvironment(GridHadoopTaskInfo info) throws GridException { + @Override public void cleanupTaskEnvironment(GridHadoopTaskInfo info) throws IgniteCheckedException { // No-op. } @@ -660,13 +660,13 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac /** {@inheritDoc} */ @Override public Collection<IgniteFsBlockLocation> affinity(IgniteFsPath path, long start, long len) - throws GridException { + throws IgniteCheckedException { return BLOCK_MAP.get(new Block(path, start, len)); } /** {@inheritDoc} */ @Override public Collection<IgniteFsBlockLocation> affinity(IgniteFsPath path, long start, long len, - long maxLen) throws GridException { + long maxLen) throws IgniteCheckedException { return null; } @@ -687,27 +687,27 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac /** {@inheritDoc} */ @Override public GridGgfsInputStreamAdapter open(IgniteFsPath path, int bufSize, int seqReadsBeforePrefetch) - throws GridException { + throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public GridGgfsInputStreamAdapter open(IgniteFsPath path) throws GridException { + @Override public GridGgfsInputStreamAdapter open(IgniteFsPath path) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public GridGgfsInputStreamAdapter open(IgniteFsPath path, int bufSize) throws GridException { + @Override public GridGgfsInputStreamAdapter open(IgniteFsPath path, int bufSize) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public GridGgfsStatus globalSpace() throws GridException { + @Override public GridGgfsStatus globalSpace() throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public void globalSampling(@Nullable Boolean val) throws GridException { + @Override public void globalSampling(@Nullable Boolean val) throws IgniteCheckedException { // No-op. } @@ -727,7 +727,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public IgniteFuture<?> awaitDeletesAsync() throws GridException { + @Override public IgniteFuture<?> awaitDeletesAsync() throws IgniteCheckedException { return null; } @@ -757,58 +757,58 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public boolean exists(IgniteFsPath path) throws GridException { + @Override public boolean exists(IgniteFsPath path) throws IgniteCheckedException { return false; } /** {@inheritDoc} */ - @Nullable @Override public IgniteFsFile info(IgniteFsPath path) throws GridException { + @Nullable @Override public IgniteFsFile info(IgniteFsPath path) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public IgniteFsPathSummary summary(IgniteFsPath path) throws GridException { + @Override public IgniteFsPathSummary summary(IgniteFsPath path) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ @Nullable @Override public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) - throws GridException { + throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public void rename(IgniteFsPath src, IgniteFsPath dest) throws GridException { + @Override public void rename(IgniteFsPath src, IgniteFsPath dest) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public boolean delete(IgniteFsPath path, boolean recursive) throws GridException { + @Override public boolean delete(IgniteFsPath path, boolean recursive) throws IgniteCheckedException { return false; } /** {@inheritDoc} */ - @Override public void mkdirs(IgniteFsPath path) throws GridException { + @Override public void mkdirs(IgniteFsPath path) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void mkdirs(IgniteFsPath path, @Nullable Map<String, String> props) throws GridException { + @Override public void mkdirs(IgniteFsPath path, @Nullable Map<String, String> props) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public Collection<IgniteFsPath> listPaths(IgniteFsPath path) throws GridException { + @Override public Collection<IgniteFsPath> listPaths(IgniteFsPath path) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public Collection<IgniteFsFile> listFiles(IgniteFsPath path) throws GridException { + @Override public Collection<IgniteFsFile> listFiles(IgniteFsPath path) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public long usedSpaceSize() throws GridException { + @Override public long usedSpaceSize() throws IgniteCheckedException { return 0; } @@ -818,83 +818,83 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public IgniteFsOutputStream create(IgniteFsPath path, boolean overwrite) throws GridException { + @Override public IgniteFsOutputStream create(IgniteFsPath path, boolean overwrite) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ @Override public IgniteFsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite, int replication, - long blockSize, @Nullable Map<String, String> props) throws GridException { + long blockSize, @Nullable Map<String, String> props) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ @Override public IgniteFsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite, @Nullable IgniteUuid affKey, int replication, long blockSize, @Nullable Map<String, String> props) - throws GridException { + throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public IgniteFsOutputStream append(IgniteFsPath path, boolean create) throws GridException { + @Override public IgniteFsOutputStream append(IgniteFsPath path, boolean create) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ @Override public IgniteFsOutputStream append(IgniteFsPath path, int bufSize, boolean create, - @Nullable Map<String, String> props) throws GridException { + @Nullable Map<String, String> props) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public void setTimes(IgniteFsPath path, long accessTime, long modificationTime) throws GridException { + @Override public void setTimes(IgniteFsPath path, long accessTime, long modificationTime) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public IgniteFsMetrics metrics() throws GridException { + @Override public IgniteFsMetrics metrics() throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public void resetMetrics() throws GridException { + @Override public void resetMetrics() throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public long size(IgniteFsPath path) throws GridException { + @Override public long size(IgniteFsPath path) throws IgniteCheckedException { return 0; } /** {@inheritDoc} */ - @Override public void format() throws GridException { + @Override public void format() throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ @Override public <T, R> R execute(IgniteFsTask<T, R> task, @Nullable IgniteFsRecordResolver rslvr, - Collection<IgniteFsPath> paths, @Nullable T arg) throws GridException { + Collection<IgniteFsPath> paths, @Nullable T arg) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ @Override public <T, R> R execute(IgniteFsTask<T, R> task, @Nullable IgniteFsRecordResolver rslvr, Collection<IgniteFsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) - throws GridException { + throws IgniteCheckedException { return null; } /** {@inheritDoc} */ @Override public <T, R> R execute(Class<? extends IgniteFsTask<T, R>> taskCls, @Nullable IgniteFsRecordResolver rslvr, Collection<IgniteFsPath> paths, @Nullable T arg) - throws GridException { + throws IgniteCheckedException { return null; } /** {@inheritDoc} */ @Override public <T, R> R execute(Class<? extends IgniteFsTask<T, R>> taskCls, @Nullable IgniteFsRecordResolver rslvr, Collection<IgniteFsPath> paths, boolean skipNonExistentFiles, - long maxRangeLen, @Nullable T arg) throws GridException { + long maxRangeLen, @Nullable T arg) throws IgniteCheckedException { return null; } @@ -1063,22 +1063,22 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public void stopNodes() throws GridException { + @Override public void stopNodes() throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void stopNodes(Collection<UUID> ids) throws GridException { + @Override public void stopNodes(Collection<UUID> ids) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void restartNodes() throws GridException { + @Override public void restartNodes() throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void restartNodes(Collection<UUID> ids) throws GridException { + @Override public void restartNodes(Collection<UUID> ids) throws IgniteCheckedException { // No-op. } @@ -1193,7 +1193,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public ClusterMetrics metrics() throws GridException { + @Override public ClusterMetrics metrics() throws IgniteCheckedException { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java index 464ea35..b92b432 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java @@ -15,6 +15,7 @@ import org.apache.hadoop.mapred.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; +import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; @@ -109,9 +110,9 @@ public class GridHadoopMapReduceTest extends GridHadoopAbstractWordCountTest { * Simple test job statistics. * * @param jobId Job id. - * @throws GridException + * @throws IgniteCheckedException */ - private void checkJobStatistics(GridHadoopJobId jobId) throws GridException, IOException { + private void checkJobStatistics(GridHadoopJobId jobId) throws IgniteCheckedException, IOException { GridHadoopCounters cntrs = grid(0).hadoop().counters(jobId); GridHadoopPerformanceCounter perfCntr = GridHadoopPerformanceCounter.getCounter(cntrs, null); @@ -178,8 +179,8 @@ public class GridHadoopMapReduceTest extends GridHadoopAbstractWordCountTest { try { return ggfs.exists(statPath); } - catch (GridException e) { - throw new GridRuntimeException(e); + catch (IgniteCheckedException e) { + throw new IgniteException(e); } } }, 10000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopStartup.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopStartup.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopStartup.java index 3a76c38..d8a603c 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopStartup.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopStartup.java @@ -10,6 +10,7 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.hadoop.conf.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; @@ -20,7 +21,7 @@ public class GridHadoopStartup { /** * @param args Arguments. */ - public static void main(String[] args) throws GridException { + public static void main(String[] args) throws IgniteCheckedException { G.start("config/hadoop/default-config.xml"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java index e95016f..4c8a139 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java @@ -229,7 +229,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest return null; } - }, GridException.class, null); + }, IgniteCheckedException.class, null); } /** @@ -339,7 +339,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest return null; } - }, GridException.class, null); + }, IgniteCheckedException.class, null); assertEquals(executedTasks.get(), cancelledTasks.get() + 1); } @@ -394,7 +394,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest return null; } - }, GridException.class, null); + }, IgniteCheckedException.class, null); assertEquals(executedTasks.get(), cancelledTasks.get()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java index 973ee43..893d1c6 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.hadoop; import com.google.common.base.*; import org.apache.hadoop.io.*; +import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; @@ -101,10 +102,10 @@ abstract class GridHadoopTasksAllVersionsTest extends GridHadoopAbstractWordCoun * @param taskNum Number of task in job. * @param words Pairs of words and its counts. * @return Context with mock output. - * @throws GridException If fails. + * @throws IgniteCheckedException If fails. */ private GridHadoopTestTaskContext runTaskWithInput(GridHadoopV2Job gridJob, GridHadoopTaskType taskType, - int taskNum, String... words) throws GridException { + int taskNum, String... words) throws IgniteCheckedException { GridHadoopTaskInfo taskInfo = new GridHadoopTaskInfo(taskType, gridJob.id(), taskNum, 0, null); GridHadoopTestTaskContext ctx = new GridHadoopTestTaskContext(taskInfo, gridJob); @@ -173,10 +174,10 @@ abstract class GridHadoopTasksAllVersionsTest extends GridHadoopAbstractWordCoun * @param fileBlock block of input file to be processed. * @param gridJob Hadoop job implementation. * @return Context of combine task with mock output. - * @throws GridException If fails. + * @throws IgniteCheckedException If fails. */ private GridHadoopTestTaskContext runMapCombineTask(GridHadoopFileBlock fileBlock, GridHadoopV2Job gridJob) - throws GridException { + throws IgniteCheckedException { GridHadoopTaskInfo taskInfo = new GridHadoopTaskInfo(GridHadoopTaskType.MAP, gridJob.id(), 0, 0, fileBlock); GridHadoopTestTaskContext mapCtx = new GridHadoopTestTaskContext(taskInfo, gridJob); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java index 54807e4..27e9fff 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java @@ -9,6 +9,7 @@ package org.gridgain.grid.kernal.processors.hadoop; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; @@ -23,7 +24,7 @@ import java.util.*; public class GridHadoopTestRoundRobinMrPlanner implements GridHadoopMapReducePlanner { /** {@inheritDoc} */ @Override public GridHadoopMapReducePlan preparePlan(GridHadoopJob job, Collection<ClusterNode> top, - @Nullable GridHadoopMapReducePlan oldPlan) throws GridException { + @Nullable GridHadoopMapReducePlan oldPlan) throws IgniteCheckedException { if (top.isEmpty()) throw new IllegalArgumentException("Topology is empty"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java index a70e753..deed692 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.hadoop.io.*; import org.apache.hadoop.mapred.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; @@ -171,7 +172,7 @@ class GridHadoopTestTaskContext extends GridHadoopV2TaskContext { * @param taskInfo Task info. * @param gridJob Grid Hadoop job. */ - public GridHadoopTestTaskContext(GridHadoopTaskInfo taskInfo, GridHadoopJob gridJob) throws GridException { + public GridHadoopTestTaskContext(GridHadoopTaskInfo taskInfo, GridHadoopJob gridJob) throws IgniteCheckedException { super(taskInfo, gridJob, gridJob.id(), null, jobConfDataInput(gridJob)); } @@ -180,9 +181,9 @@ class GridHadoopTestTaskContext extends GridHadoopV2TaskContext { * * @param job Job. * @return DataInput with JobConf. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - private static DataInput jobConfDataInput(GridHadoopJob job) throws GridException { + private static DataInput jobConfDataInput(GridHadoopJob job) throws IgniteCheckedException { JobConf jobConf = new JobConf(); for (Map.Entry<String, String> e : ((GridHadoopDefaultJobInfo)job.info()).properties().entrySet()) @@ -194,7 +195,7 @@ class GridHadoopTestTaskContext extends GridHadoopV2TaskContext { jobConf.write(new DataOutputStream(buf)); } catch (IOException e) { - throw new GridException(e); + throw new IgniteCheckedException(e); } return new DataInputStream(new ByteArrayInputStream(buf.toByteArray())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java index 789ea8f..cc3870b 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java @@ -13,6 +13,7 @@ import org.apache.hadoop.fs.*; import org.apache.hadoop.io.*; import org.apache.hadoop.io.serializer.*; import org.apache.hadoop.mapred.*; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; @@ -50,9 +51,9 @@ public class GridHadoopV2JobSelfTest extends GridHadoopAbstractSelfTest { /** * Tests that {@link GridHadoopJob} provides wrapped serializer if it's set in configuration. * - * @throws GridException If fails. + * @throws IgniteCheckedException If fails. */ - public void testCustomSerializationApplying() throws GridException { + public void testCustomSerializationApplying() throws IgniteCheckedException { JobConf cfg = new JobConf(); cfg.setMapOutputKeyClass(IntWritable.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java index 8244566..85803f6 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java @@ -45,19 +45,19 @@ public abstract class GridHadoopAbstractMapTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public GridHadoopPartitioner partitioner() throws GridException { + @Override public GridHadoopPartitioner partitioner() throws IgniteCheckedException { assert false; return null; } /** {@inheritDoc} */ - @Override public GridHadoopSerialization keySerialization() throws GridException { + @Override public GridHadoopSerialization keySerialization() throws IgniteCheckedException { return new GridHadoopWritableSerialization(IntWritable.class); } /** {@inheritDoc} */ - @Override public GridHadoopSerialization valueSerialization() throws GridException { + @Override public GridHadoopSerialization valueSerialization() throws IgniteCheckedException { return new GridHadoopWritableSerialization(IntWritable.class); } @@ -72,7 +72,7 @@ public abstract class GridHadoopAbstractMapTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void run() throws GridException { + @Override public void run() throws IgniteCheckedException { assert false; } @@ -82,11 +82,11 @@ public abstract class GridHadoopAbstractMapTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void prepareTaskEnvironment() throws GridException { + @Override public void prepareTaskEnvironment() throws IgniteCheckedException { assert false; } - @Override public void cleanupTaskEnvironment() throws GridException { + @Override public void cleanupTaskEnvironment() throws IgniteCheckedException { assert false; } } @@ -115,7 +115,7 @@ public abstract class GridHadoopAbstractMapTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public GridHadoopJob createJob(GridHadoopJobId jobId, IgniteLogger log) throws GridException { + @Override public GridHadoopJob createJob(GridHadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException { assert false; return null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java index 26aee6a..b8359f7 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java @@ -128,7 +128,7 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS try { fut.get(); } - catch (GridException e) { + catch (IgniteCheckedException e) { IOException exp = X.cause(e, IOException.class); assertNotNull(exp); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsNodeStartup.java b/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsNodeStartup.java index 97b847c..1f23ec7 100644 --- a/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsNodeStartup.java +++ b/modules/hadoop/src/test/java/org/gridgain/loadtests/ggfs/GridGgfsNodeStartup.java @@ -23,9 +23,9 @@ public class GridGgfsNodeStartup { * Start up an empty node with specified cache configuration. * * @param args Command line arguments, none required. - * @throws GridException If example execution failed. + * @throws IgniteCheckedException If example execution failed. */ - public static void main(String[] args) throws GridException { + public static void main(String[] args) throws IgniteCheckedException { try (Ignite ignored = G.start("config/hadoop/default-config.xml")) { // Wait until Ok is pressed. JOptionPane.showMessageDialog( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java index 1c33809..464d1c8 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java @@ -105,7 +105,7 @@ public abstract class GridHibernateAccessStrategyAdapter { try { return cache.get(key); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -133,7 +133,7 @@ public abstract class GridHibernateAccessStrategyAdapter { try { cache.putx(key, val); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -279,7 +279,7 @@ public abstract class GridHibernateAccessStrategyAdapter { try { ignite.compute(cache.gridProjection()).call(new ClearKeyCallable(key, cache.name())); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -294,7 +294,7 @@ public abstract class GridHibernateAccessStrategyAdapter { try { cache.globalClearAll(); } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -333,7 +333,7 @@ public abstract class GridHibernateAccessStrategyAdapter { } /** {@inheritDoc} */ - @Override public Void call() throws GridException { + @Override public Void call() throws IgniteCheckedException { GridCache<Object, Object> cache = ignite.cache(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java index 0a74979..224a993 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java @@ -36,7 +36,7 @@ public class GridHibernateGeneralDataRegion extends GridHibernateRegion implemen @Nullable @Override public Object get(Object key) throws CacheException { try { return cache.get(key); - } catch (GridException e) { + } catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -45,7 +45,7 @@ public class GridHibernateGeneralDataRegion extends GridHibernateRegion implemen @Override public void put(Object key, Object val) throws CacheException { try { cache.putx(key, val); - } catch (GridException e) { + } catch (IgniteCheckedException e) { throw new CacheException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java index e7b78ba..24f2256 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java @@ -86,7 +86,7 @@ public class GridHibernateNonStrictAccessStrategy extends GridHibernateAccessStr ctx.updateCache(cache); } } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -123,7 +123,7 @@ public class GridHibernateNonStrictAccessStrategy extends GridHibernateAccessStr return true; } - catch (GridException e) { + catch (IgniteCheckedException e) { throw new CacheException(e); } } @@ -200,9 +200,9 @@ public class GridHibernateNonStrictAccessStrategy extends GridHibernateAccessStr * Updates cache. * * @param cache Cache. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - void updateCache(GridCache<Object, Object> cache) throws GridException { + void updateCache(GridCache<Object, Object> cache) throws IgniteCheckedException { if (!F.isEmpty(rmvs)) cache.removeAll(rmvs);
