Skip to content

Commit e072039

Browse files
chernserchernser
committed
moved away from using BinaryStreamUtils writing bitmap
1 parent 758b51d commit e072039

File tree

3 files changed

+53
-25
lines changed

3 files changed

+53
-25
lines changed

‎client-v2/src/main/java/com/clickhouse/client/api/Client.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
1515
import com.clickhouse.client.api.data_formats.internal.MapBackedRecord;
1616
import com.clickhouse.client.api.data_formats.internal.ProcessParser;
17+
import com.clickhouse.client.api.data_formats.internal.SerializerUtils;
1718
import com.clickhouse.client.api.enums.Protocol;
1819
import com.clickhouse.client.api.enums.ProxyType;
1920
import com.clickhouse.client.api.insert.DataSerializationException;
@@ -25,7 +26,6 @@
2526
import com.clickhouse.client.api.internal.ClientV1AdaptorHelper;
2627
import com.clickhouse.client.api.internal.HttpAPIClientHelper;
2728
import com.clickhouse.client.api.internal.MapUtils;
28-
import com.clickhouse.client.api.internal.SerializerUtils;
2929
import com.clickhouse.client.api.internal.SettingsConverter;
3030
import com.clickhouse.client.api.internal.TableSchemaParser;
3131
import com.clickhouse.client.api.internal.ValidationUtils;
@@ -46,7 +46,6 @@
4646
import com.clickhouse.data.ClickHouseColumn;
4747
import com.clickhouse.data.ClickHouseDataType;
4848
import com.clickhouse.data.ClickHouseFormat;
49-
import com.clickhouse.data.format.BinaryStreamUtils;
5049
import org.apache.hc.client5.http.ConnectTimeoutException;
5150
import org.apache.hc.core5.concurrent.DefaultThreadFactory;
5251
import org.apache.hc.core5.http.ClassicHttpResponse;
@@ -1091,35 +1090,35 @@ public synchronized void register(Class<?> clazz, TableSchema schema) {
10911090

10921091
if (defaultsSupport) {
10931092
if (value != null) {//Because we now support defaults, we have to send nonNull
1094-
BinaryStreamUtils.writeNonNull(stream);//Write 0 for no default
1093+
SerializerUtils.writeNonNull(stream);//Write 0 for no default
10951094

10961095
if (column.isNullable()) {//If the column is nullable
1097-
BinaryStreamUtils.writeNonNull(stream);//Write 0 for not null
1096+
SerializerUtils.writeNonNull(stream);//Write 0 for not null
10981097
}
10991098
} else {//So if the object is null
11001099
if (column.hasDefault()) {
1101-
BinaryStreamUtils.writeNull(stream);//Send 1 for default
1100+
SerializerUtils.writeNull(stream);//Send 1 for default
11021101
return;
11031102
} else if (column.isNullable()) {//And the column is nullable
1104-
BinaryStreamUtils.writeNonNull(stream);
1105-
BinaryStreamUtils.writeNull(stream);//Then we send null, write 1
1103+
SerializerUtils.writeNonNull(stream);
1104+
SerializerUtils.writeNull(stream);//Then we send null, write 1
11061105
return;//And we're done
11071106
} else if (column.getDataType() == ClickHouseDataType.Array) {//If the column is an array
1108-
BinaryStreamUtils.writeNonNull(stream);//Then we send nonNull
1107+
SerializerUtils.writeNonNull(stream);//Then we send nonNull
11091108
} else {
11101109
throw new IllegalArgumentException(String.format("An attempt to write null into not nullable column '%s'", column.getColumnName()));
11111110
}
11121111
}
11131112
} else {
11141113
if (column.isNullable()) {
11151114
if (value == null) {
1116-
BinaryStreamUtils.writeNull(stream);
1115+
SerializerUtils.writeNull(stream);
11171116
return;
11181117
}
1119-
BinaryStreamUtils.writeNonNull(stream);
1118+
SerializerUtils.writeNonNull(stream);
11201119
} else if (value == null) {
11211120
if (column.getDataType() == ClickHouseDataType.Array) {
1122-
BinaryStreamUtils.writeNonNull(stream);
1121+
SerializerUtils.writeNonNull(stream);
11231122
} else {
11241123
throw new IllegalArgumentException(String.format("An attempt to write null into not nullable column '%s'", column.getColumnName()));
11251124
}

client-v2/src/main/java/com/clickhouse/client/api/internal/SerializerUtils.java renamed to client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/SerializerUtils.java

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package com.clickhouse.client.api.internal;
1+
package com.clickhouse.client.api.data_formats.internal;
22

33
import com.clickhouse.client.api.Client;
44
import com.clickhouse.client.api.ClientException;
5-
import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
65
import com.clickhouse.client.api.query.POJOSetter;
76
import com.clickhouse.data.ClickHouseAggregateFunction;
87
import com.clickhouse.data.ClickHouseColumn;
@@ -72,14 +71,14 @@ private static void serializeArrayData(OutputStream stream, Object value, ClickH
7271
//Serialize the array to the stream
7372
//The array is a list of values
7473
List<?> values = (List<?>) value;
75-
BinaryStreamUtils.writeVarInt(stream, values.size());
74+
writeVarInt(stream, values.size());
7675
for (Object val : values) {
7776
if (column.getArrayBaseColumn().isNullable()) {
7877
if (val == null) {
79-
BinaryStreamUtils.writeNull(stream);
78+
writeNull(stream);
8079
continue;
8180
}
82-
BinaryStreamUtils.writeNonNull(stream);
81+
writeNonNull(stream);
8382
}
8483
serializeData(stream, val, column.getArrayBaseColumn());
8584
}
@@ -107,7 +106,7 @@ private static void serializeMapData(OutputStream stream, Object value, ClickHou
107106
//Serialize the map to the stream
108107
//The map is a list of key-value pairs
109108
Map<?, ?> map = (Map<?, ?>) value;
110-
BinaryStreamUtils.writeVarInt(stream, map.size());
109+
writeVarInt(stream, map.size());
111110
map.forEach((key, val) -> {
112111
try {
113112
serializePrimitiveData(stream, key, Objects.requireNonNull(column.getKeyInfo()));
@@ -213,7 +212,13 @@ private static void serializePrimitiveData(OutputStream stream, Object value, Cl
213212

214213
private static void serializeAggregateFunction(OutputStream stream, Object value, ClickHouseColumn column) throws IOException {
215214
if (column.getAggregateFunction() == ClickHouseAggregateFunction.groupBitmap) {
216-
BinaryStreamUtils.writeBitmap(stream, (ClickHouseBitmap) value);
215+
if (value == null) {
216+
throw new IllegalArgumentException("Cannot serialize null value for aggregate function: " + column.getAggregateFunction());
217+
} else if (value instanceof ClickHouseBitmap) {
218+
stream.write(((ClickHouseBitmap)value).toBytes()); // TODO: review toBytes() implementation - it can be simplified
219+
} else {
220+
throw new IllegalArgumentException("Cannot serialize value of type " + value.getClass() + " for aggregate function: " + column.getAggregateFunction());
221+
}
217222
} else {
218223
throw new UnsupportedOperationException("Unsupported aggregate function: " + column.getAggregateFunction());
219224
}
@@ -527,4 +532,34 @@ public Class<?> defineClass(String name, byte[] code) throws ClassNotFoundExcept
527532
return super.defineClass(name, code, 0, code.length);
528533
}
529534
}
535+
536+
public static void writeVarInt(OutputStream output, long value) throws IOException {
537+
// reference code https://github.com/ClickHouse/ClickHouse/blob/abe314feecd1647d7c2b952a25da7abf5c19f352/src/IO/VarInt.h#L187
538+
for (int i = 0; i < 9; i++) {
539+
byte b = (byte) (value & 0x7F);
540+
541+
if (value > 0x7F) {
542+
b |= 0x80;
543+
}
544+
545+
output.write(b);
546+
value >>= 7;
547+
548+
if (value == 0) {
549+
return;
550+
}
551+
}
552+
}
553+
554+
public static void writeNull(OutputStream output) throws IOException {
555+
writeBoolean(output, true);
556+
}
557+
558+
public static void writeNonNull(OutputStream output) throws IOException {
559+
writeBoolean(output, false);
560+
}
561+
562+
public static void writeBoolean(OutputStream output, boolean value) throws IOException {
563+
output.write(value ? 1 : 0);
564+
}
530565
}

‎client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.clickhouse.client.api.ConnectionInitiationException;
1111
import com.clickhouse.client.api.ConnectionReuseStrategy;
1212
import com.clickhouse.client.api.ServerException;
13+
import com.clickhouse.client.api.data_formats.internal.SerializerUtils;
1314
import com.clickhouse.client.api.enums.ProxyType;
1415
import com.clickhouse.client.config.ClickHouseClientOption;
1516
import com.clickhouse.client.config.ClickHouseDefaults;
@@ -54,27 +55,20 @@
5455

5556
import javax.net.ssl.SSLContext;
5657
import javax.net.ssl.SSLException;
57-
import java.io.BufferedReader;
58-
import java.io.ByteArrayOutputStream;
5958
import java.io.IOException;
6059
import java.io.InputStream;
61-
import java.io.InputStreamReader;
6260
import java.io.OutputStream;
6361
import java.net.ConnectException;
6462
import java.net.InetSocketAddress;
6563
import java.net.NoRouteToHostException;
6664
import java.net.URI;
6765
import java.net.URISyntaxException;
6866
import java.net.UnknownHostException;
69-
import java.nio.ByteBuffer;
7067
import java.nio.charset.StandardCharsets;
7168
import java.security.NoSuchAlgorithmException;
7269
import java.util.Base64;
73-
import java.util.EnumSet;
74-
import java.util.HashSet;
7570
import java.util.Map;
7671
import java.util.Set;
77-
import java.util.StringTokenizer;
7872
import java.util.concurrent.TimeUnit;
7973
import java.util.function.Function;
8074

0 commit comments

Comments
 (0)