Small fixes benchmark (#2246)

* Adding method to verify the number rows inserted

* Fix jdbcURL for cloud

* set back warmup iterations to 3

Author: mzitnik

performance/src/test/com/clickhouse/benchmark/BenchmarkRunner.java

@@ -53,7 +53,7 @@ public static void main(String[] args) throws Exception {
                 .timeUnit(TimeUnit.MILLISECONDS)
                 .addProfiler(GCProfiler.class)
                 .addProfiler(MemPoolProfiler.class)
-                .warmupIterations(1)
+                .warmupIterations(3)
                 .warmupTime(TimeValue.seconds(5))
                 .measurementIterations(10)
                 .jvmArgs("-Xms8g", "-Xmx8g")

performance/src/test/com/clickhouse/benchmark/clients/BenchmarkBase.java

@@ -265,16 +265,32 @@ protected static Client getClientV2(boolean includeDb) {
                 .setDefaultDatabase(includeDb ? DB_NAME : "default")
                 .build();
     }
-    
+    private static String jdbcURLV1(boolean isCloud) {
+        ClickHouseNode node = getServer();
+        if (isCloud) {
+            return String.format("jdbc:clickhouse://%s:%s?clickhouse.jdbc.v1=true&ssl=true", node.getHost(), node.getPort());
+        } else
+            return String.format("jdbc:clickhouse://%s:%s?clickhouse.jdbc.v1=true", node.getHost(), node.getPort());
+    }
+
+    private static String jdbcURLV2(boolean isCloud) {
+        ClickHouseNode node = getServer();
+        if (isCloud) {
+            return String.format("jdbc:clickhouse://%s:%s?ssl=true", node.getHost(), node.getPort());
+        } else
+            return String.format("jdbc:clickhouse://%s:%s", node.getHost(), node.getPort());
+    }
+
     protected static Connection getJdbcV1() {
         Properties properties = new Properties();
         properties.put("user", getUsername());
         properties.put("password", getPassword());
-        
-        ClickHouseNode node = getServer();
+
         Connection jdbcV1 = null;
+        String jdbcURL = jdbcURLV1(isCloud());
+        LOGGER.info("JDBC URL: " + jdbcURL);
         try {
-            jdbcV1 = new ClickHouseDriver().connect(String.format("jdbc:clickhouse://%s:%s?clickhouse.jdbc.v1=true", node.getHost(), node.getPort()), properties);
+            jdbcV1 = new ClickHouseDriver().connect(jdbcURL, properties);
         } catch (SQLException e) {
             LOGGER.error(e.getMessage());
         }
@@ -286,10 +302,12 @@ protected static Connection getJdbcV2() {
         properties.put("user", getUsername());
         properties.put("password", getPassword());
 
-        ClickHouseNode node = getServer();
         Connection jdbcV2 = null;
+        String jdbcURL = jdbcURLV1(isCloud());
+        LOGGER.info("JDBC URL: " + jdbcURL);
+
         try {
-            jdbcV2 = new ClickHouseDriver().connect(String.format("jdbc:clickhouse://%s:%s", node.getHost(), node.getPort()), properties);
+            jdbcV2 = new ClickHouseDriver().connect(jdbcURL, properties);
         } catch (SQLException e) {
             LOGGER.error(e.getMessage());
         }

performance/src/test/com/clickhouse/benchmark/clients/JDBCInsert.java

@@ -1,6 +1,8 @@
 package com.clickhouse.benchmark.clients;
 
 import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.TearDown;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,6 +16,27 @@
 
 public class JDBCInsert extends BenchmarkBase {
     private static final Logger LOGGER = LoggerFactory.getLogger(JDBCInsert.class);
+    @TearDown(Level.Invocation)
+    public void verifyRowsInsertedAndCleanup(DataState dataState) {
+        boolean success;
+        int count = 0;
+        do {
+            success = verifyCount(dataState.tableNameEmpty, dataState.dataSet.getSize());
+            if (!success) {
+                LOGGER.warn("Retrying to verify rows inserted");
+                try {
+                    Thread.sleep(2500);
+                } catch (InterruptedException e) {
+                    LOGGER.error("Error: ", e);
+                }
+            }
+        } while (!success && count++ < 10);
+        if (!success) {
+            LOGGER.error("Failed to verify rows inserted");
+            throw new RuntimeException("Failed to verify rows inserted");
+        }
+        truncateTable(dataState.tableNameEmpty);
+    }
     void insetData(Connection connection, DataState dataState) throws SQLException {
         int size = dataState.dataSet.getSchema().getColumns().size();
         String names = dataState.dataSet.getSchema().getColumns().stream().map(column -> column.getColumnName()).collect(Collectors.joining(","));