Fixed to use shared and added Blackhole

Author: mzitnik

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

@@ -1,7 +1,12 @@
 package com.clickhouse.benchmark;
 
+import com.clickhouse.benchmark.clients.Compression;
 import com.clickhouse.benchmark.clients.ConcurrentInsertClient;
 import com.clickhouse.benchmark.clients.ConcurrentQueryClient;
+import com.clickhouse.benchmark.clients.Deserializers;
+import com.clickhouse.benchmark.clients.InsertClient;
+import com.clickhouse.benchmark.clients.QueryClient;
+import com.clickhouse.benchmark.clients.Serializers;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.profile.GCProfiler;
 import org.openjdk.jmh.profile.MemPoolProfiler;
@@ -28,13 +33,13 @@ public static void main(String[] args) throws Exception {
         Map<String, String> argMap = parseArguments(args);
 
         Options opt = new OptionsBuilder()
-//                .include(QueryClient.class.getSimpleName())
-//                .include(InsertClient.class.getSimpleName())
+                .include(QueryClient.class.getSimpleName())
+                .include(InsertClient.class.getSimpleName())
                 .include(ConcurrentInsertClient.class.getSimpleName())
                 .include(ConcurrentQueryClient.class.getSimpleName())
-//                .include(Compression.class.getSimpleName())
-//                .include(Serializers.class.getSimpleName())
-//                .include(Deserializers.class.getSimpleName())
+                .include(Compression.class.getSimpleName())
+                .include(Serializers.class.getSimpleName())
+                .include(Deserializers.class.getSimpleName())
                 .forks(1) // must be a fork. No fork only for debugging
                 .mode(Mode.SampleTime)
                 .timeUnit(TimeUnit.MILLISECONDS)
@@ -43,10 +48,10 @@ public static void main(String[] args) throws Exception {
                 .warmupIterations(1)
                 .warmupTime(TimeValue.seconds(5))
                 .measurementIterations(3)
-                .jvmArgs("-Xms10g", "-Xmx10g")
+                .jvmArgs("-Xms8g", "-Xmx8g")
                 .measurementTime(TimeValue.seconds(isCloud() ? 30 : 5))
                 .resultFormat(ResultFormatType.JSON)
-//                .output(String.format("jmh-results-%s-%s.out", isCloud() ? "cloud" : "local", System.currentTimeMillis()))
+                .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();
 
@@ -74,6 +79,10 @@ public static String getSelectQuery(String tableName) {
         return "SELECT * FROM `" + DB_NAME + "`.`" + tableName + "`";
     }
 
+    public static String getSelectQueryWithLimit(String tableName, int limit) {
+        return "SELECT * FROM `" + DB_NAME + "`.`" + tableName + "` LIMIT " + limit;
+    }
+
     public static String getSelectCountQuery(String tableName) {
         return String.format("SELECT COUNT(*) FROM `%s`.`%s`", DB_NAME, tableName);
     }

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

@@ -27,7 +27,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.clickhouse.benchmark.TestEnvironment.getServer;
-@Threads(2)
+@Threads(3)
 @State(Scope.Benchmark)
 public class ConcurrentInsertClient extends BenchmarkBase {
     private static final Logger LOGGER = LoggerFactory.getLogger(ConcurrentInsertClient.class);
@@ -98,7 +98,7 @@ public void insertV1(DataState dataState, ThreadLocalState threadLocalState) {
         String tableName = threadLocalState.createTableName();
         try {
             ClickHouseFormat format = dataState.dataSet.getFormat();
-            try (ClickHouseResponse response = getClientV1().read(getServer())
+            try (ClickHouseResponse response = clientV1Shared.read(getServer())
                     .write()
                     .option(ClickHouseClientOption.ASYNC, false)
                     .format(format)

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

@@ -25,6 +25,7 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.infra.Blackhole;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,6 +40,7 @@
 @State(Scope.Benchmark)
 public class ConcurrentQueryClient extends BenchmarkBase {
     private static final Logger LOGGER = LoggerFactory.getLogger(ConcurrentQueryClient.class);
+    private static int LIMIT = 10000;
     private ClickHouseClient clientV1Shared;
     private Client clientV2Shared;
     @Setup(Level.Trial)
@@ -64,16 +66,16 @@ public void teardownIteration(DataState dataState) {
         truncateTable(dataState.tableNameEmpty);
     }
     @Benchmark
-    public void queryV1(DataState dataState) throws InterruptedException {
+    public void queryV1(DataState dataState, Blackhole blackhole) {
         try {
             try (ClickHouseResponse response = clientV1Shared.read(getServer())
-                    .query(BenchmarkRunner.getSelectQuery(dataState.tableNameFilled))
+                    .query(BenchmarkRunner.getSelectQueryWithLimit(dataState.tableNameFilled, LIMIT))
                     .format(ClickHouseFormat.RowBinaryWithNamesAndTypes)
                     .option(ClickHouseClientOption.ASYNC, false)
                     .executeAndWait()) {
                 for (ClickHouseRecord record: response.records()) {//Compiler optimization avoidance
                     for (int i = 0; i < dataState.dataSet.getSchema().getColumns().size(); i++) {
-                        isNotNull(record.getValue(i), false);
+                        blackhole.consume(record.getValue(i));
                     }
                 }
             }
@@ -83,13 +85,13 @@ public void queryV1(DataState dataState) throws InterruptedException {
     }
 
     @Benchmark
-    public void queryV2(DataState dataState) {
+    public void queryV2(DataState dataState, Blackhole blackhole) {
         try {
-            try(QueryResponse response = clientV2Shared.query(BenchmarkRunner.getSelectQuery(dataState.tableNameFilled)).get()) {
+            try(QueryResponse response = clientV2Shared.query(BenchmarkRunner.getSelectQueryWithLimit(dataState.tableNameFilled, LIMIT)).get()) {
                 ClickHouseBinaryFormatReader reader = clientV2Shared.newBinaryFormatReader(response);
                 while (reader.next() != null) {//Compiler optimization avoidance
                     for (int i = 1; i <= dataState.dataSet.getSchema().getColumns().size(); i++) {
-                        isNotNull(reader.readValue(1), false);
+                        blackhole.consume(reader.readValue(1));
                     }
                 }
             }