#AI Commit#bug fix

Author: zqburde

dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/execution/impl/LinkisNodeExecutionImpl.java

@@ -43,6 +43,7 @@
 import scala.tools.nsc.settings.Final;
 
 import java.text.MessageFormat;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Arrays;
@@ -349,14 +350,17 @@ public String getResult(Job job, int index, int maxSize) {
     @Override
     public Map<String, String> getResultVariables(Job job, int maxSize) {
         Map<String, String> variables = new LinkedHashMap<>();
-        Object fileContent = getResultFileContent(job, 0, maxSize);
+        Object resultSetResponse = getResultSetResponse(job, 0, maxSize);
+        Object fileContent = extractFileContent(resultSetResponse);
+        Object metaData = extractMetaData(resultSetResponse);
         if (fileContent == null) {
             job.getLogObj().warn("Branch variable extraction skipped because result file content is null.");
             LOGGER.warn("Branch variable extraction skipped because result file content is null.");
             return variables;
         }
         job.getLogObj().info("Branch variable extraction file content type: " + fileContent.getClass().getName());
         LOGGER.info("Branch variable extraction file content type: {}", fileContent.getClass().getName());
+        LOGGER.info("Branch variable extraction metadata preview: {}", previewObject(metaData));
         if (!(fileContent instanceof ArrayList)) {
             job.getLogObj().warn("Branch variable extraction skipped because result file content is not ArrayList: " + fileContent);
             LOGGER.warn("Branch variable extraction skipped because result file content is not ArrayList: {}", fileContent);
@@ -374,7 +378,7 @@ public Map<String, String> getResultVariables(Job job, int maxSize) {
         if (firstRow instanceof Map) {
             extractVariablesFromMapRows(rows, variables);
         } else if (firstRow instanceof ArrayList) {
-            extractVariablesFromArrayRows(rows, variables);
+            extractVariablesFromArrayRows(rows, metaData, variables);
         } else {
             job.getLogObj().warn("Branch variable extraction skipped because first row type is unsupported: " + firstRow.getClass().getName());
             LOGGER.warn("Branch variable extraction skipped because first row type is unsupported: {}", firstRow.getClass().getName());
@@ -384,7 +388,7 @@ public Map<String, String> getResultVariables(Job job, int maxSize) {
         return variables;
     }
 
-    private void extractVariablesFromArrayRows(ArrayList rows, Map<String, String> variables) {
+    private void extractVariablesFromArrayRows(ArrayList rows, Object metaData, Map<String, String> variables) {
         if (rows.size() >= 2 && rows.get(0) instanceof ArrayList && rows.get(1) instanceof ArrayList) {
             ArrayList headers = (ArrayList) rows.get(0);
             ArrayList values = (ArrayList) rows.get(1);
@@ -404,6 +408,13 @@ private void extractVariablesFromArrayRows(ArrayList rows, Map<String, String> v
             ArrayList row = (ArrayList) rows.get(0);
             if (row.size() == 1) {
                 LOGGER.warn("Branch variable extraction saw a single-row single-column result: {}. Column name may not be present in fileContent.", row);
+                String columnName = extractSingleColumnName(metaData);
+                String value = normalizeCellValue(row.get(0));
+                if (StringUtils.isNotBlank(columnName) && value != null) {
+                    variables.put(columnName, value);
+                    LOGGER.info("Branch variable extraction recovered single-column metadata: {}={}", columnName, value);
+                    return;
+                }
             }
         }
 
@@ -438,6 +449,37 @@ private void extractVariablesFromMapRows(ArrayList rows, Map<String, String> var
         }
     }
 
+    private String extractSingleColumnName(Object metaData) {
+        if (metaData instanceof Map) {
+            Map map = (Map) metaData;
+            String columnName = firstNonBlank(map.get("columnName"), map.get("name"), map.get("column"), map.get("alias"));
+            if (StringUtils.isNotBlank(columnName)) {
+                return columnName;
+            }
+        }
+        if (metaData instanceof List && !((List) metaData).isEmpty()) {
+            Object first = ((List) metaData).get(0);
+            if (first instanceof Map) {
+                Map map = (Map) first;
+                String columnName = firstNonBlank(map.get("columnName"), map.get("name"), map.get("column"), map.get("alias"));
+                if (StringUtils.isNotBlank(columnName)) {
+                    return columnName;
+                }
+            }
+        }
+        return null;
+    }
+
+    private String firstNonBlank(Object... values) {
+        for (Object value : values) {
+            String text = normalizeCellValue(value);
+            if (StringUtils.isNotBlank(text)) {
+                return text;
+            }
+        }
+        return null;
+    }
+
     private String previewRows(ArrayList rows) {
         int previewSize = Math.min(rows.size(), 3);
         return rows.subList(0, previewSize).toString();
@@ -447,7 +489,37 @@ private String normalizeCellValue(Object value) {
         return value == null ? null : value.toString();
     }
 
-    private Object getResultFileContent(Job job, int index, int maxSize) {
+    private String previewObject(Object value) {
+        if (value == null) {
+            return "null";
+        }
+        String text = value.toString();
+        return text.length() > 300 ? text.substring(0, 300) + "..." : text;
+    }
+
+    private Object extractFileContent(Object resultSetResponse) {
+        return invokeNoArgMethod(resultSetResponse, "getFileContent", "fileContent");
+    }
+
+    private Object extractMetaData(Object resultSetResponse) {
+        return invokeNoArgMethod(resultSetResponse, "getMetaData", "getMetadata", "metaData", "metadata", "getMeta", "meta");
+    }
+
+    private Object invokeNoArgMethod(Object target, String... methodNames) {
+        if (target == null) {
+            return null;
+        }
+        for (String methodName : methodNames) {
+            try {
+                Method method = target.getClass().getMethod(methodName);
+                return method.invoke(target);
+            } catch (Throwable ignored) {
+            }
+        }
+        return null;
+    }
+
+    private Object getResultSetResponse(Job job, int index, int maxSize) {
         JobInfoResult jobInfo = getClient(job).getJobInfo(job.getJobExecuteResult());
         String[] resultSetList = jobInfo.getResultSetList(getClient(job));
         if (resultSetList != null && resultSetList.length > index) {