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/290a020f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/290a020f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/290a020f Branch: refs/heads/master Commit: 290a020f51339a4f7698be8ec9a2074921dc8f0a Parents: a94989d e486f75 Author: William Guo <[email protected]> Authored: Fri Jul 21 13:14:50 2017 +0800 Committer: William Guo <[email protected]> Committed: Fri Jul 21 13:14:50 2017 +0800 ---------------------------------------------------------------------- .../griffin/core/GriffinWebApplication.java | 2 + .../apache/griffin/core/common/JsonConvert.java | 59 +++++++ .../griffin/core/common/PropertiesOperate.java | 37 +++++ .../core/metastore/HiveMetastoreProxy.java | 4 +- .../AutowiringSpringBeanJobFactory.java | 45 ------ .../org/apache/griffin/core/schedule/Conf.java | 35 ----- .../apache/griffin/core/schedule/JobHealth.java | 56 ------- .../core/schedule/Repo/ScheduleStateRepo.java | 37 ----- .../griffin/core/schedule/ScheduleResult.java | 88 ----------- .../griffin/core/schedule/ScheduleState.java | 100 ------------ .../griffin/core/schedule/SchedulerConfig.java | 63 -------- .../core/schedule/SchedulerController.java | 7 +- .../griffin/core/schedule/SchedulerService.java | 8 +- .../core/schedule/SchedulerServiceImpl.java | 95 ++++++++++-- .../griffin/core/schedule/SparkJobDO.java | 150 ------------------ .../griffin/core/schedule/SparkSubmitJob.java | 85 +++++------ .../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 +++++++ .../main/resources/application-dev.properties | 2 + .../src/main/resources/application.properties | 4 +- .../core/schedule/SchedulerControllerTest.java | 6 +- .../core/schedule/SchedulerServiceImplTest.java | 34 +++-- .../core/schedule/SparkSubmitJobTest.java | 19 +-- 28 files changed, 784 insertions(+), 662 deletions(-) ----------------------------------------------------------------------
