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

[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/882c6eda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/882c6eda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/882c6eda

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: 882c6edab2155e3c71c61f9c6988da3b27c392d6
Parents: 15c62ce 06f969f
Author: Lionel Liu 
Authored: Tue Jan 16 16:58:24 2018 +0800
Committer: Lionel Liu 
Committed: Tue Jan 16 16:58:24 2018 +0800

--
 .../griffin/measure/process/BatchDqProcess.scala|  4 ++--
 .../griffin/measure/process/StreamingDqThread.scala |  4 ++--
 .../griffin/measure/process/engine/DqEngine.scala   |  2 +-
 .../griffin/measure/process/engine/DqEngines.scala  | 16 
 .../measure/process/engine/SparkDqEngine.scala  |  3 +--
 5 files changed, 14 insertions(+), 15 deletions(-)
--

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

[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/712a5a7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/712a5a7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/712a5a7c

Branch: refs/heads/griffin-0.2.0-incubating-rc1
Commit: 712a5a7c990a35f84fbf0d271bfa3f609740dc71
Parents: 761d6d1 8e9b50f
Author: Lionel Liu 
Authored: Fri Nov 24 11:17:47 2017 +0800
Committer: Lionel Liu 
Committed: Fri Nov 24 11:17:47 2017 +0800

--
 .../org/apache/griffin/core/job/SparkSubmitJob.java |  9 +
 .../griffin/core/measure/entity/DataConnector.java  | 16 ++--
 .../apache/griffin/core/measure/entity/Rule.java|  7 ++-
 3 files changed, 17 insertions(+), 15 deletions(-)
--

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

[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/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 
Authored: Thu Nov 23 10:31:47 2017 +0800
Committer: Lionel Liu 
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(-)
--