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:01:25 UTC
[12/50] 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/cebff400
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/cebff400
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/cebff400
Branch: refs/heads/streaming
Commit: cebff400a0ac9e9b57a9ea3b2a4e72efccd6baf7
Parents: b093bd5 c3c47db
Author: Li, Yang <ya...@ebay.com>
Authored: Fri Mar 6 18:16:34 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Fri Mar 6 18:16:34 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/cube/CubeInstance.java | 11 +++
.../org/apache/kylin/cube/CubeSegmentsTest.java | 4 +-
.../apache/kylin/cube/cuboid/CuboidTest.java | 13 ---
.../apache/kylin/dict/HiveTableReaderTest.java | 2 +-
.../hybrid/test_kylin_hybrid_left_join.json | 4 +-
.../invertedindex/test_kylin_ii_left_join.json | 4 +-
.../test_kylin_ii_left_join_desc.json | 4 +-
.../test_kylin_inner_join_model_desc.json | 59 +++++++++++++
.../test_kylin_left_join_model_desc.json | 59 +++++++++++++
.../invertedindex/index/TableRecordInfo.java | 30 -------
.../kylin/invertedindex/model/IIDesc.java | 19 ++--
.../kylin/invertedindex/model/IIDimension.java | 69 ---------------
.../invertedindex/IIDescManagerTest.java | 2 +-
.../invertedindex/invertedindex/IIDescTest.java | 4 +-
.../invertedindex/IIInstanceTest.java | 4 +-
.../invertedindex/InvertedIndexLocalTest.java | 2 +-
.../kylin/job/BuildCubeWithEngineTest.java | 22 ++---
.../apache/kylin/job/BuildIIWithEngineTest.java | 93 +++++++++++---------
.../kylin/job/dataGen/FactTableGenerator.java | 2 -
.../kylin/metadata/model/DataModelDesc.java | 20 ++++-
.../kylin/metadata/model/DimensionDesc.java | 69 +++++++++++++++
.../kylin/metadata/project/ProjectL2Cache.java | 3 +
.../realization/RealizationRegistry.java | 1 +
.../kylin/metadata/MetadataManagerTest.java | 19 ++--
pom.xml | 4 +
.../kylin/query/enumerator/CubeEnumerator.java | 15 +++-
.../apache/kylin/query/routing/RoutingRule.java | 1 -
.../RoutingRules/RealizationSortRule.java | 20 ++---
.../kylin/query/test/CombinationTest.java | 13 ++-
.../apache/kylin/query/test/IIQueryTest.java | 28 ++++--
.../apache/kylin/query/test/KylinQueryTest.java | 55 ++++--------
.../apache/kylin/query/test/KylinTestBase.java | 2 +-
query/src/test/resources/query/sql/query09.sql | 8 +-
query/src/test/resources/query/sql/query10.sql | 8 +-
query/src/test/resources/query/sql/query11.sql | 8 +-
query/src/test/resources/query/sql/query12.sql | 8 +-
query/src/test/resources/query/sql/query13.sql | 8 +-
query/src/test/resources/query/sql/query14.sql | 11 +--
query/src/test/resources/query/sql/query15.sql | 10 ++-
query/src/test/resources/query/sql/query16.sql | 11 +--
query/src/test/resources/query/sql/query17.sql | 10 ++-
query/src/test/resources/query/sql/query18.sql | 10 ++-
query/src/test/resources/query/sql/query19.sql | 10 ++-
query/src/test/resources/query/sql/query20.sql | 10 ++-
query/src/test/resources/query/sql/query42.sql | 8 +-
query/src/test/resources/query/sql/query43.sql | 8 +-
query/src/test/resources/query/sql/query44.sql | 9 +-
query/src/test/resources/query/sql/query50.sql | 8 +-
query/src/test/resources/query/sql/query51.sql | 8 +-
query/src/test/resources/query/sql/query54.sql | 8 +-
query/src/test/resources/query/sql/query56.sql | 6 +-
query/src/test/resources/query/sql/query57.sql | 6 +-
query/src/test/resources/query/sql/query58.sql | 6 +-
query/src/test/resources/query/sql/query60.sql | 7 +-
query/src/test/resources/query/sql/query61.sql | 7 +-
query/src/test/resources/query/sql/query66.sql | 8 +-
query/src/test/resources/query/sql/query72.sql | 8 +-
.../resources/query/sql_derived/query05.sql | 7 +-
.../resources/query/sql_orderby/query01.sql | 8 +-
.../resources/query/sql_subquery/query00.sql | 7 +-
.../resources/query/sql_subquery/query01.sql | 7 +-
.../resources/query/sql_subquery/query03.sql | 15 +++-
.../resources/query/sql_subquery/query04.sql | 15 +++-
.../resources/query/sql_subquery/query05.sql | 9 ++
.../kylin/rest/service/CacheServiceTest.java | 6 +-
.../kylin/storage/hybrid/HybridInstance.java | 4 +
.../storage/hybrid/HybridStorageEngine.java | 79 +++++++----------
.../storage/hbase/InvertedIndexHBaseTest.java | 2 +-
.../endpoint/EndpointAggregationTest.java | 2 +-
.../endpoint/TableRecordInfoTest.java | 2 +-
.../kylin/storage/hybrid/HybridManagerTest.java | 2 +-
.../apache/kylin/storage/test/StorageTest.java | 2 +-
72 files changed, 629 insertions(+), 404 deletions(-)
----------------------------------------------------------------------