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 2015/06/23 09:56:38 UTC
incubator-ignite git commit: # 980: cleanup
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-980 7a836d1ac -> 72f09295d
# 980: cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72f09295
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72f09295
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72f09295
Branch: refs/heads/ignite-980
Commit: 72f09295d6b0b3e5db8577b4e127badf22a14729
Parents: 7a836d1
Author: iveselovskiy <iv...@gridgain.com>
Authored: Tue Jun 23 10:56:19 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Tue Jun 23 10:56:19 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/processors/hadoop/HadoopJobInfo.java | 1 -
.../ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java | 1 +
.../ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java | 2 ++
.../apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java | 4 ----
4 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72f09295/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
index 5876262..b56d3d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
@@ -21,7 +21,6 @@ import org.apache.ignite.*;
import org.jetbrains.annotations.*;
import java.io.*;
-import java.util.*;
/**
* Compact job description.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72f09295/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
index b9232c9..f76b354 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
@@ -55,6 +55,7 @@ public class IgniteHadoopFileSystemCounterWriter implements HadoopCounterWriter
Configuration hadoopCfg = HadoopUtils.safeCreateConfiguration();
final HadoopJobInfo jobInfo = job.info();
+
final HadoopJobId jobId = job.id();
for (Map.Entry<String, String> e : ((HadoopDefaultJobInfo)jobInfo).properties().entrySet())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72f09295/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java
index a5f9913..d8cb3ae 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultJobInfo.java
@@ -80,6 +80,8 @@ public class HadoopDefaultJobInfo implements HadoopJobInfo, Externalizable {
/** {@inheritDoc} */
@Override public HadoopJob createJob(Class<? extends HadoopJob> jobCls0,
HadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException {
+ assert jobCls0 != null;
+
try {
Constructor<? extends HadoopJob> constructor = jobCls0.getConstructor(HadoopJobId.class,
HadoopDefaultJobInfo.class, IgniteLogger.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72f09295/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
index d1765a8..0defd93 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
@@ -97,14 +97,10 @@ public class HadoopV2Job implements HadoopJob {
*/
public HadoopV2Job(HadoopJobId jobId, final HadoopDefaultJobInfo jobInfo, IgniteLogger log) {
assert jobId != null;
- //assert locNodeId != null;
assert jobInfo != null;
this.jobId = jobId;
this.jobInfo = jobInfo;
- //this.locNodeId = locNodeId;
-
- //assert ((HadoopClassLoader)getClass().getClassLoader()).name().equals(HadoopClassLoader.nameForJob(locNodeId));
hadoopJobID = new JobID(jobId.globalId().toString(), jobId.localId());