#AI commit# 开发阶段： 日志打印优化，spark init sql 异常优化

Author: v-kkhuang

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/CodeUtils.java

@@ -0,0 +1,262 @@
+/*
+ * 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.linkis.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Code masking utility for security logging. Prevents sensitive user code from being logged in
+ * plain text.
+ */
+public class CodeUtils {
+
+  /** Default maximum preview length */
+  private static final int DEFAULT_MAX_PREVIEW_LENGTH = 50;
+
+  /** Default preview length for code snippet (first N characters) */
+  private static final int DEFAULT_CODE_SNIPPET_LENGTH = 6;
+
+  /** Maximum lines to preview */
+  private static final int MAX_PREVIEW_LINES = 3;
+
+  /**
+   * Mask code for logging - only shows length and line count
+   *
+   * @param code the code to mask
+   * @return masked code information
+   */
+  public static String maskCode(String code) {
+    if (StringUtils.isBlank(code)) {
+      return "[empty code]";
+    }
+    int length = code.length();
+    int lines = code.split("\n", -1).length;
+    return String.format("[code length: %d, lines: %d]", length, lines);
+  }
+
+  /**
+   * Mask code for logging - shows type, length, line count, and code snippet
+   *
+   * @param code the code to mask
+   * @param codeType the type of code (e.g., "SQL", "Scala", "Python")
+   * @return masked code information with snippet
+   */
+  public static String maskCode(String code, String codeType) {
+    if (StringUtils.isBlank(code)) {
+      return "[empty " + codeType + " code]";
+    }
+    int length = code.length();
+    int lines = code.split("\n", -1).length;
+
+    // Get code snippet (first N characters for debugging)
+    String snippet = getCodeSnippet(code, DEFAULT_CODE_SNIPPET_LENGTH);
+
+    return String.format(
+        "[%s code, length: %d, lines: %d, snippet: %s]", codeType, length, lines, snippet);
+  }
+
+  /**
+   * Get code snippet (first N characters) for debugging
+   *
+   * @param code the code
+   * @param length number of characters to show
+   * @return code snippet (always truncated for security)
+   */
+  public static String getCodeSnippet(String code, int length) {
+    if (StringUtils.isBlank(code)) {
+      return "";
+    }
+
+    String trimmed = code.trim();
+
+    // Always truncate for security, even if code is short
+    if (trimmed.length() <= length) {
+      return trimmed + "...";
+    }
+
+    return trimmed.substring(0, length) + "...";
+  }
+
+  /**
+   * Mask code for logging - shows type, length, line count, and preview
+   *
+   * @param code the code to mask
+   * @param codeType the type of code (e.g., "SQL", "Scala", "Python")
+   * @param maxPreviewLength maximum characters to preview
+   * @return masked code information
+   */
+  public static String maskCode(String code, String codeType, int maxPreviewLength) {
+    if (StringUtils.isBlank(code)) {
+      return "[empty " + codeType + " code]";
+    }
+    int length = code.length();
+    int lines = code.split("\n", -1).length;
+
+    if (maxPreviewLength <= 0) {
+      return String.format("[%s code, length: %d, lines: %d]", codeType, length, lines);
+    }
+
+    String preview = getPreview(code, maxPreviewLength);
+    return String.format(
+        "[%s code, length: %d, lines: %d, preview: %s]", codeType, length, lines, preview);
+  }
+
+  /**
+   * Get a safe preview of the code (truncated and cleaned)
+   *
+   * @param code the code to preview
+   * @param maxLength maximum length of preview
+   * @return safe preview string
+   */
+  public static String getPreview(String code, int maxLength) {
+    if (StringUtils.isBlank(code)) {
+      return "";
+    }
+
+    // Remove sensitive patterns (passwords, tokens, etc.)
+    String cleaned = removeSensitiveInfo(code);
+
+    // Truncate to max length
+    if (cleaned.length() <= maxLength) {
+      return cleaned;
+    }
+
+    return cleaned.substring(0, maxLength) + "...";
+  }
+
+  /**
+   * Remove sensitive information from code preview
+   *
+   * @param code the code to clean
+   * @return cleaned code
+   */
+  private static String removeSensitiveInfo(String code) {
+    // Remove common sensitive patterns
+    String cleaned = code;
+
+    // Remove password values
+    cleaned =
+        cleaned.replaceAll(
+            "(?i)(password|passwd|pwd)\\s*['\"]?\\s*[:=]\\s*['\"][^'\"]*['\"]", "$1='***'");
+    cleaned = cleaned.replaceAll("(?i)(password|passwd|pwd)\\s*[:=]\\s*[^\\s'\"]+", "$1=***");
+
+    // Remove token/key values
+    cleaned =
+        cleaned.replaceAll(
+            "(?i)(token|api[_-]?key|secret|access[_-]?key)\\s*['\"]?\\s*[:=]\\s*['\"][^'\"]*['\"]",
+            "$1='***'");
+    cleaned =
+        cleaned.replaceAll(
+            "(?i)(token|api[_-]?key|secret|access[_-]?key)\\s*[:=]\\s*[^\\s'\"]+", "$1=***");
+
+    // Remove connection strings (jdbc:, mysql:, postgres:, etc.)
+    cleaned =
+        cleaned.replaceAll("(?i)(jdbc:[^\\s'\"]+|mysql://[^\\s'\"]+|postgres://[^\\s'\"]+)", "***");
+
+    return cleaned;
+  }
+
+  /**
+   * Get only the first few lines of code (for preview)
+   *
+   * @param code the code to preview
+   * @param maxLines maximum lines to show
+   * @return preview string
+   */
+  public static String getLinePreview(String code, int maxLines) {
+    if (StringUtils.isBlank(code)) {
+      return "";
+    }
+
+    String[] lines = code.split("\n", -1);
+    StringBuilder preview = new StringBuilder();
+
+    for (int i = 0; i < Math.min(maxLines, lines.length); i++) {
+      if (i > 0) {
+        preview.append("\n");
+      }
+      preview.append(lines[i]);
+    }
+
+    if (lines.length > maxLines) {
+      preview.append("\n... (").append(lines.length - maxLines).append(" more lines)");
+    }
+
+    return preview.toString();
+  }
+
+  /**
+   * Get code type from file extension or code content
+   *
+   * @param code the code
+   * @param fileType file extension (e.g., ".sql", ".scala", ".py")
+   * @return detected code type
+   */
+  public static String detectCodeType(String code, String fileType) {
+    if (StringUtils.isNotBlank(fileType)) {
+      switch (fileType.toLowerCase()) {
+        case ".sql":
+          return "SQL";
+        case ".scala":
+          return "Scala";
+        case ".py":
+          return "Python";
+        case ".java":
+          return "Java";
+        case ".sh":
+        case ".bash":
+          return "Shell";
+        case "hql":
+          return "HiveQL";
+        default:
+          break;
+      }
+    }
+
+    // Try to detect from content
+    if (StringUtils.isBlank(code)) {
+      return "Unknown";
+    }
+
+    String trimmed = code.trim().toUpperCase();
+
+    if (trimmed.startsWith("SELECT")
+        || trimmed.startsWith("INSERT")
+        || trimmed.startsWith("UPDATE")
+        || trimmed.startsWith("DELETE")
+        || trimmed.startsWith("CREATE")
+        || trimmed.startsWith("ALTER")
+        || trimmed.startsWith("DROP")
+        || trimmed.startsWith("WITH")) {
+      return "SQL";
+    }
+
+    if (trimmed.contains("DEF ") || trimmed.contains("CLASS ") || trimmed.startsWith("IMPORT ")) {
+      if (code.contains("println") || code.contains("Array(")) {
+        return "Scala";
+      }
+      return "Java";
+    }
+
+    if (trimmed.startsWith("IMPORT ") || trimmed.contains("PRINT ") || trimmed.contains("DEF ")) {
+      return "Python";
+    }
+
+    return "Unknown";
+  }
+}

