mdbq 3.11.11__py3-none-any.whl → 3.12.0__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '3.11.11'
+VERSION = '3.12.0'

mdbq/mysql/deduplicator.py

@@ -14,6 +14,7 @@ from collections import defaultdict
 import sys
 from datetime import datetime
 import uuid
+from contextlib import contextmanager
 
 
 warnings.filterwarnings('ignore')
@@ -47,8 +48,8 @@ class MySQLDeduplicator:
             batch_size: int = 1000,
             skip_system_dbs: bool = True,
             max_retries: int = 3,
-            retry_interval: int = 5,
-            pool_size: int = 5,
+            retry_waiting_time: int = 5,
+            pool_size: int = 10,
             primary_key: str = 'id',
             date_range: Optional[List[str]] = None,
             recent_month: Optional[int] = None,
@@ -87,15 +88,30 @@ class MySQLDeduplicator:
             cursorclass=pymysql.cursors.DictCursor
         )
 
+        # 并发模式要将 pool_size 加大
+        MAX_POOL_SIZE = 200
+        MAX_WORKERS = 4
+        if max_workers > MAX_WORKERS:
+            logger.warning(f"max_workers({max_workers}) 超过最大建议值({MAX_WORKERS})，自动将 max_workers 调整为 {MAX_WORKERS}")
+            max_workers = MAX_WORKERS
+        expected_threads = max_workers * 10
+        if pool_size < expected_threads:
+            logger.warning(f"pool_size({pool_size}) < max_workers({max_workers}) * 10，自动将 pool_size 调整为 {expected_threads}")
+            pool_size = expected_threads
+        if pool_size > MAX_POOL_SIZE:
+            logger.warning(f"pool_size({pool_size}) 超过最大建议值({MAX_POOL_SIZE})，自动将 pool_size 调整为 {MAX_POOL_SIZE}")
+            pool_size = MAX_POOL_SIZE
+        self.max_workers = max_workers
+        self.pool_size = pool_size
+
         # 配置参数
-        self.max_workers = min(max(1, max_workers), pool_size)  # 限制最大线程数，不能超过连接池
         self.batch_size = batch_size
         self.skip_system_dbs = skip_system_dbs
         self.max_retries = max_retries
-        self.retry_interval = retry_interval
+        self.retry_waiting_time = retry_waiting_time
         self.primary_key = primary_key
 
-        # 时间范围参数（只保留解析后的结果，去除冗余原始参数）
+        # 时间范围参数
         self.date_column = date_column
         self._dedup_start_date = None
         self._dedup_end_date = None
@@ -128,6 +144,9 @@ class MySQLDeduplicator:
                 year -= 1
             self._dedup_start_date = f"{year}-{month:02d}-01"
             self._dedup_end_date = today.strftime("%Y-%m-%d")
+        
+        if self._dedup_start_date and self._dedup_end_date:
+            logger.info('去重日期范围', {'开始': self._dedup_start_date, '结束': self._dedup_end_date})
 
         # 排除列处理，直接合并去重
         self.exclude_columns = list(set((exclude_columns or []) + ['id', '更新时间']))
@@ -164,6 +183,14 @@ class MySQLDeduplicator:
             logger.error(f"获取数据库连接失败: {str(e)}", {'error_type': type(e).__name__})
             raise ConnectionError(f"连接数据库失败: {str(e)}")
 
+    @contextmanager
+    def _conn_ctx(self):
+        conn = self._get_connection()
+        try:
+            yield conn
+        finally:
+            conn.close()
+
     @staticmethod
     def _retry_on_failure(func: Any) -> Any:
         """
@@ -187,7 +214,7 @@ class MySQLDeduplicator:
                 except (pymysql.OperationalError, pymysql.InterfaceError) as e:
                     last_exception = e
                     if attempt < self.max_retries:
-                        wait_time = self.retry_interval * (attempt + 1)
+                        wait_time = self.retry_waiting_time * (attempt + 1)
                         logger.warning(
                             f"数据库操作失败，准备重试 (尝试 {attempt + 1}/{self.max_retries})",
                             {'error': str(e), 'wait_time': wait_time, 'func': func.__name__})
@@ -203,7 +230,6 @@ class MySQLDeduplicator:
             raise Exception("未知错误")
         return wrapper
 
-    @_retry_on_failure
     def _get_databases(self) -> List[str]:
         """
         获取所有非系统数据库列表，排除 exclude_databases。
