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/80074bd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/80074bd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/80074bd1 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: 80074bd1af18fe289485dc0543b55770f0bbcbd9 Parents: 4d84ab0 71fcf93 Author: Lionel Liu <[email protected]> Authored: Mon Jan 22 09:52:38 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Mon Jan 22 09:52:38 2018 +0800 ---------------------------------------------------------------------- README.md | 31 +- griffin-doc/service/postman/griffin.json | 68 +- .../griffin/core/config/PropertiesConfig.java | 4 +- .../griffin/core/job/FileExistPredicator.java | 4 +- .../apache/griffin/core/job/JobInstance.java | 12 +- .../apache/griffin/core/job/JobServiceImpl.java | 65 +- .../griffin/core/job/entity/GriffinJob.java | 6 +- .../griffin/core/job/entity/JobDataSegment.java | 10 +- .../griffin/core/job/entity/JobSchedule.java | 8 +- .../core/job/entity/SegmentPredicate.java | 5 + .../griffin/core/job/entity/SegmentRange.java | 8 + .../measure/ExternalMeasureOperationImpl.java | 6 +- .../measure/GriffinMeasureOperationImpl.java | 19 +- .../griffin/core/measure/MeasureOperation.java | 2 +- .../griffin/core/measure/MeasureOrgService.java | 1 - .../core/measure/MeasureServiceImpl.java | 11 +- .../core/measure/entity/ExternalMeasure.java | 3 +- .../core/measure/entity/GriffinMeasure.java | 20 +- .../griffin/core/measure/entity/Measure.java | 4 +- .../griffin/core/measure/entity/Rule.java | 8 +- .../griffin/core/measure/repo/MeasureRepo.java | 10 - .../org/apache/griffin/core/util/AvroUtil.java | 30 - .../org/apache/griffin/core/util/TimeUtil.java | 44 +- .../src/main/resources/application.properties | 4 +- service/src/main/resources/sparkJob.properties | 16 +- .../core/config/PropertiesConfigTest.java | 160 ++++ .../griffin/core/job/JobInstanceTest.java | 186 ++++ .../griffin/core/job/JobServiceImplTest.java | 934 +++++++++++-------- .../griffin/core/job/SparkSubmitJobTest.java | 179 +++- .../griffin/core/job/repo/JobRepoTest.java | 94 ++ .../core/measure/MeasureControllerTest.java | 24 +- .../core/measure/MeasureOrgServiceImplTest.java | 212 +++-- .../core/measure/MeasureServiceImplTest.java | 336 +++++-- .../measure/repo/DataConnectorRepoTest.java | 80 ++ .../core/measure/repo/MeasureRepoTest.java | 189 ++-- .../apache/griffin/core/util/EntityHelper.java | 167 +++- .../griffin/core/util/GriffinUtilTest.java | 87 -- .../apache/griffin/core/util/JsonUtilTest.java | 84 ++ .../griffin/core/util/PropertiesUtilTest.java | 45 + .../apache/griffin/core/util/TimeUtilTest.java | 94 ++ .../src/test/resources/application.properties | 79 +- service/src/test/resources/quartz.properties | 2 +- service/src/test/resources/sparkJob.properties | 50 + 43 files changed, 2332 insertions(+), 1069 deletions(-) ----------------------------------------------------------------------
