mdbq 4.0.114__tar.gz → 4.0.115__tar.gz

{mdbq-4.0.114 → mdbq-4.0.115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 4.0.114
+Version: 4.0.115
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

mdbq-4.0.115/mdbq/__version__.py

@@ -0,0 +1 @@
+VERSION = '4.0.115'

{mdbq-4.0.114 → mdbq-4.0.115}/mdbq/redis/redis_cache.py

@@ -68,9 +68,9 @@ class CacheStatsCollector:
         self.namespace_stats = defaultdict(int)
         
         # 同步提交控制
-        self.submit_interval = self.config.get('submit_interval', 300)  # 每N次操作提交一次统计数据
+        self.submit_interval = self.config.get('submit_interval', 600)  # 每隔N秒定时提交一次（期间有新操作时）
         self.last_submit_time = time.time()
-        self.min_submit_interval = self.config.get('min_submit_interval', 300)  # 最少N秒提交一次
+        self.last_operation_count = 0  # 上次提交时的操作总数
 
     def record_operation(self, operation: str, response_time: float = 0, namespace: str = ""):
         """记录操作统计"""
@@ -120,67 +120,47 @@ class CacheStatsCollector:
             })
     
     def _check_and_submit(self):
-        """检查并提交统计数据（同步）"""
+        """检查并提交统计数据 """
         if not self.mysql_pool:
             return
             
         current_time = time.time()
         time_since_last_submit = current_time - self.last_submit_time
-        should_submit = False
-        reason = ""
-        
-        # 重构后的提交逻辑：
-        # 1. 每N次操作提交一次，但每X秒内只能提交一次（防止频繁提交）
-        # 2. 每隔X秒提交一次，但必须满足N次操作
-        
-        if self.stats['total_operations'] % self.submit_interval == 0:
-            # 达到操作次数阈值
-            if time_since_last_submit >= self.min_submit_interval:
-                # 满足时间间隔要求，可以提交
-                should_submit = True
-                reason = f"达到操作次数阈值({self.submit_interval}次)且满足时间间隔({self.min_submit_interval}秒)"
-            else:
-                # 时间间隔不够，延迟提交
-                remaining_time = self.min_submit_interval - time_since_last_submit
-                logger.debug("操作次数达标但时间间隔不足，延迟提交", {
-                    'instance_name': self.instance_name,
-                    'process_id': self.process_id,
-                    'total_operations': self.stats['total_operations'],
-                    'time_since_last_submit': round(time_since_last_submit, 2),
-                    'remaining_time': round(remaining_time, 2)
-                })
-        elif time_since_last_submit >= self.min_submit_interval:
-            # 达到时间间隔阈值
-            if self.stats['total_operations'] >= self.submit_interval:
-                # 满足操作次数要求，可以提交
-                should_submit = True
-                reason = f"达到时间间隔阈值({self.min_submit_interval}秒)且满足操作次数({self.submit_interval}次)"
-            else:
-                # 操作次数不够，不提交
-                logger.debug("时间间隔达标但操作次数不足，暂不提交", {
-                    'instance_name': self.instance_name,
-                    'process_id': self.process_id,
-                    'total_operations': self.stats['total_operations'],
-                    'required_operations': self.submit_interval,
-                    'time_since_last_submit': round(time_since_last_submit, 2)
-                })
         
-        if should_submit and self.stats['total_operations'] > 0:
-            try:
-                self._submit_to_mysql()
+        # 提交逻辑：每隔固定秒数且期间有新操作则提交
+        if time_since_last_submit >= self.submit_interval:
+            # 检查是否有新的操作（与上次提交时相比）
+            new_operations = self.stats['total_operations'] - self.last_operation_count
+            
+            if new_operations > 0:
+                # 有新操作，提交统计数据
+                try:
+                    self._submit_to_mysql()
+                    self.last_submit_time = current_time
+                    self.last_operation_count = self.stats['total_operations']
+                    
+                    logger.info("统计数据定时提交", {
+                        'instance_name': self.instance_name,
+                        'process_id': self.process_id,
+                        'total_operations': self.stats['total_operations'],
+                        'new_operations': new_operations,
+                        'time_since_last_submit': round(time_since_last_submit, 2),
+                        'submit_interval': self.submit_interval
+                    })
+                except Exception as e:
+                    logger.error("统计数据提交失败", {
+                        'instance_name': self.instance_name,
+                        'process_id': self.process_id,
+                        'error': str(e)
+                    })
+            else:
+                # 无新操作，跳过提交但更新时间
                 self.last_submit_time = current_time
-                logger.info("统计数据已同步提交", {
+                logger.debug("定时检查：期间无新操作，跳过提交", {
                     'instance_name': self.instance_name,
                     'process_id': self.process_id,
                     'total_operations': self.stats['total_operations'],
-                    'time_since_last_submit': round(time_since_last_submit, 2),
-                    'reason': reason
-                })
-            except Exception as e:
-                logger.error("统计数据提交失败", {
-                    'instance_name': self.instance_name,
-                    'process_id': self.process_id,
-                    'error': str(e)
+                    'time_since_last_submit': round(time_since_last_submit, 2)
                 })
     
     def _submit_to_mysql(self):
@@ -284,6 +264,7 @@ class CacheStatsCollector:
             self.response_times.clear()
             self.namespace_stats.clear()
             self.last_submit_time = time.time()
+            self.last_operation_count = 0
 
 
 class CacheSystemState(enum.Enum):
@@ -300,8 +281,7 @@ class CacheConfig:
     def __init__(self, **kwargs):
         # 基础配置
         self.default_ttl = kwargs.get('default_ttl', 3600)  # 默认过期时间(秒)
-        self.stats_interval = kwargs.get('stats_interval', 300)  # 每N次操作提交一次统计数据
-        self.stats_initial_delay = kwargs.get('stats_initial_delay', 300)  # 最少N秒提交一次
+        self.stats_submit_interval = kwargs.get('stats_submit_interval', 600)  # 每隔N秒定时提交一次（期间有新操作时）
         self.enable_stats = kwargs.get('enable_stats', True)  # 是否启用统计功能
         self.max_value_size = kwargs.get('max_value_size', 10 * 1024 * 1024)  # 最大值大小(字节)
         self.cache_prefix = kwargs.get('cache_prefix', 'cache')  # 缓存键前缀
@@ -343,8 +323,7 @@ class SmartCacheSystem:
                 mysql_pool=self.mysql_pool,
                 config={
                     'instance_name': self.instance_name,
-                    'submit_interval': self.config.stats_interval,  # 每N次操作提交一次
-                    'min_submit_interval': 300,  # 最少N秒提交一次
+                    'submit_interval': self.config.stats_submit_interval,  # 每隔N秒定时提交一次（期间有新操作时）
                     'table_name': self.config.table_name,
                     'db_name': self.config.db_name
                 }

{mdbq-4.0.114 → mdbq-4.0.115}/mdbq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 4.0.114
+Version: 4.0.115
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

mdbq-4.0.114/mdbq/__version__.py

@@ -1 +0,0 @@
-VERSION = '4.0.114'