@@ -212,7 +238,7 @@ class MySQLDeduplicator:
             List[str]: 数据库名列表。
         """
         sql = "SHOW DATABASES"
-        with self._get_connection() as conn:
+        with self._conn_ctx() as conn:
             with conn.cursor() as cursor:
                 cursor.execute(sql)
                 all_dbs = [row['Database'] for row in cursor.fetchall()]
@@ -220,7 +246,6 @@ class MySQLDeduplicator:
                 filtered = [db for db in all_dbs if db.lower() not in self.SYSTEM_DATABASES and db.lower() not in self.exclude_databases] if self.skip_system_dbs else [db for db in all_dbs if db.lower() not in self.exclude_databases]
                 return filtered
 
-    @_retry_on_failure
     def _get_tables(self, database: str) -> List[str]:
         """
         获取指定数据库的所有表名（排除 temp_ 前缀的临时表）。
@@ -231,15 +256,12 @@ class MySQLDeduplicator:
             List[str]: 表名列表。
         """
         sql = "SHOW TABLES"
-
-        with self._get_connection() as conn:
+        with self._conn_ctx() as conn:
             with conn.cursor() as cursor:
                 cursor.execute(f"USE `{database}`")
                 cursor.execute(sql)
-                # 严格过滤所有以'temp_'为前缀的表名（如temp_xxx、temp_xxx_dedup_...、temp_xxx_reorderid_...等）
                 return [row[f'Tables_in_{database}'] for row in cursor.fetchall() if not re.match(r'^temp_.*', row[f'Tables_in_{database}'])]
 
-    @_retry_on_failure
     def _get_table_columns(self, database: str, table: str) -> List[str]:
         """
         获取指定表的所有列名（排除主键列）。
@@ -256,14 +278,12 @@ class MySQLDeduplicator:
         WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s
         ORDER BY ORDINAL_POSITION
         """
-
-        with self._get_connection() as conn:
+        with self._conn_ctx() as conn:
             with conn.cursor() as cursor:
                 cursor.execute(sql, (database, table))
                 return [row['COLUMN_NAME'] for row in cursor.fetchall()
                         if row['COLUMN_NAME'].lower() != self.primary_key.lower()]
 
-    @_retry_on_failure
     def _ensure_index(self, database: str, table: str, date_column: str) -> None:
         """
         检查并为 date_column 自动创建索引（如果未存在）。
@@ -273,7 +293,7 @@ class MySQLDeduplicator:
             table (str): 表名。
             date_column (str): 需要检查的日期列名。
         """
-        with self._get_connection() as conn:
+        with self._conn_ctx() as conn:
             with conn.cursor() as cursor:
                 # 检查索引是否已存在
                 cursor.execute(
@@ -295,7 +315,33 @@ class MySQLDeduplicator:
                     except Exception as e:
                         logger.error('自动创建date_column索引失败', {"库": database, "表": table, "date_column": date_column, "异常": str(e)})
 
-    @_retry_on_failure
+    def _row_generator(self, database, table, select_cols, select_where, batch_size=10000):
+        """
+        生成器：分批拉取表数据，避免一次性加载全部数据到内存。
+        Args:
+            database (str): 数据库名。
+            table (str): 表名。
+            select_cols (str): 选择的列字符串。
+            select_where (str): where条件字符串。
+            batch_size (int): 每批拉取的行数。
+        Yields:
+            dict: 每行数据。
+        """
+        offset = 0
+        while True:
+            sql = f"SELECT {select_cols} FROM `{database}`.`{table}` {select_where} LIMIT {batch_size} OFFSET {offset}"
+            with self._conn_ctx() as conn:
+                with conn.cursor() as cursor:
+                    cursor.execute(sql)
+                    rows = cursor.fetchall()
+                    if not rows:
+                        break
+                    for row in rows:
+                        yield row
+            if len(rows) < batch_size:
+                break
+            offset += batch_size
+            
     def _get_all_dates(self, database: str, table: str, date_column: str) -> List[str]:
         """
         获取表中所有不同的日期分区（按天）。
