Skip to content

Commit bd32f84

Browse files
committed
Remove some obsolete completers.
1 parent 68c832b commit bd32f84

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

lib/src/connection_pool.dart

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ class ConnectionPool extends Object with _ConnectionHelpers implements Queriable
9494
_log.finest("Logged in on cnx#${cnx.number}");
9595
c.complete(cnx);
9696
} catch (e) {
97-
_releaseReuseCompleteError(cnx, c, e);
97+
if (!(e is MySqlException)) {
98+
_removeConnection(cnx);
99+
}
100+
c.completeError(e);
98101
}
99102
}
100103

@@ -175,7 +178,6 @@ class ConnectionPool extends Object with _ConnectionHelpers implements Queriable
175178
_log.info("Running query: ${sql}");
176179

177180
var cnx = await _getConnection();
178-
var c = new Completer<Results>();
179181
_log.fine("Got cnx#${cnx.number} for query");
180182
try {
181183
var results = await cnx.processHandler(new _QueryStreamHandler(sql));
@@ -269,15 +271,14 @@ class ConnectionPool extends Object with _ConnectionHelpers implements Queriable
269271

270272
var cnx = await _getConnection();
271273
cnx.inTransaction = true;
272-
var c = new Completer<Transaction>();
273274
var sql;
274275
if (consistent) {
275276
sql = "start transaction with consistent snapshot";
276277
} else {
277278
sql = "start transaction";
278279
}
279280
try {
280-
var results = await cnx.processHandler(new _QueryStreamHandler(sql));
281+
await cnx.processHandler(new _QueryStreamHandler(sql));
281282
_log.fine("Transaction started on cnx#${cnx.number}");
282283
return new _TransactionImpl._(cnx, this);
283284
} catch (e) {
@@ -327,14 +328,6 @@ class ConnectionPool extends Object with _ConnectionHelpers implements Queriable
327328
}
328329

329330
abstract class _ConnectionHelpers {
330-
_releaseReuseCompleteError(_Connection cnx, Completer c, dynamic e) {
331-
if (e is MySqlException) {
332-
} else {
333-
_removeConnection(cnx);
334-
}
335-
c.completeError(e);
336-
}
337-
338331
_releaseReuseThrow(_Connection cnx, dynamic e) {
339332
if (!(e is MySqlException)) {
340333
_removeConnection(cnx);

lib/src/query.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ class Query extends Object with _ConnectionHelpers {
2626
_inTransaction = true,
2727
_log = new Logger("Query");
2828

29-
Future<_Connection> _getConnection() {
29+
Future<_Connection> _getConnection() async {
3030
if (_cnx != null) {
31-
var c = new Completer<_Connection>();
32-
c.complete(_cnx);
33-
return c.future;
31+
return _cnx;
3432
}
3533
return _pool._getConnection();
3634
}
@@ -104,7 +102,6 @@ class Query extends Object with _ConnectionHelpers {
104102
Future<Results> _execute(_PreparedQuery preparedQuery, List values,
105103
{bool retainConnection: false}) async {
106104
_log.finest("About to execute");
107-
var c = new Completer<Results>();
108105
var handler = new _ExecuteQueryHandler(preparedQuery, _executed, values);
109106
preparedQuery.cnx.autoRelease = !retainConnection;
110107
try {
@@ -126,7 +123,6 @@ class Query extends Object with _ConnectionHelpers {
126123
*/
127124
Future<List<Results>> executeMulti(List<List> parameters) async {
128125
var preparedQuery = await _prepare(true);
129-
var c = new Completer<List<Results>>();
130126
_log.fine("Prepared query for multi execution. Number of values: ${parameters.length}");
131127
var resultList = new List<Results>();
132128

0 commit comments

Comments
 (0)