Adjusting V1 benchmarks

Author: Paultagoras

clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java

@@ -1975,6 +1975,33 @@ public void testInsertWithCustomFormat() throws ClickHouseException {
         }
     }
 
+    @Test(groups = { "integration" })
+    public void testInsertRawDataSimple() throws Exception {
+        testInsertRawDataSimple(1000);
+    }
+    public void testInsertRawDataSimple(int numberOfRecords) throws Exception {
+        String tableName = "test_insert_raw_data_simple";
+        ClickHouseNode server = getServer();
+        sendAndWait(server, "DROP TABLE IF EXISTS " + tableName,
+                "CREATE TABLE IF NOT EXISTS "+ tableName + " (i Int16, f String) engine=MergeTree ORDER BY i");
+        try (ClickHouseClient client = getClient()) {
+            ClickHouseRequest.Mutation request = client.read(server).write().table(tableName).format(ClickHouseFormat.JSONEachRow);
+            ClickHouseConfig config = request.getConfig();
+            CompletableFuture<ClickHouseResponse> future;
+            try (ClickHousePipedOutputStream stream = ClickHouseDataStreamFactory.getInstance().createPipedOutputStream(config)) {
+                // start the worker thread which transfer data from the input into ClickHouse
+                future = request.data(stream.getInputStream()).execute();
+                for (int i = 0; i < numberOfRecords; i++) {
+                    BinaryStreamUtils.writeBytes(stream, String.format("{\"i\": %s, \"\": \"JSON\"}", i).getBytes(StandardCharsets.UTF_8));
+                }
+            }
+
+            ClickHouseResponseSummary summary = future.get().getSummary();
+            Assert.assertEquals(summary.getWrittenRows(), numberOfRecords);
+        }
+    }
+
+
     @Test(groups = { "integration" })
     public void testInsertWithInputFunction() throws ClickHouseException {
         ClickHouseNode server = getServer();

clickhouse-http-client/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() {
@@ -42,27 +45,41 @@ public void pingBenchmark() {
     public void queryBenchmarkSmall() throws Exception {
         LOGGER.info("(V1) Query benchmark");
         ApacheHttpConnectionImplTest apacheHttpConnectionImplTest = new ApacheHttpConnectionImplTest();
-        apacheHttpConnectionImplTest.testQuery(1000);
+        apacheHttpConnectionImplTest.testQuery(SMALL_SIZE);
     }
 
     @Benchmark
     public void queryBenchmarkMedium() throws Exception {
         LOGGER.info("(V1) Query benchmark");
         ApacheHttpConnectionImplTest apacheHttpConnectionImplTest = new ApacheHttpConnectionImplTest();
-        apacheHttpConnectionImplTest.testQuery(1000000);
+        apacheHttpConnectionImplTest.testQuery(MEDIUM_SIZE);
     }
 
     @Benchmark
     public void queryBenchmarkLarge() throws Exception {
         LOGGER.info("(V1) Query benchmark");
         ApacheHttpConnectionImplTest apacheHttpConnectionImplTest = new ApacheHttpConnectionImplTest();
-        apacheHttpConnectionImplTest.testQuery(1000000000);
+        apacheHttpConnectionImplTest.testQuery(LARGE_SIZE);
     }
 
     @Benchmark
-    public void insertRawDataBenchmark() throws Exception {
+    public void insertRawDataBenchmarkSmall() throws Exception {
         LOGGER.info("(V1) Insert raw data benchmark");
         ApacheHttpConnectionImplTest apacheHttpConnectionImplTest = new ApacheHttpConnectionImplTest();
-        apacheHttpConnectionImplTest.testInsertWithCustomFormat();
+        apacheHttpConnectionImplTest.testInsertRawDataSimple(SMALL_SIZE);
+    }
+
+    @Benchmark
+    public void insertRawDataBenchmarkMedium() throws Exception {
+        LOGGER.info("(V1) Insert raw data benchmark");
+        ApacheHttpConnectionImplTest apacheHttpConnectionImplTest = new ApacheHttpConnectionImplTest();
+        apacheHttpConnectionImplTest.testInsertRawDataSimple(MEDIUM_SIZE);
+    }
+
+    @Benchmark
+    public void insertRawDataBenchmarkLarge() throws Exception {
+        LOGGER.info("(V1) Insert raw data benchmark");
+        ApacheHttpConnectionImplTest apacheHttpConnectionImplTest = new ApacheHttpConnectionImplTest();
+        apacheHttpConnectionImplTest.testInsertRawDataSimple(LARGE_SIZE);
     }
 }