You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/10/13 11:42:49 UTC

[inlong] 02/02: [INLONG-6171][Manager] Fix the lightweight group union nodes relation error (#6172)

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

healchow pushed a commit to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git

commit 2247d7d5b0150d4984a6c518af6ee396d6287185
Author: woofyzhao <49...@qq.com>
AuthorDate: Thu Oct 13 17:45:17 2022 +0800

    [INLONG-6171][Manager] Fix the lightweight group union nodes relation error (#6172)
---
 .../service/resource/sort/DefaultSortConfigOperator.java | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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 6096777ac..a4c6b5d80 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
@@ -123,18 +123,22 @@ public class DefaultSortConfigOperator implements SortConfigOperator {
             List<StreamSource> sources = sourceMap.get(streamId);
             List<StreamSink> sinks = sinkMap.get(streamId);
             List<NodeRelation> relations;
-            if (CollectionUtils.isEmpty(transformResponses)) {
-                relations = NodeRelationUtils.createNodeRelations(sources, sinks);
-            } else {
-                relations = NodeRelationUtils.createNodeRelations(inlongStream);
-                // in standard mode, replace upstream source node and transform input fields node to mq node
-                if (InlongConstants.STANDARD_MODE.equals(groupInfo.getLightweight())) {
+
+            if (InlongConstants.STANDARD_MODE.equals(groupInfo.getLightweight())) {
+                if (CollectionUtils.isNotEmpty(transformResponses)) {
+                    relations = NodeRelationUtils.createNodeRelations(inlongStream);
+
+                    // in standard mode, replace upstream source node and transform input fields node to mq node
                     // mq node name, which is inlong stream id
                     String mqNodeName = sources.get(0).getSourceName();
                     Set<String> nodeNameSet = getInputNodeNames(sources, transformResponses);
                     adjustTransformField(transformResponses, nodeNameSet, mqNodeName);
                     adjustNodeRelations(relations, nodeNameSet, mqNodeName);
+                } else {
+                    relations = NodeRelationUtils.createNodeRelations(sources, sinks);
                 }
+            } else {
+                relations = NodeRelationUtils.createNodeRelations(inlongStream);
             }
 
             // create extract-transform-load nodes