remove unused logic

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

@@ -75,9 +75,6 @@ public class RecommendService {
     @ApolloJsonValue("${risk.scene:[]}")
     private Set<Long> riskScenes;
 
-    @Value("${flow.pool.upgrade.switch:true}")
-    private boolean flowPoolUpgradeSwitch;
-
     private LoadingCache<String, Set<String>> riskUserCache = CacheBuilder.newBuilder()
             .maximumSize(5)
             .refreshAfterWrite(300, TimeUnit.SECONDS)
@@ -418,8 +415,6 @@ public class RecommendService {
         recallParam.setHotSceneType(param.getHotSceneType());
         recallParam.setClientIp(param.getClientIp());
 
-        recallParam.setFlowPoolUpgrade(flowPoolUpgradeSwitch);
-
         return recallParam;
     }
 

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

@@ -29,9 +29,6 @@ public class FlowPoolConfigService {
     @Qualifier("redisTemplate")
     private RedisTemplate<String, String> redisTemplate;
 
-    @Value("${flow.pool.upgrade.switch:true}")
-    private boolean flowPoolUpgradeSwitch;
-
     private LoadingCache<String, Map<String, Double>> levelWeightConfigCache = CacheBuilder.newBuilder()
             .maximumSize(10)
             .refreshAfterWrite(60, TimeUnit.SECONDS)
@@ -52,9 +49,7 @@ public class FlowPoolConfigService {
 
     public Map<String, Double> getLevelWeight4FlowPoolWithLevel() {
         try {
-            return flowPoolUpgradeSwitch
-                    ? levelWeightConfigCache.get("flow:pool:level:weight:v2")
-                    : levelWeightConfigCache.get("flow:pool:level:recommend:weight");
+            return levelWeightConfigCache.get("flow:pool:level:weight:v2");
         } catch (ExecutionException e) {
             log.error("getFlowPoolConfig error", e);
             return Collections.emptyMap();

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

@@ -4,22 +4,10 @@ package com.tzld.piaoquan.recommend.server.service.flowpool;
  * @author dyp
  */
 public class FlowPoolConstants {
-    public static final String EXPERIMENTAL_FLOW_SET_LEVEL = "experimental_flow_set_level";
-    public static final String EXPERIMENTAL_FLOW_SET_LEVEL_SCORE = "experimental_flow_set_level_score";
-
     public static final String PUSH_FORM = "flow_pool";
     public static final String QUICK_PUSH_FORM = "quick_flow_pool";
 
-    public static final String KEY_WITH_LEVEL_FORMAT = "flow:pool:level:item:%s:%s";
-    public static final String KEY_WITH_LEVEL_SUPPLY_FORMAT = "flow:pool:level:item:supply:%s:%s";
-    public static final String KEY_QUICK_WITH_LEVEL_FORMAT = "flow:pool:quick:item:%s:3";
-    public static final String KEY_WITH_LEVEL_SCORE_FORMAT = "flow:pool:level:item:score:%s:%s";
-    public static final String KEY_QUICK_WITH_LEVEL_SCORE_FORMAT = "flow:pool:quick:item:score:%s:3";
-
-
     public static final String KEY_WITH_LEVEL_FORMAT_V2 = "flow:pool:level:item:v2:%s:%s";
     public static final String KEY_QUICK_WITH_LEVEL_FORMAT_V2 = "flow:pool:quick:item:0:3";
-    public static final String KEY_WITH_LEVEL_SCORE_FORMAT_V2 = "flow:pool:level:item:score:v2:%s:%s";
-    public static final String KEY_QUICK_WITH_LEVEL_SCORE_FORMAT_V2 = "flow:pool:quick:item:score:0:3";
 
 }

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

@@ -6,10 +6,8 @@ import com.tzld.piaoquan.recommend.server.common.ThreadPoolFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
-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.stereotype.Service;
 
@@ -38,13 +36,6 @@ public class FlowPoolService {
 
     private ExecutorService pool = ThreadPoolFactory.defaultPool();
 
-    @Value("${flow.pool.upgrade.switch:true}")
-    private boolean flowPoolUpgradeSwitch;
-
-    private int[] appTypes = {VLOG.getCode(), LOVE_MOVIE.getCode(), LOVE_LIVE.getCode(), LONG_VIDEO.getCode(),
-            SHORT_VIDEO.getCode(), H5.getCode(), APP_SPEED.getCode(), WAN_NENG_VIDEO.getCode(),
-            LAO_HAO_KAN_VIDEO.getCode(), ZUI_JING_QI.getCode(), PIAO_QUAN_VIDEO_PLUS.getCode(), JOURNEY.getCode()};
-
     public void updateDistributeCountWithLevel(List<Video> videos) {
         if (CollectionUtils.isEmpty(videos)) {
             return;
@@ -56,18 +47,9 @@ public class FlowPoolService {
     }
 
     private void asyncDelDistributeCountWithLevel(Map<Long, String> videoFlowPoolMap) {
-        if (flowPoolUpgradeSwitch) {
-            asyncDelDistributeCountV2(videoFlowPoolMap, (appType, level, values) -> {
-                redisTemplate.opsForSet().remove(String.format(KEY_WITH_LEVEL_FORMAT_V2, appType, level), values);
-            });
-        } else {
-            asyncDelDistributeCount(videoFlowPoolMap, (appType, level, values) -> {
-                String key = String.format(KEY_WITH_LEVEL_FORMAT, appType, level);
-                Long count = redisTemplate.opsForSet().remove(key, values);
-            });
-        }
-
-
+        asyncDelDistributeCountV2(videoFlowPoolMap, (appType, level, values) -> {
+            redisTemplate.opsForSet().remove(String.format(KEY_WITH_LEVEL_FORMAT_V2, appType, level), values);
+        });
     }
 
     private Map<Long, String> updateDistributeCount(List<Video> videos) {
@@ -83,34 +65,6 @@ public class FlowPoolService {
         return removeMap;
     }
 
-    private void asyncDelDistributeCount(Map<Long, String> videoFlowPoolMap,
-                                         TripleConsumer<Integer, String, String[]> flowPoolRemoveConsumer) {
-        if (MapUtils.isEmpty(videoFlowPoolMap)) {
-            return;
-        }
-        pool.execute(() -> {
-            List<String> keys = videoFlowPoolMap.entrySet().stream()
-                    .map(v -> String.format(localDistributeCountFormat, v.getKey(), v.getValue()))
-                    .collect(Collectors.toList());
-            redisTemplate.delete(keys);
-
-            Map<String, Double> levelWeight = flowPoolConfigService.getLevelWeight4FlowPoolWithLevel();
-            String[] values = new String[videoFlowPoolMap.size()];
-            int i = 0;
-            for (Map.Entry v : videoFlowPoolMap.entrySet()) {
-                values[i++] = String.format(valueFormat, v.getKey(), v.getValue());
-            }
-            // remove 每小程序每层的数据
-            // TODO 现在视频只会出现在一个层级，所以可以做个优化
-            for (String level : levelWeight.keySet()) {
-                for (int appType : appTypes) {
-                    flowPoolRemoveConsumer.accept(appType, level, values);
-                }
-            }
-        });
-    }
-
-
     private void asyncDelDistributeCountV2(Map<Long, String> videoFlowPoolMap,
                                            TripleConsumer<Integer, String, String[]> flowPoolRemoveConsumer) {
         if (MapUtils.isEmpty(videoFlowPoolMap)) {

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

@@ -16,7 +16,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.math3.util.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

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

@@ -32,6 +32,4 @@ public class RecallParam {
 
     private boolean riskUser;
 
-    private boolean flowPoolUpgrade;
-
 }

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

@@ -46,9 +46,7 @@ public class FlowPoolWithLevelRecallStrategyTomson extends AbstractFlowPoolWithL
         // 2. 判断各层级是否有视频需分发
         List<LevelWeight> availableLevels = new ArrayList<>();
         for (Map.Entry<String, Double> entry : levelWeightMap.entrySet()) {
-            String levelKey = param.isFlowPoolUpgrade()
-                    ? String.format(KEY_WITH_LEVEL_FORMAT_V2, 0, entry.getKey())
-                    : String.format(KEY_WITH_LEVEL_FORMAT, param.getAppType(), entry.getKey());
+            String levelKey = String.format(KEY_WITH_LEVEL_FORMAT_V2, 0, entry.getKey());
             if (redisTemplate.hasKey(levelKey)) {
                 LevelWeight lw = new LevelWeight();
                 lw.setLevel(entry.getKey());