Merge pull request #2212 from ClickHouse/v2_async_compression

corrected v1 tests and config to match v2

Author: chernser

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

@@ -32,7 +32,7 @@ public static void main(String[] args) throws Exception {
         Options opt = new OptionsBuilder()
                 .include(QueryClient.class.getSimpleName())
                 .include(InsertClient.class.getSimpleName())
-                .include(Components.class.getSimpleName())
+//                .include(Components.class.getSimpleName())
                 .forks(1) // must be a fork. No fork only for debugging
                 .mode(Mode.SampleTime)
                 .timeUnit(TimeUnit.MILLISECONDS)
@@ -45,6 +45,7 @@ public static void main(String[] args) throws Exception {
                 .jvmArgs("-Xms8g", "-Xmx8g")
                 .measurementTime(TimeValue.seconds(isCloud() ? 30 : 10))
                 .resultFormat(ResultFormatType.JSON)
+                .output(String.format("jmh-results-%s-%s.out", isCloud() ? "cloud" : "local", System.currentTimeMillis()))
                 .result(String.format("jmh-results-%s-%s.json", isCloud() ? "cloud" : "local", System.currentTimeMillis()))
                 .build();
 

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

@@ -12,6 +12,7 @@
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.insert.InsertResponse;
+import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.data.ClickHouseDataProcessor;
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.data.ClickHouseFormat;
@@ -77,11 +78,10 @@ public static class DataState {
         int limit;
         @Param({"data_filled"})
         String tableNameFilled;
+
         @Param({"data_empty"})
         String tableNameEmpty;
 
-        @Param({"true"})
-        boolean useClientCompression = true;
         DataSet dataSet;
 
         public void setDataSet(DataSet dataSet) {

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

@@ -57,7 +57,7 @@ public void insertV1(DataState dataState) {
             try (ClickHouseResponse response = clientV1.read(getServer())
                     .write()
                     .option(ClickHouseClientOption.ASYNC, false)
-                    .option(ClickHouseClientOption.COMPRESS, dataState.useClientCompression)
+                    .option(ClickHouseClientOption.DECOMPRESS, false)
                     .format(format)
                     .query(BenchmarkRunner.getInsertQuery(dataState.tableNameEmpty))
                     .data(out -> {
@@ -81,7 +81,46 @@ public void insertV2(DataState dataState) {
                     out.write(bytes);
                 }
                 out.close();
-            }, format, new InsertSettings().compressClientRequest(dataState.useClientCompression)).get()) {
+            }, format, new InsertSettings().compressClientRequest(false)).get()) {
+                response.getWrittenRows();
+            }
+        } catch (Exception e) {
+            LOGGER.error("Error: ", e);
+        }
+    }
+
+    @Benchmark
+    public void insertV1Compressed(DataState dataState) {
+        try {
+            ClickHouseFormat format = dataState.dataSet.getFormat();
+            try (ClickHouseResponse response = clientV1.read(getServer())
+                    .write()
+                    .option(ClickHouseClientOption.ASYNC, false)
+                    .option(ClickHouseClientOption.DECOMPRESS, true)
+                    .format(format)
+                    .query(BenchmarkRunner.getInsertQuery(dataState.tableNameEmpty))
+                    .data(out -> {
+                        for (byte[] bytes: dataState.dataSet.getBytesList(format)) {
+                            out.write(bytes);
+                        }
+                    }).executeAndWait()) {
+                response.getSummary();
+            }
+        } catch (Exception e) {
+            LOGGER.error("Error: ", e);
+        }
+    }
+
+    @Benchmark
+    public void insertV2Compressed(DataState dataState) {
+        try {
+            ClickHouseFormat format = dataState.dataSet.getFormat();
+            try (InsertResponse response = clientV2.insert(dataState.tableNameEmpty, out -> {
+                for (byte[] bytes: dataState.dataSet.getBytesList(format)) {
+                    out.write(bytes);
+                }
+                out.close();
+            }, format, new InsertSettings()).get()) {
                 response.getWrittenRows();
             }
         } catch (Exception e) {
@@ -97,6 +136,7 @@ public void insertV1RowBinary(DataState dataState) {
                     .write()
                     .option(ClickHouseClientOption.ASYNC, false)
                     .format(format)
+                    .option(ClickHouseClientOption.DECOMPRESS, false)
                     .query(BenchmarkRunner.getInsertQuery(dataState.tableNameEmpty))
                     .data(out -> {
                         ClickHouseDataProcessor p = dataState.dataSet.getClickHouseDataProcessor();
@@ -131,7 +171,8 @@ public void insertV2RowBinary(DataState dataState) {
                 }
                 out.flush();
 
-            }, ClickHouseFormat.RowBinaryWithDefaults, new InsertSettings()).get()) {
+            }, ClickHouseFormat.RowBinaryWithDefaults, new InsertSettings()
+                    .compressClientRequest(false)).get()) {
                 response.getWrittenRows();
             }
         } catch (Exception e) {