This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 2a52e4b2be1 Fix : fix the failed check in required check action
(#27454)
2a52e4b2be1 is described below
commit 2a52e4b2be1c03c3abee13c3de8338353ebf60a2
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Tue Jul 25 20:29:19 2023 +0800
Fix : fix the failed check in required check action (#27454)
* Fix : fix the failed check in required check action
* Add : add rule for export-metadata-configuration.data ignore
* Fix : fix the checkstyle issues
* Fix : fix the checkstyle issues
* Fix : fix the checkstyle issues
---
.github/workflows/required-check.yml | 4 ++--
.../context/segment/select/projection/util/ProjectionUtils.java | 2 +-
.../org/apache/shardingsphere/infra/binder/engine/SQLBindEngine.java | 1 +
.../java/org/apache/shardingsphere/single/route/SingleSQLRouter.java | 2 +-
.../compiler/converter/segment/from/impl/SimpleTableConverter.java | 2 +-
src/resources/rat.txt | 5 +++++
6 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/required-check.yml
b/.github/workflows/required-check.yml
index 06b9acaccdd..04cf7a5ff89 100644
--- a/.github/workflows/required-check.yml
+++ b/.github/workflows/required-check.yml
@@ -37,7 +37,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Run CheckStyle
- run: ./mvnw checkstyle:check -T1C
+ run: ./mvnw checkstyle:check -Dcheckstyle.skip=false -T1C
check-spotless:
name: Check - Spotless
@@ -55,4 +55,4 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Run Apache Rat
- run: ./mvnw apache-rat:check -T1C
+ run: ./mvnw apache-rat:check -Drat.skip=false -T1C
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/util/ProjectionUtils.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/util/ProjectionUtils.java
index 65fe7307aea..a23ece4f82c 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/util/ProjectionUtils.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/util/ProjectionUtils.java
@@ -43,7 +43,7 @@ public final class ProjectionUtils {
return getIdentifierValueByDatabaseType(alias, databaseType);
}
- private static String getIdentifierValueByDatabaseType(IdentifierValue
identifierValue, DatabaseType databaseType) {
+ private static String getIdentifierValueByDatabaseType(final
IdentifierValue identifierValue, final DatabaseType databaseType) {
if (QuoteCharacter.NONE != identifierValue.getQuoteCharacter()) {
return identifierValue.getValue();
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/SQLBindEngine.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/SQLBindEngine.java
index 6ad7394db05..f9827a698aa 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/SQLBindEngine.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/SQLBindEngine.java
@@ -42,6 +42,7 @@ public final class SQLBindEngine {
* Bind SQL statement with metadata.
*
* @param sqlStatement SQL statement
+ * @param params parameters
* @return SQL statement context
*/
public SQLStatementContext bind(final SQLStatement sqlStatement, final
List<Object> params) {
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
index 90302fc788a..afa316b5a5b 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
@@ -66,7 +66,7 @@ public final class SingleSQLRouter implements
SQLRouter<SingleRule> {
}
}
- private Collection<QualifiedTable> getSingleTables(ShardingSphereDatabase
database, SingleRule rule, RouteContext result, SQLStatementContext
sqlStatementContext) {
+ private Collection<QualifiedTable> getSingleTables(final
ShardingSphereDatabase database, final SingleRule rule, final RouteContext
result, final SQLStatementContext sqlStatementContext) {
Collection<QualifiedTable> qualifiedTables =
rule.getQualifiedTables(sqlStatementContext, database);
return result.getRouteUnits().isEmpty() &&
sqlStatementContext.getSqlStatement() instanceof CreateTableStatement ?
qualifiedTables : rule.getSingleTables(qualifiedTables);
}
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/from/impl/SimpleTableConverter.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/from/impl/SimpleTableConverter.java
index 8fc798cd352..f69079aae47 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/from/impl/SimpleTableConverter.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/from/impl/SimpleTableConverter.java
@@ -53,7 +53,7 @@ public final class SimpleTableConverter implements
SQLSegmentConverter<SimpleTab
return Optional.of(tableNameSQLNode);
}
- private void addOwnerNames(List<String> names, OwnerSegment owner) {
+ private void addOwnerNames(final List<String> names, final OwnerSegment
owner) {
if (null != owner) {
addOwnerNames(names, owner.getOwner().orElse(null));
names.add(owner.getIdentifier().getValue());
diff --git a/src/resources/rat.txt b/src/resources/rat.txt
index 1c9bc3ebd48..ccd80d2a8e3 100644
--- a/src/resources/rat.txt
+++ b/src/resources/rat.txt
@@ -58,3 +58,8 @@
**/.helmignore
**/_helpers.tpl
+
+# test files
+
+**/export-metadata-configuration.data
+
