Repository: incubator-griffin Updated Branches: refs/heads/master 2bdebecc5 -> 83f3bc2e0
head option optimize Author: Lionel Liu <[email protected]> Author: dodobel <[email protected]> Author: Eugene <[email protected]> Closes #349 from bhlx3lyx7/spark2. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/83f3bc2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/83f3bc2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/83f3bc2e Branch: refs/heads/master Commit: 83f3bc2e0d5e1d090cbf9a632fe2621bdb786cf4 Parents: 2bdebec Author: Lionel Liu <[email protected]> Authored: Thu Jul 12 17:53:15 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Thu Jul 12 17:53:15 2018 +0800 ---------------------------------------------------------------------- .../org/apache/griffin/measure/sink/MultiSinks.scala | 12 +++--------- .../builder/dsl/transform/ProfilingExpr2DQSteps.scala | 3 ++- 2 files changed, 5 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/83f3bc2e/measure/src/main/scala/org/apache/griffin/measure/sink/MultiSinks.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/sink/MultiSinks.scala b/measure/src/main/scala/org/apache/griffin/measure/sink/MultiSinks.scala index cb19a4f..ede52cc 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/sink/MultiSinks.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/sink/MultiSinks.scala @@ -27,17 +27,11 @@ case class MultiSinks(persists: Iterable[Sink]) extends Sink { val block: Boolean = false - val headSink: Sink = persists.headOption.orNull + val headSinkOpt: Option[Sink] = persists.headOption - val metricName: String = headSink match { - case null => "" - case _ => headSink.metricName - } + val metricName: String = headSinkOpt.map(_.metricName).getOrElse("") - val timeStamp: Long = headSink match { - case null => 0 - case _ => headSink.timeStamp - } + val timeStamp: Long = headSinkOpt.map(_.timeStamp).getOrElse(0) val config: Map[String, Any] = Map[String, Any]() http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/83f3bc2e/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/ProfilingExpr2DQSteps.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/ProfilingExpr2DQSteps.scala b/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/ProfilingExpr2DQSteps.scala index ea527c5..28fa96a 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/ProfilingExpr2DQSteps.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/step/builder/dsl/transform/ProfilingExpr2DQSteps.scala @@ -18,6 +18,7 @@ under the License. */ package org.apache.griffin.measure.step.builder.dsl.transform +import org.apache.commons.lang.StringUtils import org.apache.griffin.measure.configuration.enums.{BatchProcessType, NormalizeType, StreamingProcessType} import org.apache.griffin.measure.configuration.dqdefinition.RuleParam import org.apache.griffin.measure.context.DQContext @@ -62,7 +63,7 @@ case class ProfilingExpr2DQSteps(context: DQContext, val analyzer = ProfilingAnalyzer(profilingExpr, sourceName) val selExprDescs = analyzer.selectionExprs.map { sel => val alias = sel match { - case s: AliasableExpr if (s.alias.nonEmpty) => s" AS `${s.alias.getOrElse{""}}`" + case s: AliasableExpr => s.alias.filter(StringUtils.isNotEmpty).map(a => s" AS `${a}`").getOrElse("") case _ => "" } s"${sel.desc}${alias}"
