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/14 01:00:41 UTC
[06/50] [abbrv] incubator-kylin git commit: Merge branch
'streaming-localdict' of https://github.com/KylinOLAP/Kylin into
streaming-localdict
Merge branch 'streaming-localdict' of https://github.com/KylinOLAP/Kylin into streaming-localdict
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/bb7bd843
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/bb7bd843
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/bb7bd843
Branch: refs/heads/streaming-localdict
Commit: bb7bd843a523e009fb2fbadec4ea3dd5100d2041
Parents: 2209fde 132b0ca
Author: Li, Yang <ya...@ebay.com>
Authored: Tue Mar 10 16:57:34 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Tue Mar 10 16:57:34 2015 +0800
----------------------------------------------------------------------
.../test_kylin_ii_inner_join_desc.json | 4 +-
.../test_kylin_ii_left_join_desc.json | 4 +-
.../invertedindex/index/TableRecordInfo.java | 1 +
.../kylin/invertedindex/model/IIDesc.java | 2 +
job/pom.xml | 6 +
.../kylin/job/execution/AbstractExecutable.java | 10 +-
.../apache/kylin/streaming/StreamBuilder.java | 41 ++++--
.../invertedindex/IIStreamBuilder.java | 43 +++---
webapp/app/js/controllers/cubeAdvanceSetting.js | 1 +
webapp/app/js/controllers/cubeDimensions.js | 1 -
webapp/app/js/controllers/cubeModel.js | 21 +--
webapp/app/js/filters/filter.js | 1 +
webapp/app/less/component.less | 17 +--
.../cubeDesigner/advanced_settings.html | 141 ++++++++++---------
.../app/partials/cubeDesigner/data_model.html | 12 +-
.../app/partials/cubeDesigner/dimensions.html | 2 +-
webapp/app/partials/cubes/cube_schema.html | 2 +-
17 files changed, 177 insertions(+), 132 deletions(-)
----------------------------------------------------------------------