@@ -308,7 +354,7 @@ class MySQLDeduplicator:
             List[str]: 所有不同的日期（字符串）。
         """
         sql = f"SELECT DISTINCT `{date_column}` FROM `{database}`.`{table}` ORDER BY `{date_column}` ASC"
-        with self._get_connection() as conn:
+        with self._conn_ctx() as conn:
             with conn.cursor() as cursor:
                 cursor.execute(sql)
                 return [row[date_column] for row in cursor.fetchall() if row[date_column] is not None]
@@ -367,7 +413,7 @@ class MySQLDeduplicator:
                 pk_real = next((c for c in all_columns if c.lower() == pk.lower()), pk)
                 where_sql = f"t.`{time_col}` = '{date_val}'"
                 # 获取原始数据总量（只统计当天数据）
-                with self._get_connection() as conn:
+                with self._conn_ctx() as conn:
                     with conn.cursor() as cursor:
                         count_where = f"WHERE `{time_col}` = '{date_val}'"
                         count_sql = f"SELECT COUNT(*) as cnt FROM `{database}`.`{table}` {count_where}"
@@ -394,7 +440,7 @@ class MySQLDeduplicator:
                             del_ids.extend(ids[1:])
                     affected_rows = 0
                     if not dry_run and del_ids:
-                        with self._get_connection() as conn:
+                        with self._conn_ctx() as conn:
                             with conn.cursor() as cursor:
                                 for i in range(0, len(del_ids), self.batch_size):
                                     batch_ids = del_ids[i:i+self.batch_size]
@@ -418,7 +464,7 @@ class MySQLDeduplicator:
                 GROUP BY {column_list}
                 HAVING COUNT(*) > 1
                 """
-                with self._get_connection() as conn:
+                with self._conn_ctx() as conn:
                     with conn.cursor() as cursor:
                         logger.debug('创建临时表SQL', {'sql': create_temp_sql})
                         cursor.execute(create_temp_sql)
@@ -484,7 +530,7 @@ class MySQLDeduplicator:
             pk = self.primary_key
             pk_real = next((c for c in all_columns if c.lower() == pk.lower()), pk)
             # 获取原始数据总量
-            with self._get_connection() as conn:
+            with self._conn_ctx() as conn:
                 with conn.cursor() as cursor:
                     count_sql = f"SELECT COUNT(*) as cnt FROM `{database}`.`{table}`"
                     logger.debug('执行SQL', {'sql': count_sql})
@@ -508,7 +554,7 @@ class MySQLDeduplicator:
                         del_ids.extend(ids[1:])
                 affected_rows = 0
                 if not dry_run and del_ids:
-                    with self._get_connection() as conn:
+                    with self._conn_ctx() as conn:
                         with conn.cursor() as cursor:
                             for i in range(0, len(del_ids), self.batch_size):
                                 batch_ids = del_ids[i:i+self.batch_size]
