This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 81837b76b1a Rename each to entry for map.entrySet in for each
statement (#22128)
81837b76b1a is described below
commit 81837b76b1a95064cc6338e7fbe71515327377c8
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Nov 12 23:41:51 2022 +0800
Rename each to entry for map.entrySet in for each statement (#22128)
---
.../command/generic/OpenGaussErrorResponsePacket.java | 6 +++---
.../packet/generic/PostgreSQLErrorResponsePacket.java | 6 +++---
.../merge/dal/show/ShowCreateTableMergedResult.java | 10 +++++-----
.../query/UnusedShardingAlgorithmsQueryResultSet.java | 6 +++---
.../query/UnusedShardingAuditorsQueryResultSet.java | 6 +++---
.../query/UnusedShardingKeyGeneratorsQueryResultSet.java | 6 +++---
.../loader/StandardPipelineTableMetaDataLoader.java | 6 +++---
.../postgresql/ddlgenerator/PostgresIndexSQLGenerator.java | 14 +++++++-------
.../mode/metadata/persist/MetaDataPersistService.java | 4 ++--
.../backend/session/RequiredSessionVariableRecorder.java | 5 ++---
10 files changed, 34 insertions(+), 35 deletions(-)
diff --git
a/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/packet/command/generic/OpenGaussErrorResponsePacket.java
b/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/packet/command/generic/OpenGaussErrorResponsePacket.java
index d72e1b929c8..b4eb2ff73d6 100644
---
a/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/packet/command/generic/OpenGaussErrorResponsePacket.java
+++
b/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/packet/command/generic/OpenGaussErrorResponsePacket.java
@@ -122,9 +122,9 @@ public final class OpenGaussErrorResponsePacket implements
PostgreSQLIdentifierP
@Override
public void write(final PostgreSQLPacketPayload payload) {
- for (Entry<Character, String> each : fields.entrySet()) {
- payload.writeInt1(each.getKey());
- payload.writeStringNul(each.getValue());
+ for (Entry<Character, String> entry : fields.entrySet()) {
+ payload.writeInt1(entry.getKey());
+ payload.writeStringNul(entry.getValue());
}
payload.writeInt1(0);
}
diff --git
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/generic/PostgreSQLErrorResponsePacket.java
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/generic/PostgreSQLErrorResponsePacket.java
index 34b026883a2..5d865cffa1a 100644
---
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/generic/PostgreSQLErrorResponsePacket.java
+++
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/generic/PostgreSQLErrorResponsePacket.java
@@ -90,9 +90,9 @@ public final class PostgreSQLErrorResponsePacket implements
PostgreSQLIdentifier
@Override
public void write(final PostgreSQLPacketPayload payload) {
- for (Entry<Character, String> each : fields.entrySet()) {
- payload.writeInt1(each.getKey());
- payload.writeStringNul(each.getValue());
+ for (Entry<Character, String> entry : fields.entrySet()) {
+ payload.writeInt1(entry.getKey());
+ payload.writeStringNul(entry.getValue());
}
payload.writeInt1(0);
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
index 4eda032d4d0..909eb487a58 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
@@ -51,15 +51,15 @@ public final class ShowCreateTableMergedResult extends
LogicTablesMergedResult {
String actualIndexName =
IndexMetaDataUtil.getActualIndexName(each, actualTableName);
memoryResultSetRow.setCell(2,
memoryResultSetRow.getCell(2).toString().replace(actualIndexName, each));
}
- for (Entry<String, ShardingSphereConstraint> each :
table.getConstrains().entrySet()) {
- String actualIndexName =
IndexMetaDataUtil.getActualIndexName(each.getKey(), actualTableName);
- memoryResultSetRow.setCell(2,
memoryResultSetRow.getCell(2).toString().replace(actualIndexName,
each.getKey()));
- Optional<TableRule> tableRule =
shardingRule.findTableRule(each.getValue().getReferencedTableName());
+ for (Entry<String, ShardingSphereConstraint> entry :
table.getConstrains().entrySet()) {
+ String actualIndexName =
IndexMetaDataUtil.getActualIndexName(entry.getKey(), actualTableName);
+ memoryResultSetRow.setCell(2,
memoryResultSetRow.getCell(2).toString().replace(actualIndexName,
entry.getKey()));
+ Optional<TableRule> tableRule =
shardingRule.findTableRule(entry.getValue().getReferencedTableName());
if (!tableRule.isPresent()) {
continue;
}
for (DataNode dataNode : tableRule.get().getActualDataNodes()) {
- memoryResultSetRow.setCell(2,
memoryResultSetRow.getCell(2).toString().replace(dataNode.getTableName(),
each.getValue().getReferencedTableName()));
+ memoryResultSetRow.setCell(2,
memoryResultSetRow.getCell(2).toString().replace(dataNode.getTableName(),
entry.getValue().getReferencedTableName()));
}
}
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
index 2143c819a40..c73c3aaf8a2 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAlgorithmsQueryResultSet.java
@@ -57,9 +57,9 @@ public final class UnusedShardingAlgorithmsQueryResultSet
implements DatabaseDis
private void getUnusedShardingAlgorithms(final ShardingRuleConfiguration
shardingRuleConfig) {
Collection<String> inUsedAlgorithms =
getUsedShardingAlgorithms(shardingRuleConfig);
Map<String, AlgorithmConfiguration> map = new HashMap<>();
- for (Entry<String, AlgorithmConfiguration> each :
shardingRuleConfig.getShardingAlgorithms().entrySet()) {
- if (!inUsedAlgorithms.contains(each.getKey())) {
- map.put(each.getKey(), each.getValue());
+ for (Entry<String, AlgorithmConfiguration> entry :
shardingRuleConfig.getShardingAlgorithms().entrySet()) {
+ if (!inUsedAlgorithms.contains(entry.getKey())) {
+ map.put(entry.getKey(), entry.getValue());
}
}
data = map.entrySet().iterator();
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAuditorsQueryResultSet.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAuditorsQueryResultSet.java
index 31137315447..42b7efc74e6 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAuditorsQueryResultSet.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingAuditorsQueryResultSet.java
@@ -54,9 +54,9 @@ public final class UnusedShardingAuditorsQueryResultSet
implements DatabaseDistS
private void getUnusedAuditors(final ShardingRuleConfiguration
shardingRuleConfig) {
Collection<String> inUsedAuditors =
getUsedAuditors(shardingRuleConfig);
Map<String, AlgorithmConfiguration> map = new HashMap<>();
- for (Entry<String, AlgorithmConfiguration> each :
shardingRuleConfig.getAuditors().entrySet()) {
- if (!inUsedAuditors.contains(each.getKey())) {
- map.put(each.getKey(), each.getValue());
+ for (Entry<String, AlgorithmConfiguration> entry :
shardingRuleConfig.getAuditors().entrySet()) {
+ if (!inUsedAuditors.contains(entry.getKey())) {
+ map.put(entry.getKey(), entry.getValue());
}
}
data = map.entrySet().iterator();
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorsQueryResultSet.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorsQueryResultSet.java
index bdb072cd379..c06c9fbd453 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorsQueryResultSet.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorsQueryResultSet.java
@@ -57,9 +57,9 @@ public final class UnusedShardingKeyGeneratorsQueryResultSet
implements Database
private void getUnusedKeyGenerators(final ShardingRuleConfiguration
shardingRuleConfig) {
Collection<String> inUsedKeyGenerators =
getUsedKeyGenerators(shardingRuleConfig);
Map<String, AlgorithmConfiguration> map = new HashMap<>();
- for (Entry<String, AlgorithmConfiguration> each :
shardingRuleConfig.getKeyGenerators().entrySet()) {
- if (!inUsedKeyGenerators.contains(each.getKey())) {
- map.put(each.getKey(), each.getValue());
+ for (Entry<String, AlgorithmConfiguration> entry :
shardingRuleConfig.getKeyGenerators().entrySet()) {
+ if (!inUsedKeyGenerators.contains(entry.getKey())) {
+ map.put(entry.getKey(), entry.getValue());
}
}
data = map.entrySet().iterator();
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoader.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoader.java
index 851fb190821..4c0b9c12555 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoader.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/loader/StandardPipelineTableMetaDataLoader.java
@@ -135,9 +135,9 @@ public final class StandardPipelineTableMetaDataLoader
implements PipelineTableM
}
}
Map<String, Collection<String>> result = new LinkedHashMap<>();
- for (Entry<String, SortedMap<Short, String>> each :
orderedColumnsOfIndexes.entrySet()) {
- Collection<String> columnNames =
result.computeIfAbsent(each.getKey(), unused -> new LinkedList<>());
- columnNames.addAll(each.getValue().values());
+ for (Entry<String, SortedMap<Short, String>> entry :
orderedColumnsOfIndexes.entrySet()) {
+ Collection<String> columnNames =
result.computeIfAbsent(entry.getKey(), unused -> new LinkedList<>());
+ columnNames.addAll(entry.getValue().values());
}
return result;
}
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresIndexSQLGenerator.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresIndexSQLGenerator.java
index f3669f75781..2399b2852e6 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresIndexSQLGenerator.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresIndexSQLGenerator.java
@@ -142,16 +142,16 @@ public final class PostgresIndexSQLGenerator extends
AbstractPostgresDDLAdapter
return executeByTemplate(param,
"component/indexes/%s/column_details.ftl");
}
- private String getColumnPropertyDisplayData(final Map<String, Object>
each, final Map<String, Object> indexData) throws SQLException {
- String result = (String) each.get("attdef");
- if (null != each.get("collnspname")) {
- result += " COLLATE " + each.get("collnspname");
+ private String getColumnPropertyDisplayData(final Map<String, Object>
columnDetail, final Map<String, Object> indexData) throws SQLException {
+ String result = (String) columnDetail.get("attdef");
+ if (null != columnDetail.get("collnspname")) {
+ result += " COLLATE " + columnDetail.get("collnspname");
}
- if (null != each.get("opcname")) {
- result += " " + each.get("opcname");
+ if (null != columnDetail.get("opcname")) {
+ result += " " + columnDetail.get("opcname");
}
if ("btree".equals(indexData.get("amname"))) {
- String[] options = (String[]) ((PgArray)
each.get("options")).getArray();
+ String[] options = (String[]) ((PgArray)
columnDetail.get("options")).getArray();
if (options.length > 0) {
result += " " + options[0];
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
index 1c67436e50b..87fae7bef6a 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
@@ -99,8 +99,8 @@ public final class MetaDataPersistService {
private Map<String, DataSourceProperties> getDataSourcePropertiesMap(final
Map<String, DataSource> dataSourceMap) {
Map<String, DataSourceProperties> result = new
LinkedHashMap<>(dataSourceMap.size(), 1);
- for (Entry<String, DataSource> each : dataSourceMap.entrySet()) {
- result.put(each.getKey(),
DataSourcePropertiesCreator.create(each.getValue()));
+ for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
+ result.put(entry.getKey(),
DataSourcePropertiesCreator.create(entry.getValue()));
}
return result;
}
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/RequiredSessionVariableRecorder.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/RequiredSessionVariableRecorder.java
index 8259f73fc93..d56cba98137 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/RequiredSessionVariableRecorder.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/RequiredSessionVariableRecorder.java
@@ -76,9 +76,8 @@ public final class RequiredSessionVariableRecorder {
private String aggregateToMySQLSetSQL() {
StringJoiner result = new StringJoiner(",", "SET ", "");
- for (Entry<String, String> stringStringEntry :
sessionVariables.entrySet()) {
- String s = stringStringEntry.getKey() + "=" +
stringStringEntry.getValue();
- result.add(s);
+ for (Entry<String, String> entry : sessionVariables.entrySet()) {
+ result.add(entry.getKey() + "=" + entry.getValue());
}
return result.toString();
}
