[30/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
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/c06caa91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/c06caa91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/c06caa91 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: c06caa915b787c73d7340c72d076a9d33973c63f Parents: 5d39a54 a691f5e Author: Lionel LiuAuthored: Fri Feb 9 19:01:07 2018 +0800 Committer: Lionel Liu Committed: Fri Feb 9 19:01:07 2018 +0800 -- .../org/apache/griffin/measure/data/connector/DataConnector.scala | 1 + 1 file changed, 1 insertion(+) --
[30/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
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/c06caa91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/c06caa91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/c06caa91 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: c06caa915b787c73d7340c72d076a9d33973c63f Parents: 5d39a54 a691f5e Author: Lionel LiuAuthored: Fri Feb 9 19:01:07 2018 +0800 Committer: Lionel Liu Committed: Fri Feb 9 19:01:07 2018 +0800 -- .../org/apache/griffin/measure/data/connector/DataConnector.scala | 1 + 1 file changed, 1 insertion(+) --
[30/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
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/1675c934 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/1675c934 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/1675c934 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 1675c934b0c2ea65a33609e6b356872a2eab994d Parents: eab1854 f690644 Author: Lionel LiuAuthored: Tue Feb 6 10:43:24 2018 +0800 Committer: Lionel Liu Committed: Tue Feb 6 10:43:24 2018 +0800 -- ui/angular/src/app/health/health.component.ts | 2 +- ui/angular/src/app/metric/metric.component.ts | 2 +- ui/angular/src/app/sidebar/sidebar.component.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --
[30/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
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/eab1854f Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/eab1854f Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/eab1854f Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: eab1854fc4fe85b70f30c937d21e40423d1f9d0f Parents: 82db484 fd31809 Author: Lionel LiuAuthored: Tue Feb 6 10:36:54 2018 +0800 Committer: Lionel Liu Committed: Tue Feb 6 10:36:54 2018 +0800 -- .../apache/griffin/measure/util/MailUtil.java | 20 ++-- .../griffin/core/common/CacheEvictor.java | 6 +- .../griffin/core/config/PropertiesConfig.java | 49 ++--- .../griffin/core/config/SchedulerConfig.java| 7 +- .../core/exception/GriffinExceptionMessage.java | 1 + .../griffin/core/job/FileExistPredicator.java | 10 +- .../apache/griffin/core/job/JobController.java | 5 + .../apache/griffin/core/job/JobInstance.java| 77 +++-- .../org/apache/griffin/core/job/JobService.java | 2 + .../apache/griffin/core/job/JobServiceImpl.java | 110 +++ .../apache/griffin/core/job/SparkSubmitJob.java | 24 ++-- .../griffin/core/job/entity/JobSchedule.java| 10 +- .../core/job/entity/SegmentPredicate.java | 10 +- .../griffin/core/job/entity/SegmentRange.java | 2 +- .../core/job/factory/PredicatorFactory.java | 4 + .../griffin/core/job/repo/JobInstanceRepo.java | 2 +- .../griffin/core/job/repo/JobScheduleRepo.java | 2 + .../measure/ExternalMeasureOperationImpl.java | 15 +-- .../measure/GriffinMeasureOperationImpl.java| 55 ++ .../griffin/core/measure/MeasureController.java | 6 + .../griffin/core/measure/MeasureService.java| 10 +- .../core/measure/MeasureServiceImpl.java| 9 ++ .../core/measure/entity/DataConnector.java | 27 - .../core/measure/entity/GriffinMeasure.java | 41 ++- .../griffin/core/measure/entity/Rule.java | 87 --- .../core/metastore/hive/HiveMetaStoreProxy.java | 2 +- .../hive/HiveMetaStoreServiceImpl.java | 25 +++-- .../griffin/core/metric/MetricStoreImpl.java| 7 +- .../apache/griffin/core/util/MeasureUtil.java | 76 + .../griffin/core/util/PropertiesUtil.java | 52 + .../org/apache/griffin/core/util/TimeUtil.java | 81 +- service/src/main/resources/sparkJob.properties | 15 ++- .../core/config/PropertiesConfigTest.java | 48 +++- .../griffin/core/job/JobControllerTest.java | 3 +- .../griffin/core/job/JobInstanceTest.java | 8 +- .../griffin/core/job/JobServiceImplTest.java| 42 +++ .../GriffinMeasureOperationImplTest.java| 11 -- .../core/measure/MeasureControllerTest.java | 33 +- .../core/measure/MeasureServiceImplTest.java| 46 +++- .../griffin/core/util/PropertiesUtilTest.java | 38 ++- .../apache/griffin/core/util/TimeUtilTest.java | 27 ++--- service/src/test/resources/sparkJob.properties | 21 ++-- 42 files changed, 723 insertions(+), 403 deletions(-) --