Merge commit '2f084601b938d6051c0fe02a9fc075be549547f0' into mergekylin
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/69532cd5 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/69532cd5 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/69532cd5 Branch: refs/heads/KYLIN-2606 Commit: 69532cd5ff3dc7da9a4670795f1230faa489c389 Parents: a0b7e74 2f08460 Author: Hongbin Ma <mahong...@apache.org> Authored: Thu Jun 29 13:43:13 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Thu Jun 29 13:43:13 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/job/DeployUtil.java | 118 +++---- .../apache/kylin/common/KylinConfigBase.java | 28 ++ .../java/org/apache/kylin/cube/CubeManager.java | 21 +- .../kylin/cube/cli/DictionaryGeneratorCLI.java | 10 +- .../InMemCubeBuilderInputConverter.java | 5 + .../org/apache/kylin/cube/model/CubeDesc.java | 2 +- .../apache/kylin/cube/model/RowKeyColDesc.java | 9 +- .../org/apache/kylin/job/JoinedFlatTable.java | 52 +++- .../kylin/metadata/model/ISourceAware.java | 1 + .../kylin/source/ISampleDataDeployer.java | 47 +++ .../java/org/apache/kylin/source/ISource.java | 6 + .../source/datagen/ModelDataGenerator.java | 7 +- .../engine/spark/KylinKryoRegistrator.java | 1 + .../org/apache/kylin/jdbc/KylinConnection.java | 4 +- .../java/org/apache/kylin/jdbc/DriverTest.java | 10 + .../kylin/provision/BuildCubeWithEngine.java | 14 +- .../kylin/source/hive/BeelineHiveClient.java | 2 +- .../apache/kylin/source/hive/DBConnConf.java | 86 ++++++ .../kylin/source/hive/HiveClientFactory.java | 1 + .../apache/kylin/source/hive/HiveMRInput.java | 41 ++- .../kylin/source/hive/HiveMetadataExplorer.java | 78 ++++- .../apache/kylin/source/hive/HiveSource.java | 17 ++ .../apache/kylin/source/hive/IHiveClient.java | 7 +- .../org/apache/kylin/source/jdbc/CmdStep.java | 69 +++++ .../apache/kylin/source/jdbc/HiveCmdStep.java | 77 +++++ .../apache/kylin/source/jdbc/JdbcExplorer.java | 305 +++++++++++++++++++ .../kylin/source/jdbc/JdbcHiveMRInput.java | 93 ++++++ .../apache/kylin/source/jdbc/JdbcSource.java | 66 ++++ .../org/apache/kylin/source/jdbc/JdbcTable.java | 67 ++++ .../kylin/source/jdbc/JdbcTableReader.java | 107 +++++++ .../org/apache/kylin/source/jdbc/SqlUtil.java | 107 +++++++ .../apache/kylin/source/kafka/KafkaSource.java | 8 +- .../kylin/storage/hbase/HBaseResourceStore.java | 7 +- .../apache/kylin/tool/KylinConfigCLITest.java | 12 +- webapp/app/js/controllers/modelEdit.js | 5 +- webapp/app/js/controllers/modelMeasures.js | 33 +- webapp/app/js/controllers/page.js | 5 + webapp/app/js/controllers/projects.js | 38 +-- webapp/app/js/controllers/sourceMeta.js | 9 + webapp/app/js/filters/filter.js | 17 ++ .../cubeDesigner/advanced_settings.html | 2 +- webapp/app/partials/cubeDesigner/measures.html | 2 +- webapp/app/partials/cubes/cubes.html | 10 +- .../app/partials/modelDesigner/data_model.html | 2 +- .../partials/modelDesigner/model_measures.html | 2 +- webapp/app/partials/models/model_json_edit.html | 44 +++ webapp/app/partials/models/model_schema.html | 4 +- webapp/app/partials/models/models_tree.html | 2 + .../app/partials/projects/project_detail.html | 29 ++ webapp/app/routes.json | 8 + 50 files changed, 1499 insertions(+), 198 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/69532cd5/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/69532cd5/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/69532cd5/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java ----------------------------------------------------------------------
