Commit f3b742a9 authored by 张彦钊's avatar 张彦钊

合并冲突

parent 461dcf57
...@@ -45,13 +45,9 @@ object GmeiConfig extends Serializable { ...@@ -45,13 +45,9 @@ object GmeiConfig extends Serializable {
.config("spark.sql.extensions","org.apache.spark.sql.TiExtensions") .config("spark.sql.extensions","org.apache.spark.sql.TiExtensions")
.appName("feededa") .appName("feededa")
.enableHiveSupport() .enableHiveSupport()
.config("spark.tispark.pd.addresses","172.16.40.158:2379")
.config("spark.sql.extensions","org.apache.spark.sql.TiExtensions")
.getOrCreate() .getOrCreate()
spark.sql("SET mapreduce.job.queuename=data") spark.sql("use online")
spark.sql("SET mapred.input.dir.recursive=true")
spark.sql("SET hive.mapred.supports.subdirectories=true")
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/brickhouse-0.7.1-SNAPSHOT.jar")
spark.sql("ADD JAR hdfs:///user/hive/share/lib/udf/hive-udf-1.0-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'") spark.sql("CREATE TEMPORARY FUNCTION json_map AS 'brickhouse.udf.json.JsonMapUDF'")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment