You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/05 09:44:52 UTC
[25/38] incubator-ignite git commit: # Renaming
# Renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7479ede
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7479ede
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7479ede
Branch: refs/heads/master
Commit: b7479ede167d989d6a5ba32b63fc473edb0fed95
Parents: 5e4cd4d
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 11:23:33 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 11:23:33 2014 +0300
----------------------------------------------------------------------
.../examples/ggfs/GgfsMapReduceExample.java | 4 +-
.../grid/ggfs/IgniteFsConfiguration.java | 2 +-
.../grid/ggfs/mapreduce/GridGgfsFileRange.java | 72 --------------------
.../GridGgfsInputStreamJobAdapter.java | 45 ------------
.../grid/ggfs/mapreduce/GridGgfsJob.java | 62 -----------------
.../grid/ggfs/mapreduce/GridGgfsJobAdapter.java | 20 ------
.../mapreduce/GridGgfsRangeInputStream.java | 6 +-
.../ggfs/mapreduce/GridGgfsRecordResolver.java | 8 +--
.../grid/ggfs/mapreduce/GridGgfsTask.java | 10 +--
.../grid/ggfs/mapreduce/GridGgfsTaskArgs.java | 2 +-
.../grid/ggfs/mapreduce/IgniteFsFileRange.java | 72 ++++++++++++++++++++
.../IgniteFsInputStreamJobAdapter.java | 45 ++++++++++++
.../grid/ggfs/mapreduce/IgniteFsJob.java | 62 +++++++++++++++++
.../grid/ggfs/mapreduce/IgniteFsJobAdapter.java | 20 ++++++
.../GridGgfsByteDelimiterRecordResolver.java | 6 +-
.../GridGgfsFixedLengthRecordResolver.java | 6 +-
.../kernal/processors/ggfs/GridGgfsJobImpl.java | 12 ++--
.../processors/ggfs/GridGgfsProcessor.java | 2 +-
.../ggfs/GridGgfsProcessorAdapter.java | 2 +-
.../processors/ggfs/GridNoopGgfsProcessor.java | 2 +-
.../processors/ggfs/GridGgfsTaskSelfTest.java | 6 +-
.../GridGgfsAbstractRecordResolverSelfTest.java | 4 +-
...GgfsByteDelimiterRecordResolverSelfTest.java | 4 +-
...idGgfsFixedLengthRecordResolverSelfTest.java | 4 +-
...sNewLineDelimiterRecordResolverSelfTest.java | 4 +-
...fsStringDelimiterRecordResolverSelfTest.java | 4 +-
26 files changed, 243 insertions(+), 243 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/examples/src/main/java/org/gridgain/examples/ggfs/GgfsMapReduceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/ggfs/GgfsMapReduceExample.java b/examples/src/main/java/org/gridgain/examples/ggfs/GgfsMapReduceExample.java
index c006641..85f103d 100644
--- a/examples/src/main/java/org/gridgain/examples/ggfs/GgfsMapReduceExample.java
+++ b/examples/src/main/java/org/gridgain/examples/ggfs/GgfsMapReduceExample.java
@@ -121,7 +121,7 @@ public class GgfsMapReduceExample {
*/
private static class GrepTask extends GridGgfsTask<String, Collection<Line>> {
/** {@inheritDoc} */
- @Override public GridGgfsJob createJob(IgniteFsPath path, GridGgfsFileRange range,
+ @Override public IgniteFsJob createJob(IgniteFsPath path, IgniteFsFileRange range,
GridGgfsTaskArgs<String> args) throws GridException {
return new GrepJob(args.userArgument());
}
@@ -152,7 +152,7 @@ public class GgfsMapReduceExample {
/**
* Grep job.
*/
- private static class GrepJob extends GridGgfsInputStreamJobAdapter {
+ private static class GrepJob extends IgniteFsInputStreamJobAdapter {
/** Regex string. */
private final String regex;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsConfiguration.java
index d86049d..287e93c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsConfiguration.java
@@ -756,7 +756,7 @@ public class IgniteFsConfiguration {
/**
* Get maximum default range size of a file being split during GGFS task execution. When GGFS task is about to
- * be executed, it requests file block locations first. Each location is defined as {@link GridGgfsFileRange} which
+ * be executed, it requests file block locations first. Each location is defined as {@link org.gridgain.grid.ggfs.mapreduce.IgniteFsFileRange} which
* has length. In case this parameter is set to positive value, then GGFS will split single file range into smaller
* ranges with length not greater that this parameter. The only exception to this case is when maximum task range
* length is smaller than file block size. In this case maximum task range size will be overridden and set to file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsFileRange.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsFileRange.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsFileRange.java
deleted file mode 100644
index e37def7..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsFileRange.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.ggfs.mapreduce;
-
-import org.gridgain.grid.ggfs.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-/**
- * Entity representing part of GGFS file identified by file path, start position, and length.
- */
-public class GridGgfsFileRange {
- /** File path. */
- private IgniteFsPath path;
-
- /** Start position. */
- private long start;
-
- /** Length. */
- private long len;
-
- /**
- * Creates file range.
- *
- * @param path File path.
- * @param start Start position.
- * @param len Length.
- */
- public GridGgfsFileRange(IgniteFsPath path, long start, long len) {
- this.path = path;
- this.start = start;
- this.len = len;
- }
-
- /**
- * Gets file path.
- *
- * @return File path.
- */
- public IgniteFsPath path() {
- return path;
- }
-
- /**
- * Gets range start position.
- *
- * @return Start position.
- */
- public long start() {
- return start;
- }
-
- /**
- * Gets range length.
- *
- * @return Length.
- */
- public long length() {
- return len;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridGgfsFileRange.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsInputStreamJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsInputStreamJobAdapter.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsInputStreamJobAdapter.java
deleted file mode 100644
index a5ac21d..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsInputStreamJobAdapter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.ggfs.mapreduce;
-
-import org.apache.ignite.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.ggfs.*;
-import org.gridgain.grid.util.*;
-
-import java.io.*;
-
-/**
- * Convenient {@link GridGgfsJob} adapter. It limits data returned from {@link org.gridgain.grid.ggfs.IgniteFsInputStream} to bytes within
- * the {@link GridGgfsFileRange} assigned to the job.
- * <p>
- * Under the covers it simply puts job's {@code GridGgfsInputStream} position to range start and wraps in into
- * {@link GridFixedSizeInputStream} limited to range length.
- */
-public abstract class GridGgfsInputStreamJobAdapter extends GridGgfsJobAdapter {
- /** {@inheritDoc} */
- @Override public final Object execute(IgniteFs ggfs, GridGgfsFileRange range, IgniteFsInputStream in)
- throws GridException, IOException {
- in.seek(range.start());
-
- return execute(ggfs, new GridGgfsRangeInputStream(in, range));
- }
-
- /**
- * Executes this job.
- *
- * @param ggfs GGFS instance.
- * @param in Input stream.
- * @return Execution result.
- * @throws GridException If execution failed.
- * @throws IOException If IO exception encountered while working with stream.
- */
- public abstract Object execute(IgniteFs ggfs, GridGgfsRangeInputStream in) throws GridException, IOException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsJob.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsJob.java
deleted file mode 100644
index 84617dd..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsJob.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.ggfs.mapreduce;
-
-import org.apache.ignite.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.ggfs.*;
-
-import java.io.*;
-
-/**
- * Defines executable unit for {@link GridGgfsTask}. Before this job is executed, it is assigned one of the
- * ranges provided by the {@link GridGgfsRecordResolver} passed to one of the {@code GridGgfs.execute(...)} methods.
- * <p>
- * {@link #execute(org.apache.ignite.IgniteFs, GridGgfsFileRange, org.gridgain.grid.ggfs.IgniteFsInputStream)} method is given {@link GridGgfsFileRange} this
- * job is expected to operate on, and already opened {@link org.gridgain.grid.ggfs.IgniteFsInputStream} for the file this range belongs to.
- * <p>
- * Note that provided input stream has position already adjusted to range start. However, it will not
- * automatically stop on range end. This is done to provide capability in some cases to look beyond
- * the range end or seek position before the reange start.
- * <p>
- * In majority of the cases, when you want to process only provided range, you should explicitly control amount
- * of returned data and stop at range end. You can also use {@link GridGgfsInputStreamJobAdapter}, which operates
- * on {@link GridGgfsRangeInputStream} bounded to range start and end, or manually wrap provided input stream with
- * {@link GridGgfsRangeInputStream}.
- * <p>
- * You can inject any resources in concrete implementation, just as with regular {@link org.apache.ignite.compute.ComputeJob} implementations.
- */
-public interface GridGgfsJob {
- /**
- * Executes this job.
- *
- * @param ggfs GGFS instance.
- * @param range File range aligned to record boundaries.
- * @param in Input stream for split file. This input stream is not aligned to range and points to file start
- * by default.
- * @return Execution result.
- * @throws GridException If execution failed.
- * @throws IOException If file system operation resulted in IO exception.
- */
- public Object execute(IgniteFs ggfs, GridGgfsFileRange range, IgniteFsInputStream in) throws GridException,
- IOException;
-
- /**
- * This method is called when system detects that completion of this
- * job can no longer alter the overall outcome (for example, when parent task
- * has already reduced the results). Job is also cancelled when
- * {@link org.apache.ignite.compute.ComputeTaskFuture#cancel()} is called.
- * <p>
- * Note that job cancellation is only a hint, and just like with
- * {@link Thread#interrupt()} method, it is really up to the actual job
- * instance to gracefully finish execution and exit.
- */
- public void cancel();
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsJobAdapter.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsJobAdapter.java
deleted file mode 100644
index e347339..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsJobAdapter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.ggfs.mapreduce;
-
-/**
- * Adapter for {@link GridGgfsJob} with no-op implementation of {@link #cancel()} method.
- */
-public abstract class GridGgfsJobAdapter implements GridGgfsJob {
- /** {@inheritDoc} */
- @Override public void cancel() {
- // No-op.
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRangeInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRangeInputStream.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRangeInputStream.java
index fc0e6be..ac96c68 100644
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRangeInputStream.java
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRangeInputStream.java
@@ -17,9 +17,9 @@ import java.io.*;
/**
* Decorator for regular {@link org.gridgain.grid.ggfs.IgniteFsInputStream} which streams only data within the given range.
- * This stream is used for {@link GridGgfsInputStreamJobAdapter} convenience adapter to create
+ * This stream is used for {@link IgniteFsInputStreamJobAdapter} convenience adapter to create
* jobs which will be working only with the assigned range. You can also use it explicitly when
- * working with {@link GridGgfsJob} directly.
+ * working with {@link IgniteFsJob} directly.
*/
public final class GridGgfsRangeInputStream extends IgniteFsInputStream {
/** Base input stream. */
@@ -77,7 +77,7 @@ public final class GridGgfsRangeInputStream extends IgniteFsInputStream {
* @param range File range.
* @throws IOException In case of exception.
*/
- public GridGgfsRangeInputStream(IgniteFsInputStream is, GridGgfsFileRange range) throws IOException {
+ public GridGgfsRangeInputStream(IgniteFsInputStream is, IgniteFsFileRange range) throws IOException {
this(is, range.start(), range.length());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRecordResolver.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRecordResolver.java
index e8d64d0..e128776 100644
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRecordResolver.java
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsRecordResolver.java
@@ -18,8 +18,8 @@ import org.jetbrains.annotations.*;
import java.io.*;
/**
- * GGFS record resolver. When {@link GridGgfsTask} is split into {@link GridGgfsJob}s each produced job will obtain
- * {@link GridGgfsFileRange} based on file data location. Record resolver is invoked in each job before actual
+ * GGFS record resolver. When {@link GridGgfsTask} is split into {@link IgniteFsJob}s each produced job will obtain
+ * {@link IgniteFsFileRange} based on file data location. Record resolver is invoked in each job before actual
* execution in order to adjust record boundaries in a way consistent with user data.
* <p>
* E.g., you may want to split your task into jobs so that each job process zero, one or several lines from that file.
@@ -45,6 +45,6 @@ public interface GridGgfsRecordResolver extends Serializable {
* @throws GridException If resolve failed.
* @throws IOException If resolve failed.
*/
- @Nullable public GridGgfsFileRange resolveRecords(IgniteFs ggfs, IgniteFsInputStream stream,
- GridGgfsFileRange suggestedRecord) throws GridException, IOException;
+ @Nullable public IgniteFsFileRange resolveRecords(IgniteFs ggfs, IgniteFsInputStream stream,
+ IgniteFsFileRange suggestedRecord) throws GridException, IOException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java
index 055ef09..35e16de 100644
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java
@@ -26,15 +26,15 @@ import java.util.*;
* GGFS task which can be executed on the grid using one of {@code GridGgfs.execute()} methods. Essentially GGFS task
* is regular {@link org.apache.ignite.compute.ComputeTask} with different map logic. Instead of implementing
* {@link org.apache.ignite.compute.ComputeTask#map(List, Object)} method to split task into jobs, you must implement
- * {@link GridGgfsTask#createJob(org.gridgain.grid.ggfs.IgniteFsPath, GridGgfsFileRange, GridGgfsTaskArgs)} method.
+ * {@link GridGgfsTask#createJob(org.gridgain.grid.ggfs.IgniteFsPath, IgniteFsFileRange, GridGgfsTaskArgs)} method.
* <p>
- * Each file participating in GGFS task is split into {@link GridGgfsFileRange}s first. Normally range is a number of
+ * Each file participating in GGFS task is split into {@link IgniteFsFileRange}s first. Normally range is a number of
* consequent bytes located on a single node (see {@code GridGgfsGroupDataBlocksKeyMapper}). In case maximum range size
* is provided (either through {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getMaximumTaskRangeLength()} or {@code GridGgfs.execute()}
* argument), then ranges could be further divided into smaller chunks.
* <p>
* Once file is split into ranges, each range is passed to {@code GridGgfsTask.createJob()} method in order to create a
- * {@link GridGgfsJob}.
+ * {@link IgniteFsJob}.
* <p>
* Finally all generated jobs are sent to Grid nodes for execution.
* <p>
@@ -116,7 +116,7 @@ public abstract class GridGgfsTask<T, R> extends ComputeTaskAdapter<GridGgfsTask
throw new GridException("Failed to find any of block affinity nodes in subgrid [loc=" + loc +
", subgrid=" + subgrid + ']');
- GridGgfsJob job = createJob(path, new GridGgfsFileRange(file.path(), loc.start(), loc.length()), args);
+ IgniteFsJob job = createJob(path, new IgniteFsFileRange(file.path(), loc.start(), loc.length()), args);
if (job != null) {
ComputeJob jobImpl = ggfsProc.createJob(job, ggfs.name(), file.path(), loc.start(),
@@ -145,7 +145,7 @@ public abstract class GridGgfsTask<T, R> extends ComputeTaskAdapter<GridGgfsTask
* @return GGFS job. If {@code null} is returned, the passed in file range will be skipped.
* @throws GridException If job creation failed.
*/
- @Nullable public abstract GridGgfsJob createJob(IgniteFsPath path, GridGgfsFileRange range,
+ @Nullable public abstract IgniteFsJob createJob(IgniteFsPath path, IgniteFsFileRange range,
GridGgfsTaskArgs<T> args) throws GridException;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java
index 2b321c7..fd36ffe 100644
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java
@@ -16,7 +16,7 @@ import java.util.*;
/**
* GGFS task arguments. When you initiate new GGFS task execution using one of {@code GridGgfs.execute(...)} methods,
* all passed parameters are encapsulated in a single {@code GridGgfsTaskArgs} object. Later on this object is
- * passed to {@link GridGgfsTask#createJob(org.gridgain.grid.ggfs.IgniteFsPath, GridGgfsFileRange, GridGgfsTaskArgs)} method.
+ * passed to {@link GridGgfsTask#createJob(org.gridgain.grid.ggfs.IgniteFsPath, IgniteFsFileRange, GridGgfsTaskArgs)} method.
* <p>
* Task arguments encapsulates the following data:
* <ul>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsFileRange.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsFileRange.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsFileRange.java
new file mode 100644
index 0000000..1e1f27a
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsFileRange.java
@@ -0,0 +1,72 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.ggfs.mapreduce;
+
+import org.gridgain.grid.ggfs.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+/**
+ * Entity representing part of GGFS file identified by file path, start position, and length.
+ */
+public class IgniteFsFileRange {
+ /** File path. */
+ private IgniteFsPath path;
+
+ /** Start position. */
+ private long start;
+
+ /** Length. */
+ private long len;
+
+ /**
+ * Creates file range.
+ *
+ * @param path File path.
+ * @param start Start position.
+ * @param len Length.
+ */
+ public IgniteFsFileRange(IgniteFsPath path, long start, long len) {
+ this.path = path;
+ this.start = start;
+ this.len = len;
+ }
+
+ /**
+ * Gets file path.
+ *
+ * @return File path.
+ */
+ public IgniteFsPath path() {
+ return path;
+ }
+
+ /**
+ * Gets range start position.
+ *
+ * @return Start position.
+ */
+ public long start() {
+ return start;
+ }
+
+ /**
+ * Gets range length.
+ *
+ * @return Length.
+ */
+ public long length() {
+ return len;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(IgniteFsFileRange.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsInputStreamJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsInputStreamJobAdapter.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsInputStreamJobAdapter.java
new file mode 100644
index 0000000..ddc04b3
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsInputStreamJobAdapter.java
@@ -0,0 +1,45 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.ggfs.mapreduce;
+
+import org.apache.ignite.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.ggfs.*;
+import org.gridgain.grid.util.*;
+
+import java.io.*;
+
+/**
+ * Convenient {@link IgniteFsJob} adapter. It limits data returned from {@link org.gridgain.grid.ggfs.IgniteFsInputStream} to bytes within
+ * the {@link IgniteFsFileRange} assigned to the job.
+ * <p>
+ * Under the covers it simply puts job's {@code GridGgfsInputStream} position to range start and wraps in into
+ * {@link GridFixedSizeInputStream} limited to range length.
+ */
+public abstract class IgniteFsInputStreamJobAdapter extends IgniteFsJobAdapter {
+ /** {@inheritDoc} */
+ @Override public final Object execute(IgniteFs ggfs, IgniteFsFileRange range, IgniteFsInputStream in)
+ throws GridException, IOException {
+ in.seek(range.start());
+
+ return execute(ggfs, new GridGgfsRangeInputStream(in, range));
+ }
+
+ /**
+ * Executes this job.
+ *
+ * @param ggfs GGFS instance.
+ * @param in Input stream.
+ * @return Execution result.
+ * @throws GridException If execution failed.
+ * @throws IOException If IO exception encountered while working with stream.
+ */
+ public abstract Object execute(IgniteFs ggfs, GridGgfsRangeInputStream in) throws GridException, IOException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJob.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJob.java
new file mode 100644
index 0000000..4aa33ec
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJob.java
@@ -0,0 +1,62 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.ggfs.mapreduce;
+
+import org.apache.ignite.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.ggfs.*;
+
+import java.io.*;
+
+/**
+ * Defines executable unit for {@link GridGgfsTask}. Before this job is executed, it is assigned one of the
+ * ranges provided by the {@link GridGgfsRecordResolver} passed to one of the {@code GridGgfs.execute(...)} methods.
+ * <p>
+ * {@link #execute(org.apache.ignite.IgniteFs, IgniteFsFileRange, org.gridgain.grid.ggfs.IgniteFsInputStream)} method is given {@link IgniteFsFileRange} this
+ * job is expected to operate on, and already opened {@link org.gridgain.grid.ggfs.IgniteFsInputStream} for the file this range belongs to.
+ * <p>
+ * Note that provided input stream has position already adjusted to range start. However, it will not
+ * automatically stop on range end. This is done to provide capability in some cases to look beyond
+ * the range end or seek position before the reange start.
+ * <p>
+ * In majority of the cases, when you want to process only provided range, you should explicitly control amount
+ * of returned data and stop at range end. You can also use {@link IgniteFsInputStreamJobAdapter}, which operates
+ * on {@link GridGgfsRangeInputStream} bounded to range start and end, or manually wrap provided input stream with
+ * {@link GridGgfsRangeInputStream}.
+ * <p>
+ * You can inject any resources in concrete implementation, just as with regular {@link org.apache.ignite.compute.ComputeJob} implementations.
+ */
+public interface IgniteFsJob {
+ /**
+ * Executes this job.
+ *
+ * @param ggfs GGFS instance.
+ * @param range File range aligned to record boundaries.
+ * @param in Input stream for split file. This input stream is not aligned to range and points to file start
+ * by default.
+ * @return Execution result.
+ * @throws GridException If execution failed.
+ * @throws IOException If file system operation resulted in IO exception.
+ */
+ public Object execute(IgniteFs ggfs, IgniteFsFileRange range, IgniteFsInputStream in) throws GridException,
+ IOException;
+
+ /**
+ * This method is called when system detects that completion of this
+ * job can no longer alter the overall outcome (for example, when parent task
+ * has already reduced the results). Job is also cancelled when
+ * {@link org.apache.ignite.compute.ComputeTaskFuture#cancel()} is called.
+ * <p>
+ * Note that job cancellation is only a hint, and just like with
+ * {@link Thread#interrupt()} method, it is really up to the actual job
+ * instance to gracefully finish execution and exit.
+ */
+ public void cancel();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJobAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJobAdapter.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJobAdapter.java
new file mode 100644
index 0000000..e8aa1ea
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJobAdapter.java
@@ -0,0 +1,20 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.ggfs.mapreduce;
+
+/**
+ * Adapter for {@link IgniteFsJob} with no-op implementation of {@link #cancel()} method.
+ */
+public abstract class IgniteFsJobAdapter implements IgniteFsJob {
+ /** {@inheritDoc} */
+ @Override public void cancel() {
+ // No-op.
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsByteDelimiterRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsByteDelimiterRecordResolver.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsByteDelimiterRecordResolver.java
index fb9cf0e..eb9de8d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsByteDelimiterRecordResolver.java
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsByteDelimiterRecordResolver.java
@@ -70,8 +70,8 @@ public class GridGgfsByteDelimiterRecordResolver implements GridGgfsRecordResolv
}
/** {@inheritDoc} */
- @Override public GridGgfsFileRange resolveRecords(IgniteFs ggfs, IgniteFsInputStream stream,
- GridGgfsFileRange suggestedRecord) throws GridException, IOException {
+ @Override public IgniteFsFileRange resolveRecords(IgniteFs ggfs, IgniteFsInputStream stream,
+ IgniteFsFileRange suggestedRecord) throws GridException, IOException {
long suggestedStart = suggestedRecord.start();
long suggestedEnd = suggestedStart + suggestedRecord.length();
@@ -102,7 +102,7 @@ public class GridGgfsByteDelimiterRecordResolver implements GridGgfsRecordResolv
long end = curDelim != null ? curDelim.end : stream.position();
- return new GridGgfsFileRange(suggestedRecord.path(), start, end - start);
+ return new IgniteFsFileRange(suggestedRecord.path(), start, end - start);
}
else
// We failed to find any delimiters up to the EOS.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsFixedLengthRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsFixedLengthRecordResolver.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsFixedLengthRecordResolver.java
index 212b780..3230062 100644
--- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsFixedLengthRecordResolver.java
+++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/GridGgfsFixedLengthRecordResolver.java
@@ -45,8 +45,8 @@ public class GridGgfsFixedLengthRecordResolver implements GridGgfsRecordResolver
}
/** {@inheritDoc} */
- @Override public GridGgfsFileRange resolveRecords(IgniteFs ggfs, IgniteFsInputStream stream,
- GridGgfsFileRange suggestedRecord)
+ @Override public IgniteFsFileRange resolveRecords(IgniteFs ggfs, IgniteFsInputStream stream,
+ IgniteFsFileRange suggestedRecord)
throws GridException, IOException {
long suggestedEnd = suggestedRecord.start() + suggestedRecord.length();
@@ -59,7 +59,7 @@ public class GridGgfsFixedLengthRecordResolver implements GridGgfsRecordResolver
assert end >= start;
- return start != end ? new GridGgfsFileRange(suggestedRecord.path(), start, end - start) : null;
+ return start != end ? new IgniteFsFileRange(suggestedRecord.path(), start, end - start) : null;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java
index f460d5d..2abbef7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java
@@ -22,12 +22,12 @@ import java.io.*;
/**
* GGFS job implementation.
*/
-public class GridGgfsJobImpl implements ComputeJob, GridInternalWrapper<GridGgfsJob> {
+public class GridGgfsJobImpl implements ComputeJob, GridInternalWrapper<IgniteFsJob> {
/** */
private static final long serialVersionUID = 0L;
/** GGFS job. */
- private GridGgfsJob job;
+ private IgniteFsJob job;
/** GGFS name. */
private String ggfsName;
@@ -60,7 +60,7 @@ public class GridGgfsJobImpl implements ComputeJob, GridInternalWrapper<GridGgfs
* @param len Split length.
* @param rslvr GGFS split resolver.
*/
- public GridGgfsJobImpl(GridGgfsJob job, String ggfsName, IgniteFsPath path, long start, long len,
+ public GridGgfsJobImpl(IgniteFsJob job, String ggfsName, IgniteFsPath path, long start, long len,
GridGgfsRecordResolver rslvr) {
this.job = job;
this.ggfsName = ggfsName;
@@ -75,7 +75,7 @@ public class GridGgfsJobImpl implements ComputeJob, GridInternalWrapper<GridGgfs
IgniteFs ggfs = ignite.fileSystem(ggfsName);
try (IgniteFsInputStream in = ggfs.open(path)) {
- GridGgfsFileRange split = new GridGgfsFileRange(path, start, len);
+ IgniteFsFileRange split = new IgniteFsFileRange(path, start, len);
if (rslvr != null) {
split = rslvr.resolveRecords(ggfs, in, split);
@@ -90,7 +90,7 @@ public class GridGgfsJobImpl implements ComputeJob, GridInternalWrapper<GridGgfs
in.seek(split.start());
- return job.execute(ggfs, new GridGgfsFileRange(path, split.start(), split.length()), in);
+ return job.execute(ggfs, new IgniteFsFileRange(path, split.start(), split.length()), in);
}
catch (IOException e) {
throw new GridException("Failed to execute GGFS job for file split [ggfsName=" + ggfsName +
@@ -104,7 +104,7 @@ public class GridGgfsJobImpl implements ComputeJob, GridInternalWrapper<GridGgfs
}
/** {@inheritDoc} */
- @Override public GridGgfsJob userObject() {
+ @Override public IgniteFsJob userObject() {
return job;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
index 3d26dcd..8a73665 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java
@@ -222,7 +222,7 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter {
}
/** {@inheritDoc} */
- @Nullable @Override public ComputeJob createJob(GridGgfsJob job, @Nullable String ggfsName, IgniteFsPath path,
+ @Nullable @Override public ComputeJob createJob(IgniteFsJob job, @Nullable String ggfsName, IgniteFsPath path,
long start, long length, GridGgfsRecordResolver recRslv) {
return new GridGgfsJobImpl(job, ggfsName, path, start, length, recRslv);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java
index f2dd046..85ef324 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java
@@ -67,6 +67,6 @@ public abstract class GridGgfsProcessorAdapter extends GridProcessorAdapter {
* @param recRslv Record resolver.
* @return Compute job.
*/
- @Nullable public abstract ComputeJob createJob(GridGgfsJob job, @Nullable String ggfsName, IgniteFsPath path,
+ @Nullable public abstract ComputeJob createJob(IgniteFsJob job, @Nullable String ggfsName, IgniteFsPath path,
long start, long length, GridGgfsRecordResolver recRslv);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java
index 0c3887b..5654a95 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java
@@ -56,7 +56,7 @@ public class GridNoopGgfsProcessor extends GridGgfsProcessorAdapter {
}
/** {@inheritDoc} */
- @Nullable @Override public ComputeJob createJob(GridGgfsJob job, @Nullable String ggfsName, IgniteFsPath path,
+ @Nullable @Override public ComputeJob createJob(IgniteFsJob job, @Nullable String ggfsName, IgniteFsPath path,
long start, long length, GridGgfsRecordResolver recRslv) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
index 641977a..9e3838a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
@@ -230,7 +230,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest {
*/
private static class Task extends GridGgfsTask<String, IgniteBiTuple<Long, Integer>> {
/** {@inheritDoc} */
- @Override public GridGgfsJob createJob(IgniteFsPath path, GridGgfsFileRange range,
+ @Override public IgniteFsJob createJob(IgniteFsPath path, IgniteFsFileRange range,
GridGgfsTaskArgs<String> args) throws GridException {
return new Job();
}
@@ -256,7 +256,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest {
/**
* Job.
*/
- private static class Job implements GridGgfsJob, Serializable {
+ private static class Job implements IgniteFsJob, Serializable {
@IgniteInstanceResource
private Ignite ignite;
@@ -267,7 +267,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest {
private ComputeJobContext ctx;
/** {@inheritDoc} */
- @Override public Object execute(IgniteFs ggfs, GridGgfsFileRange range, IgniteFsInputStream in)
+ @Override public Object execute(IgniteFs ggfs, IgniteFsFileRange range, IgniteFsInputStream in)
throws GridException, IOException {
assert ignite != null;
assert ses != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
index 9199576..afa008d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
@@ -173,7 +173,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe
* @param len Length.
* @return Split.
*/
- protected GridGgfsFileRange split(long start, long len) {
- return new GridGgfsFileRange(FILE, start, len);
+ protected IgniteFsFileRange split(long start, long len) {
+ return new IgniteFsFileRange(FILE, start, len);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java
index 3ae1929..b88ccc2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java
@@ -280,7 +280,7 @@ public class GridGgfsByteDelimiterRecordResolverSelfTest extends GridGgfsAbstrac
GridGgfsByteDelimiterRecordResolver rslvr = resolver(delims);
- GridGgfsFileRange split;
+ IgniteFsFileRange split;
try (IgniteFsInputStream is = read()) {
split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
@@ -306,7 +306,7 @@ public class GridGgfsByteDelimiterRecordResolverSelfTest extends GridGgfsAbstrac
GridGgfsByteDelimiterRecordResolver rslvr = resolver(delims);
- GridGgfsFileRange split;
+ IgniteFsFileRange split;
try (IgniteFsInputStream is = read()) {
split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java
index 7170831..287e119 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java
@@ -92,7 +92,7 @@ public class GridGgfsFixedLengthRecordResolverSelfTest extends GridGgfsAbstractR
GridGgfsFixedLengthRecordResolver rslvr = resolver(len);
- GridGgfsFileRange split;
+ IgniteFsFileRange split;
try (IgniteFsInputStream is = read()) {
split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
@@ -118,7 +118,7 @@ public class GridGgfsFixedLengthRecordResolverSelfTest extends GridGgfsAbstractR
GridGgfsFixedLengthRecordResolver rslvr = resolver(len);
- GridGgfsFileRange split;
+ IgniteFsFileRange split;
try (IgniteFsInputStream is = read()) {
split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java
index 7ed1a6a..49328bb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java
@@ -76,7 +76,7 @@ public class GridGgfsNewLineDelimiterRecordResolverSelfTest extends GridGgfsAbst
GridGgfsNewLineRecordResolver rslvr = resolver();
- GridGgfsFileRange split;
+ IgniteFsFileRange split;
try (IgniteFsInputStream is = read()) {
split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
@@ -101,7 +101,7 @@ public class GridGgfsNewLineDelimiterRecordResolverSelfTest extends GridGgfsAbst
GridGgfsNewLineRecordResolver rslvr = resolver();
- GridGgfsFileRange split;
+ IgniteFsFileRange split;
try (IgniteFsInputStream is = read()) {
split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7479ede/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java
index b9e0f7a..bf31792 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java
@@ -82,7 +82,7 @@ public class GridGgfsStringDelimiterRecordResolverSelfTest extends GridGgfsAbstr
GridGgfsByteDelimiterRecordResolver rslvr = resolver(delims);
- GridGgfsFileRange split;
+ IgniteFsFileRange split;
try (IgniteFsInputStream is = read()) {
split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
@@ -108,7 +108,7 @@ public class GridGgfsStringDelimiterRecordResolverSelfTest extends GridGgfsAbstr
GridGgfsStringDelimiterRecordResolver rslvr = resolver(delims);
- GridGgfsFileRange split;
+ IgniteFsFileRange split;
try (IgniteFsInputStream is = read()) {
split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));