Skip to content

Commit ce527d0

Browse files
committed
WL11932: Remove Fabric support
This worklog removes the Fabric support. All related code was removed, including test cases.
1 parent 4cd702f commit ce527d0

16 files changed

+7
-2922
lines changed

cpyint

lib/mysql/connector/__init__.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,6 @@ def connect(*args, **kwargs):
147147
new_config = read_option_files(**kwargs)
148148
return connect(**new_config)
149149

150-
if all(['fabric' in kwargs, 'failover' in kwargs]):
151-
raise InterfaceError("fabric and failover arguments can not be used")
152-
153-
if 'fabric' in kwargs:
154-
if 'pool_name' in kwargs:
155-
raise AttributeError("'pool_name' argument is not supported with "
156-
" MySQL Fabric. Use 'pool_size' instead.")
157-
from .fabric import connect as fabric_connect
158-
return fabric_connect(*args, **kwargs)
159-
160150
# Failover
161151
if 'failover' in kwargs:
162152
return _get_failover_connection(**kwargs)

lib/mysql/connector/abstracts.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -380,12 +380,7 @@ def _check_server_version(self, server_version):
380380
raise errors.InterfaceError("Failed parsing MySQL version")
381381

382382
version = tuple([int(v) for v in match.groups()[0:3]])
383-
if 'fabric' in match.group(4).lower():
384-
if version < (1, 5):
385-
raise errors.InterfaceError(
386-
"MySQL Fabric '{0}' is not supported".format(
387-
server_version))
388-
elif version < (4, 1):
383+
if version < (4, 1):
389384
raise errors.InterfaceError(
390385
"MySQL Version '{0}' is not supported.".format(server_version))
391386

lib/mysql/connector/constants.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@
7474
}
7575

7676
CNX_POOL_ARGS = ('pool_name', 'pool_size', 'pool_reset_session')
77-
CNX_FABRIC_ARGS = ['fabric_host', 'fabric_username', 'fabric_password',
78-
'fabric_port', 'fabric_connect_attempts',
79-
'fabric_connect_delay', 'fabric_report_errors',
80-
'fabric_ssl_ca', 'fabric_ssl_key', 'fabric_ssl_cert',
81-
'fabric_user']
8277

8378
def flag_is_set(flag, flags):
8479
"""Checks if the flag is set

lib/mysql/connector/errors.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,6 @@ class PoolError(Error):
261261
pass
262262

263263

264-
class MySQLFabricError(Error):
265-
"""Exception for errors relating to MySQL Fabric"""
266-
267264
_SQLSTATE_CLASS_EXCEPTION = {
268265
'02': DataError, # no data
269266
'07': DatabaseError, # dynamic SQL error

lib/mysql/connector/fabric/__init__.py

Lines changed: 0 additions & 75 deletions
This file was deleted.

lib/mysql/connector/fabric/balancing.py

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)