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:47:11 UTC
incubator-griffin git commit: Refactoring/logbeforeignoreexceptions
Repository: incubator-griffin
Updated Branches:
refs/heads/master 4cc508f1f -> adab48794
Refactoring/logbeforeignoreexceptions
Author: Grant <gr...@gmail.com>
Closes #310 from grant-xuexu/refactoring/logbeforeignoreexceptions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/adab4879
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/adab4879
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/adab4879
Branch: refs/heads/master
Commit: adab48794c095566b72695a1011a28841cd17d06
Parents: 4cc508f
Author: Grant <gr...@gmail.com>
Authored: Tue Jun 19 10:47:06 2018 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Tue Jun 19 10:47:06 2018 +0800
----------------------------------------------------------------------
.../griffin/measure/configuration/dqdefinition/DQConfig.scala | 4 ++--
.../griffin/measure/configuration/dqdefinition/EnvConfig.scala | 2 +-
.../measure/datasource/cache/StreamingOffsetCacheable.scala | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/adab4879/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala
----------------------------------------------------------------------
diff --git a/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala b/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala
index 222f6e2..8d69377 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala
+++ b/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/DQConfig.scala
@@ -39,7 +39,7 @@ case class DQConfig(@JsonProperty("name") name: String,
@JsonProperty("evaluate.rule") evaluateRule: EvaluateRuleParam
) extends Param {
def getName: String = name
- def getTimestampOpt: Option[Long] = if (timestamp != null) Some(timestamp) else None
+ def getTimestampOpt: Option[Long] = if (timestamp != 0) Some(timestamp) else None
def getProcType: String = procType
def getDataSources: Seq[DataSourceParam] = {
dataSources.foldLeft((Nil: Seq[DataSourceParam], Set[String]())) { (ret, ds) =>
@@ -145,7 +145,7 @@ case class RuleParam( @JsonProperty("dsl.type") dslType: String,
) extends Param {
def getDslType: DslType = if (dslType != null) DslType(dslType) else DslType("")
def getDqType: DqType = if (dqType != null) DqType(dqType) else DqType("")
- def getCache: Boolean = if (cache != null) cache else false
+ def getCache: Boolean = if (cache) cache else false
def getName: String = if (name != null) name else ""
def getRule: String = if (rule != null) rule else ""
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/adab4879/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/EnvConfig.scala
----------------------------------------------------------------------
diff --git a/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/EnvConfig.scala b/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/EnvConfig.scala
index 54a1a51..9793c01 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/EnvConfig.scala
+++ b/measure/src/main/scala/org/apache/griffin/measure/configuration/dqdefinition/EnvConfig.scala
@@ -68,7 +68,7 @@ case class SparkParam( @JsonProperty("log.level") logLevel: String,
def getBatchInterval: String = if (batchInterval != null) batchInterval else ""
def getProcessInterval: String = if (processInterval != null) processInterval else ""
def getConfig: Map[String, String] = if (config != null) config else Map[String, String]()
- def needInitClear: Boolean = if (initClear != null) initClear else false
+ def needInitClear: Boolean = if (initClear) initClear else false
def validate(): Unit = {
// assert(StringUtils.isNotBlank(cpDir), "checkpoint.dir should not be empty")
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/adab4879/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 3195d24..e9cd296 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 _ => None
+ case _ => error("try to read not existing value from OffsetCacheClient::readSelfInfo");None
}
}
}