From c2832337ffdbadbdd31f6e098ace4e35c15a891a Mon Sep 17 00:00:00 2001
From: qhzhou <qianzhou@ebay.com>
Date: Mon, 17 Nov 2014 10:07:36 +0800
Subject: [PATCH 1/2] fix compile error

---
 job/src/main/java/com/kylinolap/job/JobDAO.java      | 7 +------
 job/src/main/java/com/kylinolap/job/JobInstance.java | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/job/src/main/java/com/kylinolap/job/JobDAO.java b/job/src/main/java/com/kylinolap/job/JobDAO.java
index 19b7c7c..7c6a2ed 100644
--- a/job/src/main/java/com/kylinolap/job/JobDAO.java
+++ b/job/src/main/java/com/kylinolap/job/JobDAO.java
@@ -162,10 +162,8 @@ public void deleteJob(String uuid) throws IOException {
     }
 
     public void updateJobInstance(JobInstance jobInstance) throws IOException {
-        JobInstance updatedJob = null;
-
         try {
-            updatedJob = getJob(jobInstance.getUuid());
+            JobInstance updatedJob = getJob(jobInstance.getUuid());
             if (updatedJob == null) {
                 saveJob(jobInstance);
                 return;
@@ -181,9 +179,6 @@ public void updateJobInstance(JobInstance jobInstance) throws IOException {
 
             updatedJob.clearSteps();
             updatedJob.addSteps(jobInstance.getSteps());
-//            for (int i = 0; i < jobInstance.getSteps().size(); i++) {
-//                updatedJob.addSteps(i, jobInstance.getSteps().get(i));
-//            }
 
             saveJob(updatedJob);
         } catch (IOException e) {
diff --git a/job/src/main/java/com/kylinolap/job/JobInstance.java b/job/src/main/java/com/kylinolap/job/JobInstance.java
index 7f270f4..808bc67 100644
--- a/job/src/main/java/com/kylinolap/job/JobInstance.java
+++ b/job/src/main/java/com/kylinolap/job/JobInstance.java
@@ -224,7 +224,7 @@ public void setMrWaiting(long mrWaiting) {
         this.mrWaiting = mrWaiting;
     }
 
-    List<JobStep> getSteps() {
+    public List<JobStep> getSteps() {
         if (steps == null) {
             steps = Lists.newArrayList();
         }

From 0adbcd84e0f501d2066885fb4f7d31785fcd9da7 Mon Sep 17 00:00:00 2001
From: qhzhou <qianzhou@ebay.com>
Date: Mon, 17 Nov 2014 10:11:02 +0800
Subject: [PATCH 2/2] fix naming issue

---
 job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java b/job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java
index b995619..bb73f1c 100644
--- a/job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java
+++ b/job/src/main/java/com/kylinolap/job/JobInstanceBuilder.java
@@ -16,11 +16,9 @@
 package com.kylinolap.job;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 
 import com.google.common.collect.Lists;
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,9 +62,9 @@ public JobInstanceBuilder(JobEngineConfig engineCfg) {
         init(jobInstance);
         switch (jobInstance.getType()) {
         case BUILD:
-            return buildCreateBuildCubeSegmentSteps(jobInstance);
+            return createBuildCubeSegmentSteps(jobInstance);
         case MERGE:
-            return buildCreateMergeCubeSegmentsSteps(jobInstance);
+            return createMergeCubeSegmentsSteps(jobInstance);
         default:
             throw new IllegalArgumentException("job type:" + jobInstance.getType() + " not supported");
         }
@@ -145,7 +143,7 @@ private String getRowkeyDistributionOutputPath() {
         return jobWorkingDir + "/" + cubeName + "/rowkey_stats";
     }
 
-    private List<JobStep> buildCreateMergeCubeSegmentsSteps(JobInstance jobInstance) throws IOException {
+    private List<JobStep> createMergeCubeSegmentsSteps(JobInstance jobInstance) throws IOException {
 
         if (cube.getMergingSegments() == null || cube.getMergingSegments().size() < 2) {
             throw new IllegalArgumentException("Merging segments count should be more than 2");
@@ -187,7 +185,7 @@ private String getRowkeyDistributionOutputPath() {
         return result;
     }
 
-    private List<JobStep> buildCreateBuildCubeSegmentSteps(JobInstance jobInstance) throws IOException {
+    private List<JobStep> createBuildCubeSegmentSteps(JobInstance jobInstance) throws IOException {
 
         // clear existing steps
 //        jobInstance.clearSteps();