mdbq 4.0.60__py3-none-any.whl → 4.0.62__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.60'
+VERSION = '4.0.62'

mdbq/mysql/uploader.py

@@ -1324,33 +1324,33 @@ class MySQLUploader:
         total_skipped = 0
         total_failed = 0
 
-        logger.info("开始上传", {
-            '库': db_name,
-            '表': table_name,
-            '批次': batch_id,
-            '传入': len(data) if hasattr(data, '__len__') else 1,
-            '参数': {
-                '主键': validated_primary_keys,
-                '去重': check_duplicate,
-                '去重列': duplicate_columns,
-                '允许空值': allow_null,
-                '分表方式': partition_by,
-                '分表列': partition_date_column,
-                # '自动建表': auto_create,
-                '索引': validated_indexes,
-                '更新旧数据': update_on_duplicate,
-                '事务模式': transaction_mode,
-                '唯一约束': validated_unique_keys
-            },
-            # '数据样例': self._shorten_for_log(data, 2)
-        })
-
         try:
             # 验证参数格式
             validated_primary_keys = self._validate_primary_keys_format(primary_keys, db_name, table_name)
             validated_indexes = self._validate_indexes_format(indexes, db_name, table_name)
             validated_unique_keys = self._validate_unique_keys_format(unique_keys, db_name, table_name)
             
+            logger.info("开始上传", {
+                '库': db_name,
+                '表': table_name,
+                '批次': batch_id,
+                '传入': len(data) if hasattr(data, '__len__') else 1,
+                '参数': {
+                    '主键': validated_primary_keys,
+                    '去重': check_duplicate,
+                    '去重列': duplicate_columns,
+                    '允许空值': allow_null,
+                    '分表方式': partition_by,
+                    '分表列': partition_date_column,
+                    # '自动建表': auto_create,
+                    '索引': validated_indexes,
+                    '更新旧数据': update_on_duplicate,
+                    '事务模式': transaction_mode,
+                    '唯一约束': validated_unique_keys
+                },
+                # '数据样例': self._shorten_for_log(data, 2)
+            })
+            
             # 验证分表参数
             if partition_by:
                 partition_by = str(partition_by).lower()
@@ -1486,8 +1486,16 @@ class MySQLUploader:
                 '失败': total_failed
             })
 
-        # 更新索引
-        self._update_indexes(db_name, table_name, validated_indexes)
+        # 更新索引（只有在成功时才执行）
+        if success_flag and 'validated_indexes' in locals():
+            try:
+                self._update_indexes(db_name, table_name, validated_indexes)
+            except Exception as e:
+                logger.warning('更新索引时发生错误', {
+                    '库': db_name,
+                    '表': table_name,
+                    '错误': str(e)
+                })
         return True
 
     @_execute_with_retry
@@ -2086,7 +2094,7 @@ class MySQLUploader:
         
         # 检查是否为空列表
         if len(unique_keys) == 0:
-            logger.warning('unique_keys为空列表，将忽略此参数', {'库': db_name, '表': table_name})
+            logger.debug('unique_keys为空列表，将忽略此参数', {'库': db_name, '表': table_name})
             return None
         
         validated_keys = []
@@ -2169,7 +2177,7 @@ class MySQLUploader:
         
         # 检查是否为空列表
         if len(indexes) == 0:
-            logger.warning('indexes为空列表，将忽略此参数', {'库': db_name, '表': table_name})
+            logger.debug('indexes为空列表，将忽略此参数', {'库': db_name, '表': table_name})
             return None
         
         validated_indexes = []
@@ -2234,7 +2242,7 @@ class MySQLUploader:
         
         # 检查是否为空列表
         if len(primary_keys) == 0:
-            logger.warning('primary_keys为空列表，将忽略此参数', {'库': db_name, '表': table_name})
+            logger.debug('primary_keys为空列表，将忽略此参数', {'库': db_name, '表': table_name})
             return None
         
         validated_keys = []

{mdbq-4.0.60.dist-info → mdbq-4.0.62.dist-info}/METADATA

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

{mdbq-4.0.60.dist-info → mdbq-4.0.62.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=IpOHQuRLDdueRIdWtuMKHCfRNfGVH0lhKWtZG7idBsE,18
+mdbq/__version__.py,sha256=y8SCr2feIYwnNjFYZAb8gWmpL8HZhwKp_Fgt6QAYlls,18
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=kPe3wsQNaB1slfX-Z7VMqzZoMoqPfc7ylYXZDBeFzzI,24945
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -9,7 +9,7 @@ mdbq/mysql/deduplicator.py,sha256=AB3gL7ZwhcmzGHSu4UY4M6YZVPFZ2wlAN3BCcwAhegQ,73
 mdbq/mysql/mysql.py,sha256=pDg771xBugCMSTWeskIFTi3pFLgaqgyG3smzf-86Wn8,56772
 mdbq/mysql/s_query.py,sha256=rSlAIUNfTrI25vYjoq9OpEbzsbrzc0m8mxb_0G7h878,45496
 mdbq/mysql/unique_.py,sha256=MaztT-WIyEQUs-OOYY4pFulgHVcXR1BfCy3QUz0XM_U,21127
-mdbq/mysql/uploader.py,sha256=Rv6I_1R8IRhdxbfxtKWusaVOTzNOzy-zsKdeIpr261A,110999
+mdbq/mysql/uploader.py,sha256=21AeMKv3ZQz-VQ2eMG-KC1s9SJ34EWsP8AzefueNv_Q,111434
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=X66sVdvVgzoNzmgVJyPtd7bjEvctEKtLPblEPF65EWc,46940
 mdbq/other/error_handler.py,sha256=4p5haAXSY-P78stp4Xwo_MwAngWYqyKj5ogWIuYXMeY,12631
@@ -22,7 +22,7 @@ mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.0.60.dist-info/METADATA,sha256=kR0RdNmcDOys9rVniMCYgJSnOtz5s3i6ymrti1S1hhA,364
-mdbq-4.0.60.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.60.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.60.dist-info/RECORD,,
+mdbq-4.0.62.dist-info/METADATA,sha256=vKfYTHaUFyBsM00BM6Ce17S-M2e7Y994AflTFGPyzLs,364
+mdbq-4.0.62.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.62.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.62.dist-info/RECORD,,