You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2018/06/20 02:47:46 UTC
incubator-griffin git commit: Refactoring/fix throwable
Repository: incubator-griffin
Updated Branches:
refs/heads/master 130d20016 -> 865cd3149
Refactoring/fix throwable
Author: Grant <gr...@gmail.com>
Closes #315 from grant-xuexu/refactoring/fix_throwable.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/865cd314
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/865cd314
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/865cd314
Branch: refs/heads/master
Commit: 865cd3149d15e8760cbf15ffebe7f14d61bce69a
Parents: 130d200
Author: Grant <gr...@gmail.com>
Authored: Wed Jun 20 10:47:40 2018 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Wed Jun 20 10:47:40 2018 +0800
----------------------------------------------------------------------
.../measure/datasource/cache/StreamingCacheClient.scala | 5 +++--
.../measure/datasource/cache/StreamingOffsetCacheable.scala | 2 +-
.../step/builder/preproc/PreProcRuleParamGenerator.scala | 6 ++++--
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/865cd314/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingCacheClient.scala
----------------------------------------------------------------------
diff --git a/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingCacheClient.scala b/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingCacheClient.scala
index 10c443e..bfdc2da 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingCacheClient.scala
+++ b/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingCacheClient.scala
@@ -71,9 +71,10 @@ trait StreamingCacheClient extends StreamingOffsetCacheable with WithFanIn[Long]
val readyTimeDelay: Long = TimeUtil.milliseconds(param.getString(_ReadyTimeDelay, "1m")).getOrElse(60000L)
val deltaTimeRange: (Long, Long) = {
def negative(n: Long): Long = if (n <= 0) n else 0
+ case class StringSeq(values:Seq[String])
param.get(_TimeRange) match {
- case Some(seq: Seq[String]) => {
- val nseq = seq.flatMap(TimeUtil.milliseconds(_))
+ case Some(seq: StringSeq) => {
+ val nseq = seq.values.flatMap(TimeUtil.milliseconds(_))
val ns = negative(nseq.headOption.getOrElse(0))
val ne = negative(nseq.tail.headOption.getOrElse(0))
(ns, ne)
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/865cd314/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingOffsetCacheable.scala
----------------------------------------------------------------------
diff --git a/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingOffsetCacheable.scala b/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingOffsetCacheable.scala
index e9cd296..52c1650 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingOffsetCacheable.scala
+++ b/measure/src/main/scala/org/apache/griffin/measure/datasource/cache/StreamingOffsetCacheable.scala
@@ -80,7 +80,7 @@ trait StreamingOffsetCacheable extends Loggable with Serializable {
try {
Some(v.toLong)
} catch {
- case _ => error("try to read not existing value from OffsetCacheClient::readSelfInfo");None
+ case _:Throwable => error("try to read not existing value from OffsetCacheClient::readSelfInfo");None
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/865cd314/measure/src/main/scala/org/apache/griffin/measure/step/builder/preproc/PreProcRuleParamGenerator.scala
----------------------------------------------------------------------
diff --git a/measure/src/main/scala/org/apache/griffin/measure/step/builder/preproc/PreProcRuleParamGenerator.scala b/measure/src/main/scala/org/apache/griffin/measure/step/builder/preproc/PreProcRuleParamGenerator.scala
index b9bb4fc..64b8623 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/step/builder/preproc/PreProcRuleParamGenerator.scala
+++ b/measure/src/main/scala/org/apache/griffin/measure/step/builder/preproc/PreProcRuleParamGenerator.scala
@@ -25,6 +25,8 @@ import org.apache.griffin.measure.configuration.dqdefinition.RuleParam
*/
object PreProcRuleParamGenerator {
+ case class StringAnyMap(values:Map[String,Any])
+
val _name = "name"
def getNewPreProcRules(rules: Seq[RuleParam], suffix: String): Seq[RuleParam] = {
@@ -45,7 +47,7 @@ object PreProcRuleParamGenerator {
keys.foldLeft(details) { (map, key) =>
map.get(key) match {
case Some(s: String) => map + (key -> genNewString(s, suffix))
- case Some(subMap: Map[String, Any]) => map + (key -> getNewMap(subMap, suffix))
+ case Some(subMap: StringAnyMap) => map + (key -> getNewMap(subMap.values, suffix))
case Some(arr: Seq[_]) => map + (key -> getNewArr(arr, suffix))
case _ => map
}
@@ -56,7 +58,7 @@ object PreProcRuleParamGenerator {
paramArr.foldLeft(Nil: Seq[Any]) { (res, param) =>
param match {
case s: String => res :+ genNewString(s, suffix)
- case map: Map[String, Any] => res :+ getNewMap(map, suffix)
+ case map: StringAnyMap => res :+ getNewMap(map.values, suffix)
case arr: Seq[_] => res :+ getNewArr(arr, suffix)
case _ => res :+ param
}