hive

Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/78bcd7dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/78bcd7dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/78bcd7dd

Branch: refs/heads/griffin-0.2.0-incubating-rc4
Commit: 78bcd7dde1a8534540f1f1540c31c78b554639df
Parents: 8a49d88
Author: Lionel Liu <[email protected]>
Authored: Tue Apr 17 16:11:36 2018 +0800
Committer: Lionel Liu <[email protected]>
Committed: Tue Apr 17 16:11:36 2018 +0800

----------------------------------------------------------------------
 .../org/apache/griffin/measure/process/BatchDqProcess.scala    | 6 +-----
 .../apache/griffin/measure/process/StreamingDqProcess.scala    | 6 +-----
 measure/src/test/resources/env-test.json                       | 3 +--
 3 files changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/78bcd7dd/measure/src/main/scala/org/apache/griffin/measure/process/BatchDqProcess.scala
----------------------------------------------------------------------
diff --git 
a/measure/src/main/scala/org/apache/griffin/measure/process/BatchDqProcess.scala
 
b/measure/src/main/scala/org/apache/griffin/measure/process/BatchDqProcess.scala
index 04b608a..deccf5f 100644
--- 
a/measure/src/main/scala/org/apache/griffin/measure/process/BatchDqProcess.scala
+++ 
b/measure/src/main/scala/org/apache/griffin/measure/process/BatchDqProcess.scala
@@ -56,11 +56,7 @@ case class BatchDqProcess(allParam: AllParam) extends 
DqProcess {
     val conf = new SparkConf().setAppName(metricName)
     conf.setAll(sparkParam.config)
     conf.set("spark.sql.crossJoin.enabled", "true")
-    sparkSession = if (conf.contains("hive.metastore.uris")) {
-      SparkSession.builder().config(conf).enableHiveSupport().getOrCreate()
-    } else {
-      SparkSession.builder().config(conf).getOrCreate()
-    }
+    sparkSession = 
SparkSession.builder().config(conf).enableHiveSupport().getOrCreate()
     sparkSession.sparkContext.setLogLevel(sparkParam.logLevel)
     sqlContext = sparkSession.sqlContext
 

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/78bcd7dd/measure/src/main/scala/org/apache/griffin/measure/process/StreamingDqProcess.scala
----------------------------------------------------------------------
diff --git 
a/measure/src/main/scala/org/apache/griffin/measure/process/StreamingDqProcess.scala
 
b/measure/src/main/scala/org/apache/griffin/measure/process/StreamingDqProcess.scala
index b7ec449..19e553e 100644
--- 
a/measure/src/main/scala/org/apache/griffin/measure/process/StreamingDqProcess.scala
+++ 
b/measure/src/main/scala/org/apache/griffin/measure/process/StreamingDqProcess.scala
@@ -57,11 +57,7 @@ case class StreamingDqProcess(allParam: AllParam) extends 
DqProcess {
     val conf = new SparkConf().setAppName(metricName)
     conf.setAll(sparkParam.config)
     conf.set("spark.sql.crossJoin.enabled", "true")
-    sparkSession = if (conf.contains("hive.metastore.uris")) {
-      SparkSession.builder().config(conf).enableHiveSupport().getOrCreate()
-    } else {
-      SparkSession.builder().config(conf).getOrCreate()
-    }
+    sparkSession = 
SparkSession.builder().config(conf).enableHiveSupport().getOrCreate()
     sparkSession.sparkContext.setLogLevel(sparkParam.logLevel)
     sqlContext = sparkSession.sqlContext
 

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/78bcd7dd/measure/src/test/resources/env-test.json
----------------------------------------------------------------------
diff --git a/measure/src/test/resources/env-test.json 
b/measure/src/test/resources/env-test.json
index 5a0c573..4a8e3d0 100644
--- a/measure/src/test/resources/env-test.json
+++ b/measure/src/test/resources/env-test.json
@@ -5,8 +5,7 @@
     "batch.interval": "10s",
     "process.interval": "10m",
     "config": {
-      "spark.master": "local[*]",
-      "hive.metastore.uris": "thrift://localhost:9083"
+      "spark.master": "local[*]"
     },
     "init.clear": true
   },

Reply via email to