@@ -529,7 +575,7 @@ class MySQLDeduplicator:
             GROUP BY {column_list}
             HAVING COUNT(*) > 1
             """
-            with self._get_connection() as conn:
+            with self._conn_ctx() as conn:
                 with conn.cursor() as cursor:
                     logger.debug('创建临时表SQL', {'sql': create_temp_sql})
                     cursor.execute(create_temp_sql)
@@ -584,7 +630,7 @@ class MySQLDeduplicator:
             logger.error('异常', {"库": database, "表": table, "异常": str(e), 'func': sys._getframe().f_code.co_name, 'traceback': repr(e)})
             if temp_table:
                 try:
-                    with self._get_connection() as conn:
+                    with self._conn_ctx() as conn:
                         with conn.cursor() as cursor:
                             drop_temp_sql = f"DROP TABLE IF EXISTS `{database}`.`{temp_table}`"
                             cursor.execute(drop_temp_sql)
@@ -628,13 +674,14 @@ class MySQLDeduplicator:
             logger.info('单表开始', {
                 "库": database, 
                 "表": table, 
-                "参数": {
-                    "指定去重列": columns, 
-                    "去重方式": "Python" if use_python_dedup else "SQL", 
-                    "数据处理": self.duplicate_keep_mode,
-                    "模拟运行": dry_run, 
-                    '排除列': self.exclude_columns,
-                    }})
+                # "参数": {
+                #     "指定去重列": columns, 
+                #     "去重方式": "Python" if use_python_dedup else "SQL", 
+                #     "数据处理": self.duplicate_keep_mode,
+                #     "模拟运行": dry_run, 
+                #     '排除列': self.exclude_columns,
+                #     },
+                })
             all_columns = self._get_table_columns(database, table)
             all_columns_lower = [col.lower() for col in all_columns]
             time_col = self.date_column
@@ -680,7 +727,7 @@ class MySQLDeduplicator:
                             logger.warning('分区处理失败', {"库": database, "表": table, "日期": date_val, "异常": err, "func": sys._getframe().f_code.co_name})
                         total_dup += dup_count
                         total_del += affected_rows
-                logger.info('单表完成', {"库": database, "表": table, "结果[重复, 删除]": (total_dup, total_del), '日期范围': f"{start_date} - {end_date}"})
+                logger.debug('单表完成', {"库": database, "表": table, "结果[重复, 删除]": (total_dup, total_del), '日期范围': f"{start_date} - {end_date}"})
                 # 自动重排id列（仅当有实际删除时且reorder_id为True）
                 if reorder_id and total_del > 0:
                     try:
@@ -688,10 +735,12 @@ class MySQLDeduplicator:
                         logger.info('自动重排id列完成', {"库": database, "表": table, "结果": reorder_ok})
                     except Exception as e:
                         logger.error('自动重排id列异常', {"库": database, "表": table, "异常": str(e)})
+                if affected_rows > 0:
+                    logger.info('单表完成(仅显示有删除的结果)', {"库": database, "表": table, "重复组": total_dup, "实际删除": total_del})
                 return (total_dup, total_del)
             # 没有date_column，直接全表去重
             result = self._deduplicate_table(database, table, columns, dry_run, use_python_dedup, date_val=None)
-            logger.info('单表完成', {"库": database, "表": table, "结果[重复, 删除]": result, '日期范围': '全表'})
+            logger.debug('单表完成', {"库": database, "表": table, "结果[重复, 删除]": result, '日期范围': '全表'})
             dup_count, affected_rows = result
             if reorder_id and affected_rows > 0:
                 try:
@@ -699,6 +748,8 @@ class MySQLDeduplicator:
                     logger.info('自动重排id列完成', {"库": database, "表": table, "结果": reorder_ok})
                 except Exception as e:
                     logger.error('自动重排id列异常', {"库": database, "表": table, "异常": str(e)})
+            if affected_rows > 0:
+                logger.info('单表完成(仅显示有删除的结果)', {"库": database, "表": table, "重复组": dup_count, "实际删除": affected_rows})
             return result
         except Exception as e:
             logger.error('发生全局错误', {"库": database, "表": table, 'func': sys._getframe().f_code.co_name, "发生全局错误": str(e)})
@@ -770,7 +821,11 @@ class MySQLDeduplicator:
                     results[table] = (dup_count, affected_rows)
             total_dup = sum(r[0] for r in results.values())
             total_del = sum(r[1] for r in results.values())
-            logger.info('库完成', {"库": database, "重复组": total_dup, "总删除行": total_del, "详细结果": results})
+            logger.debug('库完成', {"库": database, "重复组": total_dup, "总删除行": total_del, "详细结果": results})
+            # 只显示有删除的详细结果
+            if total_del > 0:
+                filtered_results = {tbl: res for tbl, res in results.items() if res[1] > 0}
+                logger.info('库完成(仅显示有删除的结果)', {"库": database, "重复组": total_dup, "总删除行": total_del, "详细结果": filtered_results})
             return results
         except Exception as e:
             logger.error('发生全局错误', {"库": database, 'func': sys._getframe().f_code.co_name, "error": str(e), 'traceback': repr(e)})
@@ -819,7 +874,8 @@ class MySQLDeduplicator:
                     'use_python_dedup': use_python_dedup
                     },
                 })
-            if parallel and self.max_workers > 1:
+            # 如果parallel=True且库数量大于1，则只在外层并发，内层串行
+            if parallel and self.max_workers > 1 and len(target_dbs) > 1:
                 with concurrent.futures.ThreadPoolExecutor(
                         max_workers=self.max_workers
                 ) as executor:
@@ -827,6 +883,7 @@ class MySQLDeduplicator:
                     for db in target_dbs:
                         tables = tables_map.get(db) if tables_map else None
                         db_columns_map = columns_map.get(db) if columns_map else None
+                        # 内层强制串行
                         futures[executor.submit(
                             self.deduplicate_database,
                             db, tables, db_columns_map, dry_run, False, reorder_id, use_python_dedup
@@ -855,7 +912,7 @@ class MySQLDeduplicator:
                 r[1] for db in all_results.values()
                 for r in db.values()
             )
-            logger.info('全局完成', {
+            logger.debug('全局完成', {
                 "总重复组": total_dup, 
                 "总删除行": total_del, 
                 "参数": {
@@ -867,12 +924,30 @@ class MySQLDeduplicator:
                     }, 
                 "详细结果": dict(all_results)
                 })
+            # 只显示有删除的详细结果
+            if total_del > 0:
+                filtered_results = {
+                    db: {tbl: res for tbl, res in tbls.items() if res[1] > 0}
+                    for db, tbls in all_results.items()
+                }
+                filtered_results = {db: tbls for db, tbls in filtered_results.items() if tbls}
+                logger.info('全局完成(仅显示有删除的结果)', {
+                    "总重复组": total_dup,
+                    "总删除行": total_del,
+                    "参数": {
+                        "模拟运行": dry_run,
+                        "并行处理": parallel,
+                        '排除列': self.exclude_columns,
+                        '重排id': reorder_id,
+                        'use_python_dedup': use_python_dedup
+                    },
+                    "详细结果": filtered_results
+                })
             return all_results
         except Exception as e:
             logger.error('异常', {"error": str(e), 'traceback': repr(e)})
             return all_results
 
-    @_retry_on_failure
     def _check_database_exists(self, database: str) -> bool:
         """
         检查数据库是否存在。
