合并冲突

eda/feededa/src/main/scala/com/gmei/GmeiConfig.scala

@@ -45,13 +45,9 @@ object GmeiConfig extends Serializable {
       .config("spark.sql.extensions","org.apache.spark.sql.TiExtensions")
       .appName("feededa")
       .enableHiveSupport()
-      .config("spark.tispark.pd.addresses","172.16.40.158:2379")
-      .config("spark.sql.extensions","org.apache.spark.sql.TiExtensions")
       .getOrCreate()
 
-    spark.sql("SET mapreduce.job.queuename=data")
-    spark.sql("SET mapred.input.dir.recursive=true")
-    spark.sql("SET hive.mapred.supports.subdirectories=true")
+    spark.sql("use online")
     spark.sql("ADD JAR hdfs:///user/hive/share/lib/udf/brickhouse-0.7.1-SNAPSHOT.jar")
     spark.sql("ADD JAR hdfs:///user/hive/share/lib/udf/hive-udf-1.0-SNAPSHOT.jar")
     spark.sql("CREATE TEMPORARY FUNCTION json_map AS 'brickhouse.udf.json.JsonMapUDF'")