[08/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-29 Thread guoyp 
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/150a13c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/150a13c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/150a13c3

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: 150a13c3b9887eabab0d53d1356360e2596a98c7
Parents: 80074bd a0b130a
Author: Lionel Liu 
Authored: Wed Jan 24 10:57:54 2018 +0800
Committer: Lionel Liu 
Committed: Wed Jan 24 10:57:54 2018 +0800

--
 .../measure/cache/info/ZKInfoCache.scala|   2 +
 .../measure/rule/adaptor/GlobalKeys.scala   |   5 +
 .../rule/adaptor/GriffinDslAdaptor.scala| 110 +--
 .../apache/griffin/measure/utils/TimeUtil.scala |  67 +++
 .../resources/_timeliness-batch-griffindsl.json |   5 +-
 .../_timeliness-streaming-griffindsl.json   |  11 +-
 .../griffin/measure/utils/TimeUtilTest.scala|  38 +++
 7 files changed, 208 insertions(+), 30 deletions(-)
--

[08/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-29 Thread guoyp 
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/150a13c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/150a13c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/150a13c3

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: 150a13c3b9887eabab0d53d1356360e2596a98c7
Parents: 80074bd a0b130a
Author: Lionel Liu 
Authored: Wed Jan 24 10:57:54 2018 +0800
Committer: Lionel Liu 
Committed: Wed Jan 24 10:57:54 2018 +0800

--
 .../measure/cache/info/ZKInfoCache.scala|   2 +
 .../measure/rule/adaptor/GlobalKeys.scala   |   5 +
 .../rule/adaptor/GriffinDslAdaptor.scala| 110 +--
 .../apache/griffin/measure/utils/TimeUtil.scala |  67 +++
 .../resources/_timeliness-batch-griffindsl.json |   5 +-
 .../_timeliness-streaming-griffindsl.json   |  11 +-
 .../griffin/measure/utils/TimeUtilTest.scala|  38 +++
 7 files changed, 208 insertions(+), 30 deletions(-)
--

[08/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-29 Thread guoyp 
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/150a13c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/150a13c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/150a13c3

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: 150a13c3b9887eabab0d53d1356360e2596a98c7
Parents: 80074bd a0b130a
Author: Lionel Liu 
Authored: Wed Jan 24 10:57:54 2018 +0800
Committer: Lionel Liu 
Committed: Wed Jan 24 10:57:54 2018 +0800

--
 .../measure/cache/info/ZKInfoCache.scala|   2 +
 .../measure/rule/adaptor/GlobalKeys.scala   |   5 +
 .../rule/adaptor/GriffinDslAdaptor.scala| 110 +--
 .../apache/griffin/measure/utils/TimeUtil.scala |  67 +++
 .../resources/_timeliness-batch-griffindsl.json |   5 +-
 .../_timeliness-streaming-griffindsl.json   |  11 +-
 .../griffin/measure/utils/TimeUtilTest.scala|  38 +++
 7 files changed, 208 insertions(+), 30 deletions(-)
--

[08/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-06 Thread guoyp 
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/4e6862f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/4e6862f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/4e6862f7

Branch: refs/heads/griffin-0.2.0-incubating-rc1
Commit: 4e6862f74cd938c3dfd63ed2cb7407ae519d3224
Parents: 134ad28 2d268aa
Author: Lionel Liu 
Authored: Tue Jan 9 17:58:59 2018 +0800
Committer: Lionel Liu 
Committed: Tue Jan 9 17:58:59 2018 +0800

--
 griffin-doc/measure/dsl-guide.md| 39 +---
 .../rule/adaptor/GriffinDslAdaptor.scala|  2 +-
 .../resources/_accuracy-batch-griffindsl.json   |  9 +
 .../resources/_accuracy-batch-sparksql.json |  2 +-
 4 files changed, 37 insertions(+), 15 deletions(-)
--

[08/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-06 Thread guoyp 
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 
Authored: Tue Jan 9 17:44:38 2018 +0800
Committer: Lionel Liu 
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