VladPolskiy/mariadb-connector-python
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-python.git synced 2025-08-07 11:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Coding style fixes (PEP8)

Browse Source 
Fixed various coding style stuff detected by flake8.
Added .pre-commit-config.yaml:
With command pre_commit install a hook for flake8 will be
installed.
This commit is contained in:
Georg Richter
2022-08-07 16:47:26 +02:00
parent 3fe0ee06ec
commit cdd42743cc
44 changed files with 1372 additions and 1145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
mariadb/connectionpool.py
View File

@ -17,12 +17,14 @@
# 51 Franklin St., Fifth Floor, Boston, MA 02110, USA
#
import mariadb, sys
import _thread, time
import mariadb
import _thread
import time
MAX_POOL_SIZE = 64
POOL_IDLE_TIMEOUT = 1800
class ConnectionPool(object):
"""
Class defining a pool of database connections
@ -31,7 +33,7 @@ class ConnectionPool(object):
A connection pool holds a number of open connections and handles
thread safety when providing connections to threads.
The size of a connection pool is configurable at creation time,
The size of a connection pool is configurable at creation time,
but cannot be changed afterwards. The maximum size of a connection
pool is limited to 64 connections.
@ -39,9 +41,11 @@ class ConnectionPool(object):
* pool_name (str) -- Name of connection pool
* pool_size (int)=5 -- Size of pool. If not specified default value of 5 will be used. Maximum allowed number is 64.
* pool_size (int)=5 -- Size of pool. If not specified default value
of 5 will be used. Maximum allowed number is 64.
* pool_reset_connection (bool)=True -- Will reset the connection before returning it to the pool. Default value is True.
* pool_reset_connection (bool)=True -- Will reset the connection before
returning it to the pool. Default value is True.
"""
def __init__(self, *args, **kwargs):
@ -63,33 +67,33 @@ class ConnectionPool(object):
self._pool_args = {}
self._conn_args = {}
self._lock_pool = _thread.RLock()
self.__closed= 0
self.__closed = 0
key_words= ["pool_name", "pool_size", "pool_reset_connection"]
key_words = ["pool_name", "pool_size", "pool_reset_connection"]
# check if pool_name was provided
if kwargs and "pool_name" in kwargs:
# check if pool_name already exists
if kwargs["pool_name"] in mariadb._CONNECTION_POOLS:
raise mariadb.ProgrammingError("Pool '%s' already exists" \
raise mariadb.ProgrammingError("Pool '%s' already exists"
% kwargs["pool_name"])
else:
raise mariadb.ProgrammingError("No pool name specified")
# save pool keyword arguments
self._pool_args["name"]= kwargs.get("pool_name")
self._pool_args["size"]= kwargs.get("pool_size", 5);
self._pool_args["reset_connection"]= \
self._pool_args["name"] = kwargs.get("pool_name")
self._pool_args["size"] = kwargs.get("pool_size", 5)
self._pool_args["reset_connection"] = \
kwargs.get("pool_reset_connection", True)
# validate pool size (must be in range between 1 and MAX_POOL_SIZE)
if not (0 < self._pool_args["size"] <= MAX_POOL_SIZE):
raise mariadb.ProgrammingError("Pool size must be in range of "\
"1 and %s" % MAX_POOL_SIZE)
raise mariadb.ProgrammingError("Pool size must be in range of "
"1 and %s" % MAX_POOL_SIZE)
# store pool and connection arguments
self._conn_args= kwargs.copy()
self._conn_args = kwargs.copy()
for key in key_words:
if key in self._conn_args:
del self._conn_args[key]
@ -99,30 +103,34 @@ class ConnectionPool(object):
# fill connection pool
for i in range(0, self._pool_args["size"]):
try:
connection= mariadb.Connection(**self._conn_args)
except:
# if an error occurred, close all connections and raise exception
connection = mariadb.Connection(**self._conn_args)
except mariadb.Error:
# if an error occurred, close all connections
# and raise exception
for j in range(0, len(self._connections)):
try:
self._connections[j].close()
except:
# connect failed, so we are not interested in errors
except mariadb.Error:
# connect failed, so we are not
# interested in errors
# from close() method
pass
del self._connections[j]
raise
self.add_connection(connection)
# store connection pool in _CONNECTION_POOLS
mariadb._CONNECTION_POOLS[self._pool_args["name"]]= self
# store connection pool in _CONNECTION_POOLS
mariadb._CONNECTION_POOLS[self._pool_args["name"]] = self
def __repr__(self):
if (self.__closed):
return "<mariadb.connectionPool.ConnectionPool object (closed) at %s>" % (hex(id(self)),)
return "<mariadb.connectionPool.ConnectionPool object (closed) "\
"at %s>" % (hex(id(self)),)
else:
return "<mariadb.connectionPool.ConnectionPool object (name=%s) at %s>" % (self.pool_name, hex(id(self)))
return "<mariadb.connectionPool.ConnectionPool object (name=%s) "\
"at %s>" % (self.pool_name, hex(id(self)))
def add_connection(self, connection= None):
def add_connection(self, connection=None):
"""
Adds a connection object to the connection pool.
@ -131,55 +139,57 @@ class ConnectionPool(object):
"""
if not self._conn_args:
raise mariadb.PoolError("Couldn't get configuration for pool %s" % \
self._pool_args["name"])
raise mariadb.PoolError("Couldn't get configuration for pool %s" %
self._pool_args["name"])
if connection is not None and \
not isinstance(connection, mariadb.connections.Connection):
raise mariadb.ProgrammingError("Passed parameter is not a connection object")
if (connection is not None and
not isinstance(connection, mariadb.connections.Connection)):
raise mariadb.ProgrammingError("Passed parameter is not a "
"connection object")
if connection == None and len(self._conn_args) == 0:
raise mariadb.PoolError("Can't get configuration for pool %s" % \
self._pool_args["name"])
if connection is None and len(self._conn_args) == 0:
raise mariadb.PoolError("Can't get configuration for pool %s" %
self._pool_args["name"])
if len(self._connections) >= self._pool_args["size"]:
raise mariadb.PoolError("Can't add connection to pool %s: "
"No free slot available (%s)." % (self._pool_args["name"], len(self._connections)))
"No free slot available (%s)." %
(self._pool_args["name"],
len(self._connections)))
with self._lock_pool:
if connection is None:
connection= mariadb.Connection(**self._conn_args)
connection._Connection__pool= self
connection._Connection__in_use= 0
connection._Connection__last_used= time.monotonic()
connection = mariadb.Connection(**self._conn_args)
connection._Connection__pool = self
connection._Connection__in_use = 0
connection._Connection__last_used = time.monotonic()
self._connections.append(connection)
def get_connection(self):
"""
Returns a connection from the connection pool or raises a PoolError
exception if a connection is not available.
"""
now= time.monotonic()
conn= None
timediff= -1
now = time.monotonic()
conn = None
timediff = -1
with self._lock_pool:
for i in range(0, len(self._connections)):
if not self._connections[i]._Connection__in_use:
try:
self._connections[i].ping()
except:
except mariadb.Error:
continue
t = now - self._connections[i]._Connection__last_used
if t > timediff:
conn= self._connections[i]
conn = self._connections[i]
timediff = t
if conn:
conn._Connection__in_use= 1
conn._Connection__in_use = 1
return conn
def _close_connection(self, connection):
@ -191,28 +201,28 @@ class ConnectionPool(object):
with self._lock_pool:
if self._pool_args["reset_connection"]:
connection.reset()
connection._Connection__in_use= 0
connection._Connection__last_used= time.monotonic()
connection._Connection__in_use = 0
connection._Connection__last_used = time.monotonic()
def set_config(self, **kwargs):
"""
Sets the connection configuration for the connection pool.
For valid connection arguments check the mariadb.connect() method.
Note: This method doesn't create connections in the pool.
To fill the pool one has to use add_connection() ḿethod.
"""
self._conn_args= kwargs;
self._conn_args = kwargs
def close(self):
"""Closes connection pool and all connections."""
try:
for c in self._connections:
c._Connection__pool= None
c._Connection__pool = None
c.close()
finally:
self._connections= None
self._connections = None
del mariadb._CONNECTION_POOLS[self._pool_args["name"]]
@property
@ -242,11 +252,11 @@ class ConnectionPool(object):
@property
def pool_reset_connection(self):
"""
If set to true, the connection will be reset on both client and server side\n
after .close() method was called
If set to true, the connection will be reset on both client and server
side after .close() method was called
"""
return self._pool_args["reset_connection"]
@pool_reset_connection.setter
def pool_reset_connection(self, reset):
self._pool_args["reset_connection"]= reset
self._pool_args["reset_connection"] = reset