Repository: incubator-griffin Updated Branches: refs/heads/master 95f5bf960 -> 4ca4cdb9b
utilize scala codes: nonempty,foreach,exists Author: qiyzhou <[email protected]> Closes #281 from zornlemma/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/4ca4cdb9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/4ca4cdb9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/4ca4cdb9 Branch: refs/heads/master Commit: 4ca4cdb9b50bc41b0ae3c7201cb3663a3849d469 Parents: 95f5bf9 Author: qiyzhou <[email protected]> Authored: Tue May 22 10:34:53 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Tue May 22 10:34:53 2018 +0800 ---------------------------------------------------------------------- .../apache/griffin/measure/cache/info/InfoCacheInstance.scala | 2 +- .../data/connector/batch/TextDirBatchDataConnector.scala | 2 +- .../org/apache/griffin/measure/data/source/DataSource.scala | 6 +++--- .../org/apache/griffin/measure/process/temp/TableRegs.scala | 2 +- .../org/apache/griffin/measure/rule/dsl/expr/SelectExpr.scala | 2 +- .../griffin/measure/rule/trans/DistinctnessRulePlanTrans.scala | 2 +- .../griffin/measure/rule/trans/TimelinessRulePlanTrans.scala | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4ca4cdb9/measure/src/main/scala/org/apache/griffin/measure/cache/info/InfoCacheInstance.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/cache/info/InfoCacheInstance.scala b/measure/src/main/scala/org/apache/griffin/measure/cache/info/InfoCacheInstance.scala index bcde266..b116fca 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/cache/info/InfoCacheInstance.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/cache/info/InfoCacheInstance.scala @@ -45,7 +45,7 @@ object InfoCacheInstance extends InfoCache { def listKeys(path: String): List[String] = { infoCaches.foldLeft(Nil: List[String]) { (res, infoCache) => - if (res.size > 0) res else infoCache.listKeys(path) + if (res.nonEmpty) res else infoCache.listKeys(path) } } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4ca4cdb9/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala b/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala index 769a20f..16e79ae 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala @@ -89,7 +89,7 @@ case class TextDirBatchDataConnector(sqlContext: SQLContext, dqEngines: DqEngine private def touchDone(dir: String): Unit = HdfsUtil.createEmptyFile(HdfsUtil.getHdfsFilePath(dir, doneFile)) private def emptyDir(dir: String): Boolean = { - HdfsUtil.listSubPathsByType(dir, "file").filter(!_.startsWith(ignoreFilePrefix)).size == 0 + !HdfsUtil.listSubPathsByType(dir, "file").exists(!_.startsWith(ignoreFilePrefix)) } // def available(): Boolean = { http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4ca4cdb9/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSource.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSource.scala b/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSource.scala index b4324dd..5eae2a0 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSource.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSource.scala @@ -47,8 +47,8 @@ case class DataSource(sqlContext: SQLContext, dataSourceCacheOpt.foreach(_.init) dataConnectors.foreach(_.init) - dataSourceCacheOpt.map(_.tmstCache = tmstCache) - dataConnectors.map(_.tmstCache = tmstCache) + dataSourceCacheOpt.foreach(_.tmstCache = tmstCache) + dataConnectors.foreach(_.tmstCache = tmstCache) } def loadData(timeInfo: TimeInfo): TimeRange = { @@ -81,7 +81,7 @@ case class DataSource(sqlContext: SQLContext, } val pairs = batches ++ caches - if (pairs.size > 0) { + if (pairs.nonEmpty) { pairs.reduce { (a, b) => (unionDfOpts(a._1, b._1), a._2.merge(b._2)) } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4ca4cdb9/measure/src/main/scala/org/apache/griffin/measure/process/temp/TableRegs.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/process/temp/TableRegs.scala b/measure/src/main/scala/org/apache/griffin/measure/process/temp/TableRegs.scala index d205099..8f8e0f1 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/process/temp/TableRegs.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/process/temp/TableRegs.scala @@ -66,7 +66,7 @@ case class TableRegs() { def existTable(key: String, table: String): Boolean = { tables.get(key) match { - case Some(set) => set.exists(_ == table) + case Some(set) => set.contains(table) case _ => false } } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4ca4cdb9/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/expr/SelectExpr.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/expr/SelectExpr.scala b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/expr/SelectExpr.scala index 0c3c451..4f84b10 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/expr/SelectExpr.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/expr/SelectExpr.scala @@ -121,7 +121,7 @@ case class SelectionExpr(head: HeadExpr, selectors: Seq[SelectExpr], aliasOpt: O def alias: Option[String] = { if (aliasOpt.isEmpty) { val aliasSeq = (head +: selectors).flatMap(_.alias) - if (aliasSeq.size > 0) Some(aliasSeq.mkString("_")) else None + if (aliasSeq.nonEmpty) Some(aliasSeq.mkString("_")) else None } else aliasOpt } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4ca4cdb9/measure/src/main/scala/org/apache/griffin/measure/rule/trans/DistinctnessRulePlanTrans.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/rule/trans/DistinctnessRulePlanTrans.scala b/measure/src/main/scala/org/apache/griffin/measure/rule/trans/DistinctnessRulePlanTrans.scala index ccdf178..3ed6839 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/rule/trans/DistinctnessRulePlanTrans.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/rule/trans/DistinctnessRulePlanTrans.scala @@ -233,7 +233,7 @@ case class DistinctnessRulePlanTrans(dataSourceNames: Seq[String], val duplicationArrayName = details.getString(_duplicationArray, "") val dupRulePlan = if (duplicationArrayName.nonEmpty) { val recordEnable = details.getBoolean(_recordEnable, false) - if (groupAliases.size > 0) { + if (groupAliases.nonEmpty) { // with some group by requirement // 9. origin data join with distinct information val informedTableName = "__informed" http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/4ca4cdb9/measure/src/main/scala/org/apache/griffin/measure/rule/trans/TimelinessRulePlanTrans.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/rule/trans/TimelinessRulePlanTrans.scala b/measure/src/main/scala/org/apache/griffin/measure/rule/trans/TimelinessRulePlanTrans.scala index d6dc499..deee65b 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/rule/trans/TimelinessRulePlanTrans.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/rule/trans/TimelinessRulePlanTrans.scala @@ -193,7 +193,7 @@ case class TimelinessRulePlanTrans(dataSourceNames: Seq[String], // 6. percentiles val percentiles = getPercentiles(details) - val percentilePlan = if (percentiles.size > 0) { + val percentilePlan = if (percentiles.nonEmpty) { val percentileTableName = "__percentile" val percentileColName = details.getStringOrKey(_percentileColPrefix) val percentileCols = percentiles.map { pct =>
