Merge branch 'master' of http://git.wanmeizhensuo.com/ML/ffm-baseline

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

@@ -695,7 +695,7 @@ object GetDiaryPortrait {
       )
       val jdbc = "jdbc:mysql://10.66.157.22:4000/jerry_test?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true"
 
-      GmeiConfig.writeToJDBCTable(jdbc,result,"pre_test",SaveMode.Overwrite)
+      GmeiConfig.writeToJDBCTable(jdbc,result,"diary_feat",SaveMode.Overwrite)
 
 
       sc.stop()

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

@@ -53,6 +53,11 @@ object GmeiConfig extends Serializable {
       .enableHiveSupport()
       .getOrCreate()
 
+    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'")
+    spark.sql("CREATE TEMPORARY FUNCTION is_json AS 'com.gmei.hive.common.udf.UDFJsonFormatCheck'")
     val context = SparkContext.getOrCreate(sparkConf)
     (context, spark)
   }