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/03/03 11:07:59 UTC
[03/26] incubator-kylin git commit: Merge branch 'streaming' of
https://github.com/KylinOLAP/Kylin into streaming
Merge branch 'streaming' of https://github.com/KylinOLAP/Kylin into streaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/7f1abe08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7f1abe08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7f1abe08
Branch: refs/heads/streaming
Commit: 7f1abe081d8152fcefc8a6a7030ac26b31ebcc4b
Parents: 1c0719e aa49da3
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Fri Feb 27 14:25:40 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Fri Feb 27 14:25:40 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/common/KylinConfig.java | 10 +-
.../org/apache/kylin/common/util/ClassUtil.java | 53 ++++++++
.../apache/kylin/common/util/ClasspathUtil.java | 45 -------
.../common/persistence/ResourceToolTest.java | 4 +-
.../common/util/AbstractKylinTestCase.java | 6 +-
.../kylin/common/util/BasicHadoopTest.java | 2 +-
.../common/util/HBaseMetadataTestCase.java | 2 +-
.../common/util/LocalFileMetadataTestCase.java | 4 +-
.../kylin/dict/DictionaryInfoSerializer.java | 3 +-
.../org/apache/kylin/dict/TrieDictionary.java | 3 +-
.../main/java/org/apache/kylin/dict/Util.java | 44 -------
.../apache/kylin/job/CubeMetadataUpgrade.java | 2 +-
.../kylin/job/common/HadoopShellExecutable.java | 5 +-
.../kylin/job/common/MapReduceExecutable.java | 35 +++---
.../kylin/job/engine/JobEngineConfig.java | 2 +-
.../kylin/job/hadoop/AbstractHadoopJob.java | 2 +-
.../kylin/job/manager/ExecutableManager.java | 28 +++--
.../kylin/job/BuildCubeWithEngineTest.java | 6 +-
.../apache/kylin/job/BuildIIWithEngineTest.java | 4 +-
.../org/apache/kylin/job/ExportHBaseData.java | 2 +-
.../org/apache/kylin/job/ImportHBaseData.java | 2 +-
.../apache/kylin/job/SampleCubeSetupTest.java | 4 +-
.../kylin/job/tools/CubeMigrationTests.java | 4 +-
.../java/org/apache/kylin/rest/DebugTomcat.java | 2 +-
webapp/app/js/controllers/cubeEdit.js | 17 +--
webapp/app/js/controllers/cubeSchema.js | 2 +-
webapp/app/js/controllers/cubes.js | 122 ++++++++++---------
webapp/app/js/model/cubeListModel.js | 0
webapp/app/js/model/jobListModel.js | 2 +-
.../app/partials/cubeDesigner/incremental.html | 2 +-
webapp/app/partials/cubeDesigner/measures.html | 2 +-
webapp/grunt.json | 4 +-
32 files changed, 201 insertions(+), 224 deletions(-)
----------------------------------------------------------------------