ADD: filter log

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

@@ -135,11 +135,9 @@ public class TopRecommendPipeline {
                     item.scoresMap.getOrDefault("share2returnScore", 0.0)
                     + alpha * trendScore
                     + beta * newVideoScore;
-            Video video = item.getVideo();
-            if (video == null) {
-                log.error("video is null in rankVideos, traceId = {}, videoId = {}", requestId, item.getId());
-                continue;
-            }
+            Video video = new Video();
+            video.setVideoId(Long.parseLong(item.getId()));
+            video.setPushFrom(item.getQueue());
             video.setScore(score);
             video.setSortScore(score);
             video.setScoreStr(item.getScoreStr());
@@ -252,12 +250,12 @@ public class TopRecommendPipeline {
         // Step 5: Merger
         MergeUtils.distributeItemsToMultiQueues(topQueue, items);
         topQueue.merge(recallNum * 3, userInfo, requestData, requestIndex, 0);
-        if (logPrint) {
-            log.info("traceId = {}, topQueue after merge = {}", requestData.getRequestId(), JSONUtils.toJson(topQueue));
-        }
 
         // 多样性融合
         List<RankItem> mergeItems = topQueue.getItems();
+        if (logPrint) {
+            log.info("traceId = {}, mergeItems = {}", requestData.getRequestId(), JSONUtils.toJson(mergeItems));
+        }
 //        MergeUtils.diversityRerank(mergeItems, SimilarityUtils.getIsSameUserTagOrCategoryFunc(), recallNum, 6, 2);
 
         // Step 6: Global Rank & subList

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

@@ -23,9 +23,9 @@ public class Region3hHotCandidate extends IndexCandidateQueue {
     public int addCandidateKey(Map<String, Candidate> candidates, int recallNum, User user, RecommendRequest requestData, int requestIndex, int expId) {
         int currRecall = 0;
         String region = user.getRegion();
-        Map<String, Candidate> simplifiedCandidates = new ConcurrentHashMap<String, Candidate>();
+        Map<String, Candidate> simplifiedCandidates = new ConcurrentHashMap<>();
 
-        int num = recallNum / 3;
+        int num = recallNum;
 
 
         // index key video:queue:type=region3h:region=北京:ordering=short_rov