Pool implementation for one-shot queries does not use all available r…

…esources Fixes #742 Signed-off-by: Thomas Segismont <[email protected]>
eclipse-vertx · Aug 20, 2020 · 1bfb2ae · 1bfb2ae
1 parent 6bbdcf5
commit 1bfb2ae
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 11 deletions.
diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTest.java b/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTest.java
@@ -17,9 +17,9 @@
 
 package io.vertx.pgclient;
 
-import io.vertx.sqlclient.PoolOptions;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
+import io.vertx.sqlclient.PoolOptions;
 import org.junit.Test;
 
 import java.util.concurrent.atomic.AtomicReference;
@@ -130,4 +130,36 @@ public void testMaxWaitQueueSize(TestContext ctx) {
       pool.close();
     }
   }
+
+  @Test
+  public void testUseAvailableResources(TestContext ctx) {
+    int poolSize = 10;
+    Async async = ctx.async(poolSize + 1);
+    PgPool pool = PgPool.pool(options, new PoolOptions().setMaxSize(poolSize));
+    AtomicReference<PgConnection> ctrlConnRef = new AtomicReference<>();
+    PgConnection.connect(vertx, options, ctx.asyncAssertSuccess(ctrlConn -> {
+      ctrlConnRef.set(ctrlConn);
+      for (int i = 0; i < poolSize; i++) {
+        vertx.setTimer(10 * (i + 1), l -> {
+          pool.query("select pg_sleep(5)").execute(ctx.asyncAssertSuccess(res -> async.countDown()));
+        });
+      }
+      vertx.setTimer(10 * (poolSize + 1), event -> {
+        ctrlConn.query("select count(*) as cnt from pg_stat_activity where application_name like '%vertx%'").execute(ctx.asyncAssertSuccess(rows -> {
+          Integer count = rows.iterator().next().getInteger("cnt");
+          ctx.assertEquals(poolSize + 1, count);
+          async.countDown();
+        }));
+      });
+    }));
+    try {
+      async.await();
+    } finally {
+      PgConnection ctrlConn = ctrlConnRef.get();
+      if (ctrlConn != null) {
+        ctrlConn.close();
+      }
+      pool.close();
+    }
+  }
 }
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PoolBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PoolBase.java
@@ -17,19 +17,13 @@
 
 package io.vertx.sqlclient.impl;
 
-import io.vertx.sqlclient.PoolOptions;
+import io.vertx.core.*;
 import io.vertx.sqlclient.Pool;
+import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.Transaction;
 import io.vertx.sqlclient.impl.command.CommandBase;
 import io.vertx.sqlclient.impl.command.CommandResponse;
-import io.vertx.sqlclient.impl.command.CommandScheduler;
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Context;
-import io.vertx.core.Future;
-import io.vertx.core.Handler;
-import io.vertx.core.Vertx;
-import io.vertx.core.VertxException;
 
 /**
  * Todo :
@@ -88,9 +82,11 @@ public <R> void schedule(CommandBase<R> cmd, Handler<? super CommandResponse<R>>
       pool.acquire(new CommandWaiter() { // SHOULD BE IT !!!!!
         @Override
         protected void onSuccess(Connection conn) {
-          cmd.handler = handler;
+          cmd.handler = commandResponse -> {
+            conn.close(this);
+            handler.handle(commandResponse);
+          };
           conn.schedule(cmd);
-          conn.close(this);
         }
         @Override
         protected void onFailure(Throwable cause) {