You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/01/23 09:31:50 UTC
[03/50] [abbrv] incubator-kylin git commit: fix test data issue
fix test data issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/dc83c0a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/dc83c0a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/dc83c0a1
Branch: refs/heads/inverted-index
Commit: dc83c0a16f475344553f60518f304033b7949a88
Parents: 43c4f98
Author: qianhao.zhou <qi...@ebay.com>
Authored: Wed Jan 21 17:41:40 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Wed Jan 21 17:41:40 2015 +0800
----------------------------------------------------------------------
examples/test_case_data/localmeta/project/default.json | 2 +-
examples/test_case_data/localmeta/project/onlyinner.json | 2 +-
examples/test_case_data/localmeta/project/onlyleft.json | 2 +-
server/src/main/java/com/kylinolap/rest/service/JobService.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/dc83c0a1/examples/test_case_data/localmeta/project/default.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/project/default.json b/examples/test_case_data/localmeta/project/default.json
index 730aa9e..b7cfa83 100644
--- a/examples/test_case_data/localmeta/project/default.json
+++ b/examples/test_case_data/localmeta/project/default.json
@@ -1,7 +1,7 @@
{
"uuid" : "1eaca32a-a33e-4b69-83dd-0bb8b1f8c91b",
"name": "default",
- "datamodels": [
+ "realizations": [
{
"name": "test_kylin_with_slr_model_desc",
"type": "CUBE",
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/dc83c0a1/examples/test_case_data/localmeta/project/onlyinner.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/project/onlyinner.json b/examples/test_case_data/localmeta/project/onlyinner.json
index daf138a..b98d762 100644
--- a/examples/test_case_data/localmeta/project/onlyinner.json
+++ b/examples/test_case_data/localmeta/project/onlyinner.json
@@ -1,7 +1,7 @@
{
"uuid" : "1eaca32a-a33e-4b69-83dd-0bb8b1f8c92b",
"name": "onlyinner",
- "datamodels": [
+ "realizations": [
{
"name": "test_kylin_with_slr_model_desc",
"type": "CUBE",
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/dc83c0a1/examples/test_case_data/localmeta/project/onlyleft.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/project/onlyleft.json b/examples/test_case_data/localmeta/project/onlyleft.json
index c37b31b..9569eea 100644
--- a/examples/test_case_data/localmeta/project/onlyleft.json
+++ b/examples/test_case_data/localmeta/project/onlyleft.json
@@ -1,7 +1,7 @@
{
"uuid" : "1eaca32a-a33e-4b69-83dd-0bb8b1f8c93b",
"name": "onlyleft",
- "datamodels": [
+ "realizations": [
{
"name": "test_kylin_with_slr_left_join_model_desc",
"type": "CUBE",
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/dc83c0a1/server/src/main/java/com/kylinolap/rest/service/JobService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/com/kylinolap/rest/service/JobService.java b/server/src/main/java/com/kylinolap/rest/service/JobService.java
index f6e8ba0..f521d10 100644
--- a/server/src/main/java/com/kylinolap/rest/service/JobService.java
+++ b/server/src/main/java/com/kylinolap/rest/service/JobService.java
@@ -172,7 +172,7 @@ public class JobService extends BasicService {
result.setType(CubeBuildTypeEnum.BUILD);
result.setStatus(parseToJobStatus(job.getStatus()));
result.setMrWaiting(cubeJob.getMapReduceWaitTime());
- result.setDuration(cubeJob.getDuration());
+ result.setDuration(cubeJob.getDuration() / 1000);
for (int i = 0; i < cubeJob.getTasks().size(); ++i) {
AbstractExecutable task = cubeJob.getTasks().get(i);
result.addStep(parseToJobStep(task, i));