Skip to content

[ISSUE-11199] Pipe: fix NPE when casting from null values in InsertRowNode deserialization #11200

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
SteveYurongSu merged 2 commits into from
Sep 24, 2023
Merged

[ISSUE-11199] Pipe: fix NPE when casting from null values in InsertRowNode deserialization #11200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8766a77
fix: allow casting from null when deserializing InsertRowNode
VGalaxies Sep 22, 2023
23a3a92
test: add test of inserting null values for pipe data synchronization…
VGalaxies Sep 23, 2023
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
62 changes: 62 additions & 0 deletions integration-test/src/test/java/org/apache/iotdb/pipe/it/IoTDBPipeDataSyncIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,66 @@ public void testEnv() throws Exception {
}
}
}

@Test
public void testInsertNull() throws Exception {
DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0);

String receiverIp = receiverDataNode.getIp();
int receiverPort = receiverDataNode.getPort();

try (SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) senderEnv.getLeaderConfigNodeConnection()) {
Map<String, String> extractorAttributes = new HashMap<>();
Map<String, String> processorAttributes = new HashMap<>();
Map<String, String> connectorAttributes = new HashMap<>();

connectorAttributes.put("connector", "iotdb-thrift-connector");
connectorAttributes.put("connector.ip", receiverIp);
connectorAttributes.put("connector.port", Integer.toString(receiverPort));

TSStatus status =
client.createPipe(
new TCreatePipeReq("testPipe", connectorAttributes)
.setExtractorAttributes(extractorAttributes)
.setProcessorAttributes(processorAttributes));

Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());

Assert.assertEquals(
TSStatusCode.SUCCESS_STATUS.getStatusCode(), client.startPipe("testPipe").getCode());

try (Connection connection = receiverEnv.getConnection();
Statement statement = connection.createStatement()) {
statement.execute("create aligned timeseries root.sg.d1(s0 float, s1 float)");
} catch (SQLException e) {
e.printStackTrace();
fail(e.getMessage());
}

try (Connection connection = senderEnv.getConnection();
Statement statement = connection.createStatement()) {
statement.execute("create aligned timeseries root.sg.d1(s0 float, s1 float)");
statement.execute("insert into root.sg.d1(time, s0, s1) values (3, null, 25.34)");
} catch (SQLException e) {
e.printStackTrace();
fail(e.getMessage());
}

try (Connection connection = receiverEnv.getConnection();
Statement statement = connection.createStatement()) {
await()
.atMost(600, TimeUnit.SECONDS)
.untilAsserted(
() ->
TestUtils.assertResultSetEqual(
statement.executeQuery("select * from root.**"),
"Time,root.sg.d1.s0,root.sg.d1.s1,",
Collections.singleton("3,null,25.34,")));
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
}
}
}
}
7 changes: 7 additions & 0 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

import java.util.Arrays;
import java.util.List;
import java.util.Objects;

@SuppressWarnings("java:S106") // for console outputs
public class CommonUtils {
Expand Down Expand Up @@ -110,6 +111,9 @@ public static Object parseValue(TSDataType dataType, String value) throws QueryP
}

public static boolean checkCanCastType(TSDataType src, TSDataType dest) {
if (Objects.isNull(src)) {
return true;
}
switch (src) {
case INT32:
if (dest == TSDataType.INT64 || dest == TSDataType.FLOAT || dest == TSDataType.DOUBLE) {
Expand All @@ -128,6 +132,9 @@ public static boolean checkCanCastType(TSDataType src, TSDataType dest) {
}

public static Object castValue(TSDataType srcDataType, TSDataType destDataType, Object value) {
if (Objects.isNull(value)) {
return null;
}
switch (srcDataType) {
case INT32:
if (destDataType == TSDataType.INT64) {
Expand Down