You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/04/19 13:08:25 UTC
[shardingsphere] branch master updated: Fix UnusedFormalParameter rule for pmd (#25238)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 5625a50c7e5 Fix UnusedFormalParameter rule for pmd (#25238)
5625a50c7e5 is described below
commit 5625a50c7e51f026e0c1118c5dcddc323b34ea4d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Apr 19 21:08:13 2023 +0800
Fix UnusedFormalParameter rule for pmd (#25238)
---
.../mysql/ingest/client/netty/MySQLNegotiatePackageDecoder.java | 4 ++--
.../sqlfederation/executor/TranslatableTableScanExecutor.java | 8 ++++----
.../config/yaml/swapper/YamlProxyConfigurationSwapper.java | 5 ++---
.../jdbc/executor/callback/ProxyJDBCExecutorCallback.java | 9 +--------
.../backend/mysql/connector/sane/MySQLSaneQueryResultEngine.java | 4 ++--
5 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiatePackageDecoder.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiatePackageDecoder.java
index 7e0e63d5b33..ed4e6112ba7 100644
--- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiatePackageDecoder.java
+++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiatePackageDecoder.java
@@ -43,7 +43,7 @@ public final class MySQLNegotiatePackageDecoder extends ByteToMessageDecoder {
protected void decode(final ChannelHandlerContext ctx, final ByteBuf in, final List<Object> out) {
MySQLPacketPayload payload = new MySQLPacketPayload(in, ctx.channel().attr(CommonConstants.CHARSET_ATTRIBUTE_KEY).get());
if (handshakeReceived) {
- MySQLPacket responsePacket = decodeResponsePacket(payload, out);
+ MySQLPacket responsePacket = decodeResponsePacket(payload);
if (responsePacket instanceof MySQLOKPacket) {
ctx.channel().pipeline().remove(this);
}
@@ -58,7 +58,7 @@ public final class MySQLNegotiatePackageDecoder extends ByteToMessageDecoder {
return new MySQLHandshakePacket(payload);
}
- private MySQLPacket decodeResponsePacket(final MySQLPacketPayload payload, final List<Object> out) {
+ private MySQLPacket decodeResponsePacket(final MySQLPacketPayload payload) {
int header = payload.getByteBuf().getByte(0) & 0xff;
switch (header) {
case MySQLErrPacket.HEADER:
diff --git a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
index ee075ac60cd..15c0679839d 100644
--- a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
+++ b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
@@ -185,7 +185,7 @@ public final class TranslatableTableScanExecutor implements TableScanExecutor {
MergeEngine mergeEngine = new MergeEngine(database, executorContext.getProps(), new ConnectionContext());
MergedResult mergedResult = mergeEngine.merge(queryResults, queryContext.getSqlStatementContext());
Collection<Statement> statements = getStatements(executionGroupContext.getInputGroups());
- return createScalarEnumerable(mergedResult, queryResults.get(0).getMetaData(), statements);
+ return createScalarEnumerable(mergedResult, statements);
} catch (final SQLException ex) {
throw new SQLWrapperException(ex);
} finally {
@@ -193,9 +193,9 @@ public final class TranslatableTableScanExecutor implements TableScanExecutor {
}
}
- private AbstractEnumerable<Object> createScalarEnumerable(final MergedResult mergedResult, final QueryResultMetaData metaData, final Collection<Statement> statements) throws SQLException {
+ private AbstractEnumerable<Object> createScalarEnumerable(final MergedResult mergedResult, final Collection<Statement> statements) throws SQLException {
// TODO remove getRows when mergedResult support JDBC first method
- Collection<Object> rows = getScalarRows(mergedResult, metaData);
+ Collection<Object> rows = getScalarRows(mergedResult);
return new AbstractEnumerable<Object>() {
@Override
@@ -205,7 +205,7 @@ public final class TranslatableTableScanExecutor implements TableScanExecutor {
};
}
- private Collection<Object> getScalarRows(final MergedResult mergedResult, final QueryResultMetaData metaData) throws SQLException {
+ private Collection<Object> getScalarRows(final MergedResult mergedResult) throws SQLException {
Collection<Object> result = new LinkedList<>();
while (mergedResult.next()) {
Object currentRow = mergedResult.getValue(1, Object.class);
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
index b32a299f4c2..554d2cb646c 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
@@ -58,15 +58,14 @@ public final class YamlProxyConfigurationSwapper {
private Map<String, DatabaseConfiguration> swapDatabaseConfigurations(final YamlProxyConfiguration yamlConfig) {
Map<String, DatabaseConfiguration> result = new LinkedHashMap<>(yamlConfig.getDatabaseConfigurations().size(), 1);
for (Entry<String, YamlProxyDatabaseConfiguration> entry : yamlConfig.getDatabaseConfigurations().entrySet()) {
- Map<String, DataSourceConfiguration> databaseDataSourceConfigs =
- swapDataSourceConfigurations(entry.getValue().getDataSources(), entry.getValue().getDatabaseName());
+ Map<String, DataSourceConfiguration> databaseDataSourceConfigs = swapDataSourceConfigurations(entry.getValue().getDataSources());
Collection<RuleConfiguration> databaseRuleConfigs = ruleConfigSwapperEngine.swapToRuleConfigurations(entry.getValue().getRules());
result.put(entry.getKey(), new DataSourceGeneratedDatabaseConfiguration(databaseDataSourceConfigs, databaseRuleConfigs));
}
return result;
}
- private Map<String, DataSourceConfiguration> swapDataSourceConfigurations(final Map<String, YamlProxyDataSourceConfiguration> yamlConfigs, final String databaseName) {
+ private Map<String, DataSourceConfiguration> swapDataSourceConfigurations(final Map<String, YamlProxyDataSourceConfiguration> yamlConfigs) {
Map<String, DataSourceConfiguration> result = new LinkedHashMap<>(yamlConfigs.size(), 1);
for (Entry<String, YamlProxyDataSourceConfiguration> entry : yamlConfigs.entrySet()) {
result.put(entry.getKey(), dataSourceConfigSwapper.swap(entry.getValue()));
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
index f776efa9a74..13f5c2c6661 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
@@ -64,14 +64,7 @@ public abstract class ProxyJDBCExecutorCallback extends JDBCExecutorCallback<Exe
@Override
public ExecuteResult executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode, final DatabaseType storageType) throws SQLException {
- if (fetchMetaData && !hasMetaData) {
- hasMetaData = true;
- return executeSQL(sql, statement, connectionMode, true, storageType);
- }
- return executeSQL(sql, statement, connectionMode, false, storageType);
- }
-
- private ExecuteResult executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode, final boolean withMetaData, final DatabaseType storageType) throws SQLException {
+ hasMetaData = fetchMetaData && !hasMetaData;
databaseConnector.add(statement);
if (execute(sql, statement, isReturnGeneratedKeys)) {
ResultSet resultSet = statement.getResultSet();
diff --git a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLSaneQueryResultEngine.java b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLSaneQueryResultEngine.java
index bd653af97ff..0263e7674bc 100644
--- a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLSaneQueryResultEngine.java
+++ b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLSaneQueryResultEngine.java
@@ -55,7 +55,7 @@ public final class MySQLSaneQueryResultEngine implements SaneQueryResultEngine {
return createQueryResult((SelectStatement) sqlStatement);
}
if (sqlStatement instanceof MySQLShowOtherStatement) {
- return Optional.of(createQueryResult((MySQLShowOtherStatement) sqlStatement));
+ return Optional.of(createQueryResult());
}
if (sqlStatement instanceof MySQLSetStatement) {
return Optional.of(new UpdateResult(0, 0));
@@ -82,7 +82,7 @@ public final class MySQLSaneQueryResultEngine implements SaneQueryResultEngine {
: Optional.of(new RawMemoryQueryResult(new RawQueryResultMetaData(queryResultColumnMetaDataList), Collections.singletonList(new MemoryQueryResultDataRow(data))));
}
- private QueryResult createQueryResult(final MySQLShowOtherStatement sqlStatement) {
+ private QueryResult createQueryResult() {
RawQueryResultColumnMetaData queryResultColumnMetaData = createRawQueryResultColumnMetaData("", "");
MemoryQueryResultDataRow resultDataRow = new MemoryQueryResultDataRow(Collections.singletonList("1"));
return new RawMemoryQueryResult(new RawQueryResultMetaData(Collections.singletonList(queryResultColumnMetaData)), Collections.singletonList(resultDataRow));