This is an automated email from the ASF dual-hosted git repository. zhangliang 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 4a05f4e5ca9 Fix sonar issue on EncryptPredicateColumnTokenGenerator (#34765) 4a05f4e5ca9 is described below commit 4a05f4e5ca9011054a2e13eaccc609971736a7e4 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sun Feb 23 20:40:10 2025 +0800 Fix sonar issue on EncryptPredicateColumnTokenGenerator (#34765) --- .../generator/predicate/EncryptPredicateColumnTokenGenerator.java | 7 +------ 1 file changed, 1 insertion(+), 6 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 bba0c665db3..9b39163757c 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 @@ -110,8 +110,7 @@ public final class EncryptPredicateColumnTokenGenerator implements CollectionSQL if (isIncludeLike(expression)) { Optional<LikeQueryColumnItem> likeQueryColumnItem = encryptColumn.getLikeQuery(); Preconditions.checkState(likeQueryColumnItem.isPresent()); - Collection<Projection> columnProjections = - createColumnProjections(likeQueryColumnItem.get().getName(), columnSegment.getIdentifier().getQuoteCharacter(), databaseType); + Collection<Projection> columnProjections = createColumnProjections(likeQueryColumnItem.get().getName(), columnSegment.getIdentifier().getQuoteCharacter(), databaseType); return Collections.singleton(new SubstitutableColumnNameToken(startIndex, stopIndex, columnProjections, databaseType)); } Collection<Projection> columnProjections = encryptColumn.getAssistedQuery() @@ -124,10 +123,6 @@ public final class EncryptPredicateColumnTokenGenerator implements CollectionSQL return expression instanceof BinaryOperationExpression && "LIKE".equalsIgnoreCase(((BinaryOperationExpression) expression).getOperator()); } - private boolean isContainsColumnSegment(final ExpressionSegment expressionSegment, final ColumnSegment targetColumnSegment) { - return expressionSegment.getStartIndex() <= targetColumnSegment.getStartIndex() && expressionSegment.getStopIndex() >= targetColumnSegment.getStopIndex(); - } - private Collection<Projection> createColumnProjections(final String columnName, final QuoteCharacter quoteCharacter, final DatabaseType databaseType) { ColumnProjection columnProjection = new ColumnProjection(null, new IdentifierValue(columnName, quoteCharacter), null, databaseType); return Collections.singleton(columnProjection);