Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/06cd3058 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/06cd3058 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/06cd3058 Branch: refs/heads/griffin-0.1.6-incubating-rc1 Commit: 06cd305866472ebc7e196472345fc074717f326d Parents: f8d68ae 1cf0a99 Author: William Guo <[email protected]> Authored: Mon Aug 28 18:29:09 2017 +0800 Committer: William Guo <[email protected]> Committed: Mon Aug 28 18:29:09 2017 +0800 ---------------------------------------------------------------------- .gitignore | 5 + merge_pr.py | 0 service/pom.xml | 44 ++- .../griffin/core/GriffinWebApplication.java | 4 +- .../griffin/core/common/CacheEvictor.java | 18 + .../apache/griffin/core/common/JsonConvert.java | 77 ---- .../griffin/core/common/PropertiesOperate.java | 54 --- .../griffin/core/common/SimpleCORSFilter.java | 8 - .../apache/griffin/core/config/CacheConfig.java | 9 + .../griffin/core/config/SwaggerConfig.java | 9 + .../AutowiringSpringBeanJobFactory.java | 54 +++ .../core/config/jobConfig/SchedulerConfig.java | 58 +++ .../core/config/jobConfig/SparkJobConfig.java | 37 ++ .../core/error/exception/GriffinException.java | 41 ++ .../exception/RuntimeExceptionHandler.java | 65 ++++ .../apache/griffin/core/job/JobController.java | 73 ++++ .../org/apache/griffin/core/job/JobService.java | 44 +++ .../apache/griffin/core/job/JobServiceImpl.java | 378 +++++++++++++++++++ .../apache/griffin/core/job/SparkSubmitJob.java | 254 +++++++++++++ .../griffin/core/job/entity/JobHealth.java | 49 +++ .../griffin/core/job/entity/JobInstance.java | 114 ++++++ .../griffin/core/job/entity/JobRequestBody.java | 108 ++++++ .../core/job/entity/LivySessionStates.java | 93 +++++ .../griffin/core/job/entity/SparkJobDO.java | 181 +++++++++ .../griffin/core/job/repo/JobInstanceRepo.java | 67 ++++ .../griffin/core/measure/AuditableEntity.java | 86 ----- .../griffin/core/measure/DataConnector.java | 137 ------- .../griffin/core/measure/EvaluateRule.java | 56 --- .../apache/griffin/core/measure/Measure.java | 136 ------- .../griffin/core/measure/MeasureController.java | 51 +-- .../griffin/core/measure/MeasureService.java | 23 +- .../core/measure/MeasureServiceImpl.java | 99 +++-- .../core/measure/entity/AuditableEntity.java | 86 +++++ .../core/measure/entity/DataConnector.java | 126 +++++++ .../core/measure/entity/EvaluateRule.java | 61 +++ .../griffin/core/measure/entity/Measure.java | 165 ++++++++ .../core/measure/repo/DataConnectorRepo.java | 2 +- .../core/measure/repo/EvaluateRuleRepo.java | 2 +- .../griffin/core/measure/repo/MeasureRepo.java | 16 +- .../core/metastore/HiveMetastoreController.java | 74 ---- .../core/metastore/HiveMetastoreProxy.java | 66 ---- .../core/metastore/HiveMetastoreService.java | 41 -- .../metastore/HiveMetastoreServiceImpl.java | 157 -------- .../core/metastore/KafkaSchemaController.java | 67 ---- .../core/metastore/KafkaSchemaService.java | 39 -- .../core/metastore/KafkaSchemaServiceImpl.java | 144 ------- .../metastore/hive/HiveMetastoreController.java | 73 ++++ .../core/metastore/hive/HiveMetastoreProxy.java | 78 ++++ .../metastore/hive/HiveMetastoreService.java | 39 ++ .../hive/HiveMetastoreServiceImpl.java | 155 ++++++++ .../metastore/kafka/KafkaSchemaController.java | 65 ++++ .../metastore/kafka/KafkaSchemaService.java | 39 ++ .../metastore/kafka/KafkaSchemaServiceImpl.java | 107 ++++++ .../griffin/core/metric/MetricController.java | 16 +- .../griffin/core/metric/MetricService.java | 2 +- .../core/schedule/SchedulerController.java | 79 ---- .../core/schedule/SchedulerRequestBody.java | 106 ------ .../griffin/core/schedule/SchedulerService.java | 46 --- .../core/schedule/SchedulerServiceImpl.java | 302 --------------- .../griffin/core/schedule/SparkSubmitJob.java | 256 ------------- .../griffin/core/schedule/entity/JobHealth.java | 56 --- .../core/schedule/entity/JobInstance.java | 100 ----- .../core/schedule/entity/SparkJobDO.java | 152 -------- .../AutowiringSpringBeanJobFactory.java | 45 --- .../core/schedule/quartzConfig/Conf.java | 35 -- .../schedule/quartzConfig/SchedulerConfig.java | 63 ---- .../core/schedule/repo/JobInstanceRepo.java | 59 --- .../griffin/core/service/GriffinController.java | 34 +- .../core/util/GriffinOperationMessage.java | 50 ++- .../apache/griffin/core/util/GriffinUtil.java | 80 ++++ .../main/resources/application-dev.properties | 15 +- .../src/main/resources/application.properties | 15 +- service/src/main/resources/sparkJob.properties | 21 +- .../griffin/core/job/JobControllerTest.java | 128 +++++++ .../griffin/core/job/JobInstanceRepoTest.java | 42 +++ .../griffin/core/job/JobServiceImplTest.java | 222 +++++++++++ .../griffin/core/job/SparkSubmitJobTest.java | 233 ++++++++++++ .../core/measure/MeasureControllerTest.java | 63 ++-- .../griffin/core/measure/MeasureRepoTest.java | 106 ++++++ .../core/measure/MeasureServiceImplTest.java | 71 ++-- .../core/measure/repo/MeasureRepoTest.java | 6 +- .../metastore/HiveMetastoreControllerTest.java | 114 ------ .../metastore/HiveMetastoreServiceImplTest.java | 162 -------- .../metastore/KafkaSchemaControllerTest.java | 108 ------ .../metastore/KafkaSchemaServiceImplTest.java | 115 ------ .../hive/HiveMetastoreControllerTest.java | 118 ++++++ .../hive/HiveMetastoreServiceImplTest.java | 167 ++++++++ .../kafka/KafkaSchemaControllerTest.java | 110 ++++++ .../kafka/KafkaSchemaServiceImplTest.java | 151 ++++++++ .../core/metric/MetricControllerTest.java | 2 +- .../core/schedule/SchedulerControllerTest.java | 122 ------ .../core/schedule/SchedulerServiceImplTest.java | 207 ---------- .../core/schedule/SparkSubmitJobTest.java | 187 --------- .../core/service/GriffinControllerTest.java | 10 +- .../griffin/core/util/GriffinUtilTest.java | 71 ++++ service/src/test/resources/Init_quartz-h2.sql | 190 ++++++++++ .../src/test/resources/application.properties | 21 +- service/src/test/resources/quartz-test.sql | 26 ++ service/src/test/resources/sparkJob.properties | 52 +++ service/src/test/resources/test.sql | 25 ++ ui/bower.json | 1 + ui/css/main.css | 75 +++- ui/img/logo.png | Bin 0 -> 20582 bytes ui/img/spinner.gif | Bin 0 -> 5860 bytes ui/index.html | 12 +- ui/js/bs.js | 3 +- ui/js/controllers/createjob-ac-ctrl.js | 168 +++++---- ui/js/controllers/createrule-ac-ctrl.js | 232 +++--------- ui/js/controllers/dataassets-ctrl.js | 27 +- ui/js/controllers/detail-ctrl.js | 4 +- ui/js/controllers/health-ctrl.js | 27 +- ui/js/controllers/job-ctrl.js | 261 ++++++------- ui/js/controllers/metrics-ctrl.js | 2 +- ui/js/controllers/rule-ctrl.js | 19 +- ui/js/controllers/sidebar-ctrl.js | 37 +- ui/js/controllers/viewrule-ctrl.js | 9 +- ui/js/main.js | 5 + ui/js/routes.js | 12 +- ui/js/services/bark-chart.js | 2 + ui/js/services/services.js | 28 +- ui/login/login.html | 2 +- ui/login/login.js | 8 - ui/pages/dataassets/dataassets.html | 15 +- ui/pages/health/health.html | 6 + ui/pages/jobs/confirmation-ac.html | 12 +- ui/pages/jobs/createjob-ac.html | 46 ++- ui/pages/jobs/delete-confirm.html | 10 +- ui/pages/jobs/jobs.html | 47 +-- ui/pages/measures/measure.css | 2 +- ui/pages/measures/measures.html | 11 +- ui/sidebar.html | 10 +- 131 files changed, 5271 insertions(+), 4217 deletions(-) ----------------------------------------------------------------------
