Merge pull request #2318 from ClickHouse/fix_benchmarks

[repo] fixed benchmark for rowbinary writer

Author: chernser

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

@@ -92,7 +92,7 @@ public static class DataState {
         @Param({"data_empty"})
         String tableNameEmpty;
 
-        static DataSet dataSet;
+        DataSet dataSet;
 
         ByteBuffer datasetAsRowBinaryWithNamesAndTypes;
 
@@ -118,7 +118,7 @@ public void setTableNameEmpty(String tableNameEmpty) {
             this.tableNameEmpty = tableNameEmpty;
         }
 
-        public static DataSet getDataSet() {
+        public DataSet getDataSet() {
             return dataSet;
         }
 

performance/src/main/java/com/clickhouse/benchmark/clients/CompressorCompare.java

@@ -1,6 +1,5 @@
 package com.clickhouse.benchmark.clients;
 
-import com.clickhouse.benchmark.BenchmarkRunner;
 import com.clickhouse.benchmark.data.DataSet;
 import com.clickhouse.client.ClickHouseClient;
 import com.clickhouse.client.ClickHouseResponse;
@@ -57,8 +56,8 @@ public String createTableName() {
             return String.format("%s_%s", "concurrent_data_empty", id);
         }
         @Setup(Level.Trial)
-        public void setup() {
-            DataSet dataSet = DataState.getDataSet();
+        public void setup(DataState dataState) {
+            DataSet dataSet = dataState.getDataSet();
             String tableName = createTableName();
             LOGGER.warn("setup create table name: " + tableName);
             // create table

performance/src/main/java/com/clickhouse/benchmark/clients/ConcurrentInsertClient.java

@@ -1,6 +1,5 @@
 package com.clickhouse.benchmark.clients;
 
-import com.clickhouse.benchmark.BenchmarkRunner;
 import com.clickhouse.client.ClickHouseResponse;
 import com.clickhouse.client.api.data_formats.RowBinaryFormatWriter;
 import com.clickhouse.client.api.insert.InsertResponse;
@@ -155,8 +154,9 @@ public void insertV1RowBinary(DataState dataState) {
     @Benchmark
     public void insertV2RowBinary(DataState dataState) {
         try {
+            final ClickHouseFormat format = ClickHouseFormat.RowBinary;
             try (InsertResponse response = clientV2.insert(dataState.tableNameEmpty, out -> {
-                RowBinaryFormatWriter w = new RowBinaryFormatWriter(out, dataState.dataSet.getSchema(), ClickHouseFormat.RowBinary);
+                RowBinaryFormatWriter w = new RowBinaryFormatWriter(out, dataState.dataSet.getSchema(), format);
                 for (List<Object> row : dataState.dataSet.getRowsOrdered()) {
                     int index = 1;
                     for (Object value : row) {
@@ -167,7 +167,7 @@ public void insertV2RowBinary(DataState dataState) {
                 }
                 out.flush();
 
-            }, ClickHouseFormat.RowBinaryWithDefaults, new InsertSettings()).get()) {
+            }, format, new InsertSettings()).get()) {
                 response.getWrittenRows();
             }
         } catch (Exception e) {