From 4fc3cc5ecb624f75598b9b0298e0c3a098be7cdc Mon Sep 17 00:00:00 2001 From: Andy Chen Date: Tue, 26 Feb 2019 00:07:50 -0800 Subject: [PATCH] upgrade jasync to 0.9.23 --- vertx-mysql-postgresql-client-jasync/pom.xml | 2 +- .../java/io/vertx/ext/asyncsql/impl/BaseSQLClient.java | 10 ++++++++-- .../asyncsql/impl/pool/MysqlAsyncConnectionPool.java | 6 +----- .../impl/pool/PostgresqlAsyncConnectionPool.java | 7 +------ 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/vertx-mysql-postgresql-client-jasync/pom.xml b/vertx-mysql-postgresql-client-jasync/pom.xml index d54669ed..6ac368a3 100644 --- a/vertx-mysql-postgresql-client-jasync/pom.xml +++ b/vertx-mysql-postgresql-client-jasync/pom.xml @@ -14,7 +14,7 @@ Vert.x MySQL/PostgreSQL Client based on jasync-sql/Kotlin - 0.8.62 + 0.9.23 false false diff --git a/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/BaseSQLClient.java b/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/BaseSQLClient.java index 72cece4d..85460977 100644 --- a/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/BaseSQLClient.java +++ b/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/BaseSQLClient.java @@ -31,6 +31,7 @@ import io.vertx.core.logging.LoggerFactory; import io.vertx.ext.asyncsql.impl.pool.AsyncConnectionPool; import io.vertx.ext.sql.SQLConnection; +import kotlinx.coroutines.Dispatchers; import java.nio.charset.Charset; import java.time.Duration; @@ -114,6 +115,7 @@ protected ConnectionPoolConfiguration getConnectionConfiguration( long testTimeout = config.getLong("testTimeout", defaultTestTimeout); Long queryTimeout = config.getLong("queryTimeout"); Map sslConfig = buildSslConfig(config); + String applicationName = config.getString("applicationName"); log.info("Creating configuration for " + host + ":" + port); return new ConnectionPoolConfiguration( @@ -122,7 +124,7 @@ protected ConnectionPoolConfiguration getConnectionConfiguration( database, username, password, - 0 /*maxActiveConnections, unused*/, + 1 /*maxActiveConnections, unused*/, 0 /*maxIdleTime, unused*/, 0 /*maxPendingQueries, unused*/, 0 /*connectionValidationInterval*/, @@ -131,8 +133,12 @@ protected ConnectionPoolConfiguration getConnectionConfiguration( queryTimeout, vertx.nettyEventLoopGroup(), vertx.nettyEventLoopGroup(), /*executor: in non-blocking world, we should only have one event loop group*/ + Dispatchers.getDefault(), new SSLConfiguration(sslConfig), - charset); + charset, + 16777216, + PooledByteBufAllocator.DEFAULT, + applicationName); } private Map buildSslConfig(JsonObject config) { diff --git a/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/pool/MysqlAsyncConnectionPool.java b/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/pool/MysqlAsyncConnectionPool.java index b47c0a15..f16d6f56 100644 --- a/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/pool/MysqlAsyncConnectionPool.java +++ b/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/pool/MysqlAsyncConnectionPool.java @@ -16,14 +16,12 @@ package io.vertx.ext.asyncsql.impl.pool; -import com.github.jasync.sql.db.Configuration; import com.github.jasync.sql.db.Connection; import com.github.jasync.sql.db.ConnectionPoolConfiguration; import com.github.jasync.sql.db.mysql.MySQLConnection; import com.github.jasync.sql.db.mysql.util.CharsetMapper; import io.vertx.core.Vertx; import io.vertx.core.json.JsonObject; -import io.vertx.ext.asyncsql.impl.ConversionUtils; /** * Implementation of the {@link AsyncConnectionPool} for MySQL. @@ -40,9 +38,7 @@ public MysqlAsyncConnectionPool(Vertx vertx, JsonObject globalConfig, Connection protected Connection create() { return new MySQLConnection( connectionConfig.getConnectionConfiguration(), - CharsetMapper.Companion.getInstance(), - vertx.nettyEventLoopGroup(), - vertx.nettyEventLoopGroup() + CharsetMapper.Companion.getInstance() ); } diff --git a/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/pool/PostgresqlAsyncConnectionPool.java b/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/pool/PostgresqlAsyncConnectionPool.java index a43712aa..807f1e2f 100644 --- a/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/pool/PostgresqlAsyncConnectionPool.java +++ b/vertx-mysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/pool/PostgresqlAsyncConnectionPool.java @@ -16,7 +16,6 @@ package io.vertx.ext.asyncsql.impl.pool; -import com.github.jasync.sql.db.Configuration; import com.github.jasync.sql.db.Connection; import com.github.jasync.sql.db.ConnectionPoolConfiguration; import com.github.jasync.sql.db.postgresql.PostgreSQLConnection; @@ -24,7 +23,6 @@ import com.github.jasync.sql.db.postgresql.column.PostgreSQLColumnEncoderRegistry; import io.vertx.core.Vertx; import io.vertx.core.json.JsonObject; -import io.vertx.ext.asyncsql.impl.ConversionUtils; /** * Implementation of the {@link AsyncConnectionPool} for PostGresSQL. @@ -42,10 +40,7 @@ protected Connection create() { return new PostgreSQLConnection( connectionConfig.getConnectionConfiguration(), PostgreSQLColumnEncoderRegistry.Companion.getInstance(), - PostgreSQLColumnDecoderRegistry.Companion.getInstance(), - vertx.nettyEventLoopGroup(), - vertx.nettyEventLoopGroup() - ); + PostgreSQLColumnDecoderRegistry.Companion.getInstance()); } }