liqian 3 years ago
parent
commit
25c1f3281b
3 changed files with 12 additions and 11 deletions
  1. 1 1
      config.py
  2. 10 9
      utils.py
  3. 1 1
      video_recall.py

+ 1 - 1
config.py

@@ -16,7 +16,7 @@ class BaseConfig(object):
     FLOW_POOL_KEY_NAME = 'com.weiqu.video.flowpool.hot.item.score'
     # 首页推荐预曝光列表redis key 前缀,完整key格式:com.weiqu.video.hot.recommend.previewed.{appType}.{mid}
     PREVIEW_KEY_PREFIX = 'com.weiqu.video.hot.recommend.previewed.'
-    # 用户上一次在rov召回池对应的位置 redis key前缀,完整key格式:com.weiqu.video.rov.pool.last.{mid}.{date}
+    # 用户上一次在rov召回池对应的位置 redis key前缀,完整key格式:com.weiqu.video.rov.pool.last.{appType}.{mid}.{date}
     LAST_VIDEO_FROM_ROV_POOL_PREFIX = 'com.weiqu.video.rov.pool.last.'
     # 从ROV召回池获取视频的最大频次,限制每次请求的获取次数
     MAX_FREQ_FROM_ROV_POOL = 3

+ 10 - 9
utils.py

@@ -116,15 +116,16 @@ class FilterVideos(object):
         :param video_ids: 视频id列表 type-list
         :return: filtered_videos
         """
-        sql = "SELECT  video_id" \
-              "FROM    {}" \
-              "WHERE   audit_status = 5" \
-              "AND     applet_rec_status IN (1, 6)" \
-              "AND     open_status = 1" \
-              "AND     payment_status = 0" \
-              "AND     encryption_status is null" \
-              "AND     transcoding_status = 3" \
-              "AND     video_id IN {};".format(config_.VIDEO_STATUS, tuple(video_ids))
+        sql = "SELECT video_id " \
+              "FROM {} " \
+              "WHERE audit_status = 5 " \
+              "AND applet_rec_status IN (1, 6) " \
+              "AND open_status = 1 " \
+              "AND payment_status = 0 " \
+              "AND encryption_status IS NULL " \
+              "AND transcoding_status = 3 " \
+              "AND video_id IN {};".format(config_.VIDEO_STATUS, tuple(video_ids))
+
         hologres_helper = HologresHelper()
         data = hologres_helper.get_data(sql=sql)
         filtered_videos = [temp[0] for temp in data]

+ 1 - 1
video_recall.py

@@ -191,7 +191,7 @@ class PoolRecall(object):
         rov_pool_key, redis_date = self.get_pool_redis_key('rov')
         if not rov_pool_key:
             return None, None, None
-        last_rov_recall_key = config_.LAST_VIDEO_FROM_ROV_POOL_PREFIX + '{}.{}'.format(self.mid, redis_date)
+        last_rov_recall_key = config_.LAST_VIDEO_FROM_ROV_POOL_PREFIX + '{}.{}.{}'.format(self.app_type, self.mid, redis_date)
         value = self.redis_helper.get_data_from_redis(last_rov_recall_key)
         if value:
             idx = self.redis_helper.get_index_with_data(rov_pool_key, value)