From 90886c62a62ecbd64c9b229b48e4ef2cf600ae43 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 03 八月 2023 16:34:21 +0800
Subject: [PATCH] redis上级缓存添加
---
code_attribute/gpcode_manager.py | 283 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 176 insertions(+), 107 deletions(-)
diff --git a/code_attribute/gpcode_manager.py b/code_attribute/gpcode_manager.py
index 3e7c1ef..3c53c02 100644
--- a/code_attribute/gpcode_manager.py
+++ b/code_attribute/gpcode_manager.py
@@ -17,6 +17,7 @@
class CodesNameManager:
redisManager = redis_manager.RedisManager(0)
+ __gp_list_names_first_cache = []
@classmethod
def __get_redis(cls):
@@ -44,8 +45,8 @@
return None
@classmethod
- def list_second_code_name_dict(cls):
- val = RedisUtils.get(cls.__get_redis(), "gp_list_names")
+ def list_first_code_name_dict_cache(cls):
+ val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first")
if val is not None:
val = json.loads(val)
return val
@@ -61,16 +62,6 @@
if val[k] == code:
return k
return None
-
- @classmethod
- def get_second_code_name(cls, code):
- val = RedisUtils.get(cls.__get_redis(), "gp_list_names")
- if not val:
- return None
- val = json.loads(val)
- for k in val:
- if val[k] == code:
- return k
@classmethod
def get_first_name_code(cls, name):
@@ -89,6 +80,34 @@
val[name] = code
cls.set_first_code_names(val)
+ # 璁剧疆棣栨澘浠ｇ爜鍚嶇О
+ @classmethod
+ def set_first_code_names(cls, datas):
+ RedisUtils.set(cls.__get_redis(), "gp_list_names_first", json.dumps(datas))
+
+ # 鍒犻櫎棣栨澘浠ｇ爜鍚嶇О
+ @classmethod
+ def clear_first_code_names(cls):
+ RedisUtils.delete(cls.__get_redis(), "gp_list_names_first")
+
+ @classmethod
+ def list_second_code_name_dict(cls):
+ val = RedisUtils.get(cls.__get_redis(), "gp_list_names")
+ if val is not None:
+ val = json.loads(val)
+ return val
+ return None
+
+ @classmethod
+ def get_second_code_name(cls, code):
+ val = RedisUtils.get(cls.__get_redis(), "gp_list_names")
+ if not val:
+ return None
+ val = json.loads(val)
+ for k in val:
+ if val[k] == code:
+ return k
+
@classmethod
def get_second_name_code(cls, name):
val = RedisUtils.get(cls.__get_redis(), "gp_list_names")
@@ -97,20 +116,10 @@
val = json.loads(val)
return val.get(name)
- # 璁剧疆棣栨澘浠ｇ爜鍚嶇О
- @classmethod
- def set_first_code_names(cls, datas):
- cls.__get_redis().set("gp_list_names_first", json.dumps(datas))
-
# 璁剧疆浜屾澘浠ｇ爜鍚嶇О
@classmethod
def set_second_code_names(cls, datas):
- cls.__get_redis().set("gp_list_names", json.dumps(datas))
-
- # 鍒犻櫎棣栨澘浠ｇ爜鍚嶇О
- @classmethod
- def clear_first_code_names(cls):
- RedisUtils.delete(cls.__get_redis(), "gp_list_names_first")
+ RedisUtils.set(cls.__get_redis(), "gp_list_names", json.dumps(datas))
# 璁剧疆浜屾澘浠ｇ爜鍚嶇О
@classmethod
@@ -120,71 +129,114 @@
# 棣栨澘浠ｇ爜绠＄悊
class FirstCodeManager:
- redisManager = redis_manager.RedisManager(0)
+ __instance = None
- @classmethod
- def __get_redis(cls):
- return cls.redisManager.getRedis()
+ def __new__(cls, *args, **kwargs):
+ if not cls.__instance:
+ cls.__instance = super(FirstCodeManager, cls).__new__(cls, *args, **kwargs)
+ # 鍒濆鍖栬缃�
+ # 鑾峰彇浜ゆ槗绐楀彛鐨勯攣
+ cls.__instance.redisManager = redis_manager.RedisManager(0)
+ cls.__instance.__first_code_record_cache = RedisUtils.smembers(cls.__instance.__get_redis(),
+ "first_code_record")
+ cls.__instance.__first_code_limited_up_record_cache = RedisUtils.smembers(cls.__instance.__get_redis(),
+ "first_code_limited_up_record")
+ return cls.__instance
+
+ def __get_redis(self):
+ return self.redisManager.getRedis()
# 鍔犲叆棣栨澘鍘嗗彶璁板綍
- @classmethod
- def add_record(cls, codes):
+ def add_record(self, codes):
+ hasChanged = False
for code in codes:
- RedisUtils.sadd(cls.__get_redis(), "first_code_record", code)
- RedisUtils.expire(cls.__get_redis(), "first_code_record", tool.get_expire())
+ if code not in self.__first_code_record_cache:
+ RedisUtils.sadd(self.__get_redis(), "first_code_record", code)
+ hasChanged = True
+ self.__first_code_record_cache.add(code)
+ if hasChanged:
+ RedisUtils.expire(self.__get_redis(), "first_code_record", tool.get_expire())
- @classmethod
- def is_in_first_record(cls, code):
- if cls.__get_redis().sismember("first_code_record", code):
+ def is_in_first_record(self, code):
+ if RedisUtils.sismember(self.__get_redis(), "first_code_record", code):
return True
else:
return False
+
+ def is_in_first_record_cache(self, code):
+ return code in self.__first_code_record_cache
# 鍔犲叆棣栨澘娑ㄥ仠杩囦唬鐮侀泦鍚�
- @classmethod
- def add_limited_up_record(cls, codes):
+ def add_limited_up_record(self, codes):
+ hasChanged = False
for code in codes:
- RedisUtils.sadd(cls.__get_redis(), "first_code_limited_up_record", code)
- RedisUtils.expire(cls.__get_redis(), "first_code_limited_up_record", tool.get_expire())
+ if code not in self.__first_code_limited_up_record_cache:
+ RedisUtils.sadd(self.__get_redis(), "first_code_limited_up_record", code)
+ hasChanged = True
+ self.__first_code_limited_up_record_cache.add(code)
+ if hasChanged:
+ RedisUtils.expire(self.__get_redis(), "first_code_limited_up_record", tool.get_expire())
# 鏄惁娑ㄥ仠杩�
- @classmethod
- def is_limited_up(cls, code):
- if cls.__get_redis().sismember("first_code_limited_up_record", code):
+ def is_limited_up(self, code):
+ if RedisUtils.sismember(self.__get_redis(), "first_code_limited_up_record", code):
return True
else:
return False
+
+ def is_limited_up_cache(self, code):
+ return code in self.__first_code_limited_up_record_cache
# 鎯宠涔扮殑浠ｇ爜
class WantBuyCodesManager:
- redisManager = redis_manager.RedisManager(0)
- __redis_key = "want_buy_codes"
+ __instance = None
- @classmethod
- def __get_redis(cls):
- return cls.redisManager.getRedis()
+ def __new__(cls, *args, **kwargs):
+ if not cls.__instance:
+ cls.__instance = super(WantBuyCodesManager, cls).__new__(cls, *args, **kwargs)
+ # 鍒濆鍖栬缃�
+ # 鑾峰彇浜ゆ槗绐楀彛鐨勯攣
+ cls.__instance.redisManager = redis_manager.RedisManager(0)
+ cls.__instance.__redis_key = "want_buy_codes"
+ cls.__instance.__want_buy_codes_cache = RedisUtils.smembers(cls.__instance.__get_redis(),
+ cls.__instance.__redis_key)
+ return cls.__instance
- @classmethod
- def clear(cls):
- RedisUtils.delete(cls.__get_redis(), cls.__redis_key)
+ __want_buy_codes_cache = set()
- @classmethod
- def add_code(cls, code):
- RedisUtils.sadd(cls.__get_redis(), cls.__redis_key, code)
- RedisUtils.expire(cls.__get_redis(), cls.__redis_key, tool.get_expire())
+ def __get_redis(self):
+ return self.redisManager.getRedis()
- @classmethod
- def remove_code(cls, code):
- cls.__get_redis().srem(cls.__redis_key, code)
+ def clear(self):
+ RedisUtils.delete(self.__get_redis(), self.__redis_key)
- @classmethod
- def is_in(cls, code):
- return cls.__get_redis().sismember(cls.__redis_key, code)
+ def add_code(self, code):
+ self.__want_buy_codes_cache.add(code)
+ RedisUtils.sadd(self.__get_redis(), self.__redis_key, code)
+ RedisUtils.expire(self.__get_redis(), self.__redis_key, tool.get_expire())
- @classmethod
- def list_code(cls):
- return RedisUtils.smembers(cls.__get_redis(), cls.__redis_key)
+ def remove_code(self, code):
+ self.__want_buy_codes_cache.discard(code)
+ RedisUtils.srem(self.__get_redis(), self.__redis_key, code)
+
+ def sync(self):
+ self.__want_buy_codes_cache.clear()
+ codes = RedisUtils.smembers(self.__get_redis(), self.__redis_key)
+ if codes:
+ self.__want_buy_codes_cache += set(codes)
+
+ def is_in(self, code):
+ return RedisUtils.sismember(self.__get_redis(), self.__redis_key, code)
+
+ def is_in_cache(self, code):
+ return code in self.__want_buy_codes_cache
+
+ def list_code(self):
+ return RedisUtils.smembers(self.__get_redis(), self.__redis_key)
+
+ def list_code_cache(self):
+ return self.__want_buy_codes_cache
# 鏆傚仠涓嬪崟浠ｇ爜绠＄悊
@@ -208,11 +260,11 @@
@classmethod
def remove_code(cls, code):
- cls.__get_redis().srem(cls.__redis_key, code)
+ RedisUtils.srem(cls.__get_redis(), cls.__redis_key, code)
@classmethod
def is_in(cls, code):
- return cls.__get_redis().sismember(cls.__redis_key, code)
+ return RedisUtils.sismember(cls.__get_redis(), cls.__redis_key, code)
@classmethod
def list_code(cls):
@@ -264,6 +316,9 @@
CodesNameManager.set_second_code_names(old_name_codes)
+__gp_list_first_codes_cache = set()
+
+
# -------------------------------棣栨澘浠ｇ爜绠＄悊-------------------------------
# 娣诲姞棣栨澘浠ｇ爜
# code_datas 鎺橀噾杩斿洖鐨勬暟鎹�
@@ -273,7 +328,7 @@
codes_set = set()
for code in codes:
codes_set.add(code)
- old_codes_set = RedisUtils.smembers(redis_instance, "gp_list_first")
+ old_codes_set = __gp_list_first_codes_cache
if old_codes_set is None:
old_codes_set = set()
del_set = old_codes_set - codes_set
@@ -281,8 +336,13 @@
for code in add_codes:
RedisUtils.sadd(redis_instance, "gp_list_first", code)
for code in del_set:
- redis_instance.srem("gp_list_first", code)
- RedisUtils.expire(redis_instance, "gp_list_first", tool.get_expire())
+ RedisUtils.srem(redis_instance, "gp_list_first", code)
+ if add_codes or del_set:
+ RedisUtils.expire(redis_instance, "gp_list_first", tool.get_expire())
+ # 鏇存柊缂撳瓨
+ __gp_list_first_codes_cache.clear()
+ for code in codes_set:
+ __gp_list_first_codes_cache.add(code)
old_name_codes = CodesNameManager.list_first_code_name_dict()
if old_name_codes is None:
@@ -297,7 +357,7 @@
def remove_first_gp_code(codes):
redis_instance = __redisManager.getRedis()
for code in codes:
- redis_instance.srem("gp_list_first", code)
+ RedisUtils.srem(redis_instance, "gp_list_first", code)
# 鑾峰彇棣栨澘浠ｇ爜
@@ -309,7 +369,7 @@
# 鏄惁鍦ㄩ鏉块噷闈�
def is_in_first_gp_codes(code):
redis_instance = __redisManager.getRedis()
- return redis_instance.sismember("gp_list_first", code)
+ return RedisUtils.sismember(redis_instance, "gp_list_first", code)
# 鑾峰彇鍚嶇О瀵瑰簲鐨勪唬鐮�
@@ -366,13 +426,13 @@
def rm_gp(code):
redis_instance = __redisManager.getRedis()
- redis_instance.srem("gp_list", code)
+ RedisUtils.srem(redis_instance, "gp_list", code)
remove_first_gp_code([code])
def is_in_gp_pool(code):
redis_instance = __redisManager.getRedis()
- return redis_instance.sismember("gp_list", code) or is_in_first_gp_codes(code)
+ return RedisUtils.sismember(redis_instance, "gp_list", code) or is_in_first_gp_codes(code)
def get_gp_list():
@@ -401,35 +461,38 @@
return list
-# 鑾峰彇鏀剁洏浠�
-def get_price_pre(code):
- redis_instance = __redisManager.getRedis()
- result = RedisUtils.get(redis_instance, "price-pre-{}".format(code))
- if result is not None:
- return float(result)
- return None
+class CodePrePriceManager:
+ __price_pre_cache = {}
+ __redisManager = redis_manager.RedisManager(0)
+ # 鑾峰彇鏀剁洏浠�
+ @classmethod
+ def get_price_pre(cls, code):
+ redis_instance = cls.__redisManager.getRedis()
+ result = RedisUtils.get(redis_instance, "price-pre-{}".format(code))
+ if result is not None:
+ return float(result)
+ return None
-__price_pre_cache = {}
+ # 鑾峰彇缂撳瓨
+ @classmethod
+ def get_price_pre_cache(cls, code):
+ if code in cls.__price_pre_cache:
+ return float(cls.__price_pre_cache[code])
+ val = cls.get_price_pre(code)
+ if val:
+ cls.__price_pre_cache[code] = val
+ return val
-
-# 鑾峰彇缂撳瓨
-def get_price_pre_cache(code):
- if code in __price_pre_cache:
- return __price_pre_cache[code]
- val = get_price_pre(code)
- if val:
- __price_pre_cache[code] = val
- return val
-
-
-# 璁剧疆鏀剁洏浠�
-def set_price_pre(code, price, force=False):
- codes = get_gp_list()
- if code not in codes and not FirstCodeManager.is_in_first_record(code) and not force:
- return
- redis_instance = __redisManager.getRedis()
- RedisUtils.setex(redis_instance, "price-pre-{}".format(code), tool.get_expire(), str(price))
+ # 璁剧疆鏀剁洏浠�
+ @classmethod
+ def set_price_pre(cls, code, price, force=False):
+ codes = get_gp_list()
+ if code not in codes and not FirstCodeManager().is_in_first_record_cache(code) and not force:
+ return
+ redis_instance = cls.__redisManager.getRedis()
+ RedisUtils.setex(redis_instance, "price-pre-{}".format(code), tool.get_expire(), str(price))
+ cls.__price_pre_cache[code] = float(price)
__limit_up_price_dict = {}
@@ -440,7 +503,7 @@
# 璇诲彇鍐呭瓨涓殑鍊�
if code in __limit_up_price_dict:
return __limit_up_price_dict[code]
- price = get_price_pre(code)
+ price = CodePrePriceManager.get_price_pre_cache(code)
if price is None:
return None
limit_up_price = tool.to_price(decimal.Decimal(str(price)) * decimal.Decimal("1.1"))
@@ -456,7 +519,7 @@
# 鑾峰彇璺屽仠浠�
def get_limit_down_price(code):
- price = get_price_pre(code)
+ price = CodePrePriceManager.get_price_pre_cache(code)
if price is None:
return None
return tool.to_price(decimal.Decimal(str(price)) * decimal.Decimal("0.9"))
@@ -471,8 +534,14 @@
return None
+__current_price_cache = {}
+
+
# 璁剧疆鐜颁环
def set_price(code, price):
+ if code in __current_price_cache and __current_price_cache[code] == price:
+ return
+ __current_price_cache[code] = price
redis_instance = __redisManager.getRedis()
RedisUtils.setex(redis_instance, "price-{}".format(code), tool.get_expire(), price)
@@ -518,13 +587,13 @@
keys = RedisUtils.keys(redis_instance, "listen_code-*-*")
for key in keys:
- result = redis_instance.get(key)
+ result = RedisUtils.get(redis_instance, key)
if result:
# 绉婚櫎闇�瑕佹坊鍔犵殑浠ｇ爜
codes_set.discard(result)
client_id_, pos_, code_ = int(key.split("-")[1]), int(key.split("-")[2]), result
key_ = "code_listen_pos-{}".format(code_)
- val = redis_instance.get(key_)
+ val = RedisUtils.get(redis_instance, key_)
if val is None:
RedisUtils.setex(redis_instance, key_, tool.get_expire(), json.dumps((client_id_, pos_)))
else:
@@ -541,7 +610,7 @@
def init_listen_code_by_pos(client_id, pos):
redis_instance = __redisManager.getRedis()
key = "listen_code-{}-{}".format(client_id, pos)
- redis_instance.setnx(key, "")
+ RedisUtils.setnx(redis_instance, key, "")
RedisUtils.expire(redis_instance, key, tool.get_expire())
@@ -580,7 +649,7 @@
index = key.split("-")[-1]
if int(index) + 1 > constant.L2_CODE_COUNT_PER_DEVICE:
continue
- result = redis_instance.get(key)
+ result = RedisUtils.get(redis_instance, key)
if result is None or len(result) == 0:
available_positions.append((client_id, int(key.replace("listen_code-{}-".format(client_id), ""))))
else:
@@ -617,7 +686,7 @@
k = "listen_code-{}-*".format(client_id)
keys = RedisUtils.keys(redis_instance, k)
for key in keys:
- code = redis_instance.get(key)
+ code = RedisUtils.get(redis_instance, key)
if not code:
free_count += 1
return free_count
@@ -626,7 +695,7 @@
# 鑾峰彇姝ｅ湪鐩戝惉鐨勪唬鐮佺殑浣嶇疆
def get_listen_code_pos(code):
redis_instance = __redisManager.getRedis()
- val = redis_instance.get("code_listen_pos-{}".format(code))
+ val = RedisUtils.get(redis_instance, "code_listen_pos-{}".format(code))
if val is None:
return None, None
val = json.loads(val)
@@ -642,7 +711,7 @@
# 鏄惁姝ｅ湪鐩戝惉
def is_listen(code):
redis_instance = __redisManager.getRedis()
- val = redis_instance.get("code_listen_pos-{}".format(code))
+ val = RedisUtils.get(redis_instance, "code_listen_pos-{}".format(code))
if val is None:
return False
else:
@@ -666,7 +735,7 @@
# 鏄惁姝ｅ湪鎿嶄綔
def is_operate(code):
redis_instance = __redisManager.getRedis()
- return redis_instance.get("gp_operate-{}".format(code)) is not None
+ return RedisUtils.get(redis_instance, "gp_operate-{}".format(code)) is not None
# 璁剧疆姝ｅ湪鎿嶄綔鐨勪唬鐮�
--
Gitblit v1.8.0