This is an automated email from the ASF dual-hosted git repository.
wanghailin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new a047cab546 [Fix][Connector-V2] Fix NullPointerException when column
or tag contains null value in TDengine sink (#9158)
a047cab546 is described below
commit a047cab5461f732dcd4fc36a484fa2312acb00e3
Author: jiazhang <[email protected]>
AuthorDate: Wed Apr 16 09:33:43 2025 +0800
[Fix][Connector-V2] Fix NullPointerException when column or tag contains
null value in TDengine sink (#9158)
Co-authored-by: jia zhang <[email protected]>
---
.../tdengine/sink/TDengineSinkWriter.java | 7 +-
.../tdengine/sink/TDengineSinkWriterTest.java | 137 +++++++++++++++++++++
2 files changed, 143 insertions(+), 1 deletion(-)
diff --git
a/seatunnel-connectors-v2/connector-tdengine/src/main/java/org/apache/seatunnel/connectors/seatunnel/tdengine/sink/TDengineSinkWriter.java
b/seatunnel-connectors-v2/connector-tdengine/src/main/java/org/apache/seatunnel/connectors/seatunnel/tdengine/sink/TDengineSinkWriter.java
index 75154978ff..ba352357f2 100644
---
a/seatunnel-connectors-v2/connector-tdengine/src/main/java/org/apache/seatunnel/connectors/seatunnel/tdengine/sink/TDengineSinkWriter.java
+++
b/seatunnel-connectors-v2/connector-tdengine/src/main/java/org/apache/seatunnel/connectors/seatunnel/tdengine/sink/TDengineSinkWriter.java
@@ -17,6 +17,7 @@
package org.apache.seatunnel.connectors.seatunnel.tdengine.sink;
+import
org.apache.seatunnel.shade.com.google.common.annotations.VisibleForTesting;
import org.apache.seatunnel.shade.com.google.common.base.Throwables;
import org.apache.seatunnel.shade.com.google.common.collect.Lists;
import org.apache.seatunnel.shade.com.typesafe.config.Config;
@@ -129,10 +130,14 @@ public class TDengineSinkWriter extends
AbstractSinkWriter<SeaTunnelRow, Void> {
}
}
- private Object[] convertDataType(Object[] objects) {
+ @VisibleForTesting
+ Object[] convertDataType(Object[] objects) {
return Arrays.stream(objects)
.map(
object -> {
+ if (object == null) {
+ return null;
+ }
if (LocalDateTime.class.equals(object.getClass()))
{
// transform timezone according to the config
return "'"
diff --git
a/seatunnel-connectors-v2/connector-tdengine/src/test/java/org/apache/seatunnel/connectors/seatunnel/tdengine/sink/TDengineSinkWriterTest.java
b/seatunnel-connectors-v2/connector-tdengine/src/test/java/org/apache/seatunnel/connectors/seatunnel/tdengine/sink/TDengineSinkWriterTest.java
new file mode 100644
index 0000000000..174ad55f91
--- /dev/null
+++
b/seatunnel-connectors-v2/connector-tdengine/src/test/java/org/apache/seatunnel/connectors/seatunnel/tdengine/sink/TDengineSinkWriterTest.java
@@ -0,0 +1,137 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.seatunnel.connectors.seatunnel.tdengine.sink;
+
+import org.apache.seatunnel.shade.com.typesafe.config.Config;
+import org.apache.seatunnel.shade.com.typesafe.config.ConfigFactory;
+import org.apache.seatunnel.shade.com.typesafe.config.ConfigValueFactory;
+
+import org.apache.seatunnel.api.table.type.BasicType;
+import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
+import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
+import lombok.SneakyThrows;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.time.LocalDateTime;
+import java.util.TimeZone;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+class TDengineSinkWriterTest {
+ TDengineSinkWriter writer;
+
+ @SneakyThrows
+ @BeforeEach
+ public void setup() {
+ SeaTunnelRowType rowType;
+ Config config;
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+ String[] fieldNames = new String[] {"id", "name", "description",
"weight"};
+ SeaTunnelDataType<?>[] dataTypes =
+ new SeaTunnelDataType[] {
+ BasicType.LONG_TYPE,
+ BasicType.STRING_TYPE,
+ BasicType.STRING_TYPE,
+ BasicType.STRING_TYPE,
+ };
+ rowType = new SeaTunnelRowType(fieldNames, dataTypes);
+ config =
+ ConfigFactory.empty()
+ .withValue(
+ "url",
ConfigValueFactory.fromAnyRef("jdbc:TAOS://localhost:6030/"))
+ .withValue("database",
ConfigValueFactory.fromAnyRef("test_db"))
+ .withValue("stable",
ConfigValueFactory.fromAnyRef("test_stable"))
+ .withValue("username",
ConfigValueFactory.fromAnyRef("root"))
+ .withValue("password",
ConfigValueFactory.fromAnyRef("taosdata"))
+ .withValue("timezone",
ConfigValueFactory.fromAnyRef("UTC"));
+
+ // Mock JDBC objects
+ Connection mockConnection = Mockito.mock(Connection.class);
+ Statement mockStatement = Mockito.mock(Statement.class);
+ ResultSet mockResultSet = Mockito.mock(ResultSet.class);
+
+ // Mock ResultSet behavior
+ Mockito.when(mockResultSet.next())
+ .thenReturn(true, false); // First call returns true, second
call returns false
+ Mockito.when(mockResultSet.getString("note")).thenReturn("TAG");
+
+ // Mock Statement behavior
+ Mockito.when(mockStatement.executeQuery("desc test_db.test_stable"))
+ .thenReturn(mockResultSet);
+
+ // Mock Connection behavior
+
Mockito.when(mockConnection.createStatement()).thenReturn(mockStatement);
+
+ try (MockedStatic<DriverManager> mockedStatic =
Mockito.mockStatic(DriverManager.class)) {
+ Mockito.when(DriverManager.getConnection(Mockito.anyString()))
+ .thenReturn(mockConnection);
+ writer = new TDengineSinkWriter(config, rowType);
+ }
+ }
+
+ @Test
+ void testConvertDataTypeWithNull() {
+ // Prepare test data
+ LocalDateTime dateTime = LocalDateTime.of(2023, 4, 14, 15, 30, 45); //
2023-04-14 15:30:45
+ Object[] input = {
+ null, // Test for null value
+ dateTime, // Test for LocalDateTime
+ "test_string", // Test for String
+ 123, // Test for other types (Integer)
+ 45.67 // Test for other types (Double)
+ };
+
+ // Expected output
+ Object[] expectedOutput = {
+ null, // null remains unchanged
+ "'2023-04-14 15:30:45.000'", // LocalDateTime is converted to a
formatted string with
+ // the specified timezone
+ "'test_string'", // String is wrapped in single quotes
+ 123, // Integer remains unchanged
+ 45.67 // Double remains unchanged
+ };
+
+ Object[] result = writer.convertDataType(input);
+ // Verify the results
+ assertArrayEquals(expectedOutput, result);
+
+ // Test for an empty array
+ Object[] input1 = {};
+ Object[] expectedOutput1 = {};
+ Object[] result1 = writer.convertDataType(input1);
+ assertArrayEquals(
+ expectedOutput1, result1, "Empty input array should return an
empty output array.");
+
+ // Test for an array containing only null
+ Object[] input2 = {null};
+ Object[] expectedOutput2 = {null};
+ Object[] result2 = writer.convertDataType(input2);
+ assertArrayEquals(
+ expectedOutput2, result2, "Array with only null should return
an array with null.");
+ }
+}
