This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 2942c50ee20 Remove EqualsAndHashCode in SubstitutableColumnNameToken
and change related LinkedHashSet ti LinkedList (#33524)
2942c50ee20 is described below
commit 2942c50ee20b5208d1d85d64a62b8ad6a3fd29c4
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Mon Nov 4 10:27:48 2024 +0800
Remove EqualsAndHashCode in SubstitutableColumnNameToken and change related
LinkedHashSet ti LinkedList (#33524)
---
.../generator/predicate/EncryptPredicateColumnTokenGenerator.java | 4 ++--
.../token/generator/projection/EncryptProjectionTokenGenerator.java | 3 +--
.../token/generator/select/EncryptGroupByItemTokenGenerator.java | 3 +--
.../sql/token/common/pojo/generic/SubstitutableColumnNameToken.java | 3 ---
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateColumnTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateColumnTokenGenerator.java
index 5b7af3cfeb0..9b2bd6706f1 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateColumnTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateColumnTokenGenerator.java
@@ -47,7 +47,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.Iden
import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedHashSet;
+import java.util.LinkedList;
import java.util.Map;
import java.util.Optional;
@@ -81,7 +81,7 @@ public final class EncryptPredicateColumnTokenGenerator
implements CollectionSQL
private Collection<SQLToken> generateSQLTokens(final
Collection<ColumnSegment> columnSegments, final Map<String, String>
columnExpressionTableNames,
final
Collection<WhereSegment> whereSegments, final DatabaseType databaseType) {
- Collection<SQLToken> result = new
LinkedHashSet<>(columnSegments.size(), 1F);
+ Collection<SQLToken> result = new LinkedList<>();
for (ColumnSegment each : columnSegments) {
String tableName =
columnExpressionTableNames.getOrDefault(each.getExpression(), "");
Optional<EncryptTable> encryptTable =
encryptRule.findEncryptTable(tableName);
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptProjectionTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptProjectionTokenGenerator.java
index bb001274e5e..36f25e0d232 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptProjectionTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/projection/EncryptProjectionTokenGenerator.java
@@ -43,7 +43,6 @@ import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.Iden
import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
@@ -68,7 +67,7 @@ public final class EncryptProjectionTokenGenerator {
* @return generated SQL tokens
*/
public Collection<SQLToken> generateSQLTokens(final SelectStatementContext
selectStatementContext) {
- Collection<SQLToken> result = new
LinkedHashSet<>(generateSelectSQLTokens(selectStatementContext));
+ Collection<SQLToken> result = new
LinkedList<>(generateSelectSQLTokens(selectStatementContext));
selectStatementContext.getSubqueryContexts().values().stream().map(this::generateSQLTokens).forEach(result::addAll);
return result;
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGenerator.java
index 3316c7bdad5..1c0ead50733 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/select/EncryptGroupByItemTokenGenerator.java
@@ -42,7 +42,6 @@ import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.Iden
import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.Map;
import java.util.Optional;
@@ -82,7 +81,7 @@ public final class EncryptGroupByItemTokenGenerator
implements CollectionSQLToke
@Override
public Collection<SQLToken> generateSQLTokens(final SelectStatementContext
sqlStatementContext) {
- Collection<SQLToken> result = new LinkedHashSet<>();
+ Collection<SQLToken> result = new LinkedList<>();
ShardingSphereSchema schema =
sqlStatementContext.getTablesContext().getSchemaName().map(schemas::get).orElseGet(()
-> defaultSchema);
for (OrderByItem each : getGroupByItems(sqlStatementContext)) {
if (each.getSegment() instanceof ColumnOrderByItemSegment) {
diff --git
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameToken.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameToken.java
index 659dc64f152..af2836cbeb7 100644
---
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameToken.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameToken.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.generic;
import com.cedarsoftware.util.CaseInsensitiveMap;
-import lombok.EqualsAndHashCode;
import lombok.Getter;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.Projection;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.ColumnProjection;
@@ -39,8 +38,6 @@ import java.util.Map;
/**
* Substitutable column name token.
*/
-// TODO remove @EqualsAndHashCode in token rewriter
-@EqualsAndHashCode(callSuper = false, exclude = "projections")
public final class SubstitutableColumnNameToken extends SQLToken implements
Substitutable, RouteUnitAware {
private static final String COLUMN_NAME_SPLITTER = ", ";
