(inlong) branch master updated: [INLONG-9577][Manager] Fix the problem of Datatime field type conversion error (#9578)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 43571fb87a [INLONG-9577][Manager] Fix the problem of Datatime field 
type conversion error (#9578)
43571fb87a is described below

commit 43571fb87a39d9809459ba6225a0dc9c18602cc4
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Tue Jan 16 16:24:43 2024 +0800

    [INLONG-9577][Manager] Fix the problem of Datatime field type conversion 
error (#9578)
---
 .../org/apache/inlong/manager/dao/mapper/DataNodeEntityMapper.java  | 2 +-
 .../org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java    | 2 +-
 .../manager/service/resource/sort/DefaultSortConfigOperator.java    | 2 +-
 .../inlong/manager/service/tenant/InlongTenantServiceImpl.java      | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataNodeEntityMapper.java
 
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataNodeEntityMapper.java
index 32c73a1cb0..c469dccc13 100644
--- 
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataNodeEntityMapper.java
+++ 
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataNodeEntityMapper.java
@@ -56,6 +56,6 @@ public interface DataNodeEntityMapper {
             @Param("targetTenant") String targetTenant, @Param("newName") 
String newName);
 
     @MultiTenantQuery(with = false)
-    DataNodeEntity selectByIdSelective(DataNodeEntity record);
+    List<DataNodeEntity> selectByIdSelective(DataNodeEntity record);
 
 }
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java
index ce658c9167..f04fabb41a 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/FieldInfoUtils.java
@@ -290,7 +290,6 @@ public class FieldInfoUtils {
                     formatInfo = new DateFormatInfo();
                 }
                 break;
-            case DATETIME:
             case TIME:
                 if (StringUtils.isNotBlank(format)) {
                     formatInfo = new 
TimeFormatInfo(convertTimestampOrDataFormat(format));
@@ -299,6 +298,7 @@ public class FieldInfoUtils {
                 }
                 break;
             case TIMESTAMP:
+            case DATETIME:
                 if (StringUtils.isNotBlank(format)) {
                     formatInfo = new 
TimestampFormatInfo(convertTimestampOrDataFormat(format));
                 } else {
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sort/DefaultSortConfigOperator.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sort/DefaultSortConfigOperator.java
index 08bc53cbf0..94c8015ad1 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sort/DefaultSortConfigOperator.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sort/DefaultSortConfigOperator.java
@@ -149,7 +149,7 @@ public class DefaultSortConfigOperator implements 
SortConfigOperator {
         }
 
         for (StreamSource source : sources) {
-            source.setFieldList(inlongStreamInfo.getFieldList());
+            source.setFieldList(new 
ArrayList<>(inlongStreamInfo.getFieldList()));
         }
         List<NodeRelation> relations;
 
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
index 751c79c82b..c19e981d33 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/tenant/InlongTenantServiceImpl.java
@@ -293,9 +293,9 @@ public class InlongTenantServiceImpl implements 
InlongTenantService {
     public String copyDataNode(String name, String type, String from, String 
to) {
         DataNodeEntity oldDatanode = 
dataNodeEntityMapper.selectByUniqueKey(name, type);
         oldDatanode.setTenant(to);
-        DataNodeEntity newDatanode = 
dataNodeEntityMapper.selectByIdSelective(oldDatanode);
-        if (newDatanode != null) {
-            return newDatanode.getName();
+        List<DataNodeEntity> newDatanodeList = 
dataNodeEntityMapper.selectByIdSelective(oldDatanode);
+        if (CollectionUtils.isNotEmpty(newDatanodeList)) {
+            return newDatanodeList.get(0).getName();
         }
         String newName = UUID.randomUUID().toString();
         if (dataNodeEntityMapper.copy(name, type, from, to, newName) != 
InlongConstants.AFFECTED_ONE_ROW) {