This is an automated email from the ASF dual-hosted git repository.
davidzollo 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 9fdfc38142 [Fix][Connector-V2] Fix Cassandra null timestamp conversion
(#11068)
9fdfc38142 is described below
commit 9fdfc38142fb696f0306b8e0bc5afa7d6bfdc0dc
Author: Jast <[email protected]>
AuthorDate: Fri Jun 12 14:57:19 2026 +0800
[Fix][Connector-V2] Fix Cassandra null timestamp conversion (#11068)
---
.../seatunnel/cassandra/util/TypeConvertUtil.java | 6 +--
.../cassandra/util/TypeConvertUtilTest.java | 51 ++++++++++++++++++++++
2 files changed, 54 insertions(+), 3 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-cassandra/src/main/java/org/apache/seatunnel/connectors/seatunnel/cassandra/util/TypeConvertUtil.java
b/seatunnel-connectors-v2/connector-cassandra/src/main/java/org/apache/seatunnel/connectors/seatunnel/cassandra/util/TypeConvertUtil.java
index 974eb605b6..1753c97df2 100644
---
a/seatunnel-connectors-v2/connector-cassandra/src/main/java/org/apache/seatunnel/connectors/seatunnel/cassandra/util/TypeConvertUtil.java
+++
b/seatunnel-connectors-v2/connector-cassandra/src/main/java/org/apache/seatunnel/connectors/seatunnel/cassandra/util/TypeConvertUtil.java
@@ -44,6 +44,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.sql.Timestamp;
+import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -181,9 +182,8 @@ public class TypeConvertUtil {
fields[i] = row.getLocalDate(i);
break;
case ProtocolConstants.DataType.TIMESTAMP:
- fields[i] =
-
Timestamp.from(Objects.requireNonNull(row.getInstant(i)))
- .toLocalDateTime();
+ Instant instant = row.getInstant(i);
+ fields[i] = instant == null ? null :
Timestamp.from(instant).toLocalDateTime();
break;
case ProtocolConstants.DataType.BLOB:
fields[i] =
diff --git
a/seatunnel-connectors-v2/connector-cassandra/src/test/java/org/apache/seatunnel/connectors/seatunnel/cassandra/util/TypeConvertUtilTest.java
b/seatunnel-connectors-v2/connector-cassandra/src/test/java/org/apache/seatunnel/connectors/seatunnel/cassandra/util/TypeConvertUtilTest.java
new file mode 100644
index 0000000000..1490877828
--- /dev/null
+++
b/seatunnel-connectors-v2/connector-cassandra/src/test/java/org/apache/seatunnel/connectors/seatunnel/cassandra/util/TypeConvertUtilTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.cassandra.util;
+
+import org.apache.seatunnel.api.table.type.SeaTunnelRow;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.datastax.oss.driver.api.core.cql.ColumnDefinition;
+import com.datastax.oss.driver.api.core.cql.ColumnDefinitions;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.type.DataTypes;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class TypeConvertUtilTest {
+
+ @Test
+ void testBuildSeaTunnelRowKeepsNullTimestamp() {
+ Row row = mock(Row.class);
+ ColumnDefinitions columnDefinitions = mock(ColumnDefinitions.class);
+ ColumnDefinition columnDefinition = mock(ColumnDefinition.class);
+
+ when(row.size()).thenReturn(1);
+ when(row.getColumnDefinitions()).thenReturn(columnDefinitions);
+ when(columnDefinitions.get(0)).thenReturn(columnDefinition);
+ when(columnDefinition.getType()).thenReturn(DataTypes.TIMESTAMP);
+ when(row.getInstant(0)).thenReturn(null);
+
+ SeaTunnelRow seaTunnelRow = TypeConvertUtil.buildSeaTunnelRow(row);
+
+ Assertions.assertNull(seaTunnelRow.getField(0));
+ }
+}
