You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/07/20 05:39:12 UTC
[3/3] incubator-kylin git commit: Merge branch '0.7-staging' of
https://git-wip-us.apache.org/repos/asf/incubator-kylin into 0.7-staging
Merge branch '0.7-staging' of https://git-wip-us.apache.org/repos/asf/incubator-kylin into 0.7-staging
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/df020d7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/df020d7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/df020d7c
Branch: refs/heads/0.7-staging
Commit: df020d7c761cc502cccdd0c997619434d4c8b7ba
Parents: 655a658 87d316f
Author: Luke Han <lu...@apache.org>
Authored: Mon Jul 20 11:38:36 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Mon Jul 20 11:38:36 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/cube/CubeManager.java | 21 +++++++++++++++++---
.../org/apache/kylin/cube/CubeSegmentsTest.java | 6 +++---
.../apache/kylin/dict/DictionaryManager.java | 9 +++++++++
.../org/apache/kylin/dict/lookup/FileTable.java | 9 +++++++++
.../org/apache/kylin/dict/lookup/HiveTable.java | 5 +++++
.../apache/kylin/dict/lookup/ReadableTable.java | 3 +++
.../apache/kylin/dict/lookup/SnapshotTable.java | 5 +++++
.../kylin/job/cube/MergeDictionaryStep.java | 10 ++++++----
.../kylin/job/BuildCubeWithEngineTest.java | 4 ++++
.../job/hadoop/cube/MergeCuboidMapperTest.java | 2 +-
.../kylin/rest/controller/CubeController.java | 2 +-
.../kylin/rest/request/JobBuildRequest.java | 10 ++++++++++
.../apache/kylin/rest/service/JobService.java | 4 ++--
13 files changed, 76 insertions(+), 14 deletions(-)
----------------------------------------------------------------------