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

修改测试文件

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

@@ -414,6 +414,7 @@ object data_feed_exposure_precise {
       )
 
       GmeiConfig.writeToJDBCTable(result, table = "data_feed_exposure_precise", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result, table="data_feed_exposure_precise",SaveMode.Append)
 
     }
 

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

@@ -126,6 +126,8 @@ object find_bug {
       result1.show()
 
       GmeiConfig.writeToJDBCTable(result1, "bug_Recommendation_strategy_temp", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result1, table="bug_Recommendation_strategy_temp",SaveMode.Append)
+
 
 
       //device_id尾号1有点击用户日记本点击数
@@ -291,6 +293,8 @@ object find_bug {
       result3.show()
 
       GmeiConfig.writeToJDBCTable(result3, "bug_Recommendation_strategy_newUser", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result3, table="bug_Recommendation_strategy_newUser",SaveMode.Append)
+
 
     }
 
@@ -420,6 +424,8 @@ object CTR_precise {
         .join(imp_count_oldUser_all,"stat_date")
       result1.show()
 
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result1, table="bug_precise_Recommendation_strategy_temp",SaveMode.Append)
+
       GmeiConfig.writeToJDBCTable(result1, "bug_precise_Recommendation_strategy_temp", SaveMode.Append)
 
       //统计新用户点击率
@@ -493,6 +499,8 @@ object CTR_precise {
       result3.show()
 
       GmeiConfig.writeToJDBCTable(result3, "bug_precise_Recommendation_strategy_newUser", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result3, table="bug_precise_Recommendation_strategy_newUser",SaveMode.Append)
+
 
     }
 

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

@@ -632,6 +632,8 @@ object alpha_ctr {
 
 
       GmeiConfig.writeToJDBCTable(result, "alpha_ctr", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result, table="alpha_ctr",SaveMode.Append)
+
 
 
       val device_duration_avge = sc.sql(
@@ -656,6 +658,8 @@ object alpha_ctr {
 
       val result3=device_duration_avge.join(duration_everytime_avge,"stat_date")
       GmeiConfig.writeToJDBCTable(result3, "alpha_duration", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result3, table="alpha_duration",SaveMode.Append)
+
 
 
     }

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

@@ -164,6 +164,9 @@ object temp_count {
 
       GmeiConfig.writeToJDBCTable(result1, "ffm_diary_ctr", SaveMode.Append)
 
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result1, table="ffm_diary_ctr",SaveMode.Append)
+
+
 
     }
 
@@ -407,11 +410,11 @@ object Repeated_content_recommendation_moreday {
       val sc = spark_env._2
 
       val ti = new TiContext(sc)
-      ti.tidbMapTable(dbName = "jerry_prod", tableName = "data_feed_exposure_precise")
-      ti.tidbMapTable(dbName = "jerry_prod", tableName = "data_feed_click")
-      ti.tidbMapTable(dbName = "jerry_prod", tableName = "blacklist")
-      ti.tidbMapTable(dbName = "jerry_prod", tableName = "data_feed_exposure")
-      ti.tidbMapTable(dbName = "jerry_prod", tableName = "merge_queue_table")
+//      ti.tidbMapTable(dbName = "jerry_prod", tableName = "data_feed_exposure_precise")
+//      ti.tidbMapTable(dbName = "jerry_prod", tableName = "data_feed_click")
+//      ti.tidbMapTable(dbName = "jerry_prod", tableName = "blacklist")
+//      ti.tidbMapTable(dbName = "jerry_prod", tableName = "data_feed_exposure")
+//      ti.tidbMapTable(dbName = "jerry_prod", tableName = "merge_queue_table")
 
 
       val stat_date = GmeiConfig.getMinusNDate(1)
@@ -457,8 +460,10 @@ object Repeated_content_recommendation_moreday {
       val df_result = sc.createDataFrame(result)
 
       GmeiConfig.writeToJDBCTable(df_result, table = "Repeated_content_recommendation_moreday", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",df_result, table="Repeated_content_recommendation_moreday",SaveMode.Append)
+
 
-//      exp_diary.show()
+      //      exp_diary.show()
 //      exp_diary.createOrReplaceTempView("exp_diary")
 //      GmeiConfig.writeToJDBCTable(df, table = "Repeated_evaluation_indicator_moreday", SaveMode.Append)
 
@@ -624,6 +629,8 @@ object GetHiveSearchData {
 
 //
       GmeiConfig.writeToJDBCTable(df_result, table = "GetHiveSearchData_CTR", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",df_result, table="GetHiveSearchData_CTR",SaveMode.Append)
+
 
     }
 

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

@@ -401,6 +401,8 @@ object testt {
         .join(log_oldUser,"stat_date")
 
       GmeiConfig.writeToJDBCTable(result, "diary_meigou_crv", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result, table="diary_meigou_crv",SaveMode.Append)
+
 
 
     }
@@ -765,6 +767,8 @@ object diary_clk_card {
       result1.show()
 
       GmeiConfig.writeToJDBCTable(result1, "on_click_diary_card", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result1, table="on_click_diary_card",SaveMode.Append)
+
 
 
     }