You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2026/09/04 09:55:49 UTC
(shardingsphere) branch master updated: Remove redundant coding standards guidance (#39725)
This is an automated email from the ASF dual-hosted git repository.
terrymanu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 5442b5da131 Remove redundant coding standards guidance (#39725)
5442b5da131 is described below
commit 5442b5da13178bf64f2b956ba37f35dc3199793f
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Sep 4 17:55:42 2026 +0800
Remove redundant coding standards guidance (#39725)
* Bump org.postgresql:postgresql from 42.7.8 to 42.7.13
Fixes CVE-2026-42198 (GHSA-98qh-xjc8-98pq, Dependabot alert #127) and
CVE-2026-54291 (GHSA-j92g-9f8w-j867, Dependabot alert #129).
* Bump org.postgresql:postgresql from 42.7.8 to 42.7.13
Fixes CVE-2026-42198 (GHSA-98qh-xjc8-98pq, Dependabot alert #127) and
CVE-2026-54291 (GHSA-j92g-9f8w-j867, Dependabot alert #129).
* Remove redundant coding standards guidance
---
.codex/harness/agents/cases.toml | 3 ++-
CODE_OF_CONDUCT.md | 1 -
RELEASE-NOTES.md | 1 +
.../oracle/metadata/database/option/OracleFunctionOption.java | 3 ++-
docs/community/content/involved/conduct/code.cn.md | 4 +---
docs/community/content/involved/conduct/code.en.md | 2 --
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/.codex/harness/agents/cases.toml b/.codex/harness/agents/cases.toml
index 6de22581160..82cffd29330 100644
--- a/.codex/harness/agents/cases.toml
+++ b/.codex/harness/agents/cases.toml
@@ -977,7 +977,8 @@ forbidden_actions = ["edit_code", "edit_non_code", "mutate_git", "mutate_remote"
required_reasons = ["documentation_wording_required"]
response_style = "concise"
max_summary_chars = 100
-required_summary_terms = ["## YAML", "schema", "reject", "unknown"]
+required_summary_terms = ["## YAML", "schema", "reject"]
+required_summary_term_groups = [["unknown", "not defined"]]
forbidden_summary_terms = ["###", "|", "**Summary:**"]
critical = true
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 952cad100f1..1579429aad9 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -14,7 +14,6 @@ The following code of conduct is based on full compliance with the [Apache Softw
## Code Submission Guidelines
-- Ensure compliance with coding standards.
- Ensure all steps in the build process complete successfully, including: Apache license header check, Checkstyle check, compilation, unit tests, etc. Build process command: `./mvnw clean install -B -T1C -Pcheck`.
- Unify code style through Spotless, execute `./mvnw spotless:apply -Pcheck` to format code.
- Ensure coverage is not lower than the master branch, except for simple `getter /setter` methods, unit tests need full coverage.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 9e7da1b330c..bb2d0cf90b5 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -13,6 +13,7 @@
### CVE
1. Fix CVE-2026-42198, CVE-2026-54291 [#39724](https://github.com/apache/shardingsphere/pull/39724)
+1. Fix CVE-2026-55856, CVE-2026-55857, CVE-2026-55858 [#39628](https://github.com/apache/shardingsphere/pull/39628)
### Bug Fixes
diff --git a/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleFunctionOption.java b/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleFunctionOption.java
index 849df6772b1..da3f57b4c49 100644
--- a/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleFunctionOption.java
+++ b/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleFunctionOption.java
@@ -22,6 +22,7 @@ import org.apache.shardingsphere.database.connector.core.metadata.database.metad
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
/**
* Oracle function option.
@@ -32,7 +33,7 @@ public final class OracleFunctionOption implements DialectFunctionOption {
"CONNECT_BY_ISCYCLE", "CONNECT_BY_ISLEAF", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURRVAL", "DBTIMEZONE", "DEFAULT", "LEVEL", "LOCALTIME",
"LOCALTIMESTAMP", "NEXTVAL", "ORA_ROWSCN", "ROWID", "ROWNUM", "SESSIONTIMEZONE", "SESSION_USER", "SYSDATE", "SYSTIMESTAMP", "UID", "USER"));
- private static final Collection<String> UNPARENTHESIZED_QUALIFIED_FUNCTION_NAMES = new CaseInsensitiveSet<>(Arrays.asList("DBMS_RANDOM.VALUE"));
+ private static final Collection<String> UNPARENTHESIZED_QUALIFIED_FUNCTION_NAMES = new CaseInsensitiveSet<>(Collections.singletonList("DBMS_RANDOM.VALUE"));
@Override
public Collection<String> getUnparenthesizedFunctionNames() {
diff --git a/docs/community/content/involved/conduct/code.cn.md b/docs/community/content/involved/conduct/code.cn.md
index 7569a6fd0f3..672f0dd5cc6 100644
--- a/docs/community/content/involved/conduct/code.cn.md
+++ b/docs/community/content/involved/conduct/code.cn.md
@@ -18,7 +18,6 @@ chapter = true
## 代码提交行为规范
- - 确保遵守编码规范。
- 确保构建流程中的各个步骤都成功完成,包括:Apache 协议文件头检查、Checkstyle 检查、编译、单元测试等。构建流程启动命令:`./mvnw clean install -B -T1C -Pcheck`。
- 通过 Spotless 统一代码风格,执行 `./mvnw spotless:apply -Pcheck` 格式化代码。
- 确保覆盖率不低于 master 分支,除去简单的 `getter /setter` 方法,单元测试需全覆盖。
@@ -103,8 +102,7 @@ chapter = true
- 测试修改静态状态时,必须在每个测试结束后恢复其原始状态。
- 默认通过项目加载器获取 SPI 实现。 如果被测类实现了 `TypedSPI` 或 `DatabaseTypedSPI`,应通过 `TypedSPILoader` 或 `DatabaseTypedSPILoader` 实例化,禁止使用 `new`。
- 每个单元测试类必须直接测试一个对应的生产类,测试类必须使用生产类的准确简单类名并命名为 `<ProductionClassName>Test`。 该测试类命名规则为强制要求,与面向场景的测试方法命名规则相互独立。
- - 当某个生产方法只由一个测试用例覆盖时,测试方法命名为 `assert<MethodName>`,无额外后缀。
- - 每个公有方法使用一个独立的测试方法,测试方法顺序在可行时与生产方法保持一致。
+ - 当某个生产方法只由一个测试用例覆盖时,测试方法命名为 `assert<MethodName>`,无额外后缀;应优先使用独立测试方法覆盖单个公开的生产方法;可行时,测试方法顺序与对应的生产方法保持一致。
- 参数化测试需通过参数提供显示名,并使用 `"{0}"` 作为展示名模板。
- 测试名称应简洁并聚焦场景;避免使用 `ReturnsXXX`,也不要使用仅复述预期结果而未说明场景的措辞。
- 断言必须直接表达被测契约。 仅当被测契约是不相等或包含指定子串时,才可使用 `not` 或 `containsString`;可断言完整值或使用更具体的 matcher 时,不得使用这两个 matcher。
diff --git a/docs/community/content/involved/conduct/code.en.md b/docs/community/content/involved/conduct/code.en.md
index d0b150c48f0..82ecba5f7cd 100644
--- a/docs/community/content/involved/conduct/code.en.md
+++ b/docs/community/content/involved/conduct/code.en.md
@@ -18,7 +18,6 @@ The following code of conduct is based on full compliance with the [Apache Softw
## Code Submission Guidelines
-- Ensure compliance with coding standards.
- Ensure all steps in the build process complete successfully, including: Apache license header check, Checkstyle check, compilation, unit tests, etc. Build process command: `./mvnw clean install -B -T1C -Pcheck`.
- Unify code style through Spotless, execute `./mvnw spotless:apply -Pcheck` to format code.
- Ensure coverage is not lower than the master branch, except for simple `getter /setter` methods, unit tests need full coverage.
@@ -103,7 +102,6 @@ The following code of conduct is based on full compliance with the [Apache Softw
- Tests that modify static state must restore the original state after each test.
- Obtain SPI implementations through the project loader by default. If the class under test implements `TypedSPI` or `DatabaseTypedSPI`, instantiate it through `TypedSPILoader` or `DatabaseTypedSPILoader`, not with `new`.
- Every unit-test class must directly test a corresponding production class and be named `<ProductionClassName>Test`, using the exact simple name of the production class. This class-name rule is mandatory and is independent of scenario-focused test-method naming.
-- Except for simple `getter /setter` methods, unit tests need full coverage.
- When a production method is covered by only one test case, name that test method `assert<MethodName>` without extra suffixes, and prefer isolating one public production method per dedicated test method; when practical, keep test method ordering aligned with the corresponding production methods.
- For parameterized tests, provide display names via parameters and use `"{0}"` as the display-name template.
- Keep test names concise and scenario-focused; avoid `ReturnsXXX` and wording that restates the expected result instead of naming the scenario.