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/df43c963 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/df43c963 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/df43c963 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: df43c963aa6fa0439a13b80c7805e638a4fbf6a8 Parents: d000dab a4f4f24 Author: Lionel Liu <[email protected]> Authored: Wed Mar 21 16:11:01 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Wed Mar 21 16:11:01 2018 +0800 ---------------------------------------------------------------------- .../data/connector/DataConnectorFactory.scala | 3 - .../streaming/KafkaStreamingDataConnector.scala | 38 ++-- .../KafkaStreamingStringDataConnector.scala | 4 +- .../streaming/StreamingDataConnector.scala | 5 +- .../measure/data/source/DataSource.scala | 51 +++--- .../data/source/cache/DataSourceCache.scala | 51 ++++-- .../measure/data/source/cache/WithFanIn.scala | 57 ++++++ .../measure/process/engine/SparkSqlEngine.scala | 2 +- .../measure/rule/adaptor/InternalColumns.scala | 4 +- .../dsl/analyzer/DistinctnessAnalyzer.scala | 2 +- .../rule/dsl/expr/ClauseExpression.scala | 28 ++- .../griffin/measure/rule/dsl/expr/Expr.scala | 2 +- .../griffin/measure/rule/dsl/expr/ExprTag.scala | 23 +++ .../measure/rule/dsl/parser/BasicParser.scala | 10 +- .../rule/dsl/parser/GriffinDslParser.scala | 12 +- .../rule/trans/DistinctnessRulePlanTrans.scala | 173 ++++++++++++++----- .../griffin/measure/utils/DataFrameUtil.scala | 41 +++++ .../_distinctness-batch-griffindsl1.json | 2 +- .../_distinctness-batch-griffindsl2.json | 74 ++++++++ 19 files changed, 467 insertions(+), 115 deletions(-) ----------------------------------------------------------------------
