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 0152e137333 Fixes code inspections on database module (#38761)
0152e137333 is described below
commit 0152e1373337801a150d80360e6069c5ec2eb078
Author: Liang Zhang <[email protected]>
AuthorDate: Sat May 30 20:37:03 2026 +0800
Fixes code inspections on database module (#38761)
---
.../option/sqlbatch/DialectSQLBatchOption.java | 2 +-
.../MySQLIdentifierCaseRuleProviderTest.java | 28 +++++++---------------
.../postgresql/exception/PostgreSQLException.java | 2 +-
.../type/blob/FirebirdBlobInfoReturnPacket.java | 2 --
.../packet/handshake/FirebirdAcceptPacket.java | 2 +-
.../packet/handshake/FirebirdConnectPacket.java | 2 +-
.../command/query/PostgreSQLNoDataPacket.java | 4 ++--
.../bind/PostgreSQLBindCompletePacket.java | 4 ++--
.../close/PostgreSQLCloseCompletePacket.java | 4 ++--
.../parse/PostgreSQLParseCompletePacket.java | 4 ++--
10 files changed, 20 insertions(+), 34 deletions(-)
diff --git
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/database/metadata/option/sqlbatch/DialectSQLBatchOption.java
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/database/metadata/option/sqlbatch/DialectSQLBatchOption.java
index a3c90f7d267..2e707c6cd3b 100644
---
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/database/metadata/option/sqlbatch/DialectSQLBatchOption.java
+++
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/database/metadata/option/sqlbatch/DialectSQLBatchOption.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Dialect sql batch option.
+ * Dialect SQL batch option.
*/
@RequiredArgsConstructor
@Getter
diff --git
a/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/metadata/identifier/MySQLIdentifierCaseRuleProviderTest.java
b/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/metadata/identifier/MySQLIdentifierCaseRuleProviderTest.java
index 5d34ac71214..c78ba0ed4af 100644
---
a/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/metadata/identifier/MySQLIdentifierCaseRuleProviderTest.java
+++
b/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/metadata/identifier/MySQLIdentifierCaseRuleProviderTest.java
@@ -71,7 +71,7 @@ class MySQLIdentifierCaseRuleProviderTest {
@Test
void assertProvideWithQuotedTableName() throws SQLException {
- IdentifierCaseRule actual = provider.provide(new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, mockDataSource(true, 1)))
+ IdentifierCaseRule actual = provider.provide(new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, new FixtureDataSource(true,
1)))
.map(ruleSet ->
ruleSet.getRule(IdentifierScope.TABLE)).orElseThrow(AssertionError::new);
assertThat(actual.getLookupMode(QuoteCharacter.BACK_QUOTE),
is(LookupMode.NORMALIZED));
assertThat(actual.matches("t_mask", "T_MASK",
QuoteCharacter.BACK_QUOTE), is(Boolean.TRUE));
@@ -96,20 +96,20 @@ class MySQLIdentifierCaseRuleProviderTest {
private static Stream<Arguments> provideArguments() throws SQLException {
return Stream.of(
Arguments.of("null_data_source", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, null), null, null, null),
- Arguments.of("null_connection", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE,
mockNullConnectionDataSource()), null, null, null),
- Arguments.of("lower_case_table_names_0", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, mockDataSource(true, 0)),
+ Arguments.of("null_connection", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, new
NullConnectionFixtureDataSource()), null, null, null),
+ Arguments.of("lower_case_table_names_0", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, new FixtureDataSource(true,
0)),
LookupMode.EXACT, LookupMode.EXACT, Boolean.FALSE),
- Arguments.of("lower_case_table_names_1", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, mockDataSource(true, 1)),
+ Arguments.of("lower_case_table_names_1", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, new FixtureDataSource(true,
1)),
LookupMode.NORMALIZED, LookupMode.NORMALIZED,
Boolean.TRUE),
- Arguments.of("lower_case_table_names_2", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, mockDataSource(true, 2)),
+ Arguments.of("lower_case_table_names_2", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, new FixtureDataSource(true,
2)),
LookupMode.NORMALIZED, LookupMode.NORMALIZED,
Boolean.TRUE),
- Arguments.of("no_result_row", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, mockDataSource(false, 0)),
null, null, null),
- Arguments.of("sql_exception", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, mockFailingDataSource()),
null, null, null));
+ Arguments.of("no_result_row", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, new FixtureDataSource(false,
0)), null, null, null),
+ Arguments.of("sql_exception", new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, new
FailingFixtureDataSource()), null, null, null));
}
@Test
void assertProvideWithLowerCaseTableNamesZeroUsesScopedRules() throws
SQLException {
- IdentifierCaseRuleProviderContext context = new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, mockDataSource(true, 0));
+ IdentifierCaseRuleProviderContext context = new
IdentifierCaseRuleProviderContext(DATABASE_TYPE, new FixtureDataSource(true,
0));
IdentifierCaseRuleSet actual =
provider.provide(context).orElseThrow(AssertionError::new);
assertThat(actual.getRule(IdentifierScope.SCHEMA).matches("foo_schema",
"FOO_SCHEMA", QuoteCharacter.NONE), is(Boolean.TRUE));
assertThat(actual.getRule(IdentifierScope.TABLE).matches("foo_tbl",
"FOO_TBL", QuoteCharacter.NONE), is(Boolean.FALSE));
@@ -118,18 +118,6 @@ class MySQLIdentifierCaseRuleProviderTest {
assertThat(actual.getRule(IdentifierScope.INDEX).matches("foo_idx",
"FOO_IDX", QuoteCharacter.NONE), is(Boolean.TRUE));
}
- private static DataSource mockDataSource(final boolean hasResultSetRow,
final int lowerCaseTableNames) throws SQLException {
- return new FixtureDataSource(hasResultSetRow, lowerCaseTableNames);
- }
-
- private static DataSource mockFailingDataSource() throws SQLException {
- return new FailingFixtureDataSource();
- }
-
- private static DataSource mockNullConnectionDataSource() {
- return new NullConnectionFixtureDataSource();
- }
-
private static Object getDefaultValue(final Class<?> returnType) {
if (!returnType.isPrimitive()) {
return null;
diff --git
a/database/exception/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/exception/postgresql/exception/PostgreSQLException.java
b/database/exception/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/exception/postgresql/exception/PostgreSQLException.java
index 1118c2b7ec4..f5b490bf394 100644
---
a/database/exception/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/exception/postgresql/exception/PostgreSQLException.java
+++
b/database/exception/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/exception/postgresql/exception/PostgreSQLException.java
@@ -25,7 +25,7 @@ import java.sql.SQLException;
import java.text.MessageFormat;
/**
- * Replacement for {@link org.postgresql.util.PSQLException}.
+ * PostgreSQL exception.
*/
@Getter
public final class PostgreSQLException extends SQLException {
diff --git
a/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/info/type/blob/FirebirdBlobInfoReturnPacket.java
b/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/info/type/blob/FirebirdBlobInfoReturnPacket.java
index 2ac4e20c5c4..d0ef68b711e 100644
---
a/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/info/type/blob/FirebirdBlobInfoReturnPacket.java
+++
b/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/info/type/blob/FirebirdBlobInfoReturnPacket.java
@@ -56,8 +56,6 @@ public final class FirebirdBlobInfoReturnPacket extends
FirebirdPacket {
writeIntValue(payload, type, getSegmentCount());
return;
case MAX_SEGMENT:
- writeIntValue(payload, type, getSegmentLength());
- return;
case TOTAL_LENGTH:
writeIntValue(payload, type, getSegmentLength());
return;
diff --git
a/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/handshake/FirebirdAcceptPacket.java
b/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/handshake/FirebirdAcceptPacket.java
index 64d73b36a2f..b50ab5755cb 100644
---
a/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/handshake/FirebirdAcceptPacket.java
+++
b/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/handshake/FirebirdAcceptPacket.java
@@ -60,7 +60,7 @@ public final class FirebirdAcceptPacket extends
FirebirdPacket {
}
/**
- * Set accept data packet.
+ * Set accepted data packet.
*
* @param salt salt value
* @param publicKey public key
diff --git
a/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/handshake/FirebirdConnectPacket.java
b/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/handshake/FirebirdConnectPacket.java
index 509460c79fa..dcdf5d40eed 100644
---
a/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/handshake/FirebirdConnectPacket.java
+++
b/database/protocol/dialect/firebird/src/main/java/org/apache/shardingsphere/database/protocol/firebird/packet/handshake/FirebirdConnectPacket.java
@@ -72,7 +72,7 @@ public final class FirebirdConnectPacket extends
FirebirdPacket {
int length = userInfo.readUnsignedByte();
ByteBuf data = userInfo.readSlice(length);
if (type == FirebirdUserDataType.CNCT_SPECIFIC_DATA) {
- // specific data can be split into chunks and (i think) can be
in payload in random order
+ // specific data can be split into chunks and (I think) can be
in payload in random order
int step = data.readUnsignedByte();
pendingData.put(step,
data.toString(StandardCharsets.US_ASCII));
} else {
diff --git
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/PostgreSQLNoDataPacket.java
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/PostgreSQLNoDataPacket.java
index d52ca3dba73..6db509906d9 100644
---
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/PostgreSQLNoDataPacket.java
+++
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/PostgreSQLNoDataPacket.java
@@ -34,9 +34,9 @@ public final class PostgreSQLNoDataPacket extends
PostgreSQLPacket {
private static final PostgreSQLNoDataPacket INSTANCE = new
PostgreSQLNoDataPacket();
/**
- * Get instance of {@link PostgreSQLNoDataPacket}.
+ * Get instance of PostgreSQL no data packet.
*
- * @return instance of {@link PostgreSQLNoDataPacket}
+ * @return got instance
*/
public static PostgreSQLNoDataPacket getInstance() {
return INSTANCE;
diff --git
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLBindCompletePacket.java
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLBindCompletePacket.java
index 1f2ac05fb97..b08934c842d 100644
---
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLBindCompletePacket.java
+++
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLBindCompletePacket.java
@@ -34,9 +34,9 @@ public final class PostgreSQLBindCompletePacket extends
PostgreSQLPacket {
private static final PostgreSQLBindCompletePacket INSTANCE = new
PostgreSQLBindCompletePacket();
/**
- * Get instance of {@link PostgreSQLBindCompletePacket}.
+ * Get instance of PostgreSQL bind complete packet.
*
- * @return instance of {@link PostgreSQLBindCompletePacket}
+ * @return got instance
*/
public static PostgreSQLBindCompletePacket getInstance() {
return INSTANCE;
diff --git
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/close/PostgreSQLCloseCompletePacket.java
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/close/PostgreSQLCloseCompletePacket.java
index 3b36a48baf2..64b77ad4241 100644
---
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/close/PostgreSQLCloseCompletePacket.java
+++
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/close/PostgreSQLCloseCompletePacket.java
@@ -31,9 +31,9 @@ public final class PostgreSQLCloseCompletePacket extends
PostgreSQLPacket {
private static final PostgreSQLCloseCompletePacket INSTANCE = new
PostgreSQLCloseCompletePacket();
/**
- * Get instance of {@link PostgreSQLCloseCompletePacket}.
+ * Get instance of PostgreSQL close complete packet.
*
- * @return instance of {@link PostgreSQLCloseCompletePacket}
+ * @return got instance
*/
public static PostgreSQLCloseCompletePacket getInstance() {
return INSTANCE;
diff --git
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/parse/PostgreSQLParseCompletePacket.java
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/parse/PostgreSQLParseCompletePacket.java
index 0c2c1c99146..57bf39ba749 100644
---
a/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/parse/PostgreSQLParseCompletePacket.java
+++
b/database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/parse/PostgreSQLParseCompletePacket.java
@@ -34,9 +34,9 @@ public final class PostgreSQLParseCompletePacket extends
PostgreSQLPacket {
private static final PostgreSQLParseCompletePacket INSTANCE = new
PostgreSQLParseCompletePacket();
/**
- * Get instance of {@link PostgreSQLParseCompletePacket}.
+ * Get instance of PostgreSQL parse complete packet.
*
- * @return instance of {@link PostgreSQLParseCompletePacket}
+ * @return got instance
*/
public static PostgreSQLParseCompletePacket getInstance() {
return INSTANCE;
