kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From luke...@apache.org
Subject [01/50] [abbrv] incubator-kylin git commit: fix compile error
Date Thu, 15 Jan 2015 12:26:17 GMT
Repository: incubator-kylin
Updated Branches:
  refs/heads/inverted-index [created] cdb0cb9b4
  refs/heads/master 5f47109bb -> f9390271f
  refs/heads/staging [created] e99408647
Updated Tags:  refs/tags/kylin-0.6.3 [created] d0efb30d1
  refs/tags/v0.6.1 [created] 9a7a805eb
  refs/tags/v0.6.1_mysql_auth [created] e7d896357
  refs/tags/v0.6.2 [created] cb565d86e
  refs/tags/v0.6.4 [created] 494f47234


fix compile error


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/c6cd9f7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/c6cd9f7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/c6cd9f7d

Branch: refs/heads/inverted-index
Commit: c6cd9f7d7c082fb1e1cb0717503bd441cbeda75c
Parents: 81becc1
Author: Li, Yang <yangli9@ebay.com>
Authored: Mon Jan 12 18:06:12 2015 +0800
Committer: Li, Yang <yangli9@ebay.com>
Committed: Mon Jan 12 18:06:12 2015 +0800

----------------------------------------------------------------------
 job/src/main/java/com/kylinolap/job/JobInstance.java    |  2 --
 .../kylinolap/rest/controller/JobControllerTest.java    | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c6cd9f7d/job/src/main/java/com/kylinolap/job/JobInstance.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/com/kylinolap/job/JobInstance.java b/job/src/main/java/com/kylinolap/job/JobInstance.java
index ca6d78c..7da51e4 100644
--- a/job/src/main/java/com/kylinolap/job/JobInstance.java
+++ b/job/src/main/java/com/kylinolap/job/JobInstance.java
@@ -17,7 +17,6 @@ package com.kylinolap.job;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
@@ -33,7 +32,6 @@ import com.kylinolap.job.constant.JobStatusEnum;
 import com.kylinolap.job.constant.JobStepCmdTypeEnum;
 import com.kylinolap.job.constant.JobStepStatusEnum;
 import com.kylinolap.job.engine.JobEngineConfig;
-import org.apache.hadoop.mapred.JobStatus;
 
 @JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility
= Visibility.NONE, setterVisibility = Visibility.NONE)
 public class JobInstance extends RootPersistentEntity implements Comparable<JobInstance>
{

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c6cd9f7d/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java b/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java
index a4323ed..e13491f 100644
--- a/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java
+++ b/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.Map;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -33,8 +32,9 @@ import com.kylinolap.cube.CubeDescManager;
 import com.kylinolap.cube.CubeInstance;
 import com.kylinolap.cube.CubeManager;
 import com.kylinolap.cube.model.CubeDesc;
-import com.kylinolap.job.JobDAO;
 import com.kylinolap.job.JobInstance;
+import com.kylinolap.job.dao.JobDao;
+import com.kylinolap.job.exception.PersistentException;
 import com.kylinolap.rest.request.JobBuildRequest;
 import com.kylinolap.rest.request.JobListRequest;
 import com.kylinolap.rest.service.CubeService;
@@ -57,7 +57,7 @@ public class JobControllerTest extends ServiceTestBase {
 
     private CubeManager cubeManager;
     private CubeDescManager cubeDescManager;
-    private JobDAO jobDAO;
+    private JobDao jobDAO;
 
     @Before
     public void setup() throws Exception {
@@ -72,7 +72,7 @@ public class JobControllerTest extends ServiceTestBase {
         cubeManager = CubeManager.getInstance(testConfig);
         cubeDescManager = CubeDescManager.getInstance(testConfig);
 
-        jobDAO = JobDAO.getInstance(testConfig);
+        jobDAO = JobDao.getInstance(testConfig);
 
     }
 
@@ -84,7 +84,7 @@ public class JobControllerTest extends ServiceTestBase {
     }
 
     @Test
-    public void testBasics() throws IOException {
+    public void testBasics() throws IOException, PersistentException {
         CubeDesc cubeDesc = cubeDescManager.getCubeDesc("test_kylin_cube_with_slr_left_join_desc");
         CubeInstance cube = cubeManager.createCube(CUBE_NAME, "DEFAULT", cubeDesc, "test");
         assertNotNull(cube);
@@ -99,7 +99,7 @@ public class JobControllerTest extends ServiceTestBase {
         JobInstance job = cubeController.rebuild(CUBE_NAME, jobBuildRequest);
 
         Assert.assertNotNull(jobSchedulerController.get(job.getId()));
-        jobDAO.deleteJob(job);
+        jobDAO.deleteJob(job.getId());
         if (cubeManager.getCube(CUBE_NAME) != null) {
             cubeManager.dropCube(CUBE_NAME, false);
         }


Mime
View raw message