Performance test fixed

Author: marat-gainullin

.gitignore

@@ -6,3 +6,4 @@ target/
 *.iml
 src/test/java/com/github/pgasync/impl/Heroku.java
 .repository/
+.gradle

src/test/java/com/github/pgasync/DatabaseRule.java

@@ -1,19 +1,25 @@
 package com.github.pgasync;
 
 import static java.lang.System.getenv;
+import static ru.yandex.qatools.embed.postgresql.distribution.Version.V11_1;
 
 import com.pgasync.ConnectionPool;
 import com.pgasync.ConnectionPoolBuilder;
 import com.pgasync.Db;
 import com.pgasync.ResultSet;
 import org.junit.rules.ExternalResource;
 
+import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
+import ru.yandex.qatools.embed.postgresql.PostgresExecutable;
 import ru.yandex.qatools.embed.postgresql.PostgresProcess;
+import ru.yandex.qatools.embed.postgresql.PostgresStarter;
+import ru.yandex.qatools.embed.postgresql.config.AbstractPostgresConfig;
+import ru.yandex.qatools.embed.postgresql.config.PostgresConfig;
 
 /**
  * @author Antti Laisi
@@ -42,7 +48,7 @@ class DatabaseRule extends ExternalResource {
                     PostgresExecutable exec = runtime.prepare(config);
                     process = exec.start();
 
-                    out.printf("Started postgres to %s:%d%n", process.getConfig().net().host(), process.getConfig().net().port());
+                    System.out.printf("Started postgres to %s:%d%n", process.getConfig().net().host(), process.getConfig().net().port());
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }

src/test/java/com/github/pgasync/PerformanceTest.java

@@ -23,6 +23,7 @@
 
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.function.Function;
 import java.util.stream.IntStream;
 
 import static com.github.pgasync.DatabaseRule.createPoolBuilder;
@@ -43,11 +44,9 @@ public static Iterable<Object[]> data() {
         results = new TreeMap<>();
         List<Object[]> testData = new ArrayList<>();
         for (int poolSize = 1; poolSize <= 4; poolSize *= 2) {
-            results.putIfAbsent(key(poolSize), new TreeMap<>());
             results.putIfAbsent(key(poolSize), new TreeMap<>());
             for (int threads = 1; threads <= 16; threads *= 2) {
                 testData.add(new Object[]{poolSize, threads});
-                testData.add(new Object[]{poolSize, threads});
             }
         }
         return testData;
@@ -89,7 +88,6 @@ public void t1_preAllocatePool() throws Exception {
     }
 
     @Test
-    // @Ignore
     public void t3_run() throws Exception {
         Collection<Callable<Long>> tasks = new ArrayList<>();
         for (int i = 0; i < batchSize; ++i) {
@@ -98,7 +96,43 @@ public void t3_run() throws Exception {
 
                 @Override
                 public Long call() throws Exception {
-                    pool.completeQuery("select 42")
+
+                    pool.getConnection()
+                            .thenApply(connection -> connection.prepareStatement("select 42")
+                                    .thenApply(stmt ->
+                                            stmt.query()
+                                                    .thenAccept(res -> {
+                                                        try {
+                                                            swap.exchange(currentTimeMillis());
+                                                        } catch (Exception e) {
+                                                            throw new AssertionError(e);
+                                                        }
+                                                    })
+                                                    .handle((v, th) ->
+                                                            stmt.close()
+                                                                    .thenAccept(_v -> {
+                                                                        if (th != null)
+                                                                            throw new RuntimeException(th);
+                                                                    })
+                                                    )
+                                                    .thenCompose(Function.identity())
+                                    )
+                                    .thenCompose(Function.identity())
+                                    .handle((v, th) -> connection.close()
+                                            .thenAccept(_v -> {
+                                                if (th != null) {
+                                                    throw new RuntimeException(th);
+                                                }
+                                            }))
+                                    .thenCompose(Function.identity())
+                            )
+                            .thenCompose(Function.identity())
+                            .exceptionally(th -> {
+                                throw new AssertionError(th);
+                            });
+
+                    /*
+                    pool.completeScript("select 42")
                             .thenAccept(r -> {
                                 try {
                                     swap.exchange(currentTimeMillis());
@@ -109,6 +143,7 @@ public Long call() throws Exception {
                             .exceptionally(th -> {
                                 throw new AssertionError(th);
                             });
+                    */
                     return swap.exchange(null);
                 }
             });