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-rc1 Commit: 150a13c3b9887eabab0d53d1356360e2596a98c7 Parents: 80074bd a0b130a Author: Lionel Liu <bhlx3l...@163.com> Authored: Wed Jan 24 10:57:54 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> 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(-) ----------------------------------------------------------------------