@@ -883,13 +958,11 @@ class MySQLDeduplicator:
             bool: 数据库是否存在。
         """
         sql = "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = %s"
-
-        with self._get_connection() as conn:
+        with self._conn_ctx() as conn:
             with conn.cursor() as cursor:
                 cursor.execute(sql, (database,))
                 return bool(cursor.fetchone())
 
-    @_retry_on_failure
     def _check_table_exists(self, database: str, table: str) -> bool:
         """
         检查表是否存在。
@@ -905,13 +978,11 @@ class MySQLDeduplicator:
         FROM INFORMATION_SCHEMA.TABLES 
         WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s
         """
-
-        with self._get_connection() as conn:
+        with self._conn_ctx() as conn:
             with conn.cursor() as cursor:
                 cursor.execute(sql, (database, table))
                 return bool(cursor.fetchone())
 
-    @_retry_on_failure
     def _get_table_info(self, database: str, table: str, id_column: str = None):
         """
         获取表的所有列名、主键列名列表、指定id列是否为主键。
@@ -923,7 +994,7 @@ class MySQLDeduplicator:
             Tuple[List[str], List[str], bool]: (所有列名, 主键列名, id列是否为主键)
         """
         id_column = id_column or self.primary_key
-        with self._get_connection() as conn:
+        with self._conn_ctx() as conn:
             with conn.cursor() as cursor:
                 cursor.execute("""
                     SELECT COLUMN_NAME, COLUMN_KEY
