Skip to content

Added some null pointer checks for edge cases #2314

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
Paultagoras merged 1 commit into from
Apr 17, 2025
Merged

Added some null pointer checks for edge cases #2314

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
12 changes: 12 additions & 0 deletions ...main/java/com/clickhouse/client/api/data_formats/internal/AbstractBinaryFormatReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ protected AbstractBinaryFormatReader(InputStream inputStream, QuerySettings quer
* @throws IOException
*/
public boolean readToPOJO(Map<String, POJOSetter> deserializers, Object obj ) throws IOException {
if (columns == null || columns.length == 0) {
return false;
}

boolean firstColumn = true;

for (ClickHouseColumn column : columns) {
Expand Down Expand Up @@ -135,6 +139,10 @@ public boolean readToPOJO(Map<String, POJOSetter> deserializers, Object obj ) th
* @throws IOException
*/
public boolean readRecord(Map<String, Object> record) throws IOException {
if (columns == null || columns.length == 0) {
return false;
}

boolean firstColumn = true;
for (ClickHouseColumn column : columns) {
try {
Expand All @@ -157,6 +165,10 @@ public boolean readRecord(Map<String, Object> record) throws IOException {
}

protected boolean readRecord(Object[] record) throws IOException {
if (columns == null || columns.length == 0) {
return false;
}

boolean firstColumn = true;
for (int i = 0; i < columns.length; i++) {
try {
Expand Down
8 changes: 8 additions & 0 deletions client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,14 @@ public void testQueryAllTableNames() {
Assert.assertTrue(tableNames.containsAll(expectedTableNames));
}

@Test(groups = {"integration"})
public void testQueryAllInsertSelect() {
client.queryAll("CREATE TABLE IF NOT EXISTS nums (number Int16) ENGINE = MergeTree() ORDER BY number;");
String sql = "INSERT INTO nums SELECT * FROM system.numbers LIMIT 100";
List<GenericRecord> records = client.queryAll(sql);
Assert.assertTrue(records.isEmpty());
}

@Test(groups = {"integration"})
public void testQueryJSONEachRow() throws ExecutionException, InterruptedException {
Map<String, Object> datasetRecord = prepareSimpleDataSet();
Expand Down
Loading