Skip to content

[client-v2,jdbc-v2] Support Geometry Type #2815

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

Open
chernser wants to merge 9 commits into
base: main
Choose a base branch
from
Open

[client-v2,jdbc-v2] Support Geometry Type #2815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f948333
Added support of Geometry alias type
chernser Mar 31, 2026
46db3c4
removed extra code for handling Geometry type inference
chernser Apr 1, 2026
0b5e8b7
removed extra code for handling Geometry type inference
chernser Apr 1, 2026
cb3f1f6
Removed not needed string conversion methods
chernser Apr 1, 2026
afb1bbb
Merge branch 'main' into 03/31/26/support_geometry_type
chernser Apr 1, 2026
da38c0e
Added more tests for read
chernser Apr 1, 2026
9648af7
Merge branch 'main' into 03/31/26/support_geometry_type
chernser Apr 2, 2026
88dbc87
Fixed writing Geometry type
chernser Apr 3, 2026
386fbb7
Fixed
chernser Apr 6, 2026
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
78 changes: 74 additions & 4 deletions clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
/**
* This class represents a column defined in database.
*/
@SuppressWarnings("deprecation")
public final class ClickHouseColumn implements Serializable {
public static final String TYPE_NAME = "Column";
public static final ClickHouseColumn[] EMPTY_ARRAY = new ClickHouseColumn[0];
Expand Down Expand Up @@ -105,6 +106,8 @@ public final class ClickHouseColumn implements Serializable {

private Map<Class<?>, Integer> arrayToVariantOrdNumMap;

private Map<Integer, Integer> geometryTypeDimensionsToVariantOrdNumMap;

private Map<Class<?>, Integer> mapKeyToVariantOrdNumMap;
private Map<Class<?>, Integer> mapValueToVariantOrdNumMap;

Expand Down Expand Up @@ -293,12 +296,28 @@ private static ClickHouseColumn update(ClickHouseColumn column) {
case Ring:
column.template = ClickHouseGeoRingValue.ofEmpty();
break;
case LineString:
column.template = ClickHouseGeoRingValue.ofEmpty();
break;
case Polygon:
column.template = ClickHouseGeoPolygonValue.ofEmpty();
break;
case MultiLineString:
column.template = ClickHouseGeoPolygonValue.ofEmpty();
break;
case MultiPolygon:
column.template = ClickHouseGeoMultiPolygonValue.ofEmpty();
break;
case Geometry:
ClickHouseColumn geometryVariantHelper = GEOMETRY_VARIANT_COLUMN;
column.template = ClickHouseTupleValue.of();
column.nested = geometryVariantHelper.nested;
column.classToVariantOrdNumMap = geometryVariantHelper.classToVariantOrdNumMap;
column.arrayToVariantOrdNumMap = geometryVariantHelper.arrayToVariantOrdNumMap;
column.geometryTypeDimensionsToVariantOrdNumMap = geometryVariantHelper.geometryTypeDimensionsToVariantOrdNumMap;
column.mapKeyToVariantOrdNumMap = geometryVariantHelper.mapKeyToVariantOrdNumMap;
column.mapValueToVariantOrdNumMap = geometryVariantHelper.mapValueToVariantOrdNumMap;
break;
case Nested:
column.template = ClickHouseNestedValue.ofEmpty(column.nested);
break;
Expand All @@ -318,6 +337,28 @@ private static ClickHouseColumn update(ClickHouseColumn column) {
return column;
}

private static ClickHouseColumn createGeometryVariantColumn() {
ClickHouseColumn column = ClickHouseColumn.of("v",
"Variant(Point, Ring, LineString, MultiLineString, Polygon, MultiPolygon)");
Map<Integer, Integer> map = new HashMap<>();
map.put(1, getVariantOrdNum(column.nested, ClickHouseDataType.Point));
map.put(2, getVariantOrdNum(column.nested, ClickHouseDataType.Ring));
map.put(3, getVariantOrdNum(column.nested, ClickHouseDataType.Polygon));
map.put(4, getVariantOrdNum(column.nested, ClickHouseDataType.MultiPolygon));
column.geometryTypeDimensionsToVariantOrdNumMap = Collections.unmodifiableMap(map);
return column;
}

private static int getVariantOrdNum(List<ClickHouseColumn> nestedColumns, ClickHouseDataType dataType) {
for (int i = 0; i < nestedColumns.size(); i++) {
if (nestedColumns.get(i).getDataType() == dataType) {
return i;
}
}

throw new IllegalArgumentException("Missing nested geometry type: " + dataType);
}

protected static int readColumn(String args, int startIndex, int len, String name, List<ClickHouseColumn> list) {
ClickHouseColumn column = null;

Expand Down Expand Up @@ -374,7 +415,7 @@ protected static int readColumn(String args, int startIndex, int len, String nam
nestedColumns.add(ClickHouseColumn.of("", p));
}
}
column = new ClickHouseColumn(ClickHouseDataType.valueOf(matchedKeyword), name,
column = new ClickHouseColumn(ClickHouseDataType.of(matchedKeyword), name,
args.substring(startIndex, i), nullable, lowCardinality, params, nestedColumns);
column.aggFuncType = aggFunc;
if (!nestedColumns.isEmpty()) {
Expand Down Expand Up @@ -468,7 +509,7 @@ protected static int readColumn(String args, int startIndex, int len, String nam
variantDataTypes.add(c.dataType);
});
}
column = new ClickHouseColumn(ClickHouseDataType.valueOf(matchedKeyword), name,
column = new ClickHouseColumn(ClickHouseDataType.of(matchedKeyword), name,
args.substring(startIndex, endIndex + 1), nullable, lowCardinality, null, nestedColumns);
for (ClickHouseColumn n : nestedColumns) {
estimatedLength += n.estimatedByteLength;
Expand Down Expand Up @@ -821,18 +862,24 @@ public boolean isAggregateFunction() {

public int getVariantOrdNum(Object value) {
if (value != null && value.getClass().isArray()) {
if (arrayToVariantOrdNumMap == null) {
return -1;
}
// TODO: add cache by value class
Class<?> c = value.getClass();
while (c.isArray()) {
c = c.getComponentType();
}
return arrayToVariantOrdNumMap.getOrDefault(c, -1);
} else if (value != null && value instanceof List<?>) {
if (arrayToVariantOrdNumMap == null) {
return -1;
}
// TODO: add cache by instance of the list
Object tmpV = ((List) value).get(0);
Object tmpV = ((List<?>) value).get(0);
Class<?> valueClass = tmpV.getClass();
while (tmpV instanceof List<?>) {
tmpV = ((List) tmpV).get(0);
tmpV = ((List<?>) tmpV).get(0);
valueClass = tmpV.getClass();
}
return arrayToVariantOrdNumMap.getOrDefault(valueClass, -1);
Expand Down Expand Up @@ -865,6 +912,29 @@ public int getVariantOrdNum(Object value) {
}
}

public int getGeometryVariantOrdNum(Object value) {
if (value == null) {
return -1;
}

Integer ordNum = classToVariantOrdNumMap.get(value.getClass());
if (ordNum != null) {
return ordNum;
}

return -1;
}

public int getGeometryVariantOrdNum(int dimensions) {
if (dimensions < 1 || geometryTypeDimensionsToVariantOrdNumMap == null) {
return -1;
}

return geometryTypeDimensionsToVariantOrdNumMap.getOrDefault(dimensions, -1);
}

private static final ClickHouseColumn GEOMETRY_VARIANT_COLUMN = createGeometryVariantColumn();

public boolean isArray() {
return dataType == ClickHouseDataType.Array;
}
Expand Down
13 changes: 12 additions & 1 deletion clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseDataType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public enum ClickHouseDataType implements SQLType {
Ring(Object.class, false, true, true, 0, 0, 0, 0, 0, true), // same as Array(Point)
LineString( Object.class, false, true, true, 0, 0, 0, 0, 0, true), // same as Array(Point)
MultiLineString(Object.class, false, true, true, 0, 0, 0, 0, 0, true), // same as Array(Ring)
Geometry(Object.class, false, true, true, 0, 0, 0, 0, 0, true), // same as Variant(Point, ...)
JSON(Object.class, false, false, false, 0, 0, 0, 0, 0, true, 0x30),
@Deprecated // (since = "CH 25.11")
Object(Object.class, true, true, false, 0, 0, 0, 0, 0, true),
Expand All @@ -130,7 +131,6 @@ public enum ClickHouseDataType implements SQLType {
Time(LocalDateTime.class, true, false, false, 4, 9, 0, 0, 9, false, 0x32), // 0x33 for Time(Timezone)
Time64(LocalDateTime.class, true, false, false, 8, 9, 0, 0, 0, false, 0x34), // 0x35 for Time64(P, Timezone)
QBit(Double.class, true, true, false, 0, 0, 0, 0, 0, false, 0x36),
Geometry(Object.class, false, false, false, 0, 0, 0, 0, 0, true),
;

public static final List<ClickHouseDataType> ORDERED_BY_RANGE_INT_TYPES =
Expand Down Expand Up @@ -214,8 +214,19 @@ static Map<ClickHouseDataType, Set<Class<?>>> dataTypeClassMap() {

map.put(Point, setOf(double[].class, ClickHouseGeoPointValue.class));
map.put(Ring, setOf(double[][].class, ClickHouseGeoRingValue.class));
map.put(LineString, setOf(double[][].class, ClickHouseGeoRingValue.class));
map.put(Polygon, setOf(double[][][].class, ClickHouseGeoPolygonValue.class));
map.put(MultiLineString, setOf(double[][][].class, ClickHouseGeoPolygonValue.class));
map.put(MultiPolygon, setOf(double[][][][].class, ClickHouseGeoMultiPolygonValue.class));
map.put(Geometry, setOf(
double[].class,
double[][].class,
double[][][].class,
double[][][][].class,
ClickHouseGeoPointValue.class,
ClickHouseGeoRingValue.class,
ClickHouseGeoPolygonValue.class,
ClickHouseGeoMultiPolygonValue.class));

map.put(Date, setOf(LocalDateTime.class, LocalDate.class, ZonedDateTime.class));
map.put(Date32, setOf(LocalDateTime.class, LocalDate.class, ZonedDateTime.class));
Expand Down
Loading
Loading