# IGNITE-218: Review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0fa49ed2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0fa49ed2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0fa49ed2 Branch: refs/heads/ignite-218 Commit: 0fa49ed286e140def9c194324ffb1ca2c4413b3a Parents: 819299c Author: vozerov-gridgain <voze...@gridgain.com> Authored: Thu Jun 4 15:35:03 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Jun 4 15:35:03 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/hadoop/HadoopUtils.java | 18 ++++++++++++------ .../hadoop/v2/HadoopV2JobResourceManager.java | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0fa49ed2/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java index 94f1647..d419915 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java @@ -29,6 +29,7 @@ import org.apache.ignite.*; import org.apache.ignite.hadoop.fs.v1.*; import org.apache.ignite.internal.processors.hadoop.fs.*; import org.apache.ignite.internal.processors.hadoop.v2.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -77,6 +78,7 @@ public class HadoopUtils { String prop = HadoopUtils.disableFsCachePropertyName(scheme); + // TODO: Copy configuration instead of altering existing one. key.configuration().setBoolean(prop, true); return FileSystem.get(uri, key.configuration(), key.user()); @@ -472,11 +474,17 @@ public class HadoopUtils { * Creates String key used for equality and hashing. */ private String createEqualityKey() { - String scheme = uri.getScheme() == null ? "" : uri.getScheme().toLowerCase(); + GridStringBuilder sb = new GridStringBuilder("(").a(usr).a(")@"); - String authority = uri.getAuthority() == null ? "" : uri.getAuthority().toLowerCase(); + if (uri.getScheme() != null) + sb.a(uri.getScheme().toLowerCase()); - return "(" + usr + ")@" + scheme + "://" + authority; + sb.a("://"); + + if (uri.getAuthority() != null) + sb.a(uri.getAuthority().toLowerCase()); + + return sb.toString(); } /** @@ -568,9 +576,7 @@ public class HadoopUtils { if (authority == null) { URI dfltUri = FileSystem.getDefaultUri(cfg); - if (scheme == null || - (scheme.equals(dfltUri.getScheme()) - && dfltUri.getAuthority() != null)) + if (scheme == null || (scheme.equals(dfltUri.getScheme()) && dfltUri.getAuthority() != null)) return dfltUri; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0fa49ed2/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java index 6e2764b..d34d250 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java @@ -84,6 +84,7 @@ public class HadoopV2JobResourceManager { try { cfg.set(HadoopFileSystemsUtils.LOC_FS_WORK_DIR_PROP, dir.getAbsolutePath()); + // TODO: Make constant. String prop = HadoopUtils.disableFsCachePropertyName("file"); if (!cfg.getBoolean(prop, false))
