[34/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/4342c6d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/4342c6d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/4342c6d8 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: 4342c6d8c2a9d120e4729ec143daa546c25fed97 Parents: 6d68401 5507f57 Author: Lionel Liu Authored: Mon Feb 12 17:24:59 2018 +0800 Committer: Lionel Liu Committed: Mon Feb 12 17:24:59 2018 +0800 -- .../java/org/apache/griffin/core/metric/MetricStoreImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[34/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/4342c6d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/4342c6d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/4342c6d8 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: 4342c6d8c2a9d120e4729ec143daa546c25fed97 Parents: 6d68401 5507f57 Author: Lionel Liu Authored: Mon Feb 12 17:24:59 2018 +0800 Committer: Lionel Liu Committed: Mon Feb 12 17:24:59 2018 +0800 -- .../java/org/apache/griffin/core/metric/MetricStoreImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[34/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/4342c6d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/4342c6d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/4342c6d8 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: 4342c6d8c2a9d120e4729ec143daa546c25fed97 Parents: 6d68401 5507f57 Author: Lionel Liu Authored: Mon Feb 12 17:24:59 2018 +0800 Committer: Lionel Liu Committed: Mon Feb 12 17:24:59 2018 +0800 -- .../java/org/apache/griffin/core/metric/MetricStoreImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[34/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/b4c2d366 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/b4c2d366 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/b4c2d366 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: b4c2d36679004f08ac7804acfe6ba188e05dc0ec Parents: e72cea8 9a6dc4b Author: Lionel Liu Authored: Wed Feb 7 18:23:27 2018 +0800 Committer: Lionel Liu Committed: Wed Feb 7 18:23:27 2018 +0800 -- .../source/cache/ParquetDataSourceCache.scala | 2 +- .../griffin/measure/rule/udf/GriffinUdfs.scala | 13 +++-- .../resources/_profiling-batch-griffindsl.json | 14 -- .../measure/rule/udf/GriffinUdfsTest.scala | 50 4 files changed, 71 insertions(+), 8 deletions(-) --
[34/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/e72cea84 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/e72cea84 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/e72cea84 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: e72cea84e28f67b5e72bb24deb41f4919fd97f7e Parents: 6ef8764 fdcd7f7 Author: Lionel Liu Authored: Wed Feb 7 16:18:52 2018 +0800 Committer: Lionel Liu Committed: Wed Feb 7 16:18:52 2018 +0800 -- griffin-doc/docker/griffin-docker-guide.md | 2 +- .../org/apache/griffin/core/job/JobInstance.java | 17 - .../apache/griffin/core/job/JobServiceImpl.java| 2 +- .../apache/griffin/core/job/SparkSubmitJob.java| 14 +++--- .../griffin/core/job/entity/JobDataSegment.java| 2 +- .../griffin/core/job/entity/JobSchedule.java | 6 +++--- .../griffin/core/measure/entity/DataConnector.java | 2 +- .../org/apache/griffin/core/util/TimeUtil.java | 4 ++-- 8 files changed, 24 insertions(+), 25 deletions(-) --