You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by nj...@apache.org on 2017/08/17 12:41:48 UTC
[20/23] kylin git commit: Merge with updated tag kylin-2.1.0
Merge with updated tag kylin-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b8f08430
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b8f08430
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b8f08430
Branch: refs/heads/yaho-cube-planner
Commit: b8f08430f37515bd7e55d7a3cdfea8f74e182e20
Parents: 43eb9d7 562dd17
Author: Zhong <nj...@apache.org>
Authored: Wed Aug 16 11:36:01 2017 +0800
Committer: Zhong <nj...@apache.org>
Committed: Wed Aug 16 11:36:01 2017 +0800
----------------------------------------------------------------------
.../apache/kylin/common/KylinConfigBase.java | 6 +-
.../org/apache/kylin/common/KylinVersion.java | 6 +-
.../org/apache/kylin/common/util/ClassUtil.java | 1 -
.../main/resources/kylin-defaults.properties | 2 +
.../apache/kylin/common/KylinVersionTest.java | 40 +++
.../java/org/apache/kylin/cube/CubeManager.java | 2 +-
.../org/apache/kylin/cube/cuboid/Cuboid.java | 2 +-
.../org/apache/kylin/cube/cuboid/CuboidCLI.java | 4 +-
.../kylin/cube/cuboid/CuboidScheduler.java | 266 +++----------------
.../cube/cuboid/DefaultCuboidScheduler.java | 260 ++++++++++++++++++
.../cube/inmemcubing/InMemCubeBuilder.java | 4 +-
.../org/apache/kylin/cube/model/CubeDesc.java | 36 +--
.../org/apache/kylin/cube/util/CubingUtils.java | 25 +-
.../kylin/cube/cuboid/CuboidSchedulerTest.java | 34 +--
.../apache/kylin/metadata/MetadataManager.java | 23 +-
.../kylin/metadata/model/TableExtDesc.java | 22 +-
.../kylin/metadata/MetadataManagerTest.java | 8 +-
.../gtrecord/GTCubeStorageQueryBase.java | 16 +-
.../kylin/engine/mr/common/CubeStatsReader.java | 2 +-
.../mr/steps/FactDistinctColumnsMapper.java | 2 +-
.../kylin/engine/mr/steps/NDCuboidMapper.java | 8 +-
.../engine/spark/KylinKryoRegistrator.java | 2 +-
.../apache/kylin/engine/spark/SparkCubing.java | 5 +-
.../kylin/engine/spark/SparkCubingByLayer.java | 29 +-
.../acl/0928468a-9fab-4185-9a14-6f2e7c74823f | 27 ++
.../acl/2fbca32a-a33e-4b69-83dd-0bb8b1f8c53b | 27 ++
.../acl/2fbca32a-a33e-4b69-83dd-0bb8b1f8c91b | 24 ++
examples/sample_cube/template/user/ADMIN | 19 ++
kylin-it/pom.xml | 6 +-
pom.xml | 1 +
.../kylin/query/optrule/OLAPJoinRule.java | 2 +-
.../query/util/CognosParenthesesEscape.java | 106 --------
.../query/util/ConvertToComputedColumn.java | 248 -----------------
.../org/apache/kylin/query/util/QueryUtil.java | 2 +-
.../query/util/CognosParenthesesEscapeTest.java | 89 -------
.../query/util/ConvertToComputedColumnTest.java | 124 ---------
.../src/test/resources/query/cognos/query01.sql | 28 --
.../resources/query/cognos/query01.sql.expected | 28 --
.../src/test/resources/query/cognos/query02.sql | 27 --
.../resources/query/cognos/query02.sql.expected | 27 --
.../src/test/resources/query/cognos/query03.sql | 29 --
.../resources/query/cognos/query03.sql.expected | 29 --
.../rest/controller2/CubeControllerV2.java | 24 +-
.../apache/kylin/rest/service/AclService.java | 4 +-
.../apache/kylin/rest/service/TableService.java | 2 +-
.../kylin/source/hive/HiveMetadataExplorer.java | 2 +-
.../apache/kylin/source/jdbc/JdbcExplorer.java | 2 +-
webapp/app/js/controllers/cubeAdvanceSetting.js | 5 +
webapp/app/js/controllers/cubeEdit.js | 52 ----
webapp/app/js/controllers/cubeMeasures.js | 7 -
50 files changed, 571 insertions(+), 1175 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/b8f08430/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/b8f08430/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/b8f08430/pom.xml
----------------------------------------------------------------------