Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[client-v2] Including support for bitmap serialization #1814

Merged
merged 4 commits into from
Sep 12, 2024
Merged

[client-v2] Including support for bitmap serialization #1814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9812103
Including support for bitmap serialization
javiercj93 Sep 8, 2024
ba3412d
Adding bitmap serialization tests
javiercj93 Sep 9, 2024
13e8b89
Using random object
javiercj93 Sep 9, 2024
2539301
Merge remote-tracking branch 'origin/main' into bitmap-serialize
javiercj93 Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions client-v2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@
<version>2.35.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.roaringbitmap</groupId>
<artifactId>RoaringBitmap</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
13 changes: 13 additions & 0 deletions client-v2/src/main/java/com/clickhouse/client/api/internal/SerializerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
import com.clickhouse.client.api.ClientException;
import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
import com.clickhouse.client.api.query.POJOSetter;
import com.clickhouse.data.ClickHouseAggregateFunction;
import com.clickhouse.data.ClickHouseColumn;
import com.clickhouse.data.ClickHouseDataType;
import com.clickhouse.data.format.BinaryStreamUtils;
import com.clickhouse.data.value.ClickHouseBitmap;

import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
Expand Down Expand Up @@ -60,6 +63,9 @@ public static void serializeData(OutputStream stream, Object value, ClickHouseCo
case Map:
serializeMapData(stream, value, column);
break;
case AggregateFunction:
serializeAggregateFunction(stream, value, column);
break;
default:
serializePrimitiveData(stream, value, column);
break;
Expand Down Expand Up @@ -194,6 +200,13 @@ private static void serializePrimitiveData(OutputStream stream, Object value, Cl
}
}

private static void serializeAggregateFunction(OutputStream stream, Object value, ClickHouseColumn column) throws IOException {
if (column.getAggregateFunction() == ClickHouseAggregateFunction.groupBitmap) {
BinaryStreamUtils.writeBitmap(stream, (ClickHouseBitmap) value);
} else {
throw new UnsupportedOperationException("Unsupported aggregate function: " + column.getAggregateFunction());
}
}

public static Integer convertToInteger(Object value) {
if (value instanceof Integer) {
Expand Down
33 changes: 27 additions & 6 deletions client-v2/src/test/java/com/clickhouse/client/insert/SamplePOJO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.clickhouse.client.insert;

import com.clickhouse.client.api.metadata.TableSchema;
import com.clickhouse.data.ClickHouseColumn;
import com.clickhouse.data.ClickHouseEnum;
import com.clickhouse.data.value.ClickHouseBitmap;

import org.apache.commons.lang3.RandomStringUtils;

import java.math.BigDecimal;
Expand All @@ -14,13 +13,11 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.UUID;
import java.util.stream.IntStream;

public class SamplePOJO {
private int int8;
Expand Down Expand Up @@ -76,6 +73,9 @@ public class SamplePOJO {
private List<Integer> nestedInnerInt;
private List<String> nestedInnerString;

private ClickHouseBitmap groupBitmapUint32;
private ClickHouseBitmap groupBitmapUint64;

public SamplePOJO() {
final Random random = new Random();
int8 = random.nextInt(128);
Expand Down Expand Up @@ -154,6 +154,9 @@ public SamplePOJO() {
List<String> innerString = new ArrayList<>();
innerString.add(RandomStringUtils.randomAlphabetic(1, 256));
nestedInnerString = innerString;

groupBitmapUint32 = ClickHouseBitmap.wrap(random.ints(5, Integer.MAX_VALUE - 100, Integer.MAX_VALUE).toArray());
groupBitmapUint64 = ClickHouseBitmap.wrap(random.longs(5, Long.MAX_VALUE - 100, Long.MAX_VALUE).toArray());
}

public int getInt8() {
Expand Down Expand Up @@ -460,6 +463,22 @@ public void setNestedInnerString(List<String> nestedInnerString) {
this.nestedInnerString = nestedInnerString;
}

public ClickHouseBitmap getGroupBitmapUint32() {
return groupBitmapUint32;
}

public void setGroupBitmapUint32(ClickHouseBitmap groupBitmapUint32) {
this.groupBitmapUint32 = groupBitmapUint32;
}

public ClickHouseBitmap getGroupBitmapUint64() {
return groupBitmapUint64;
}

public void setGroupBitmapUint64(ClickHouseBitmap groupBitmapUint64) {
this.groupBitmapUint64 = groupBitmapUint64;
}

public static String generateTableCreateSQL(String tableName) {
return "CREATE TABLE " + tableName + " (" +
"int8 Int8, " +
Expand Down Expand Up @@ -501,7 +520,9 @@ public static String generateTableCreateSQL(String tableName) {
"array Array(String), " +
"tuple Tuple(Int32, Int32, Int32, Int32, Int32, Int32, Int32, Int32, Int32, Int32), " +
"map Map(String, Int32), " +
"nested Nested (innerInt Int32, innerString String)" +
"nested Nested (innerInt Int32, innerString String)," +
"groupBitmapUint32 AggregateFunction(groupBitmap, UInt32)," +
"groupBitmapUint64 AggregateFunction(groupBitmap, UInt64)" +
") ENGINE = Memory";
}
}
Loading