# IGNITE-386: Fixes after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e3a1d73c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e3a1d73c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e3a1d73c Branch: refs/heads/ignite-386 Commit: e3a1d73cfe30fa4f82a39ca5edd87241420c18ae Parents: 7c1b61f Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Mar 4 17:57:37 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Mar 4 17:57:37 2015 +0300 ---------------------------------------------------------------------- .../ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java | 7 +++---- .../apache/ignite/hadoop/fs/v1/IgniteHadoopFileSystem.java | 2 +- .../apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3a1d73c/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java index 26159d5..98f2e46 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java @@ -24,11 +24,11 @@ import org.apache.hadoop.ipc.*; import org.apache.ignite.*; import org.apache.ignite.igfs.*; import org.apache.ignite.igfs.secondary.*; +import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.processors.hadoop.igfs.*; import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; -import static org.apache.ignite.internal.processors.igfs.IgfsEx.*; import java.io.*; import java.net.*; @@ -37,8 +37,7 @@ import java.util.*; import static org.apache.ignite.internal.processors.igfs.IgfsEx.*; /** - * Adapter to use any Hadoop file system {@link org.apache.hadoop.fs.FileSystem} as - * {@link org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem}. + * Adapter to use any Hadoop file system {@link FileSystem} as {@link IgfsSecondaryFileSystem}. */ public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem, AutoCloseable { @@ -54,7 +53,7 @@ public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSys * @param uri URI of file system. * @throws IgniteCheckedException In case of error. */ - public IgfsHadoopFileSystemWrapper(String uri) throws IgniteCheckedException { + public IgniteHadoopIgfsSecondaryFileSystem(String uri) throws IgniteCheckedException { this(uri, null); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3a1d73c/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v1/IgniteHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v1/IgniteHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v1/IgniteHadoopFileSystem.java index 305d85a..93c0df4 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v1/IgniteHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v1/IgniteHadoopFileSystem.java @@ -25,9 +25,9 @@ import org.apache.hadoop.hdfs.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; -import org.apache.ignite.hadoop.fs.*; import org.apache.ignite.igfs.*; import org.apache.ignite.internal.igfs.common.*; +import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.processors.hadoop.igfs.*; import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3a1d73c/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java index 6500fb4..70ad99f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v2/IgniteHadoopFileSystem.java @@ -25,9 +25,9 @@ import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; -import org.apache.ignite.hadoop.fs.*; import org.apache.ignite.igfs.*; import org.apache.ignite.internal.igfs.common.*; +import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.processors.hadoop.igfs.*; import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; @@ -202,6 +202,7 @@ public class IgniteHadoopFileSystem extends AbstractFileSystem implements Closea * @param cfg Configuration passed to constructor. * @throws IOException If initialization failed. */ + @SuppressWarnings("ConstantConditions") private void initialize(URI name, Configuration cfg) throws IOException { enterBusy();
