repair video features

src/main/java/examples/dataloader/RecommRedisFeatureConstructor.java

@@ -23,50 +23,50 @@ public class RecommRedisFeatureConstructor {
 
         // 1day features
         UserActionFeature user1dayActionFeature = new UserActionFeature();
-        user1dayActionFeature.setExp_cnt(record.getString("u_1day_exp_cnt"));
-        user1dayActionFeature.setClick_cnt(record.getString("u_1day_click_cnt"));
-        user1dayActionFeature.setShare_cnt(record.getString("u_1day_share_cnt"));
-        user1dayActionFeature.setReturn_cnt(record.getString("u_1day_return_cnt"));
-        user1dayActionFeature.setCtr(record.getString("u_ctr_1day"));
-        user1dayActionFeature.setStr(record.getString("u_str_1day"));
-        user1dayActionFeature.setRov(record.getString("u_rov_1day"));
-        user1dayActionFeature.setRos(record.getString("u_ros_1day"));
+        user1dayActionFeature.setOriginExp_cnt(record.getString("u_1day_exp_cnt"));
+        user1dayActionFeature.setOriginClick_cnt(record.getString("u_1day_click_cnt"));
+        user1dayActionFeature.setOriginShare_cnt(record.getString("u_1day_share_cnt"));
+        user1dayActionFeature.setOriginReturn_cnt(record.getString("u_1day_return_cnt"));
+        user1dayActionFeature.setOriginCtr(record.getString("u_ctr_1day"));
+        user1dayActionFeature.setOriginStr(record.getString("u_str_1day"));
+        user1dayActionFeature.setOriginRov(record.getString("u_rov_1day"));
+        user1dayActionFeature.setOriginRos(record.getString("u_ros_1day"));
         userFeature.setDay1_cnt_features(user1dayActionFeature);
 
         // 3day features
         UserActionFeature user3dayActionFeature = new UserActionFeature();
-        user3dayActionFeature.setExp_cnt(record.getString("u_3day_exp_cnt"));
-        user3dayActionFeature.setClick_cnt(record.getString("u_3day_click_cnt"));
-        user3dayActionFeature.setShare_cnt(record.getString("u_3day_share_cnt"));
-        user3dayActionFeature.setReturn_cnt(record.getString("u_3day_return_cnt"));
-        user3dayActionFeature.setCtr(record.getString("u_ctr_3day"));
-        user3dayActionFeature.setStr(record.getString("u_str_3day"));
-        user3dayActionFeature.setRov(record.getString("u_rov_3day"));
-        user3dayActionFeature.setRos(record.getString("u_ros_3day"));
+        user3dayActionFeature.setOriginExp_cnt(record.getString("u_3day_exp_cnt"));
+        user3dayActionFeature.setOriginClick_cnt(record.getString("u_3day_click_cnt"));
+        user3dayActionFeature.setOriginShare_cnt(record.getString("u_3day_share_cnt"));
+        user3dayActionFeature.setOriginReturn_cnt(record.getString("u_3day_return_cnt"));
+        user3dayActionFeature.setOriginCtr(record.getString("u_ctr_3day"));
+        user3dayActionFeature.setOriginStr(record.getString("u_str_3day"));
+        user3dayActionFeature.setOriginRov(record.getString("u_rov_3day"));
+        user3dayActionFeature.setOriginRos(record.getString("u_ros_3day"));
         userFeature.setDay3_cnt_features(user3dayActionFeature);
 
         // 7day features
         UserActionFeature user7dayActionFeature = new UserActionFeature();
-        user7dayActionFeature.setExp_cnt(record.getString("u_7day_exp_cnt"));
-        user7dayActionFeature.setClick_cnt(record.getString("u_7day_click_cnt"));
-        user7dayActionFeature.setShare_cnt(record.getString("u_7day_share_cnt"));
-        user7dayActionFeature.setReturn_cnt(record.getString("u_7day_return_cnt"));
-        user7dayActionFeature.setCtr(record.getString("u_ctr_7day"));
-        user7dayActionFeature.setStr(record.getString("u_str_7day"));
-        user7dayActionFeature.setRov(record.getString("u_rov_7day"));
-        user7dayActionFeature.setRos(record.getString("u_ros_7day"));
+        user7dayActionFeature.setOriginExp_cnt(record.getString("u_7day_exp_cnt"));
+        user7dayActionFeature.setOriginClick_cnt(record.getString("u_7day_click_cnt"));
+        user7dayActionFeature.setOriginShare_cnt(record.getString("u_7day_share_cnt"));
+        user7dayActionFeature.setOriginReturn_cnt(record.getString("u_7day_return_cnt"));
+        user7dayActionFeature.setOriginCtr(record.getString("u_ctr_7day"));
+        user7dayActionFeature.setOriginStr(record.getString("u_str_7day"));
+        user7dayActionFeature.setOriginRov(record.getString("u_rov_7day"));
+        user7dayActionFeature.setOriginRos(record.getString("u_ros_7day"));
         userFeature.setDay7_cnt_features(user7dayActionFeature);
 
         // 3month features
         UserActionFeature user3monthActionFeature = new UserActionFeature();
-        user3monthActionFeature.setExp_cnt(record.getString("u_3month_exp_cnt"));
-        user3monthActionFeature.setClick_cnt(record.getString("u_3month_click_cnt"));
-        user3monthActionFeature.setShare_cnt(record.getString("u_3month_share_cnt"));
-        user3monthActionFeature.setReturn_cnt(record.getString("u_3month_return_cnt"));
-        user3monthActionFeature.setCtr(record.getString("u_ctr_3month"));
-        user3monthActionFeature.setStr(record.getString("u_str_3month"));
-        user3monthActionFeature.setRov(record.getString("u_rov_3month"));
-        user3monthActionFeature.setRos(record.getString("u_ros_3month"));
+        user3monthActionFeature.setOriginExp_cnt(record.getString("u_3month_exp_cnt"));
+        user3monthActionFeature.setOriginClick_cnt(record.getString("u_3month_click_cnt"));
+        user3monthActionFeature.setOriginShare_cnt(record.getString("u_3month_share_cnt"));
+        user3monthActionFeature.setOriginReturn_cnt(record.getString("u_3month_return_cnt"));
+        user3monthActionFeature.setOriginCtr(record.getString("u_ctr_3month"));
+        user3monthActionFeature.setOriginStr(record.getString("u_str_3month"));
+        user3monthActionFeature.setOriginRov(record.getString("u_rov_3month"));
+        user3monthActionFeature.setOriginRos(record.getString("u_ros_3month"));
         userFeature.setMonth3_cnt_features(user3monthActionFeature);
 
         return userFeature;
@@ -83,47 +83,47 @@ public class RecommRedisFeatureConstructor {
         itemFeature.setDaysSinceUpload(record.getString("i_days_since_upload"));
 
         UserActionFeature user1dayActionFeature = new UserActionFeature();
-        user1dayActionFeature.setExp_cnt(record.getString("i_1day_exp_cnt"));
-        user1dayActionFeature.setClick_cnt(record.getString("i_1day_click_cnt"));
-        user1dayActionFeature.setShare_cnt(record.getString("i_1day_share_cnt"));
-        user1dayActionFeature.setReturn_cnt(record.getString("i_1day_return_cnt"));
-        user1dayActionFeature.setCtr(record.getString("i_ctr_1day"));
-        user1dayActionFeature.setStr(record.getString("i_str_1day"));
-        user1dayActionFeature.setRov(record.getString("i_rov_1day"));
-        user1dayActionFeature.setRos(record.getString("i_ros_1day"));
+        user1dayActionFeature.setOriginExp_cnt(record.getString("i_1day_exp_cnt"));
+        user1dayActionFeature.setOriginClick_cnt(record.getString("i_1day_click_cnt"));
+        user1dayActionFeature.setOriginShare_cnt(record.getString("i_1day_share_cnt"));
+        user1dayActionFeature.setOriginReturn_cnt(record.getString("i_1day_return_cnt"));
+        user1dayActionFeature.setOriginCtr(record.getString("i_ctr_1day"));
+        user1dayActionFeature.setOriginStr(record.getString("i_str_1day"));
+        user1dayActionFeature.setOriginRov(record.getString("i_rov_1day"));
+        user1dayActionFeature.setOriginRos(record.getString("i_ros_1day"));
         itemFeature.setDay1_cnt_features(user1dayActionFeature);
 
         UserActionFeature user3dayActionFeature = new UserActionFeature();
-        user3dayActionFeature.setExp_cnt(record.getString("i_3day_exp_cnt"));
-        user3dayActionFeature.setClick_cnt(record.getString("i_3day_click_cnt"));
-        user3dayActionFeature.setShare_cnt(record.getString("i_3day_share_cnt"));
-        user3dayActionFeature.setReturn_cnt(record.getString("i_3day_return_cnt"));
-        user3dayActionFeature.setCtr(record.getString("i_ctr_3day"));
-        user3dayActionFeature.setStr(record.getString("i_str_3day"));
-        user3dayActionFeature.setRov(record.getString("i_rov_3day"));
-        user3dayActionFeature.setRos(record.getString("i_ros_3day"));
+        user3dayActionFeature.setOriginExp_cnt(record.getString("i_3day_exp_cnt"));
+        user3dayActionFeature.setOriginClick_cnt(record.getString("i_3day_click_cnt"));
+        user3dayActionFeature.setOriginShare_cnt(record.getString("i_3day_share_cnt"));
+        user3dayActionFeature.setOriginReturn_cnt(record.getString("i_3day_return_cnt"));
+        user3dayActionFeature.setOriginCtr(record.getString("i_ctr_3day"));
+        user3dayActionFeature.setOriginStr(record.getString("i_str_3day"));
+        user3dayActionFeature.setOriginRov(record.getString("i_rov_3day"));
+        user3dayActionFeature.setOriginRos(record.getString("i_ros_3day"));
         itemFeature.setDay3_cnt_features(user1dayActionFeature);
 
         UserActionFeature user7dayActionFeature = new UserActionFeature();
-        user7dayActionFeature.setExp_cnt(record.getString("i_7day_exp_cnt"));
-        user7dayActionFeature.setClick_cnt(record.getString("i_7day_click_cnt"));
-        user7dayActionFeature.setShare_cnt(record.getString("i_7day_share_cnt"));
-        user7dayActionFeature.setReturn_cnt(record.getString("i_7day_return_cnt"));
-        user7dayActionFeature.setCtr(record.getString("i_ctr_7day"));
-        user7dayActionFeature.setStr(record.getString("i_str_7day"));
-        user7dayActionFeature.setRov(record.getString("i_rov_7day"));
-        user7dayActionFeature.setRos(record.getString("i_ros_7day"));
+        user7dayActionFeature.setOriginExp_cnt(record.getString("i_7day_exp_cnt"));
+        user7dayActionFeature.setOriginClick_cnt(record.getString("i_7day_click_cnt"));
+        user7dayActionFeature.setOriginShare_cnt(record.getString("i_7day_share_cnt"));
+        user7dayActionFeature.setOriginReturn_cnt(record.getString("i_7day_return_cnt"));
+        user7dayActionFeature.setOriginCtr(record.getString("i_ctr_7day"));
+        user7dayActionFeature.setOriginStr(record.getString("i_str_7day"));
+        user7dayActionFeature.setOriginRov(record.getString("i_rov_7day"));
+        user7dayActionFeature.setOriginRos(record.getString("i_ros_7day"));
         itemFeature.setDay7_cnt_features(user1dayActionFeature);
 
         UserActionFeature user3monthActionFeature = new UserActionFeature();
-        user3monthActionFeature.setExp_cnt(record.getString("i_3month_exp_cnt"));
-        user3monthActionFeature.setClick_cnt(record.getString("i_3month_click_cnt"));
-        user3monthActionFeature.setShare_cnt(record.getString("i_3month_share_cnt"));
-        user3monthActionFeature.setReturn_cnt(record.getString("i_3month_return_cnt"));
-        user3monthActionFeature.setCtr(record.getString("i_ctr_3month"));
-        user3monthActionFeature.setStr(record.getString("i_str_3month"));
-        user3monthActionFeature.setRov(record.getString("i_rov_3month"));
-        user3monthActionFeature.setRos(record.getString("i_ros_3month"));
+        user3monthActionFeature.setOriginExp_cnt(record.getString("i_3month_exp_cnt"));
+        user3monthActionFeature.setOriginClick_cnt(record.getString("i_3month_click_cnt"));
+        user3monthActionFeature.setOriginShare_cnt(record.getString("i_3month_share_cnt"));
+        user3monthActionFeature.setOriginReturn_cnt(record.getString("i_3month_return_cnt"));
+        user3monthActionFeature.setOriginCtr(record.getString("i_ctr_3month"));
+        user3monthActionFeature.setOriginStr(record.getString("i_str_3month"));
+        user3monthActionFeature.setOriginRov(record.getString("i_rov_3month"));
+        user3monthActionFeature.setOriginRos(record.getString("i_ros_3month"));
         itemFeature.setMonth3_cnt_features(user3monthActionFeature);
         return itemFeature;
     }

src/main/java/examples/sparksql/SparkVideoFeaToRedisLoader.java

@@ -54,12 +54,12 @@ public class SparkVideoFeaToRedisLoader {
     }
 
 
-    static class RecordsToAdRedisKV implements Function2<Record, TableSchema, List<String>> {
+    static class RecordsToVideoRedisKV implements Function2<Record, TableSchema, List<String>> {
         @Override
         public List<String> call(Record record, TableSchema schema) throws Exception {
-            ItemFeature adItemFeature = RecommRedisFeatureConstructor.constructItemFeature(record);
-            String key = String.format(adKeyFormat, adItemFeature.getKey());
-            String value = adItemFeature.getValue();
+            ItemFeature itemFeature = RecommRedisFeatureConstructor.constructItemFeature(record);
+            String key = String.format(adKeyFormat, itemFeature.getKey());
+            String value = itemFeature.getValue();
             List<String> kv = new ArrayList<String>();
             kv.add(key);
             kv.add(value);
@@ -101,7 +101,7 @@ public class SparkVideoFeaToRedisLoader {
 
 
         // load Ad features
-        JavaRDD<List<String>> readAdData = odpsOps.readTableWithJava(project, tableAdInfo, partition, new SparkAdFeaToRedisLoader.RecordsToAdRedisKV(), Integer.valueOf(10));
+        JavaRDD<List<String>> readAdData = odpsOps.readTableWithJava(project, tableAdInfo, partition, new RecordsToVideoRedisKV(), Integer.valueOf(10));
         readAdData.sample(false, 0.0001).foreachPartition(
                 rowIterator -> {
                     RedisTemplate<String, String> redisTemplate = buildRedisTemplate();
@@ -111,7 +111,7 @@ public class SparkVideoFeaToRedisLoader {
 
 
         // load user features
-        JavaRDD<List<String>> readUserData = odpsOps.readTableWithJava(project, tableUserInfo, partition, new SparkAdFeaToRedisLoader.RecordsToUserRedisKV(), Integer.valueOf(50));
+        JavaRDD<List<String>> readUserData = odpsOps.readTableWithJava(project, tableUserInfo, partition, new RecordsToUserRedisKV(), Integer.valueOf(50));
         readUserData.repartition(50).sample(false, 0.00001).foreachPartition(
                 rowIterator -> {
                     RedisTemplate<String, String> redisTemplate = buildRedisTemplate();