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

合并

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

@@ -127,7 +127,7 @@ object find_bug {
         .join(imp_count_oldUser_all,"stat_date")
       result1.show()
 
-      GmeiConfig.writeToJDBCTable(result1, "bug_Recommendation_strategy_temp", SaveMode.Append)
+//      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)
 
 
@@ -294,7 +294,7 @@ object find_bug {
         .join(imp_count_newUser_all,"stat_date")
       result3.show()
 
-      GmeiConfig.writeToJDBCTable(result3, "bug_Recommendation_strategy_newUser", SaveMode.Append)
+//      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)
 
 
@@ -429,7 +429,7 @@ object CTR_precise {
 
       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)
+//      GmeiConfig.writeToJDBCTable(result1, "bug_precise_Recommendation_strategy_temp", SaveMode.Append)
 
       //统计新用户点击率
       val devicee_id_newUser = sc.sql(
@@ -501,7 +501,7 @@ object CTR_precise {
         .join(imp_count_newUser_all,"stat_date")
       result3.show()
 
-      GmeiConfig.writeToJDBCTable(result3, "bug_precise_Recommendation_strategy_newUser", SaveMode.Append)
+//      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

@@ -638,7 +638,7 @@ 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)
+      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result, table="alpha_ctr",SaveMode.Append)
 
 
 
@@ -662,7 +662,7 @@ object alpha_ctr {
       )
 
       val result3=device_num_count.join(duration_device,"stat_date")
-      GmeiConfig.writeToJDBCTable(result3, "alpha_duration", SaveMode.Append)
+//      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,7 +164,7 @@ object temp_count {
         .join(imp_count_oldUser_Contrast,"stat_date")
       result1.show()
 
-      GmeiConfig.writeToJDBCTable(result1, "ffm_diary_ctr", SaveMode.Append)
+//      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)
 
@@ -463,7 +463,7 @@ object Repeated_content_recommendation_moreday {
       println(result)
       val df_result = sc.createDataFrame(result)
 
-      GmeiConfig.writeToJDBCTable(df_result, table = "Repeated_content_recommendation_moreday", SaveMode.Append)
+//      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)
 
 
@@ -633,7 +633,7 @@ object GetHiveSearchData {
       "searchDoctorClickNum","searchHospitalExposureVal","searchHospitalClickNum")
 
 //
-      GmeiConfig.writeToJDBCTable(df_result, table = "GetHiveSearchData_CTR", SaveMode.Append)
+//      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

@@ -402,7 +402,7 @@ object testt {
         .join(log_newUser,"stat_date")
         .join(log_oldUser,"stat_date")
 
-      GmeiConfig.writeToJDBCTable(result, "diary_meigou_crv", SaveMode.Append)
+//      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)
 
 
@@ -769,7 +769,7 @@ object diary_clk_card {
         .join(imp_count_newUser_all_precise,"stat_date")
       result1.show()
 
-      GmeiConfig.writeToJDBCTable(result1, "on_click_diary_card", SaveMode.Append)
+//      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)