You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/15 17:12:34 UTC
[1/2] ignite git commit: Finalize.
Repository: ignite
Updated Branches:
refs/heads/ignite-3909 a6ed71b2b -> c1e35015e
Finalize.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c8e003b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c8e003b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c8e003b
Branch: refs/heads/ignite-3909
Commit: 4c8e003bf257b5ebbfda68881d29aa4f82ab6a94
Parents: a6ed71b
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 15 19:39:25 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 15 19:39:25 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/hadoop/HadoopClassLoader.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c8e003b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
index 4cc3aa4..c8f2835 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
@@ -375,8 +375,6 @@ public class HadoopClassLoader extends URLClassLoader implements ClassCache {
if (res != null)
return res;
- System.out.println(">>> EXT: " + clsName);
-
// Try to get from parent to check if the type accessible.
InputStream in = loadClassBytes(getParent(), clsName);
@@ -389,10 +387,8 @@ public class HadoopClassLoader extends URLClassLoader implements ClassCache {
rdr = new ClassReader(in);
}
catch (Exception e) {
- System.out.println(">>> ERR: " + clsName);
-
+ // Most probably we tried to load a class from rt.jar, so ignore.
return false;
- //throw new RuntimeException("Failed to read class: " + clsName, e);
}
ctx.visited.add(clsName);
[2/2] ignite git commit: Reverting accidental error.
Posted by vo...@apache.org.
Reverting accidental error.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1e35015
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1e35015
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1e35015
Branch: refs/heads/ignite-3909
Commit: c1e35015e0d91f1c57b1385d78ce6b76aa04e58c
Parents: 4c8e003
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 15 20:12:09 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 15 20:12:09 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/processors/hadoop/HadoopUtils.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1e35015/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 6d3866b..65d9810 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
@@ -277,9 +277,6 @@ public class HadoopUtils {
for (Map.Entry<String, String> entry : jobConf)
props.put(entry.getKey(), entry.getValue());
- props.put("fs.defaultFS", "dummy:///test/");
- props.put("fs.dummy.impl", "com.mapr.DummyFileSystem");
-
return new HadoopDefaultJobInfo(jobConf.getJobName(), jobConf.getUser(), hasCombiner, numReduces, props);
}