mdbq 4.0.60__tar.gz → 4.0.61__tar.gz

{mdbq-4.0.60 → mdbq-4.0.61}/PKG-INFO

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

mdbq-4.0.61/mdbq/__version__.py

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

{mdbq-4.0.60 → mdbq-4.0.61}/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

{mdbq-4.0.60 → mdbq-4.0.61}/mdbq.egg-info/PKG-INFO

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

mdbq-4.0.60/mdbq/__version__.py

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