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/09/06 09:39:09 UTC

[03/50] [abbrv] 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/87c4c394
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/87c4c394
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/87c4c394

Branch: refs/heads/master
Commit: 87c4c3947fb5528e6d29388c5ea050d26a0b94b8
Parents: 8a0bcdc 7e9d3ae
Author: shaofengshi <sh...@apache.org>
Authored: Tue Aug 11 12:36:53 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Aug 11 12:36:53 2015 +0800

----------------------------------------------------------------------
 .../common/util/HBaseMetadataTestCase.java      |   6 +
 .../kylin/cube/CubeSizeEstimationCLITest.java   | 111 -----
 .../kylin/cube/kv/RowValueDecoderTest.java      |  11 +-
 .../test_kylin_cube_with_slr_desc.json          | 384 +++++++++-------
 ...test_kylin_cube_with_slr_left_join_desc.json | 384 +++++++++-------
 .../test_kylin_cube_without_slr_desc.json       | 457 +++++++++++--------
 ...t_kylin_cube_without_slr_left_join_desc.json | 457 +++++++++++--------
 .../localmeta/data/data_gen_config.json         |  48 +-
 .../table/DEFAULT.TEST_KYLIN_FACT.json          |   2 +-
 .../kylin/invertedindex/model/IIDesc.java       |   2 +-
 .../kylin/job/common/MapReduceExecutable.java   |   5 +
 .../kylin/job/constant/JobStepStatusEnum.java   |   2 +-
 .../kylin/job/tools/HadoopStatusChecker.java    |   2 +-
 .../java/org/apache/kylin/job/DataGenTest.java  |   1 -
 .../kylin/metadata/project/ProjectL2Cache.java  |   9 +-
 .../kylin/metadata/project/ProjectManager.java  |   4 +-
 .../kylin/query/relnode/OLAPAggregateRel.java   |   4 +-
 .../apache/kylin/query/schema/OLAPTable.java    |  29 +-
 .../apache/kylin/query/test/IIQueryTest.java    |   5 +-
 query/src/test/resources/query/sql/query00.sql  |   2 +-
 query/src/test/resources/query/sql/query10.sql  |   2 +-
 query/src/test/resources/query/sql/query20.sql  |   2 +-
 query/src/test/resources/query/sql/query30.sql  |   2 +-
 query/src/test/resources/query/sql/query40.sql  |   2 +-
 query/src/test/resources/query/sql/query50.sql  |   2 +-
 query/src/test/resources/query/sql/query60.sql  |   2 +-
 query/src/test/resources/query/sql/query70.sql  |   2 +-
 query/src/test/resources/query/sql/query80.sql  |   2 +-
 .../src/test/resources/query/sql_ii/query04.sql |   2 +-
 .../src/test/resources/query/sql_ii/query08.sql |   2 +-
 .../endpoint/EndpointTupleIterator.java         |   3 +-
 31 files changed, 1095 insertions(+), 853 deletions(-)
----------------------------------------------------------------------