@@ -1032,7 +1103,7 @@ class MySQLDeduplicator:
                 logger.warning('主键不是单列id，跳过id重排', {"库": database, "表": table, "主键列": pk_cols})
                 return False
             # 检查外键约束
-            with self._get_connection() as conn:
+            with self._conn_ctx() as conn:
                 with conn.cursor() as cursor:
                     cursor.execute("""
                         SELECT * FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
@@ -1042,7 +1113,7 @@ class MySQLDeduplicator:
                         logger.warning('表存在外键约束，跳过id重排', {"库": database, "表": table})
                         return False
             # 获取表结构
-            with self._get_connection() as conn:
+            with self._conn_ctx() as conn:
                 with conn.cursor() as cursor:
                     cursor.execute(f"SHOW CREATE TABLE {table_quoted}")
                     create_table_sql = cursor.fetchone()['Create Table']
@@ -1055,7 +1126,7 @@ class MySQLDeduplicator:
             backup_table = self._make_backup_table_name(table)
             backup_table_quoted = f"`{database}`.`{backup_table}`"
             try:
-                with self._get_connection() as conn:
+                with self._conn_ctx() as conn:
                     with conn.cursor() as cursor:
                         # 1. 创建临时表，结构同原表
                         try:
@@ -1116,7 +1187,7 @@ class MySQLDeduplicator:
                                 logger.error('回滚恢复原表失败', {"库": database, "表": table, "异常": str(e)})
                             return False
                         logger.info('id重排成功且数据量一致', {"库": database, "表": table, "新表": new_cnt, "备份表": old_cnt, "备份表名": backup_table})
-                        # 5. 可选：自动删除备份表
+                        # 5. 自动删除备份表
                         if auto_drop_backup:
                             try:
                                 cursor.execute(f"DROP TABLE {backup_table_quoted}")
@@ -1127,7 +1198,7 @@ class MySQLDeduplicator:
             except Exception as e:
                 logger.error('id重排异常，准备回滚', {"库": database, "表": table, "异常": str(e)})
                 # 回滚：如临时表存在则删掉，恢复原表结构
-                with self._get_connection() as conn:
+                with self._conn_ctx() as conn:
                     with conn.cursor() as cursor:
                         try:
                             cursor.execute(f"DROP TABLE IF EXISTS {temp_table_quoted}")
@@ -1135,7 +1206,7 @@ class MySQLDeduplicator:
                             logger.error('回滚时删除临时表失败', {"库": database, "表": table, "异常": str(drop_e)})
                         # 恢复原表（如备份表存在）
                         try:
-                            with self._get_connection() as conn2:
+                            with self._conn_ctx() as conn2:
                                 with conn2.cursor() as cursor2:
                                     if self._check_table_exists(database, backup_table):
                                         cursor2.execute(f"DROP TABLE IF EXISTS {table_quoted}")
@@ -1227,23 +1298,16 @@ def main():
         batch_size=1000,
         skip_system_dbs=True,
         max_retries=3,
-        retry_interval=5,
-        pool_size=5,
+        retry_waiting_time=5,
+        # pool_size=30,
         recent_month=1,
         # date_range=['2025-06-09', '2025-06-10'],
         date_column='日期',
-        exclude_columns=None,
         exclude_databases=['测试库4'],
         exclude_tables={
             '推广数据2': [
                 '地域报表_城市_2025_04', 
-                '地域报表_城市_2025_05', 
-                '地域报表_城市_2025_06', 
                 # '地域报表_城市_2025_04_copy1', 
-                # '地域报表_城市_2025_05_copy1', 
-                # '地域报表_城市_2025_06_copy1', 
-                '奥莱店_主体报表',
-                # '奥莱店_主体报表_copy1',
             ],
             "生意参谋3": [
                 "商品排行_2025",
@@ -1255,10 +1319,10 @@ def main():
     deduplicator.deduplicate_all(dry_run=False, parallel=True, reorder_id=True)
 
     # # 指定数据库去重(多线程)
-    # deduplicator.deduplicate_database('推广数据2', dry_run=False, parallel=True, reorder_id=True)
+    # deduplicator.deduplicate_database('my_db', dry_run=False, parallel=True, reorder_id=True)
 
     # # 指定表去重(使用特定列)
-    # deduplicator.deduplicate_table('推广数据2', '地域报表_城市_2025_06_copy1', columns=[], dry_run=False, reorder_id=True)
+    # deduplicator.deduplicate_table('my_db', 'my_table', columns=['name', 'data'], dry_run=False, reorder_id=True)
 
     # # 重排id列
     # deduplicator.reorder_id_column('my_db', 'my_table', 'id', dry_run=False, auto_drop_backup=True)

{mdbq-3.11.11.dist-info → mdbq-3.12.0.dist-info}/METADATA

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

{mdbq-3.11.11.dist-info → mdbq-3.12.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=GrY3av2BYeEaosI2qWYizQyTwyijdq8IuOuFjTJqLxE,19
+mdbq/__version__.py,sha256=W8WVhYkHLU0SBDlL9Q6XQVTqIrzYjc1kFBZgqzS_NEI,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/query_data.py,sha256=nxL8hSy8yI1QLlqnkTNHHQSxRfo-6WKL5OA-N4xLB7c,179832
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -8,7 +8,7 @@ mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=Crw6LwVo3I3IUbzIETu8f46Quza3CTCh-qYf4edbBPo,24139
 mdbq/log/spider_logging.py,sha256=-ozWWEGm3HVv604ozs_OOvVwumjokmUPwbaodesUrPY,1664
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/deduplicator.py,sha256=e84MLhWjdCoDB8GxUV-z5drn8hdKGlJKnHzNW0rjIM8,65345
+mdbq/mysql/deduplicator.py,sha256=KMJ_YyqAniaLVRqOHLgO92PgwknIDB-EgaOY7S6iMZ4,68599
 mdbq/mysql/mysql.py,sha256=Kjpi-LL00WQUmTTOfhEBsNrmo4-4kFFJzrHbVKfqiBE,56770
 mdbq/mysql/s_query.py,sha256=dlnrVJ3-Vp1Suv9CNbPxyYSRqRJUHjOpF39tb2F-wBc,10190
 mdbq/mysql/uploader.py,sha256=8Px_W2bYOr1wQgMXMK0DggNiuE6a6Ul4BlJake8LSo8,64469
@@ -24,7 +24,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=YHgCKO8mEsslwet33K5tGss-nrDDwPnOSlhA9iBu0jY,24078
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=cqK-JRd_DHbToC7hyo83m8o97NZkJFqmB2xBtr6aAVU,20961
-mdbq-3.11.11.dist-info/METADATA,sha256=NHTu8tsBwtvh90jaiNN4E4i9SW5xkH6P-yYcBrxwSbU,365
-mdbq-3.11.11.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-3.11.11.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.11.11.dist-info/RECORD,,
+mdbq-3.12.0.dist-info/METADATA,sha256=Q6EyaC61H4okFva6YFV2a0Y3Iqun8L8mnpSkeVXcFdc,364
+mdbq-3.12.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-3.12.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.12.0.dist-info/RECORD,,