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/761d6d10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/761d6d10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/761d6d10 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 761d6d10070358e174a00af906825cd05bdc4a7e Parents: 752d76a 34f06af Author: Lionel Liu <bhlx3l...@163.com> Authored: Thu Nov 23 10:31:47 2017 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Thu Nov 23 10:31:47 2017 +0800 ---------------------------------------------------------------------- .../batch/HiveBatchDataConnector.scala | 31 +++-- .../measure/process/StreamingDqThread.scala | 6 +- .../process/engine/DataFrameOprEngine.scala | 5 +- .../measure/process/engine/DqEngine.scala | 2 + .../measure/process/engine/DqEngines.scala | 1 - .../measure/process/engine/SparkDqEngine.scala | 120 ++++++++++--------- .../measure/process/engine/SparkSqlEngine.scala | 2 + .../rule/adaptor/GriffinDslAdaptor.scala | 5 +- .../measure/rule/dsl/expr/SelectExpr.scala | 14 ++- .../measure/rule/dsl/parser/BasicParser.scala | 22 +++- .../apache/griffin/measure/utils/TimeUtil.scala | 2 +- measure/src/test/resources/config1.json | 4 +- .../rule/adaptor/GriffinDslAdaptorTest.scala | 2 +- 13 files changed, 121 insertions(+), 95 deletions(-) ----------------------------------------------------------------------
