remove async nonsense

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/AbstractBinaryFormatReader.java

@@ -11,7 +11,6 @@
 import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataType;
-import com.clickhouse.data.ClickHouseEnum;
 import com.clickhouse.data.value.ClickHouseBitmap;
 import com.clickhouse.data.value.ClickHouseGeoMultiPolygonValue;
 import com.clickhouse.data.value.ClickHouseGeoPointValue;
@@ -27,13 +26,20 @@
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
-import java.time.*;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.time.temporal.TemporalAmount;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 import java.util.function.Function;
 
 public abstract class AbstractBinaryFormatReader implements ClickHouseBinaryFormatReader {
@@ -49,8 +55,8 @@ public abstract class AbstractBinaryFormatReader implements ClickHouseBinaryForm
     private TableSchema schema;
     private ClickHouseColumn[] columns;
     private Map[] convertions;
-    private volatile boolean hasNext = true;
-    private volatile boolean initialState = true; // reader is in initial state, no records have been read yet
+    private boolean hasNext = true;
+    private boolean initialState = true; // reader is in initial state, no records have been read yet
 
     protected AbstractBinaryFormatReader(InputStream inputStream, QuerySettings querySettings, TableSchema schema,
                                          BinaryStreamReader.ByteBufferAllocator byteBufferAllocator) {
@@ -70,10 +76,10 @@ protected AbstractBinaryFormatReader(InputStream inputStream, QuerySettings quer
         }
     }
 
-    protected Map<String, Object> currentRecord = new ConcurrentHashMap<>();
-    protected Map<String, Object> nextRecord = new ConcurrentHashMap<>();
+    protected Map<String, Object> currentRecord = new HashMap<>();
+    protected Map<String, Object> nextRecord = new HashMap<>();
 
-    protected AtomicBoolean nextRecordEmpty = new AtomicBoolean(true);
+    protected boolean nextRecordEmpty = true;
 
     /**
      * Reads next record into POJO object using set of serializers.
@@ -170,11 +176,11 @@ public boolean hasNext() {
     protected void readNextRecord() {
         initialState = false;
         try {
-            nextRecordEmpty.set(true);
+            nextRecordEmpty = true;
             if (!readRecord(nextRecord)) {
                 endReached();
             } else {
-                nextRecordEmpty.compareAndSet(true, false);
+                nextRecordEmpty = false;
             }
         } catch (IOException e) {
             endReached();
@@ -188,7 +194,7 @@ public Map<String, Object> next() {
             return null;
         }
 
-        if (!nextRecordEmpty.get()) {
+        if (!nextRecordEmpty) {
             Map<String, Object> tmp = currentRecord;
             currentRecord = nextRecord;
             nextRecord = tmp;

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

@@ -30,8 +30,8 @@ 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(Components.class.getSimpleName())
                 .forks(1) // must be a fork. No fork only for debugging
                 .mode(Mode.SampleTime)
@@ -41,9 +41,9 @@ public static void main(String[] args) throws Exception {
                 .addProfiler(MemPoolProfiler.class)
                 .warmupIterations(0)
                 .warmupTime(TimeValue.seconds(10))
-                .measurementIterations(1)
+                .measurementIterations(10)
                 .jvmArgs("-Xms8g", "-Xmx8g")
-                .measurementTime(TimeValue.seconds(isCloud() ? 30 : 120))
+                .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()))

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

@@ -12,9 +12,8 @@
 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.ClickHouseDataProcessor;
 import com.clickhouse.data.ClickHouseFormat;
 import com.clickhouse.data.ClickHouseOutputStream;
 import com.clickhouse.data.ClickHouseRecord;
@@ -30,10 +29,10 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.math.BigInteger;
 import java.util.List;
 
 import static com.clickhouse.benchmark.BenchmarkRunner.getSelectCountQuery;

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

@@ -6,18 +6,15 @@
 import com.clickhouse.client.api.data_formats.RowBinaryFormatWriter;
 import com.clickhouse.client.api.data_formats.RowBinaryWithNamesAndTypesFormatReader;
 import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
-import com.clickhouse.client.api.insert.InsertResponse;
 import com.clickhouse.client.api.internal.ClickHouseLZ4OutputStream;
 import com.clickhouse.client.api.query.QueryResponse;
 import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataProcessor;
-import com.clickhouse.data.ClickHouseDeserializer;
 import com.clickhouse.data.ClickHouseFormat;
 import com.clickhouse.data.ClickHouseInputStream;
 import com.clickhouse.data.ClickHouseOutputStream;
-import com.clickhouse.data.ClickHousePassThruStream;
 import com.clickhouse.data.ClickHouseRecord;
 import com.clickhouse.data.ClickHouseSerializer;
 import com.clickhouse.data.format.ClickHouseRowBinaryProcessor;
@@ -56,7 +53,7 @@ public void setUpIteration(DataState dataState) {
     }
 
 
-    //    @Benchmark
+    @Benchmark
     public void CompressingOutputStreamV1(DataState dataState) {
         DataSet dataSet = dataState.dataSet;
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); ClickHouseOutputStream out =
@@ -71,7 +68,7 @@ public void CompressingOutputStreamV1(DataState dataState) {
 
     private static final LZ4Factory factory = LZ4Factory.fastestInstance();
 
-    //    @Benchmark
+    @Benchmark
     public void CompressingOutputStreamV2(DataState dataState) {
         DataSet dataSet = dataState.dataSet;
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -115,7 +112,7 @@ public void close() {
         };
     }
 
-    //    @Benchmark
+    @Benchmark
     public void SerializerOutputStreamV1(DataState dataState) {
         OutputStream empty = createEmptyOutputStream();
         try {
@@ -133,7 +130,7 @@ public void SerializerOutputStreamV1(DataState dataState) {
         }
     }
 
-    //    @Benchmark
+    @Benchmark
     public void SerializerOutputStreamV2(DataState dataState) {
         OutputStream empty = createEmptyOutputStream();
         try {

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

@@ -6,7 +6,6 @@
 import com.clickhouse.client.api.insert.InsertResponse;
 import com.clickhouse.client.api.insert.InsertSettings;
 import com.clickhouse.client.config.ClickHouseClientOption;
-import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataProcessor;
 import com.clickhouse.data.ClickHouseFormat;
 import com.clickhouse.data.ClickHouseRecord;
@@ -20,7 +19,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
-import java.util.Map;
 
 import static com.clickhouse.benchmark.TestEnvironment.getServer;