You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/15 07:22:21 UTC
[52/52] [abbrv] incubator-kylin git commit: Merge pull request #457
from janzhongi/awesome
Merge pull request #457 from janzhongi/awesome
merge latest version Gui(refactor model&cube)
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/5092c484
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/5092c484
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/5092c484
Branch: refs/heads/0.8.0
Commit: 5092c48435cd646ab81912eb196acf5d60404a71
Parents: 4b50834 10dc6a2
Author: Zhong,Jian <ji...@ebay.com>
Authored: Wed Apr 22 15:04:08 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri May 15 11:40:22 2015 +0800
----------------------------------------------------------------------
.../apache/kylin/common/util/StringUtil.java | 8 +-
.../org/apache/kylin/cube/CubeDescManager.java | 5 +
.../org/apache/kylin/cube/CubeInstance.java | 7 +-
.../test_case_data/sandbox/kylin.properties | 196 +-
.../kylin/invertedindex/IIDescManager.java | 5 +
.../apache/kylin/invertedindex/IIInstance.java | 9 +-
.../apache/kylin/metadata/MetadataManager.java | 82 +-
.../kylin/metadata/model/DataModelDesc.java | 70 +
.../kylin/metadata/project/ProjectInstance.java | 33 +-
.../kylin/metadata/project/ProjectManager.java | 43 +-
.../metadata/realization/IRealization.java | 3 +
.../kylin/rest/controller/CubeController.java | 79 +-
.../kylin/rest/controller/ModelController.java | 183 +-
.../rest/controller/ModelDescController.java | 61 +
.../rest/controller/PerformanceController.java | 20 +
.../rest/controller/ProjectController.java | 7 +-
.../kylin/rest/filter/RequestLoggingFilter.java | 30 +
.../apache/kylin/rest/model/Performance.java | 127 +
.../apache/kylin/rest/request/CubeRequest.java | 29 +-
.../apache/kylin/rest/request/ModelRequest.java | 109 +
.../kylin/rest/response/HBaseResponse.java | 26 +
.../kylin/rest/security/AclEntityFactory.java | 8 +
.../apache/kylin/rest/service/CubeService.java | 36 +-
.../apache/kylin/rest/service/ModelService.java | 140 +
.../kylin/rest/service/PerformanceService.java | 17 +
.../kylin/rest/service/ProjectService.java | 10 +-
.../apache/kylin/rest/service/QueryService.java | 16 +-
.../kylin/rest/util/PerformanceMonitorTask.java | 27 +
.../src/main/resources/applicationContext.xml | 3 +
server/src/main/resources/log4j.properties | 10 +
server/src/main/webapp/WEB-INF/web.xml | 29 +-
.../rest/controller/CubeControllerTest.java | 11 +-
.../kylin/rest/service/CacheServiceTest.java | 2 +-
.../kylin/rest/service/CubeServiceTest.java | 4 +-
.../kylin/storage/hybrid/HybridInstance.java | 13 +-
webapp/app/css/AdminLTE.css | 4600 ++++++++++--------
webapp/app/index.html | 44 +-
webapp/app/js/app.js | 2 +-
webapp/app/js/controllers/cube.js | 361 +-
webapp/app/js/controllers/cubeAdvanceSetting.js | 5 +-
webapp/app/js/controllers/cubeDimensions.js | 83 +-
webapp/app/js/controllers/cubeEdit.js | 141 +-
webapp/app/js/controllers/cubeFilter.js | 2 +-
webapp/app/js/controllers/cubeModel.js | 122 +-
webapp/app/js/controllers/cubeRefresh.js | 2 +-
webapp/app/js/controllers/cubeSchema.js | 183 +-
webapp/app/js/controllers/cubes.js | 15 +-
webapp/app/js/controllers/job.js | 9 +-
webapp/app/js/controllers/modelDimensions.js | 73 +
webapp/app/js/controllers/modelEdit.js | 251 +
webapp/app/js/controllers/modelMeasures.js | 27 +
webapp/app/js/controllers/modelRefresh.js | 23 +
webapp/app/js/controllers/modelSchema.js | 248 +
webapp/app/js/controllers/models.js | 121 +
webapp/app/js/controllers/page.js | 13 +-
webapp/app/js/controllers/projectMeta.js | 68 +-
webapp/app/js/controllers/projects.js | 2 +-
webapp/app/js/controllers/query.js | 6 +-
.../js/directives/kylin_abn_tree_directive.js | 496 ++
webapp/app/js/model/cubeDescModel.js | 1 +
webapp/app/js/model/cubeListModel.js | 7 +-
webapp/app/js/model/cubesManager.js | 4 +
webapp/app/js/model/jobListModel.js | 4 +
webapp/app/js/model/metaModel.js | 181 +-
webapp/app/js/model/modelConfig.js | 26 +
webapp/app/js/model/modelsManager.js | 178 +
webapp/app/js/model/projectModel.js | 27 +-
webapp/app/js/model/tableModel.js | 90 +-
webapp/app/js/services/message.js | 2 +-
webapp/app/js/services/model.js | 2 +-
webapp/app/js/services/models.js | 26 +
webapp/app/js/services/query.js | 2 +-
webapp/app/js/services/tree.js | 106 +-
webapp/app/js/services/users.js | 6 +-
webapp/app/less/app.less | 24 +-
webapp/app/less/component.less | 137 +
.../cubeDesigner/advanced_settings.html | 262 +-
.../app/partials/cubeDesigner/data_model.html | 199 -
.../app/partials/cubeDesigner/dimensions.html | 560 +--
webapp/app/partials/cubeDesigner/info.html | 115 +-
webapp/app/partials/cubeDesigner/measures.html | 121 +-
webapp/app/partials/cubeDesigner/overview.html | 14 +-
webapp/app/partials/cubes/cube_detail.html | 110 +-
webapp/app/partials/cubes/cube_json_edit.html | 15 -
webapp/app/partials/cubes/cube_schema.html | 13 +-
webapp/app/partials/cubes/cubes.html | 11 +-
webapp/app/partials/header.html | 26 +-
webapp/app/partials/jobs/job_merge.html | 16 +-
webapp/app/partials/jobs/job_refresh.html | 12 +-
webapp/app/partials/jobs/job_submit.html | 10 +-
webapp/app/partials/jobs/jobs.html | 13 +-
webapp/app/partials/login.html | 2 +-
.../modelDesigner/conditions_settings.html | 143 +
.../app/partials/modelDesigner/data_model.html | 203 +
.../modelDesigner/model_dimensions.html | 98 +
.../app/partials/modelDesigner/model_info.html | 99 +
.../partials/modelDesigner/model_measures.html | 54 +
webapp/app/partials/models/model_detail.html | 63 +
webapp/app/partials/models/model_edit.html | 33 +
webapp/app/partials/models/model_schema.html | 94 +
webapp/app/partials/models/models.html | 60 +
webapp/app/partials/models/models_tree.html | 46 +
.../partials/projects/project_table_tree.html | 17 +-
webapp/app/partials/query/query.html | 9 -
webapp/app/partials/query/query_detail.html | 15 +-
webapp/app/partials/tables/source_metadata.html | 185 -
.../app/partials/tables/source_table_tree.html | 19 +-
webapp/app/partials/tables/table_detail.html | 184 +
webapp/app/routes.json | 51 +-
webapp/bower.json | 7 +-
webapp/grunt.json | 1 +
111 files changed, 8265 insertions(+), 3793 deletions(-)
----------------------------------------------------------------------