You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/04/20 04:39:34 UTC
[2/3] kylin git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/kylin
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/kylin
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/39becdcd
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/39becdcd
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/39becdcd
Branch: refs/heads/master
Commit: 39becdcd4a5678ab899ab85977ae0ffffc19e541
Parents: 209068b fbf2b38
Author: shaofengshi <sh...@apache.org>
Authored: Wed Apr 20 10:09:55 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Apr 20 10:09:55 2016 +0800
----------------------------------------------------------------------
README.md | 2 +-
.../apache/kylin/common/KylinConfigBase.java | 10 +-
.../kylin/cube/model/HBaseColumnFamilyDesc.java | 13 +
.../apache/kylin/gridtable/GTScanRequest.java | 3 +-
.../kylin/cube/common/RowKeySplitterTest.java | 6 +-
.../apache/kylin/cube/kv/RowKeyDecoderTest.java | 2 +-
.../apache/kylin/cube/kv/RowKeyEncoderTest.java | 3 +-
.../gridtable/AggregationCacheSpillTest.java | 4 +-
.../test_kylin_cube_with_slr_desc.json | 2 +-
...test_kylin_cube_with_slr_left_join_desc.json | 407 ++--
.../test_kylin_cube_without_slr_desc.json | 2 +-
.../invertedindex/InvertedIndexLocalTest.java | 7 +-
.../apache/kylin/query/ITMassInQueryTest.java | 31 +-
.../query/sql_massin_distinct/query01.sql | 31 +
pom.xml | 2 +-
.../storage/hbase/cube/v2/CubeStorageQuery.java | 2 +-
.../storage/hbase/steps/CubeHTableUtil.java | 9 +-
.../storage/hbase/util/CubeMigrationCLI.java | 3 +-
webapp/app/index.html | 3 +-
webapp/app/js/controllers/cubeEdit.js | 27 +-
webapp/app/js/controllers/cubeMeasures.js | 4 +-
webapp/app/js/controllers/cubeOverwriteProp.js | 71 +
webapp/app/js/controllers/cubeSchema.js | 49 +-
webapp/app/js/directives/select.js | 1926 ++++++++++++++++++
.../cubeDesigner/cubeOverwriteProp.html | 70 +
webapp/app/partials/cubeDesigner/measures.html | 16 +-
26 files changed, 2470 insertions(+), 235 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/39becdcd/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
----------------------------------------------------------------------