linkis-commons/linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/conf/HadoopConf.scala

@@ -76,8 +76,8 @@ object HadoopConf {
     CommonVars("wds.linkis.hadoop.hdfs.cache.max.time", new TimeType("12h")).getValue.toLong
 
   /**
-   * Temporary directory for keytab files when LINKIS_KEYTAB_SWITCH is enabled
-   * 默认使用系统临时目录下的 keytab 子目录
+   * Temporary directory for keytab files when LINKIS_KEYTAB_SWITCH is enabled 默认使用系统临时目录下的 keytab
+   * 子目录
    */
   val KEYTAB_TEMP_DIR = CommonVars("linkis.keytab.temp.dir", "/tmp/keytab")
 

linkis-commons/linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/utils/HDFSUtils.scala

@@ -23,7 +23,6 @@ import org.apache.linkis.hadoop.common.conf.HadoopConf
 import org.apache.linkis.hadoop.common.conf.HadoopConf._
 import org.apache.linkis.hadoop.common.entity.HDFSFileSystemContainer
 
-import com.google.common.cache.{CacheBuilder, LoadingCache, RemovalCause, RemovalListener, RemovalNotification}
 import org.apache.commons.io.IOUtils
 import org.apache.commons.lang3.StringUtils
 import org.apache.hadoop.conf.Configuration
@@ -40,6 +39,14 @@ import java.util.concurrent.atomic.AtomicLong
 
 import scala.collection.JavaConverters._
 
+import com.google.common.cache.{
+  CacheBuilder,
+  LoadingCache,
+  RemovalCause,
+  RemovalListener,
+  RemovalNotification
+}
+
 object HDFSUtils extends Logging {
 
   private val fileSystemCache: java.util.Map[String, HDFSFileSystemContainer] =
@@ -52,9 +59,9 @@ object HDFSUtils extends Logging {
         val key = notification.getKey
         val path = notification.getValue
         val cause = notification.getCause
-        
+
         logger.info(s"Keytab cache entry removed: $key, cause: $cause")
-        
+
         // 当缓存项被移除时，清理对应的临时文件
         if (path != null) {
           val file = new File(path)
@@ -69,7 +76,8 @@ object HDFSUtils extends Logging {
       }
     }
 
-    CacheBuilder.newBuilder()
+    CacheBuilder
+      .newBuilder()
       .maximumSize(1000) // 最大缓存项数量
       .expireAfterAccess(24, TimeUnit.HOURS) // 24小时未访问过期
       .removalListener(removalListener)
@@ -525,7 +533,10 @@ object HDFSUtils extends Logging {
           // 确保keytab临时目录存在
           if (!Files.exists(keytabTempDir)) {
             Files.createDirectories(keytabTempDir)
-            Files.setPosixFilePermissions(keytabTempDir, PosixFilePermissions.fromString("rwxr-xr-x"))
+            Files.setPosixFilePermissions(
+              keytabTempDir,
+              PosixFilePermissions.fromString("rwxr-xr-x")
+            )
           }
 
           val cachedPath = keytabTempFileCache.getIfPresent(cacheKey)