Skip to content

Fix deserialization issue of nested array in other nested types #1344

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
merged 1 commit into from
May 2, 2023
Merged

Fix deserialization issue of nested array in other nested types #1344

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### Bug Fixes
* NoClassDefFoundError with clickhouse-apache-http-client-jdbc. [#1319](https://github.com/ClickHouse/clickhouse-java/issues/1319)
* Nested array in tuple array is incorrectly deserialized. [#1324](https://github.com/ClickHouse/clickhouse-java/issues/1324)
* client certificate password exposure in exception. [#1331](https://github.com/ClickHouse/clickhouse-java/issues/1331)

## 0.4.5, 2023-04-25
Expand Down
13 changes: 0 additions & 13 deletions clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
*/
@FunctionalInterface
public interface ClickHouseDeserializer {
static final class ResetValueDeserializer implements ClickHouseDeserializer {
private final ClickHouseDeserializer deserializer;

public ResetValueDeserializer(ClickHouseDeserializer deserializer) {
this.deserializer = deserializer;
}

@Override
public ClickHouseValue deserialize(ClickHouseValue ref, ClickHouseInputStream input) throws IOException {
return deserializer.deserialize(ref.resetToDefault(), input);
}
}

static class CompositeDeserializer implements ClickHouseDeserializer {
protected final ClickHouseDeserializer[] deserializers;

Expand Down
3 changes: 1 addition & 2 deletions clickhouse-data/src/main/java/com/clickhouse/data/format/ClickHouseRowBinaryProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,8 +483,7 @@ public ClickHouseDeserializer getDeserializer(ClickHouseDataConfig config, Click
}
} else {
deserializer = new BinaryDataProcessor.ArrayDeserializer(config, column, true,
new ClickHouseDeserializer.ResetValueDeserializer(
getDeserializer(config, column.getNestedColumns().get(0))));
getDeserializer(config, column.getNestedColumns().get(0)));
}
break;
}
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-data/src/main/java/com/clickhouse/data/value/ClickHouseArrayValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
? ClickHouseValues.createPrimitiveArray(clazz, 0, level)
: ClickHouseValues.createObjectArray(clazz, 0, level)));
}
} else if (length() != length) {
} else {
set((T[]) (clazz.isPrimitive()
? ClickHouseValues.createPrimitiveArray(clazz, length, level)
: ClickHouseValues.createObjectArray(clazz, length, level)));
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-data/src/main/java/com/clickhouse/data/value/array/ClickHouseBoolArrayValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ public int hashCode() {
public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
if (length < 1) {
resetToDefault();
} else if (length() != length) {
} else {
set(new boolean[length]);
}
return this;
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-data/src/main/java/com/clickhouse/data/value/array/ClickHouseByteArrayValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ public int hashCode() {
public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
if (length < 1) {
resetToDefault();
} else if (length() != length) {
} else {
set(new byte[length]);
}
return this;
Expand Down
2 changes: 1 addition & 1 deletion ...khouse-data/src/main/java/com/clickhouse/data/value/array/ClickHouseDoubleArrayValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ public int hashCode() {
public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
if (length < 1) {
resetToDefault();
} else if (length() != length) {
} else {
set(new double[length]);
}
return this;
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-data/src/main/java/com/clickhouse/data/value/array/ClickHouseFloatArrayValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ public int hashCode() {
public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
if (length < 1) {
resetToDefault();
} else if (length() != length) {
} else {
set(new float[length]);
}
return this;
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-data/src/main/java/com/clickhouse/data/value/array/ClickHouseIntArrayValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ public int hashCode() {
public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
if (length < 1) {
resetToDefault();
} else if (length() != length) {
} else {
set(new int[length]);
}
return this;
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-data/src/main/java/com/clickhouse/data/value/array/ClickHouseLongArrayValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ public int hashCode() {
public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
if (length < 1) {
resetToDefault();
} else if (length() != length) {
} else {
set(new long[length]);
}
return this;
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-data/src/main/java/com/clickhouse/data/value/array/ClickHouseShortArrayValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ public int hashCode() {
public ClickHouseArraySequence allocate(int length, Class<?> clazz, int level) {
if (length < 1) {
resetToDefault();
} else if (length() != length) {
} else {
set(new short[length]);
}
return this;
Expand Down
39 changes: 39 additions & 0 deletions clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.File;
import java.io.IOException;
import java.math.BigDecimal;
import java.sql.Array;
import java.sql.BatchUpdateException;
import java.sql.Connection;
Expand Down Expand Up @@ -1139,6 +1140,44 @@ public void testNestedArrayInTuple() throws SQLException {
Assert.assertEquals(((List<?>) ((Object[]) rs.getObject(2))[1]).get(1), new int[] { 6, 7 });
Assert.assertFalse(rs.next());
}

Assert.assertFalse(stmt.execute("drop table if exists test_nested_array_in_tuple; "
+ "create table test_nested_array_in_tuple(id UInt64, val Array(Tuple(UInt16,Array(Decimal(10,0)))))engine=Memory; "
+ "insert into test_nested_array_in_tuple values(1, [(0, [1, 2]), (1, [2, 3])]), (2, [(2, [4, 5]), (3, [6, 7])])"));
try (ResultSet rs = stmt.executeQuery("select * from test_nested_array_in_tuple order by id")) {
Assert.assertTrue(rs.next());
Assert.assertEquals(rs.getInt(1), 1);
Assert.assertEquals(((Object[]) rs.getObject(2)).length, 2);
Assert.assertEquals(((List<?>) ((Object[]) rs.getObject(2))[0]).size(), 2);
Assert.assertEquals(((List<?>) ((Object[]) rs.getObject(2))[0]).get(0), UnsignedShort.ZERO);
Assert.assertEquals(((BigDecimal[]) ((List<?>) ((Object[]) rs.getObject(2))[0]).get(1))[0],
BigDecimal.valueOf(1));
Assert.assertEquals(((BigDecimal[]) ((List<?>) ((Object[]) rs.getObject(2))[0]).get(1))[1],
BigDecimal.valueOf(2));
Assert.assertEquals(((List<?>) ((Object[]) rs.getObject(2))[1]).size(), 2);
Assert.assertEquals(((List<?>) ((Object[]) rs.getObject(2))[1]).get(0), UnsignedShort.ONE);
Assert.assertEquals(((BigDecimal[]) ((List<?>) ((Object[]) rs.getObject(2))[1]).get(1))[0],
BigDecimal.valueOf(2));
Assert.assertEquals(((BigDecimal[]) ((List<?>) ((Object[]) rs.getObject(2))[1]).get(1))[1],
BigDecimal.valueOf(3));
Assert.assertTrue(rs.next());
Assert.assertEquals(((Object[]) rs.getObject(2)).length, 2);
Assert.assertEquals(((List<?>) ((Object[]) rs.getObject(2))[0]).size(), 2);
Assert.assertEquals(((List<?>) ((Object[]) rs.getObject(2))[0]).get(0),
UnsignedShort.valueOf((short) 2));
Assert.assertEquals(((BigDecimal[]) ((List<?>) ((Object[]) rs.getObject(2))[0]).get(1))[0],
BigDecimal.valueOf(4));
Assert.assertEquals(((BigDecimal[]) ((List<?>) ((Object[]) rs.getObject(2))[0]).get(1))[1],
BigDecimal.valueOf(5));
Assert.assertEquals(((List<?>) ((Object[]) rs.getObject(2))[1]).size(), 2);
Assert.assertEquals(((List<?>) ((Object[]) rs.getObject(2))[1]).get(0),
UnsignedShort.valueOf((short) 3));
Assert.assertEquals(((BigDecimal[]) ((List<?>) ((Object[]) rs.getObject(2))[1]).get(1))[0],
BigDecimal.valueOf(6));
Assert.assertEquals(((BigDecimal[]) ((List<?>) ((Object[]) rs.getObject(2))[1]).get(1))[1],
BigDecimal.valueOf(7));
Assert.assertFalse(rs.next());
}
}
}

Expand Down