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

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

@@ -1,6 +1,5 @@
 package com.tzld.piaoquan.recommend.server;
 
-// import com.tzld.piaoquan.recommend.feature.client.FeatureClient;
 
 import com.tzld.piaoquan.abtest.client.ABTestClient;
 import com.tzld.piaoquan.recommend.feature.client.FeatureClient;
@@ -42,21 +41,11 @@ public class Application {
     }
 
 
-    @Bean
-    public FeatureClient featureClient() {
-        return new FeatureClient();
-    }
-
     @Bean
     public FeatureV2Client featureV2Client() {
         return new FeatureV2Client();
     }
 
-    @Bean
-    public ABTestClient abTestClient() {
-        return new ABTestClient();
-    }
-
     @Bean
     public ProtobufHttpMessageConverter protobufHttpMessageConverter() {
         return new ProtobufHttpMessageConverter();

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

@@ -47,7 +47,6 @@ public class AllowListStrategy implements FilterStrategy {
             });
 
     private static final String VIDEO_ALLOW_LIST_BITMAP_KEY_SET_PREFIX = "movie:videoid:allowSet:";
-    private static final String RELIGION_VIDEO_ALLOW_LIST_BITMAP_KEY = "mp:religion:allowlist:videoid:bitmap";
 
 
     @PostConstruct

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

@@ -15,10 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author dyp
@@ -41,7 +38,7 @@ public abstract class AbstractFlowPoolWithLevelRecallStrategy implements RecallS
         List<Video> results = new ArrayList<>();
         List<String> data = redisTemplate.opsForSet().randomMembers(flowPoolKey, getSize);
         if (CollectionUtils.isEmpty(data)) {
-            return null;
+            return Collections.emptyList();
         }
         Map<Long, String> videoFlowPoolMap = new LinkedHashMap<>();
         for (String value : data) {

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

@@ -1,6 +1,5 @@
 package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 
-import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.google.common.collect.Lists;
 import com.google.common.reflect.TypeToken;
 import com.tzld.piaoquan.recommend.server.model.Video;
@@ -19,7 +18,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ZSetOperations;
 

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

@@ -46,7 +46,7 @@ public abstract class AbstractVideoRecallStrategy implements RecallStrategy {
         // [[16687915, 0.5], [16528093, 0.5]]
         String value = redisTemplate.opsForValue().get(recall_key);
         if (StringUtils.isBlank(value)) {
-            return null;
+            return Collections.emptyList();
         }
         List<List<String>> videoScores = JSONUtils.fromJson(value, new TypeToken<List<List<String>>>() {
         }, Collections.emptyList());

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

@@ -104,7 +104,7 @@ public class FMModel extends Model {
         String line = null;
         int cnt = 0;
 
-        Integer curTime = new Long(System.currentTimeMillis() / 1000).intValue();
+        long curTime = System.currentTimeMillis() / 1000;
         LOGGER.info("[MODELLOAD] before model load, key size: {}, current time: {}", model.size(), curTime);
         //first stage
         while ((line = input.readLine()) != null) {

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

@@ -130,7 +130,7 @@ public class LRModel extends Model {
         String line = null;
         int cnt = 0;
 
-        Integer curTime = new Long(System.currentTimeMillis() / 1000).intValue();
+        long curTime = System.currentTimeMillis() / 1000;
         LOGGER.info("[MODELLOAD] before model load, key size: {}, current time: {}", lrModel.size(), curTime);
         //first stage
         while ((line = input.readLine()) != null) {

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

@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
 public class ModelManager {
     private static final int SCHEDULE_PERIOD = 10;
     private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-    private static ModelManager instance;
+    private static ModelManager instance = new ModelManager();
     Map<String, ModelLoadTask> loadTasks = new HashMap<>();
     Map<String, String> modelPathMap = new HashMap<>();
     private OSS client;
@@ -65,13 +65,6 @@ public class ModelManager {
     }
 
     public static ModelManager getInstance() {
-        if (instance == null) {
-            synchronized (ModelManager.class) {
-                if (instance == null) {
-                    instance = new ModelManager();
-                }
-            }
-        }
         return instance;
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score4recall/model4recall/AbstractModel.java

@@ -1,7 +1,6 @@
 package com.tzld.piaoquan.recommend.server.service.score4recall.model4recall;
 
 
-import java.util.List;
 import com.tzld.piaoquan.recommend.server.service.score.model.Model;
 
 abstract public class AbstractModel extends Model {