Skip to content

Commit 2a1f8f2

Browse files
author
neekyjiang
committed
refactor: 添加主键重复时的异常处理
1 parent 5fdd08d commit 2a1f8f2

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

MANIFEST

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ bin/mtls-log
1414
bin/mtls-monitor
1515
bin/mtls-multi-session
1616
bin/mtls-perf-bench
17+
bin/mtls-ps-mem
1718
bin/mtls-random-passwd
1819
bin/mtls-rows-diff
1920
bin/mtls-sql-distribution
@@ -38,3 +39,5 @@ mtls/values.py
3839
mtls/variable.py
3940
mtls/kits/__init__.py
4041
mtls/kits/fileformat.py
42+
mtls/ps/__init__.py
43+
mtls/ps/mem.py

bin/mtls-auto-fill

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ from mysql import connector
1414
from datetime import datetime
1515
from collections import namedtuple
1616
from mtls.values import InsertSQL,TableMeta
17+
from mysql.connector.errors import IntegrityError
1718
from concurrent.futures import ThreadPoolExecutor,ProcessPoolExecutor
1819

1920

@@ -62,8 +63,12 @@ def insert(host="127.0.0.1",port=3306,user="apuser",password="mtls@0352",databas
6263

6364
for i in range(rows):
6465
sql,args,*_ = ist[i]
65-
cursor.execute(sql,args)
66-
cnx.commit()
66+
try:
67+
cursor.execute(sql,args)
68+
cnx.commit()
69+
except IntegrityError as err:
70+
# 主键重复时不用管
71+
pass
6772

6873
except Exception as err:
6974
logging.exception(str(err))

setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
'bin/mtls-http', 'bin/mtls-log', 'bin/mtls-monitor', 'bin/mtls-backup',
88
'bin/mtls-perf-bench', 'bin/mtls-kill-all-conections', 'bin/mtls-sql-distribution',
99
'bin/mtls-file-stat', 'bin/mtls-expired-tables', 'bin/mtls-random-passwd',
10-
'bin/mtls-rows-diff', 'bin/mtls-fake-mysqld','bin/mtls-auto-fill','bin/mtls-multi-session']
10+
'bin/mtls-rows-diff', 'bin/mtls-fake-mysqld','bin/mtls-auto-fill','bin/mtls-multi-session',
11+
'bin/mtls-ps-mem']
1112

1213
scripts = olds_scripts + news_scripts
1314

1415
setup(name='mysqltools-python',
15-
version='2.22.03.01',
16+
version='2.22.07.00',
1617
scripts=scripts,
17-
packages=['mtls', 'mtls.kits'],
18+
packages=['mtls', 'mtls.kits','mtls.ps'],
1819
maintainer='Neeky',
1920
maintainer_email='[email protected]',
2021
url='https://github.com/Neeky/mysqltools-python',

0 commit comments

Comments
 (0)