Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/134ad284 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/134ad284 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/134ad284 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 134ad2842a5ca65b953342bbce6608c783e847d1 Parents: dc7c3cc e7e4c3a Author: Lionel Liu <[email protected]> Authored: Tue Jan 9 17:44:38 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Tue Jan 9 17:44:38 2018 +0800 ---------------------------------------------------------------------- griffin-doc/Testcase.md | 78 - griffin-doc/docker/griffin-docker-guide.md | 105 + griffin-doc/docker/measure-demo-docker.md | 63 + griffin-doc/dockerUIguide.md | 50 - griffin-doc/dsl-guide.md | 181 -- griffin-doc/griffin-docker-guide.md | 105 - griffin-doc/measure-batch-sample.md | 140 - griffin-doc/measure-configuration-guide.md | 211 -- griffin-doc/measure-demo-docker.md | 63 - griffin-doc/measure-streaming-sample-old.md | 204 -- griffin-doc/measure/dsl-guide.md | 181 ++ griffin-doc/measure/measure-batch-sample.md | 140 + .../measure/measure-configuration-guide.md | 211 ++ .../measure/measure-streaming-sample-old.md | 204 ++ griffin-doc/measure/measures.md | 173 ++ griffin-doc/measures.md | 173 -- griffin-doc/postman/griffin.json | 2642 ------------------ griffin-doc/postman/griffin_environment.json | 16 - griffin-doc/service/postman/griffin.json | 2635 +++++++++++++++++ .../service/postman/griffin_environment.json | 16 + griffin-doc/ui/dockerUIguide.md | 50 + griffin-doc/ui/test-case.md | 78 + griffin-doc/ui/user-guide.md | 193 ++ griffin-doc/userguide.md | 193 -- service/pom.xml | 23 +- .../apache/griffin/core/config/CacheConfig.java | 14 + .../griffin/core/config/PropertiesConfig.java | 96 + .../griffin/core/config/SchedulerConfig.java | 60 + .../AutowiringSpringBeanJobFactory.java | 54 - .../core/config/jobConfig/SchedulerConfig.java | 59 - .../core/config/jobConfig/SparkJobConfig.java | 34 - .../griffin/core/job/FileExistPredicator.java | 67 + .../apache/griffin/core/job/JobController.java | 43 +- .../apache/griffin/core/job/JobInstance.java | 282 ++ .../org/apache/griffin/core/job/JobService.java | 20 +- .../apache/griffin/core/job/JobServiceImpl.java | 629 +++-- .../org/apache/griffin/core/job/Predicator.java | 26 + .../apache/griffin/core/job/SparkSubmitJob.java | 331 +-- .../griffin/core/job/entity/AbstractJob.java | 88 + .../griffin/core/job/entity/GriffinJob.java | 79 + .../griffin/core/job/entity/JobDataBean.java | 98 + .../griffin/core/job/entity/JobDataSegment.java | 81 + .../griffin/core/job/entity/JobHealth.java | 2 + .../griffin/core/job/entity/JobInstance.java | 111 - .../core/job/entity/JobInstanceBean.java | 156 ++ .../griffin/core/job/entity/JobRequestBody.java | 114 - .../griffin/core/job/entity/JobSchedule.java | 188 ++ .../griffin/core/job/entity/LivyConf.java | 148 + .../core/job/entity/LivySessionStates.java | 27 +- .../core/job/entity/SegmentPredicate.java | 81 + .../griffin/core/job/entity/SegmentRange.java | 53 + .../griffin/core/job/entity/SparkJobDO.java | 148 - .../griffin/core/job/entity/VirtualJob.java | 34 + .../factory/AutowiringSpringBeanJobFactory.java | 54 + .../core/job/factory/PredicatorFactory.java | 38 + .../griffin/core/job/repo/GriffinJobRepo.java | 25 + .../core/job/repo/JobDataSegmentRepo.java | 26 + .../griffin/core/job/repo/JobInstanceRepo.java | 40 +- .../apache/griffin/core/job/repo/JobRepo.java | 40 + .../griffin/core/job/repo/JobScheduleRepo.java | 26 + .../griffin/core/job/repo/VirtualJobRepo.java | 25 + .../measure/ExternalMeasureOperationImpl.java | 102 + .../measure/GriffinMeasureOperationImpl.java | 114 + .../griffin/core/measure/MeasureController.java | 8 +- .../griffin/core/measure/MeasureOperation.java | 34 + .../core/measure/MeasureOrgController.java | 10 - .../griffin/core/measure/MeasureOrgService.java | 2 +- .../core/measure/MeasureOrgServiceImpl.java | 22 +- .../griffin/core/measure/MeasureService.java | 3 +- .../core/measure/MeasureServiceImpl.java | 96 +- .../core/measure/entity/DataConnector.java | 100 +- .../griffin/core/measure/entity/DataSource.java | 11 +- .../core/measure/entity/EvaluateRule.java | 3 +- .../core/measure/entity/ExternalMeasure.java | 71 + .../core/measure/entity/GriffinMeasure.java | 115 + .../griffin/core/measure/entity/Measure.java | 85 +- .../griffin/core/measure/entity/Rule.java | 40 +- .../core/measure/repo/DataConnectorRepo.java | 9 +- .../core/measure/repo/EvaluateRuleRepo.java | 1 - .../core/measure/repo/ExternalMeasureRepo.java | 25 + .../core/measure/repo/GriffinMeasureRepo.java | 25 + .../griffin/core/measure/repo/MeasureRepo.java | 19 +- .../hive/HiveMetaStoreServiceImpl.java | 32 +- .../griffin/core/metric/MetricController.java | 39 +- .../griffin/core/metric/MetricService.java | 15 +- .../griffin/core/metric/MetricServiceImpl.java | 71 +- .../apache/griffin/core/metric/MetricStore.java | 33 + .../griffin/core/metric/MetricStoreImpl.java | 90 + .../griffin/core/metric/model/Metric.java | 82 + .../griffin/core/metric/model/MetricValue.java | 64 + .../org/apache/griffin/core/util/FSUtil.java | 161 ++ .../org/apache/griffin/core/util/JsonUtil.java | 31 +- .../griffin/core/util/PropertiesUtil.java | 17 +- .../org/apache/griffin/core/util/TimeUtil.java | 119 + .../src/main/resources/Init_quartz_derby.sql | 187 ++ .../src/main/resources/application.properties | 34 +- service/src/main/resources/sparkJob.properties | 23 +- .../griffin/core/job/JobControllerTest.java | 311 +-- .../core/job/JobInstanceBeanRepoTest.java | 87 + .../griffin/core/job/JobInstanceRepoTest.java | 107 - .../griffin/core/job/JobServiceImplTest.java | 770 +++-- .../griffin/core/job/SparkSubmitJobTest.java | 121 +- .../core/measure/MeasureControllerTest.java | 401 ++- .../core/measure/MeasureOrgControllerTest.java | 22 - .../core/measure/MeasureOrgServiceImplTest.java | 196 +- .../core/measure/MeasureServiceImplTest.java | 124 +- .../griffin/core/measure/MeasureTestHelper.java | 26 +- .../core/measure/repo/MeasureRepoTest.java | 170 +- .../core/metric/MetricControllerTest.java | 65 - .../core/metric/MetricServiceImplTest.java | 62 - .../griffin/core/util/GriffinUtilTest.java | 12 +- .../apache/griffin/core/util/TimeUtilTest.java | 27 + 112 files changed, 9216 insertions(+), 6703 deletions(-) ----------------------------------------------------------------------
