Adjusting performance tests

Author: Paultagoras

client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java

@@ -7,8 +7,6 @@
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.ClickHouseNodeSelector;
 import com.clickhouse.client.ClickHouseProtocol;
-import com.clickhouse.client.ClickHouseRequest;
-import com.clickhouse.client.ClickHouseResponse;
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.insert.InsertResponse;
@@ -18,17 +16,12 @@
 import com.clickhouse.client.api.metrics.ServerMetrics;
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.config.ClickHouseClientOption;
-import com.clickhouse.client.http.ClickHouseHttpClient;
-import com.clickhouse.client.http.config.ClickHouseHttpOption;
-import com.clickhouse.config.ClickHouseOption;
 import com.clickhouse.data.ClickHouseFormat;
 import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.admin.model.ScenarioState;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.common.ConsoleNotifier;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.github.tomakehurst.wiremock.http.Fault;
-import org.apache.hc.client5.http.impl.Wire;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -39,12 +32,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.Serializable;
-import java.net.ConnectException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -156,6 +145,28 @@ public void insertRawData() throws Exception {
         assertEquals(records.size(), 1000);
     }
 
+
+    @Test(groups = { "integration" }, enabled = true)
+    public void insertRawDataSimple() throws Exception {
+        insertRawDataSimple(1000);
+    }
+    public void insertRawDataSimple(int numberOfRecords) throws Exception {
+        final String tableName = "raw_data_table";
+        createTable(String.format("CREATE TABLE IF NOT EXISTS %s (Id UInt32, event_ts Timestamp, name String, p1 Int64, p2 String) ENGINE = MergeTree() ORDER BY ()", tableName));
+
+        settings.setInputStreamCopyBufferSize(8198 * 2);
+        ByteArrayOutputStream data = new ByteArrayOutputStream();
+        PrintWriter writer = new PrintWriter(data);
+        for (int i = 0; i < numberOfRecords; i++) {
+            writer.printf("%d\t%s\t%s\t%d\t%s\n", i, "2021-01-01 00:00:00", "name" + i, i, "p2");
+        }
+        writer.flush();
+        InsertResponse response = client.insert(tableName, new ByteArrayInputStream(data.toByteArray()),
+                ClickHouseFormat.TSV, settings).get(30, TimeUnit.SECONDS);
+        OperationMetrics metrics = response.getMetrics();
+        assertEquals((int)response.getWrittenRows(), numberOfRecords );
+    }
+
     @Test(groups = { "integration" }, enabled = true)
     public void testNoHttpResponseFailure() {
         WireMockServer faultyServer = new WireMockServer( WireMockConfiguration

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -188,6 +188,15 @@ public void testQueryAll(int numberOfRecords) throws Exception {
         Assert.assertNotNull(hostnameRecord);
     }
 
+    @Test(groups = {"integration"})
+    public void testQueryAllSimple() throws Exception {
+        testQueryAllSimple(10);
+    }
+    public void testQueryAllSimple(int numberOfRecords) throws Exception {
+        GenericRecord record = client.queryAll("SELECT number FROM system.numbers LIMIT " + numberOfRecords).stream().findFirst().get();
+        Assert.assertNotNull(record);
+    }
+
     @Test(groups = {"integration"})
     public void testQueryAllNoResult() throws Exception {
         List<GenericRecord> records = client.queryAll("CREATE DATABASE IF NOT EXISTS test_db");

client-v2/src/test/perf/com/clickhouse/client/ClientBenchmark.java

@@ -15,6 +15,9 @@
 @Threads(1)
 public class ClientBenchmark {
     private static final Logger LOGGER = LoggerFactory.getLogger(ClientBenchmark.class);
+    private static final int SMALL_SIZE = 1000;
+    private static final int MEDIUM_SIZE = 1000000;
+    private static final int LARGE_SIZE = 10000000;
 
     @Setup
     public void setup() {
@@ -43,7 +46,7 @@ public void queryBenchmarkSmall() throws Exception {
         LOGGER.info("(V2) Query benchmark");
         QueryTests queryTests = new QueryTests(false, false);
         queryTests.setUp();
-        queryTests.testQueryAll(1000);
+        queryTests.testQueryAllSimple(SMALL_SIZE);
         queryTests.tearDown();
     }
 
@@ -52,7 +55,7 @@ public void queryBenchmarkMedium() throws Exception {
         LOGGER.info("(V2) Query benchmark");
         QueryTests queryTests = new QueryTests(false, false);
         queryTests.setUp();
-        queryTests.testQueryAll(1000000);
+        queryTests.testQueryAllSimple(MEDIUM_SIZE);
         queryTests.tearDown();
     }
 
@@ -61,17 +64,34 @@ public void queryBenchmarkLarge() throws Exception {
         LOGGER.info("(V2) Query benchmark");
         QueryTests queryTests = new QueryTests(false, false);
         queryTests.setUp();
-        queryTests.testQueryAll(1000000000);
+        queryTests.testQueryAllSimple(LARGE_SIZE);
         queryTests.tearDown();
     }
 
     @Benchmark
-    public void insertRawDataBenchmark() throws Exception {
+    public void insertRawDataBenchmarkSmall() throws Exception {
         LOGGER.info("(V2) Insert raw data benchmark");
         InsertTests insertTests = new InsertTests(false, false);
         insertTests.setUp();
-        insertTests.insertRawData();
-        insertTests.insertSimplePOJOs();
+        insertTests.insertRawDataSimple(SMALL_SIZE);
+        insertTests.tearDown();
+    }
+
+    @Benchmark
+    public void insertRawDataBenchmarkMedium() throws Exception {
+        LOGGER.info("(V2) Insert raw data benchmark");
+        InsertTests insertTests = new InsertTests(false, false);
+        insertTests.setUp();
+        insertTests.insertRawDataSimple(MEDIUM_SIZE);
+        insertTests.tearDown();
+    }
+
+    @Benchmark
+    public void insertRawDataBenchmarkLarge() throws Exception {
+        LOGGER.info("(V2) Insert raw data benchmark");
+        InsertTests insertTests = new InsertTests(false, false);
+        insertTests.setUp();
+        insertTests.insertRawDataSimple(LARGE_SIZE);
         insertTests.tearDown();
     }