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/19 02:48:31 UTC
incubator-griffin git commit: Refactoring/fixerasureissue
Repository: incubator-griffin
Updated Branches:
refs/heads/master adab48794 -> 1a4780e2e
Refactoring/fixerasureissue
Author: Grant <gr...@gmail.com>
Closes #311 from grant-xuexu/refactoring/fixerasureissue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/1a4780e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/1a4780e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/1a4780e2
Branch: refs/heads/master
Commit: 1a4780e2edb16e2e973d44686d090a8781280dd7
Parents: adab487
Author: Grant <gr...@gmail.com>
Authored: Tue Jun 19 10:48:25 2018 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Tue Jun 19 10:48:25 2018 +0800
----------------------------------------------------------------------
.../scala/org/apache/griffin/measure/utils/ParamUtil.scala | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/1a4780e2/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala
----------------------------------------------------------------------
diff --git a/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala b/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala
index 3f05499..c635123 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala
+++ b/measure/src/main/scala/org/apache/griffin/measure/utils/ParamUtil.scala
@@ -175,10 +175,11 @@ object ParamUtil {
}
}
+ case class StringAnyMap(values:Map[String,Any])
def getParamMap(key: String, defValue: Map[String, Any] = Map[String, Any]()): Map[String, Any] = {
try {
params.get(key) match {
- case Some(v: Map[String, Any]) => v
+ case Some(v: StringAnyMap) => v.values
case _ => defValue
}
} catch {
@@ -189,7 +190,7 @@ object ParamUtil {
def getParamMapOpt(key: String): Option[Map[String, Any]] = {
try {
params.get(key) match {
- case Some(v: Map[String, Any]) => Some(v)
+ case Some(v: StringAnyMap) => Some(v.values)
case _ => None
}
} catch {
@@ -198,9 +199,10 @@ object ParamUtil {
}
def getArr[T](key: String): Seq[T] = {
+ case class TSeqs(values:Seq[T])
try {
params.get(key) match {
- case Some(seq: Seq[T]) => seq
+ case Some(seq: TSeqs) => seq.values
case _ => Nil
}
} catch {