openstack/deb-python-pymysql
Code Issues Proposed changes

Merge pull request #318 from methane/feature/max_allowed_packet

Browse Source 
Add max_allowed_packet option (default: 16MB)
This commit is contained in:
INADA Naoki
2015-03-02 17:16:43 +09:00
parent 313da8cb58 48c564e073
commit d57b588890
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pymysql/connections.py
View File

@@ -508,7 +508,8 @@ class Connection(object):
client_flag=0, cursorclass=Cursor, init_command=None, client_flag=0, cursorclass=Cursor, init_command=None,
connect_timeout=None, ssl=None, read_default_group=None, connect_timeout=None, ssl=None, read_default_group=None,
compress=None, named_pipe=None, no_delay=False, compress=None, named_pipe=None, no_delay=False,
autocommit=False, db=None, passwd=None, local_infile=False): autocommit=False, db=None, passwd=None, local_infile=False,
max_allowed_packet=16*1024*1024):
""" """
Establish a connection to the MySQL database. Accepts several Establish a connection to the MySQL database. Accepts several
arguments: arguments:
@@ -542,11 +543,11 @@ class Connection(object):
no_delay: Disable Nagle's algorithm on the socket no_delay: Disable Nagle's algorithm on the socket
autocommit: Autocommit mode. None means use server default. (default: False) autocommit: Autocommit mode. None means use server default. (default: False)
local_infile: Boolean to enable the use of LOAD DATA LOCAL command. (default: False) local_infile: Boolean to enable the use of LOAD DATA LOCAL command. (default: False)
max_allowed_packet: Max size of packet sent to server in bytes. (default: 16MB)
db: Alias for database. (for compatibility to MySQLdb) db: Alias for database. (for compatibility to MySQLdb)
passwd: Alias for password. (for compatibility to MySQLdb) passwd: Alias for password. (for compatibility to MySQLdb)
""" """
if use_unicode is None and sys.version_info[0] > 2: if use_unicode is None and sys.version_info[0] > 2:
use_unicode = True use_unicode = True
@@ -641,6 +642,7 @@ class Connection(object):
self.decoders = conv self.decoders = conv
self.sql_mode = sql_mode self.sql_mode = sql_mode
self.init_command = init_command self.init_command = init_command
self.max_allowed_packet = max_allowed_packet
self._connect() self._connect()
def close(self): def close(self):
@@ -951,25 +953,25 @@ class Connection(object):
if isinstance(sql, text_type): if isinstance(sql, text_type):
sql = sql.encode(self.encoding) sql = sql.encode(self.encoding)
chunk_size = min(MAX_PACKET_LEN, len(sql) + 1) # +1 is for command chunk_size = min(self.max_allowed_packet, len(sql) + 1) # +1 is for command
prelude = struct.pack('<iB', chunk_size, command) prelude = struct.pack('<iB', chunk_size, command)
self._write_bytes(prelude + sql[:chunk_size-1]) self._write_bytes(prelude + sql[:chunk_size-1])
if DEBUG: dump_packet(prelude + sql) if DEBUG: dump_packet(prelude + sql)
if chunk_size < MAX_PACKET_LEN: if chunk_size < self.max_allowed_packet:
return return
seq_id = 1 seq_id = 1
sql = sql[chunk_size-1:] sql = sql[chunk_size-1:]
while True: while True:
chunk_size = min(MAX_PACKET_LEN, len(sql)) chunk_size = min(self.max_allowed_packet, len(sql))
prelude = struct.pack('<i', chunk_size)[:3] prelude = struct.pack('<i', chunk_size)[:3]
data = prelude + int2byte(seq_id%256) + sql[:chunk_size] data = prelude + int2byte(seq_id%256) + sql[:chunk_size]
self._write_bytes(data) self._write_bytes(data)
if DEBUG: dump_packet(data) if DEBUG: dump_packet(data)
sql = sql[chunk_size:] sql = sql[chunk_size:]
if not sql and chunk_size < MAX_PACKET_LEN: if not sql and chunk_size < self.max_allowed_packet:
break break
seq_id += 1 seq_id += 1
@@ -1284,7 +1286,7 @@ class LoadLocalFile(object):
seq_id = 2 seq_id = 2
try: try:
with open(self.filename, 'rb') as open_file: with open(self.filename, 'rb') as open_file:
chunk_size = MAX_PACKET_LEN chunk_size = self.connection.max_allowed_packet
prelude = b"" prelude = b""
packet = b"" packet = b""
packet_size = 0 packet_size = 0