Merge branch 'feature_log' of algorithm/recommend-server into master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/framework/model/ModelManager.java

@@ -90,15 +90,6 @@ public class ModelManager {
             // hard code  广告需要视频模型打分数据，配置要分开
             return;
 
-//            String oldPath = modelPathMap.get(modelName);
-//            if (path.equals(oldPath)) {
-//                //如果模型的path没有发生改变, 不做任何操作
-//                log.info("Model [{}] and Path [{}] has exist", modelName, path);
-//                return;
-//            } else {
-//                //如果模型的path发生改变, 需要注销掉原有的任务
-//                unRegisterModel(modelName);
-//            }
         }
 
         modelPathMap.put(modelName, path);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/implement/TopRecommendPipeline.java

@@ -374,12 +374,6 @@ public class TopRecommendPipeline {
                 }catch (Exception e){
                     log.error(String.format("parse user json is wrong in {} with {}", this.getClass().getSimpleName(), e));
                 }
-            }else{
-                JSONObject obj = new JSONObject();
-                obj.put("name", "user_key_in_model_is_null");
-                obj.put("class", this.getClass().getSimpleName());
-                log.info(obj.toString());
-//                return videos;
             }
         }
         final Set<String> userFeatureSet = new HashSet<>(Arrays.asList(
@@ -408,7 +402,6 @@ public class TopRecommendPipeline {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -544,16 +537,9 @@ public class TopRecommendPipeline {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
-
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF_FEED)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
-        JSONObject obj = new JSONObject();
-        obj.put("name", "user_key_in_model_is_not_null");
-        obj.put("class", this.getClass().getSimpleName());
-        log.info(obj.toString());
         return rovRecallScore;
     }
 
@@ -570,12 +556,6 @@ public class TopRecommendPipeline {
                 }catch (Exception e){
                     log.error(String.format("parse user json is wrong in {} with {}", this.getClass().getSimpleName(), e));
                 }
-            }else{
-                JSONObject obj = new JSONObject();
-                obj.put("name", "user_key_in_model_is_null");
-                obj.put("class", this.getClass().getSimpleName());
-                log.info(obj.toString());
-//                return videos;
             }
         }
         final Set<String> userFeatureSet = new HashSet<>(Arrays.asList(
@@ -604,7 +584,6 @@ public class TopRecommendPipeline {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -749,7 +728,6 @@ public class TopRecommendPipeline {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
         return userFeatureMap;
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/ModelService.java

@@ -83,7 +83,6 @@ public class ModelService {
             }
         }
 
-        log.info("userFeature in model = {}", JSONUtils.toJson(userFeatureMap));
 
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
                 "total_time", "play_count_total",
@@ -123,7 +122,6 @@ public class ModelService {
                 }
             }
         }
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
 
         Map<String, String> sceneFeatureMap = this.getSceneFeature(request);
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/RecommendService.java

@@ -468,7 +468,6 @@ public class RecommendService {
         // 需要被标记的视频满足什么条件
         // 逻辑已经废弃
         // markFlowPoolVideo(param, videos);
-        //log.info("markFlowPoolVideo videos {}", videos);
 
         return videos;
     }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/VideoRecommendService.java

@@ -87,8 +87,6 @@ public class VideoRecommendService {
                 stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
         stopwatch.reset().start();
         List<Video> videos = videoRecommend(request, param, recommendType);
-        // log.info("videoRecommend={}, videoRecommend cost={}", JSONUtils.toJson(videos),
-//        stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
         recommendService.updateCache(request, param, videos);
 
         // 更新position

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/ViewedService.java

@@ -64,7 +64,6 @@ public class ViewedService {
             param.put("recommendStatus", recommendStatus);
             post.setEntity(new StringEntity(JSONUtils.toJson(param)));
 
-            // log.info("request={}", JSONUtils.toJson(param));
             chr = client.execute(post);
             if (chr == null
                     || chr.getStatusLine() == null
@@ -77,7 +76,6 @@ public class ViewedService {
                 return Collections.emptyList();
             }
             String content = EntityUtils.toString(entity);
-            // log.info("response entity={}", JSONUtils.toJson(content));
             Map<String, String> data = JSONUtils.fromJson(content,
                     new TypeToken<Map<String, String>>() {
                     },
@@ -95,7 +93,6 @@ public class ViewedService {
         } catch (Exception e) {
             log.error("invoke http filterViewedVideo error", e);
         } finally {
-            // log.info("filterViewedVideo cost={}", stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
             try {
                 if (chr != null) {
                     chr.close();

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/FlowPoolWithLevelFilterService.java

@@ -27,7 +27,6 @@ public class FlowPoolWithLevelFilterService extends AbstractFilterService {
         List<Long> videoIds = viewFilter(param);
 
         videoIds = filterDistributeCountAndDel(param, videoIds);
-        // log.info("filterDistributeCountAndDel videoIds={}", JSONUtils.toJson(videoIds));
 
         return new FilterResult(videoIds);
     }
@@ -45,7 +44,6 @@ public class FlowPoolWithLevelFilterService extends AbstractFilterService {
                         v -> param.getFlowPoolMap().get(v)));
 
         Map<Long, Integer> distributeCountMap = flowPoolService.getDistributeCountWithLevel(flowPoolMap);
-        // log.info("getDistributeCountWithLevel distributeCountMap={}", JSONUtils.toJson(distributeCountMap));
 
         List<Long> remainVideoIds = new ArrayList<>();
         for (Long videoId : videoIds) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/FlowPoolWithLevelScoreFilterService.java

@@ -27,7 +27,6 @@ public class FlowPoolWithLevelScoreFilterService extends AbstractFilterService {
         List<Long> videoIds = viewFilter(param);
 
         videoIds = filterDistributeCountAndDel(param, videoIds);
-        // log.info("filterDistributeCountAndDel videoIds={}", JSONUtils.toJson(videoIds));
         return new FilterResult(videoIds);
     }
 
@@ -44,7 +43,6 @@ public class FlowPoolWithLevelScoreFilterService extends AbstractFilterService {
                         v -> param.getFlowPoolMap().get(v)));
 
         Map<Long, Integer> distributeCountMap = flowPoolService.getDistributeCountWithLevelScore(flowPoolMap);
-        // log.info("getDistributeCountWithLevelScore distributeCountMap={}", JSONUtils.toJson(distributeCountMap));
         List<Long> remainVideoIds = new ArrayList<>();
         for (Long videoId : videoIds) {
             if (distributeCountMap.get(videoId) != null

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/RankService.java

@@ -208,14 +208,12 @@ public class RankService {
 
     private List<Video> mergeAndRankRovRecallNew(RankParam param) {
         UserFeature userFeature = featureRemoteService.getUserFeature(param.getMid());
-//        log.info("userFeature = {}", JSONUtils.toJson(userFeature));
 
         List<Video> recallVideos = param.getRecallResult().mergeRecallVideos();
         List<RankItem> rankItems = CommonCollectionUtils.toList(recallVideos, RankItem::new);
 
         List<Long> videoIds = CommonCollectionUtils.toListDistinct(recallVideos, Video::getVideoId);
         Map<Long, ItemFeature> videoFeatureMap = featureRemoteService.getVideoFeatureMap(videoIds);
-//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatureMap));
 
         for (RankItem rankItem : rankItems) {
             rankItem.setItemFeature(videoFeatureMap.get(rankItem.getVideoId()));
@@ -223,10 +221,8 @@ public class RankService {
 
         // TODO
         ScoreParam scoreParam = convert(param);
-        // log.info("scoreParam {}", JSONUtils.toJson(scoreParam));
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(scoreParam, userFeature, rankItems);
-        // log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
 
         return CommonCollectionUtils.toList(rovRecallScore, i -> {
             // hard code 将排序分数 赋值给video的sortScore

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RankModel.java

@@ -178,7 +178,6 @@ public class RankStrategy4RankModel extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -313,15 +312,8 @@ public class RankStrategy4RankModel extends RankService {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
-
-
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
-        JSONObject obj = new JSONObject();
-        obj.put("name", "user_key_in_model_is_not_null");
-        log.info(obj.toString());
         return CommonCollectionUtils.toList(rovRecallScore, i -> {
             // hard code 将排序分数 赋值给video的sortScore
             Video v = i.getVideo();

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4Rankv2Model.java

@@ -80,7 +80,6 @@ public class RankStrategy4Rankv2Model extends RankService {
                 .map(t -> param.getRankKeyPrefix() + t.getVideoId())
                 .collect(Collectors.toList());
         List<String> videoScores = this.redisTemplate.opsForValue().multiGet(videoIdKeys);
-        log.info("rank mergeAndRankRovRecall videoIdKeys={}, videoScores={}", JSONUtils.toJson(videoIdKeys),
                 JSONUtils.toJson(videoScores));
         if (CollectionUtils.isNotEmpty(videoScores)
                 && videoScores.size() == rovRecallRank.size()) {
@@ -121,18 +120,6 @@ public class RankStrategy4Rankv2Model extends RankService {
                 ++difftop;
             }
         }
-        JSONObject obj = new JSONObject();
-        obj.put("name", "RankStrategy4Rankv2Model");
-        obj.put("diffpos", diffpos);
-        obj.put("difftop", difftop);
-        obj.put("videosWithModel_size", videosWithModel.size());
-        obj.put("oldRes", oldRes.stream()
-                .map(String::valueOf)
-                .collect(Collectors.joining(",")));
-        obj.put("newRes", newRes.stream()
-                .map(String::valueOf)
-                .collect(Collectors.joining(",")));
-        log.info(obj.toString());
 
         return videosWithModel;
     }
@@ -169,9 +156,6 @@ public class RankStrategy4Rankv2Model extends RankService {
                     log.error(String.format("parse user json is wrong in {} with {}", this.CLASS_NAME, e));
                 }
             }else{
-                JSONObject obj = new JSONObject();
-                obj.put("name", "user_key_in_model_is_null");
-                log.info(obj.toString());
                 return videos;
             }
         }
@@ -201,7 +185,6 @@ public class RankStrategy4Rankv2Model extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -333,16 +316,9 @@ public class RankStrategy4Rankv2Model extends RankService {
         }
 
 
-        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
-
-
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
-        JSONObject obj = new JSONObject();
-        obj.put("name", "user_key_in_model_is_not_null");
-        log.info(obj.toString());
         return CommonCollectionUtils.toList(rovRecallScore, i -> {
             // hard code 将排序分数 赋值给video的sortScore
             Video v = i.getVideo();

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMerge.java

@@ -80,8 +80,6 @@ public class RankStrategy4RegionMerge extends RankService {
                 .map(t -> param.getRankKeyPrefix() + t.getVideoId())
                 .collect(Collectors.toList());
         List<String> videoScores = this.redisTemplate.opsForValue().multiGet(videoIdKeys);
-        log.info("rank mergeAndRankRovRecall videoIdKeys={}, videoScores={}", JSONUtils.toJson(videoIdKeys),
-                JSONUtils.toJson(videoScores));
         if (CollectionUtils.isNotEmpty(videoScores)
                 && videoScores.size() == rovRecallRank.size()) {
             for (int i = 0; i < videoScores.size(); i++) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV2.java

@@ -414,7 +414,6 @@ public class RankStrategy4RegionMergeModelV2 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -553,16 +552,9 @@ public class RankStrategy4RegionMergeModelV2 extends RankService {
         }
 
 
-//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
-
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-//        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
-        JSONObject obj = new JSONObject();
-        obj.put("name", "user_key_in_model_is_not_null");
-        obj.put("class", this.CLASS_NAME);
-//        log.info(obj.toString());
         return rovRecallScore;
     }
 
@@ -637,7 +629,6 @@ public class RankStrategy4RegionMergeModelV2 extends RankService {
         int rovPoolIndex = param.getTopK();
         for (int i = 0; i < param.getSize() - param.getTopK(); i++) {
             double rand = RandomUtils.nextDouble(0, 1);
-            log.info("rand={}, flowPoolP={}", rand, flowPoolP);
             if (rand < flowPoolP) {
                 if (flowPoolIndex < flowVideos.size()) {
                     result.add(flowVideos.get(flowPoolIndex++));

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV3.java

@@ -143,19 +143,6 @@ public class RankStrategy4RegionMergeModelV3 extends RankService {
         //-------------------序-------------------
         //-------------------逻-------------------
         //-------------------辑-------------------
-//        List<String> videoIdKeys = rovRecallRank.stream()
-//                .map(t -> param.getRankKeyPrefix() + t.getVideoId())
-//                .collect(Collectors.toList());
-//        List<String> videoScores = this.redisTemplate.opsForValue().multiGet(videoIdKeys);
-//        log.info("rank mergeAndRankRovRecall videoIdKeys={}, videoScores={}", JSONUtils.toJson(videoIdKeys),
-//                JSONUtils.toJson(videoScores));
-//        if (CollectionUtils.isNotEmpty(videoScores)
-//                && videoScores.size() == rovRecallRank.size()) {
-//            for (int i = 0; i < videoScores.size(); i++) {
-//                rovRecallRank.get(i).setSortScore(NumberUtils.toDouble(videoScores.get(i), 0.0));
-//            }
-//            Collections.sort(rovRecallRank, Comparator.comparingDouble(o -> -o.getSortScore()));
-//        }
 
         // 1 模型分
         List<String> rtFeaPart = new ArrayList<>();
@@ -325,12 +312,6 @@ public class RankStrategy4RegionMergeModelV3 extends RankService {
                 }catch (Exception e){
                     log.error(String.format("parse user json is wrong in {} with {}", this.CLASS_NAME, e));
                 }
-            }else{
-                JSONObject obj = new JSONObject();
-                obj.put("name", "user_key_in_model_is_null");
-                obj.put("class", this.CLASS_NAME);
-//                log.info(obj.toString());
-//                return videos;
             }
         }
         final Set<String> userFeatureSet = new HashSet<>(Arrays.asList(
@@ -359,7 +340,6 @@ public class RankStrategy4RegionMergeModelV3 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -495,17 +475,9 @@ public class RankStrategy4RegionMergeModelV3 extends RankService {
         }
 
 
-//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
-
-
 
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-//        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
-        JSONObject obj = new JSONObject();
-        obj.put("name", "user_key_in_model_is_not_null");
-        obj.put("class", this.CLASS_NAME);
-//        log.info(obj.toString());
         return rovRecallScore;
     }
 
@@ -580,7 +552,6 @@ public class RankStrategy4RegionMergeModelV3 extends RankService {
         int rovPoolIndex = param.getTopK();
         for (int i = 0; i < param.getSize() - param.getTopK(); i++) {
             double rand = RandomUtils.nextDouble(0, 1);
-            log.info("rand={}, flowPoolP={}", rand, flowPoolP);
             if (rand < flowPoolP) {
                 if (flowPoolIndex < flowVideos.size()) {
                     result.add(flowVideos.get(flowPoolIndex++));

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV4.java

@@ -333,12 +333,6 @@ public class RankStrategy4RegionMergeModelV4 extends RankService {
                 }catch (Exception e){
                     log.error(String.format("parse user json is wrong in {} with {}", this.CLASS_NAME, e));
                 }
-            }else{
-                JSONObject obj = new JSONObject();
-                obj.put("name", "user_key_in_model_is_null");
-                obj.put("class", this.CLASS_NAME);
-//                log.info(obj.toString());
-//                return videos;
             }
         }
         final Set<String> userFeatureSet = new HashSet<>(Arrays.asList(
@@ -367,7 +361,6 @@ public class RankStrategy4RegionMergeModelV4 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -503,10 +496,6 @@ public class RankStrategy4RegionMergeModelV4 extends RankService {
         }
 
 
-//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
-
-
-
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
         return rovRecallScore;
@@ -581,7 +570,6 @@ public class RankStrategy4RegionMergeModelV4 extends RankService {
         int rovPoolIndex = param.getTopK();
         for (int i = 0; i < param.getSize() - param.getTopK(); i++) {
             double rand = RandomUtils.nextDouble(0, 1);
-            log.info("rand={}, flowPoolP={}", rand, flowPoolP);
             if (rand < flowPoolP) {
                 if (flowPoolIndex < flowVideos.size()) {
                     result.add(flowVideos.get(flowPoolIndex++));

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV5.java

@@ -346,12 +346,6 @@ public class RankStrategy4RegionMergeModelV5 extends RankService {
                 }catch (Exception e){
                     log.error(String.format("parse user json is wrong in {} with {}", this.CLASS_NAME, e));
                 }
-            }else{
-                JSONObject obj = new JSONObject();
-                obj.put("name", "user_key_in_model_is_null");
-                obj.put("class", this.CLASS_NAME);
-//                log.info(obj.toString());
-//                return videos;
             }
         }
         final Set<String> userFeatureSet = new HashSet<>(Arrays.asList(
@@ -380,7 +374,6 @@ public class RankStrategy4RegionMergeModelV5 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
@@ -516,17 +509,8 @@ public class RankStrategy4RegionMergeModelV5 extends RankService {
         }
 
 
-//        log.info("ItemFeature = {}", JSONUtils.toJson(videoFeatures));
-
-
-
         List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
                 .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-//        log.info("mergeAndRankRovRecallNew rovRecallScore={}", JSONUtils.toJson(rovRecallScore));
-        JSONObject obj = new JSONObject();
-        obj.put("name", "user_key_in_model_is_not_null");
-        obj.put("class", this.CLASS_NAME);
-//        log.info(obj.toString());
         return rovRecallScore;
     }
     private Map<String, String> getSceneFeature(RankParam param) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV547.java

@@ -408,8 +408,7 @@ public class RankStrategy4RegionMergeModelV547 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
-        
+
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
                 "total_time", "play_count_total",

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV548.java

@@ -354,7 +354,6 @@ public class RankStrategy4RegionMergeModelV548 extends RankService {
         );
         f1.putAll(f2);
         f1.putAll(f3);
-//        log.info("userFeature in model = {}", JSONUtils.toJson(f1));
 
         // 2-1: item特征处理
         final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AbstractRegionRecallStrategy.java

@@ -106,8 +106,6 @@ public abstract class AbstractRegionRecallStrategy implements RecallStrategy {
             redisTemplate.delete(lastVideoKey);
             poolKey = updateLastVideoRecord(recordKey, param);
         }
-//        log.info("recall recordKey={}, record={}, poolKey={}, lastVideoKey={}, idx={}, ", recordKey, record, poolKey,
-//                lastVideoKey, idx);
         if (StringUtils.isBlank(poolKey)) {
             return null;
         }
@@ -139,7 +137,6 @@ public abstract class AbstractRegionRecallStrategy implements RecallStrategy {
             filterParam.setForceTruncation(20);
 
             FilterResult filterResult = filterService.filter(filterParam);
-            // log.info("recall filterResult={}", JSONUtils.toJson(filterResult));
 
             if (filterResult != null && CollectionUtils.isNotEmpty(filterResult.getVideoIds())) {
                 filterResult.getVideoIds().stream().forEach(vid -> {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AbstractVideoRecallStrategy.java

@@ -45,7 +45,6 @@ public abstract class AbstractVideoRecallStrategy implements RecallStrategy {
         String recall_key = recallKey(param);
         // [[16687915, 0.5], [16528093, 0.5]]
         String value = redisTemplate.opsForValue().get(recall_key);
-        // log.info("recall recall_key={}, value={}", recall_key, JSONUtils.toJson(value));
         if (StringUtils.isBlank(value)) {
             return null;
         }
@@ -58,7 +57,6 @@ public abstract class AbstractVideoRecallStrategy implements RecallStrategy {
         List<Video> results = new ArrayList<>();
 
         FilterResult filterResult = filterService.filter(FilterParamFactory.create(param, Lists.newArrayList(videoScoreMap.keySet())));
-        // log.info("recall filterResult={}", JSONUtils.toJson(filterResult));
 
         if (filterResult != null && CollectionUtils.isNotEmpty(filterResult.getVideoIds())) {
             filterResult.getVideoIds().stream().forEach(vid -> {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/FlowPoolWithLevelRecallStrategy.java

@@ -45,14 +45,12 @@ public class FlowPoolWithLevelRecallStrategy extends AbstractFlowPoolWithLevelRe
                 availableLevels.add(lw);
             }
         }
-        // log.info("flowPoolKeyAndLevel availableLevels={}", JSONUtils.toJson(availableLevels));
         if (CollectionUtils.isEmpty(availableLevels)) {
             return Pair.of("", "");
         }
 
         // 3. 根据可分发层级权重设置分发概率
         Collections.sort(availableLevels, Comparator.comparingDouble(LevelWeight::getWeight));
-        // log.info("flowPoolKeyAndLevel sorted availableLevels={}", JSONUtils.toJson(availableLevels));
 
         double weightSum = availableLevels.stream().mapToDouble(o -> o.getWeight()).sum();
         BigDecimal weightSumBD = new BigDecimal(weightSum);
@@ -75,7 +73,6 @@ public class FlowPoolWithLevelRecallStrategy extends AbstractFlowPoolWithLevelRe
 
         // 4. 随机生成[0,1)之间数，返回相应概率区间的key
         double random_p = RandomUtils.nextDouble(0, 1);
-        // log.info("flowPoolKeyAndLevel level_p_mapping={}, random_p={}", JSONUtils.toJson(level_p_mapping), random_p);
         for (Map.Entry<String, LevelP> entry : level_p_mapping.entrySet()) {
             if (random_p >= entry.getValue().getMin()
                     && random_p <= entry.getValue().getMax()) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/FlowPoolWithLevelScoreRecallStrategy.java

@@ -70,7 +70,6 @@ public class FlowPoolWithLevelScoreRecallStrategy extends AbstractFlowPoolWithLe
         // 4. 随机生成[0,1)之间数，返回相应概率区间的key
 
         double random_p = RandomUtils.nextDouble(0, 1);
-        // log.info("flowPoolKeyAndLevel level_p_mapping={}, random_p={}", JSONUtils.toJson(level_p_mapping), random_p);
         for (Map.Entry<String, LevelP> entry : level_p_mapping.entrySet()) {
             if (random_p >= entry.getValue().getMin()
                     && random_p <= entry.getValue().getMax()) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/SpecialRecallStrategy.java

@@ -52,8 +52,6 @@ public class SpecialRecallStrategy implements RecallStrategy {
                 idx += 1;
             }
         }
-        log.info("lastSpecialRecallKey={}, value={}, specialKeyName={}, idx={}", lastSpecialRecallKey, value,
-                specialKeyName, idx);
 
         int getSize = param.getSize() * 5;
         int freq = 0;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/model/ModelManager.java

@@ -89,16 +89,6 @@ public class ModelManager {
             // throw new RuntimeException(modelName + " already exists");
             // hard code  广告需要视频模型打分数据，配置要分开
             return;
-
-//            String oldPath = modelPathMap.get(modelName);
-//            if (path.equals(oldPath)) {
-//                //如果模型的path没有发生改变, 不做任何操作
-//                log.info("Model [{}] and Path [{}] has exist", modelName, path);
-//                return;
-//            } else {
-//                //如果模型的path发生改变, 需要注销掉原有的任务
-//                unRegisterModel(modelName);
-//            }
         }
 
         modelPathMap.put(modelName, path);