zhangbo 1 year ago
parent
commit
39206a61e3

+ 16 - 2
src/main/scala/com/aliyun/odps/spark/examples/makedata/makedata_06_originData.scala

@@ -149,17 +149,31 @@ object makedata_06_originData {
           result ++= f8
           val names = Set(
             "ctx_week", "ctx_hour", "ctx_region", "ctx_city",
-            "machineinfo_brand", "machineinfo_model", "machineinfo_platform", "machineinfo_system",
+
+            "gender", "machineinfo_brand", "machineinfo_model", "machineinfo_platform", "machineinfo_sdkversion",
+            "machineinfo_system", "machineinfo_wechatversion",
+
             "u_1day_exp_cnt", "u_1day_click_cnt", "u_1day_share_cnt", "u_1day_return_cnt",
             "u_3day_exp_cnt", "u_3day_click_cnt", "u_3day_share_cnt", "u_3day_return_cnt",
-            "total_time", "play_count_total",
+            "u_7day_exp_cnt", "u_7day_click_cnt", "u_7day_share_cnt", "u_7day_return_cnt",
+            "u_3month_exp_cnt", "u_3month_click_cnt", "u_3month_share_cnt", "u_3month_return_cnt",
+
+            "title", "tags", "total_time", "play_count_total",
             "i_1day_exp_cnt", "i_1day_click_cnt", "i_1day_share_cnt", "i_1day_return_cnt",
             "i_3day_exp_cnt", "i_3day_click_cnt", "i_3day_share_cnt", "i_3day_return_cnt",
+            "i_7day_exp_cnt", "i_7day_click_cnt", "i_7day_share_cnt", "i_7day_return_cnt",
+            "i_3month_exp_cnt", "i_3month_click_cnt", "i_3month_share_cnt", "i_3month_return_cnt",
+
             "u_1day_ctr", "u_1day_str", "u_1day_rov", "u_1day_ros",
             "u_3day_ctr", "u_3day_str", "u_3day_rov", "u_3day_ros",
             "i_1day_ctr", "i_1day_str", "i_1day_rov", "i_1day_ros",
             "i_3day_ctr", "i_3day_str", "i_3day_rov", "i_3day_ros",
 
+            "u_7day_ctr", "u_7day_str", "u_7day_rov", "u_7day_ros",
+            "u_3month_ctr", "u_3month_str", "u_3month_rov", "u_3month_ros",
+            "i_7day_ctr", "i_7day_str", "i_7day_rov", "i_7day_ros",
+            "i_3month_ctr", "i_3month_str", "i_3month_rov", "i_3month_ros",
+
             "share_uv_list_1day_6_avg", "share_uv_list_1day_6_var", "share_uv_list_1day_diff_6_avg", "share_uv_list_1day_diff_6_var",
             "return_uv_list_1day_6_avg", "return_uv_list_1day_6_var", "return_uv_list_1day_diff_6_avg", "return_uv_list_1day_diff_6_var",
             "share_uv_list_1h_6_avg", "share_uv_list_1h_6_var", "share_uv_list_1h_diff_6_avg", "share_uv_list_1h_diff_6_var",