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

fix the logging problem in some datatypes #53

Merged
merged 1 commit into from
Jul 31, 2024
Merged

fix the logging problem in some datatypes #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 31 additions & 11 deletions ...ative-jdbc/src/main/java/com/timeplus/jdbc/statement/TimeplusPreparedInsertStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
import com.timeplus.data.type.DataTypeDate32;
import com.timeplus.data.type.DataTypeFloat32;
import com.timeplus.data.type.DataTypeFloat64;
import com.timeplus.data.type.DataTypeIPv4;
import com.timeplus.data.type.DataTypeIPv6;
import com.timeplus.data.type.DataTypeInt16;
import com.timeplus.data.type.DataTypeInt256;
import com.timeplus.data.type.DataTypeInt32;
Expand All @@ -57,6 +59,8 @@
import com.timeplus.data.type.complex.DataTypeDateTime;
import com.timeplus.data.type.complex.DataTypeDateTime64;
import com.timeplus.data.type.complex.DataTypeDecimal;
import com.timeplus.data.type.complex.DataTypeEnum16;
import com.timeplus.data.type.complex.DataTypeEnum8;
import com.timeplus.data.type.complex.DataTypeFixedString;
import com.timeplus.data.type.complex.DataTypeMap;
import com.timeplus.data.type.complex.DataTypeNothing;
Expand Down Expand Up @@ -123,7 +127,7 @@ public void setObject(int paramPosition, Object x) throws SQLException {
initBlockIfPossible();
int columnIdx = block.paramIdx2ColumnIdx(paramPosition - 1);
IColumn column = block.getColumn(columnIdx);
block.setObject(columnIdx, convertToCkDataType(column.type(), x));
block.setObject(columnIdx, convertToNativeDataType(column.type(), x));
}

@Override
Expand Down Expand Up @@ -222,7 +226,7 @@ private void addParameters() throws SQLException {
}

// TODO we actually need a type cast system rather than put all type cast stuffs here
private Object convertToCkDataType(IDataType<?, ?> type, Object obj) throws TimeplusSQLException {
private Object convertToNativeDataType(IDataType<?, ?> type, Object obj) throws TimeplusSQLException {
if (obj == null) {
if (type.nullable() || type instanceof DataTypeNothing)
return null;
Expand Down Expand Up @@ -282,7 +286,7 @@ private Object convertToCkDataType(IDataType<?, ?> type, Object obj) throws Time
if (obj instanceof Number)
return ((Number) obj).longValue();
}
if (type instanceof DataTypeUInt64 || type instanceof DataTypeInt128 || type instanceof DataTypeInt256 || type instanceof DataTypeUInt128 || type instanceof DataTypeUInt256) {
if (type instanceof DataTypeUInt64 || type instanceof DataTypeInt128 || type instanceof DataTypeInt256 || type instanceof DataTypeUInt128 || type instanceof DataTypeUInt256 || type instanceof DataTypeIPv6) {
if (obj instanceof BigInteger)
return obj;
if (obj instanceof BigDecimal)
Expand Down Expand Up @@ -313,27 +317,43 @@ private Object convertToCkDataType(IDataType<?, ?> type, Object obj) throws Time
return UUID.fromString((String) obj);
}
}
if (type instanceof DataTypeEnum8 || type instanceof DataTypeEnum16) {
if (obj instanceof String)
return obj;
}
if (type instanceof DataTypeIPv4) {
if (obj instanceof Long)
return obj;
if (obj instanceof Number)
return ((Number) obj).longValue();
}
if (type instanceof DataTypeBool) {
if (obj instanceof Byte)
return obj;
if (obj instanceof Boolean)
return (byte) obj;
}
if (type instanceof DataTypeNothing) {
return null;
}
if (type instanceof DataTypeNullable) {
// handled null at first, so obj also not null here
return convertToCkDataType(((DataTypeNullable) type).getNestedDataType(), obj);
return convertToNativeDataType(((DataTypeNullable) type).getNestedDataType(), obj);
}
if (type instanceof DataTypeLowCardinality) {
return convertToCkDataType(((DataTypeLowCardinality) type).getNestedTypes(), obj);
return convertToNativeDataType(((DataTypeLowCardinality) type).getNestedTypes(), obj);
}
if (type instanceof DataTypeArray) {
if (!(obj instanceof TimeplusArray)) {
throw new TimeplusSQLException(-1, "require ClickHouseArray for column: " + type.name() + ", but found " + obj.getClass());
throw new TimeplusSQLException(-1, "require TimeplusArray for column: " + type.name() + ", but found " + obj.getClass());
}
return ((TimeplusArray) obj).mapElements(unchecked(this::convertToCkDataType));
return ((TimeplusArray) obj).mapElements(unchecked(this::convertToNativeDataType));
}
if (type instanceof DataTypeTuple) {
if (!(obj instanceof TimeplusStruct)) {
throw new TimeplusSQLException(-1, "require ClickHouseStruct for column: " + type.name() + ", but found " + obj.getClass());
throw new TimeplusSQLException(-1, "require TimeplusStruct for column: " + type.name() + ", but found " + obj.getClass());
}
return ((TimeplusStruct) obj).mapAttributes(((DataTypeTuple) type).getNestedTypes(), unchecked(this::convertToCkDataType));
return ((TimeplusStruct) obj).mapAttributes(((DataTypeTuple) type).getNestedTypes(), unchecked(this::convertToNativeDataType));
}
if (type instanceof DataTypeMap) {
if (obj instanceof Map) {
Expand All @@ -342,8 +362,8 @@ private Object convertToCkDataType(IDataType<?, ?> type, Object obj) throws Time
IDataType<?, ?>[] nestedTypes = ((DataTypeMap) type).getNestedTypes();
Map<?, ?> dataMap = (Map<?, ?>) obj;
for (Entry<?, ?> entry : dataMap.entrySet()) {
Object key = convertToCkDataType(nestedTypes[0], entry.getKey());
Object value = convertToCkDataType(nestedTypes[1], entry.getValue());
Object key = convertToNativeDataType(nestedTypes[0], entry.getKey());
Object value = convertToNativeDataType(nestedTypes[1], entry.getValue());
result.put(key, value);
}
return result;
Expand Down