From 5fa8838c7b08aae1d6d8ac1d690cbc692d7c1bdd Mon Sep 17 00:00:00 2001 From: v-kkhuang <420895376@qq.com> Date: Mon, 3 Aug 2026 10:23:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?#AI=20commit#=20=E6=B5=8B=E8=AF=95=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linkis/hadoop/common/utils/HDFSUtilsKeytabCacheTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linkis-commons/linkis-hadoop-common/src/test/scala/org/apache/linkis/hadoop/common/utils/HDFSUtilsKeytabCacheTest.scala b/linkis-commons/linkis-hadoop-common/src/test/scala/org/apache/linkis/hadoop/common/utils/HDFSUtilsKeytabCacheTest.scala index bcae60743d9..40e4dcf6a66 100644 --- a/linkis-commons/linkis-hadoop-common/src/test/scala/org/apache/linkis/hadoop/common/utils/HDFSUtilsKeytabCacheTest.scala +++ b/linkis-commons/linkis-hadoop-common/src/test/scala/org/apache/linkis/hadoop/common/utils/HDFSUtilsKeytabCacheTest.scala @@ -85,7 +85,7 @@ class HDFSUtilsKeytabCacheTest { @Test def testNullLabelDifferentFromDefaultLabel: Unit = { val method = getCreateKeytabCacheKeyMethod - // null label → "testuser", "default" label → "testuser#default", they are different + // null label → "testuser", "default" label → "testUser#default", they are different val key1 = method.invoke(HDFSUtils, "testuser", null).asInstanceOf[String] val key2 = method.invoke(HDFSUtils, "testuser", "default").asInstanceOf[String] Assertions.assertNotEquals(key1, key2) From 5fc61b11d38bc1e5feb5f4a72f71c93d892caa0f Mon Sep 17 00:00:00 2001 From: v-kkhuang <420895376@qq.com> Date: Mon, 3 Aug 2026 10:45:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?#AI=20commit#=20=E6=B5=8B=E8=AF=95=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/utils/CodeAndRunTypeUtilsTest.scala | 2 +- .../test/resources/junit-platform.properties | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtilsTest.scala b/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtilsTest.scala index 32ce3b37bd1..8e466d814a0 100644 --- a/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtilsTest.scala +++ b/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtilsTest.scala @@ -28,7 +28,7 @@ class CodeAndRunTypeUtilsTest { val codeTypeAndRunTypeRelationMap = CodeAndRunTypeUtils.getCodeTypeAndLanguageTypeRelationMap assertTrue(codeTypeAndRunTypeRelationMap.nonEmpty) assertTrue(codeTypeAndRunTypeRelationMap.keySet.contains("sql")) - assertEquals(3, codeTypeAndRunTypeRelationMap("python").size) + assertEquals(4, codeTypeAndRunTypeRelationMap("python").size) } @Test diff --git a/linkis-public-enhancements/linkis-configuration/src/test/resources/junit-platform.properties b/linkis-public-enhancements/linkis-configuration/src/test/resources/junit-platform.properties index 35e3cbc9750..8bba4f4568c 100644 --- a/linkis-public-enhancements/linkis-configuration/src/test/resources/junit-platform.properties +++ b/linkis-public-enhancements/linkis-configuration/src/test/resources/junit-platform.properties @@ -1,3 +1,20 @@ +/* +* 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. +*/ + # Cucumber JUnit Platform Engine Configuration # See: https://github.com/cucumber/cucumber-jvm/tree/main/cucumber-junit-platform-engine From 04d7c6a68fab45b06235119a19a2a8bc941d7cee Mon Sep 17 00:00:00 2001 From: v-kkhuang <420895376@qq.com> Date: Mon, 3 Aug 2026 11:10:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?#AI=20commit#=20=E4=BF=AE=E5=A4=8D=20GitHub?= =?UTF-8?q?=20Actions=20check=EF=BC=9A=E5=8D=87=E7=BA=A7=20cache@v2=20?= =?UTF-8?q?=E5=88=B0=20v4=EF=BC=8C=E4=BF=AE=E5=A4=8D=20pre-existing=20?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. build-frontend/codeql-analysis/publish-docker workflow 升级 actions/cache@v2 -> @v4 v2 已被 GitHub hard deprecate，使用该 action 的 workflow 会被强制失败 2. DateTypeUtilsTest 修正 2 个计算错误的期望值 - testWeekType_Subtract_7_Weeks: 20260406 减 7 周(49天) 应为 20260216（原期望 20251124 差约 3 个月） - testCustomWeekType_IsEnd_Preservation: 20260412 减 1 周应为 20260405（原期望 20260329 差 1 周） 3. SecurityUtilsTest.testRSA 在 @BeforeAll 注入随机生成的 RSA 密钥对 CI 环境默认 linkis.rsa.public/private.key 为空，导致 InvalidKeySpecException 本地验证 linkis-common 模块 39 个测试全通过。 --- .github/workflows/build-frontend.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/publish-docker.yaml | 2 +- .../org/apache/linkis/common/utils/SecurityUtilsTest.java | 4 ++++ .../apache/linkis/common/variable/DateTypeUtilsTest.scala | 5 +++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-frontend.yml b/.github/workflows/build-frontend.yml index a84a805d4bd..cda07514385 100644 --- a/.github/workflows/build-frontend.yml +++ b/.github/workflows/build-frontend.yml @@ -34,7 +34,7 @@ jobs: with: submodules: true - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f5be6ff8abf..1fee38ef063 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: java-version: 1.8 - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index c3b9b6e8256..126f95d4c03 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -41,7 +41,7 @@ jobs: distribution: 'adopt' java-version: 8 - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/linkis-commons/linkis-common/src/test/java/org/apache/linkis/common/utils/SecurityUtilsTest.java b/linkis-commons/linkis-common/src/test/java/org/apache/linkis/common/utils/SecurityUtilsTest.java index 6953b8835b9..0d6add40954 100644 --- a/linkis-commons/linkis-common/src/test/java/org/apache/linkis/common/utils/SecurityUtilsTest.java +++ b/linkis-commons/linkis-common/src/test/java/org/apache/linkis/common/utils/SecurityUtilsTest.java @@ -33,6 +33,10 @@ public class SecurityUtilsTest { @BeforeAll public static void init() { BDPConfiguration.set("linkis.mysql.strong.security.enable", "true"); + // Provide an in-memory generated RSA key pair so that RSAUtils.encryptWithLinkisPublicKey + // can work in CI environments where no key is configured by default. + BDPConfiguration.set("linkis.rsa.public.key", RSAUtils.getDefaultPublicKey()); + BDPConfiguration.set("linkis.rsa.private.key", RSAUtils.getDefaultPrivateKey()); } @Test diff --git a/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/variable/DateTypeUtilsTest.scala b/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/variable/DateTypeUtilsTest.scala index b076da0cf6c..35a85774544 100644 --- a/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/variable/DateTypeUtilsTest.scala +++ b/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/variable/DateTypeUtilsTest.scala @@ -210,7 +210,8 @@ class DateTypeUtilsTest { val result = weekType.calculator("-", "7") // Subtract 7 weeks val resultDate = dateFormat.parse(result) - val expected = dateFormat.parse("20251124") // 7 weeks before Monday = 2025-11-24 + val expected = + dateFormat.parse("20260216") // 7 weeks (49 days) before Monday 2026-04-06 = 2026-02-16 assertEquals(expected, resultDate) } @@ -378,7 +379,7 @@ class DateTypeUtilsTest { val weekEnd = new CustomWeekType("20260409", false, true) val endResult = weekEnd.-(1) val endResultDate = dateFormat.parse(endResult) - assertEquals("20260329", endResult) // Previous Sunday + assertEquals("20260405", endResult) // Previous Sunday = 2026-04-05 } } From 8cfeaf063459024eca6ede6e78aa00700c3e19ef Mon Sep 17 00:00:00 2001 From: v-kkhuang <420895376@qq.com> Date: Mon, 3 Aug 2026 11:31:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?#AI=20commit#=20=E4=BF=AE=E5=A4=8D=20build-?= =?UTF-8?q?frontend=20wnpm=20=E4=BE=9D=E8=B5=96=E4=B8=8E=20build-backend?= =?UTF-8?q?=20linkis-storage=20=E6=B5=8B=E8=AF=95=E6=9C=9F=E6=9C=9B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. build-frontend.yml: preinstall hook 调用 wnpm（Webank 内部 npm 包装器，公网 runner 不可用） 改用 npm install --ignore-scripts 跳过 lifecycle scripts，手动 npx npm-force-resolutions 应用 resolutions 字段（postcss 8.4.21） 2. LinkisStorageConfTest.collectMaxBytesDefault: 期望值 524288000(500m) -> 1073741824(1g) commit 107b21e85 把默认值从 500m 改回 1g，测试期望未同步更新 --- .github/workflows/build-frontend.yml | 7 ++++++- .../apache/linkis/storage/conf/LinkisStorageConfTest.scala | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-frontend.yml b/.github/workflows/build-frontend.yml index cda07514385..e97c92f30b9 100644 --- a/.github/workflows/build-frontend.yml +++ b/.github/workflows/build-frontend.yml @@ -49,5 +49,10 @@ jobs: - name: Build frontend by node.js run: | cd linkis-web - npm install + # preinstall hook references wnpm (internal Webank npm wrapper unavailable on + # public GitHub runners). Skip lifecycle scripts, then apply the resolutions + # field (postcss 8.4.21) manually via npm-force-resolutions. + npm install --ignore-scripts + npx --no-install npm-force-resolutions + npm install --ignore-scripts npm run build diff --git a/linkis-commons/linkis-storage/src/test/scala/org/apache/linkis/storage/conf/LinkisStorageConfTest.scala b/linkis-commons/linkis-storage/src/test/scala/org/apache/linkis/storage/conf/LinkisStorageConfTest.scala index 15c69e700a5..ec81201bfca 100644 --- a/linkis-commons/linkis-storage/src/test/scala/org/apache/linkis/storage/conf/LinkisStorageConfTest.scala +++ b/linkis-commons/linkis-storage/src/test/scala/org/apache/linkis/storage/conf/LinkisStorageConfTest.scala @@ -47,8 +47,8 @@ class LinkisStorageConfTest { @Test @DisplayName("collectMaxBytesDefault") def collectMaxBytesDefault(): Unit = { - // 500m = 500 * 1024 * 1024 = 524288000 bytes (DPMS 534053 OOM-fix collect limit) - Assertions.assertEquals(524288000L, LinkisStorageConf.COLLECT_MAX_BYTES) + // 1g = 1 * 1024 * 1024 * 1024 = 1073741824 bytes (default collect limit) + Assertions.assertEquals(1073741824L, LinkisStorageConf.COLLECT_MAX_BYTES) } } From c8437e0738462451568b25756b6d5d088602cc8c Mon Sep 17 00:00:00 2001 From: v-kkhuang <420895376@qq.com> Date: Mon, 3 Aug 2026 15:02:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?#AI=20commit#=20fix:=20=E6=8E=92=E9=99=A4?= =?UTF-8?q?=20zookeeper=20=E4=BC=A0=E9=80=92=E5=BC=95=E5=85=A5=E7=9A=84=20?= =?UTF-8?q?logback=EF=BC=8C=E4=BF=AE=E5=A4=8D=20Spring=20Boot=20=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=20ApplicationContext=20=E5=8A=A0=E8=BD=BD=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit zookeeper 3.8.6 传递引入了 logback-core/logback-classic，与 linkis-common 声明的 log4j-slf4j-impl(2.17.2) 冲突。Spring Boot 测试启动时检测到两者 共存即抛 IllegalArgumentException: LoggerFactory is not a Logback LoggerContext but Logback is on the classpath，导致所有 @SpringBootTest 测试（TaskDaoTest/VersionDaoTest/BmlProjectDaoTest 等）全部失败。 在父 pom 的 zookeeper 依赖声明上追加 logback 排除项，让所有模块统一 不再传递引入 logback，保持项目日志框架为 log4j2-slf4j-impl。 本地验证： - linkis-bml-server: 99 tests pass - linkis-jobhistory: all tests pass --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index 857bf01769e..870abbb297e 100644 --- a/pom.xml +++ b/pom.xml @@ -887,6 +887,20 @@ com.github.spotbugs spotbugs-annotations + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic +