Skip to content

[MHA] fix issue-2779 #2780

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

Merged
chernser merged 8 commits into from
Mar 10, 2026
Merged

[MHA] fix issue-2779 #2780

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cbd7b6d
[MHA] fix issue-2779
Mar 5, 2026
231eda4
[MHA] fix issue-2779 : apply reviewer requests
Mar 5, 2026
b79b4ec
[MHA] Adding tests for issue-2779
Mar 6, 2026
43add8e
[MHA] Adding BigInteger conversion handler in convertObject method
Mar 6, 2026
2d821e9
[MHA] Adding integration test
Mar 6, 2026
6a7361c
[MHA] update Unit Tests
Mar 6, 2026
56a84ab
[MHA] delete import java.math.BigInteger
Mar 6, 2026
3cd682e
[MHA] map BigInteger to Types.NUMERIC instead of Types.DECIMAL
Mar 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
2 changes: 2 additions & 0 deletions clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/JdbcTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ public int toSqlType(ClickHouseColumn column, Map<String, Class<?>> typeMap) {
case UInt128:
case Int256:
case UInt256:
sqlType = Types.NUMERIC;
break;
case Decimal:
case Decimal32:
case Decimal64:
Expand Down
45 changes: 45 additions & 0 deletions clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcTypeMappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.clickhouse.jdbc;

import com.clickhouse.data.ClickHouseColumn;
import com.clickhouse.data.ClickHouseDataType;
import org.testng.annotations.Test;

import java.sql.Types;

import static org.testng.Assert.assertEquals;

public class JdbcTypeMappingTest {

private final JdbcTypeMapping mapping = JdbcTypeMapping.getDefaultMapping();

@Test(groups = {"unit"})
public void testInt128Mapping() {
ClickHouseColumn col = ClickHouseColumn.of("col", ClickHouseDataType.Int128, false, false);
assertEquals(mapping.toSqlType(col, null), Types.NUMERIC);
}

@Test(groups = {"unit"})
public void testInt256Mapping() {
ClickHouseColumn col = ClickHouseColumn.of("col", ClickHouseDataType.Int256, false, false);
assertEquals(mapping.toSqlType(col, null), Types.NUMERIC);
}

@Test(groups = {"unit"})
public void testUInt64Mapping() {
ClickHouseColumn col = ClickHouseColumn.of("col", ClickHouseDataType.UInt64, false, false);
assertEquals(mapping.toSqlType(col, null), Types.NUMERIC);
}

@Test(groups = {"unit"})
public void testUInt128Mapping() {
ClickHouseColumn col = ClickHouseColumn.of("col", ClickHouseDataType.UInt128, false, false);
assertEquals(mapping.toSqlType(col, null), Types.NUMERIC);
}

@Test(groups = {"unit"})
public void testUInt256Mapping() {
ClickHouseColumn col = ClickHouseColumn.of("col", ClickHouseDataType.UInt256, false, false);
assertEquals(mapping.toSqlType(col, null), Types.NUMERIC);
}
}

33 changes: 9 additions & 24 deletions jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ public class JdbcUtils {

public static final Map<String, SQLType> CLICKHOUSE_TYPE_NAME_TO_SQL_TYPE_MAP = Collections.unmodifiableMap(generateTypeMap().entrySet()
.stream().collect(
HashMap::new,
(map, entry) -> map.put(entry.getKey().name(), entry.getValue()),
HashMap::putAll
HashMap::new,
(map, entry) -> map.put(entry.getKey().name(), entry.getValue()),
HashMap::putAll
));

private static Map<ClickHouseDataType, SQLType> generateTypeMap() {
Expand All @@ -55,14 +55,14 @@ private static Map<ClickHouseDataType, SQLType> generateTypeMap() {
map.put(ClickHouseDataType.Int16, JDBCType.SMALLINT);
map.put(ClickHouseDataType.Int32, JDBCType.INTEGER);
map.put(ClickHouseDataType.Int64, JDBCType.BIGINT);
map.put(ClickHouseDataType.Int128, JDBCType.OTHER);
map.put(ClickHouseDataType.Int256, JDBCType.OTHER);
map.put(ClickHouseDataType.Int128, JDBCType.NUMERIC);
map.put(ClickHouseDataType.Int256, JDBCType.NUMERIC);
map.put(ClickHouseDataType.UInt8, JDBCType.SMALLINT);
map.put(ClickHouseDataType.UInt16, JDBCType.INTEGER);
map.put(ClickHouseDataType.UInt32, JDBCType.BIGINT);
map.put(ClickHouseDataType.UInt64, JDBCType.OTHER);
map.put(ClickHouseDataType.UInt128, JDBCType.OTHER);
map.put(ClickHouseDataType.UInt256, JDBCType.OTHER);
map.put(ClickHouseDataType.UInt64, JDBCType.NUMERIC);
map.put(ClickHouseDataType.UInt128, JDBCType.NUMERIC);
map.put(ClickHouseDataType.UInt256, JDBCType.NUMERIC);
Comment thread
chernser marked this conversation as resolved.
map.put(ClickHouseDataType.Float32, JDBCType.FLOAT);
map.put(ClickHouseDataType.Float64, JDBCType.DOUBLE);
map.put(ClickHouseDataType.BFloat16, JDBCType.FLOAT);
Expand Down Expand Up @@ -130,7 +130,7 @@ private static Map<SQLType, Class<?>> generateClassMap() {
map.put(JDBCType.CHAR, String.class);
map.put(JDBCType.VARCHAR, String.class);
map.put(JDBCType.LONGVARCHAR, String.class);
map.put(JDBCType.NUMERIC, java.math.BigDecimal.class);
map.put(JDBCType.NUMERIC, java.math.BigInteger.class);
Comment thread
cursor[bot] marked this conversation as resolved.
map.put(JDBCType.DECIMAL, java.math.BigDecimal.class);
map.put(JDBCType.BIT, Boolean.class);
map.put(JDBCType.BOOLEAN, Boolean.class);
Expand Down Expand Up @@ -173,21 +173,6 @@ private static Map<ClickHouseDataType, Class<?>> getDataTypeClassMap() {
for (Map.Entry<ClickHouseDataType, SQLType> e : CLICKHOUSE_TO_SQL_TYPE_MAP.entrySet()) {
if (e.getValue().equals(JDBCType.OTHER)) {
switch (e.getKey()) {
case UInt64:
map.put(e.getKey(), BigInteger.class);
break;
case UInt128:
map.put(e.getKey(), BigInteger.class);
break;
case UInt256:
map.put(e.getKey(), BigInteger.class);
break;
case Int128:
map.put(e.getKey(), BigInteger.class);
break;
case Int256:
map.put(e.getKey(), BigInteger.class);
break;
case Point:
map.put(e.getKey(), double[].class);
break;
Expand Down
20 changes: 20 additions & 0 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/JdbcUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

import java.io.InputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.sql.JDBCType;
import java.sql.SQLException;
import java.time.Instant;
import java.time.ZoneId;
Expand Down Expand Up @@ -150,4 +152,22 @@ public void testConvertToUnhexExpression() throws Exception {
decodedChecksum.update(decodedBytes);
assertEquals(decodedChecksum.getValue(), expectedChecksum, "Checksum of decoded bytes should match original");
}

@Test(groups = {"unit"})
public void testClickHouseToSqlType() {
assertEquals(JdbcUtils.convertToSqlType(ClickHouseDataType.Int128), JDBCType.NUMERIC);
assertEquals(JdbcUtils.convertToSqlType(ClickHouseDataType.Int256), JDBCType.NUMERIC);
assertEquals(JdbcUtils.convertToSqlType(ClickHouseDataType.UInt64), JDBCType.NUMERIC);
assertEquals(JdbcUtils.convertToSqlType(ClickHouseDataType.UInt128), JDBCType.NUMERIC);
assertEquals(JdbcUtils.convertToSqlType(ClickHouseDataType.UInt256), JDBCType.NUMERIC);
}

@Test(groups = {"unit"})
public void testClickHouseToJavaClass() {
assertEquals(JdbcUtils.convertToJavaClass(ClickHouseDataType.Int128), BigInteger.class);
assertEquals(JdbcUtils.convertToJavaClass(ClickHouseDataType.Int256), BigInteger.class);
assertEquals(JdbcUtils.convertToJavaClass(ClickHouseDataType.UInt64), BigInteger.class);
assertEquals(JdbcUtils.convertToJavaClass(ClickHouseDataType.UInt128), BigInteger.class);
assertEquals(JdbcUtils.convertToJavaClass(ClickHouseDataType.UInt256), BigInteger.class);
}
}