(shardingsphere) branch master updated: Remove useless isNeedRewrite call in EncryptProjectionTokenGenerator (#33929)

[chengzhang]

This is an automated email from the ASF dual-hosted git repository.

chengzhang 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 7d9d93a6cb1 Remove useless isNeedRewrite call in 
EncryptProjectionTokenGenerator (#33929)
7d9d93a6cb1 is described below

commit 7d9d93a6cb1c688fd5cc04480c40a6bc5f83652c
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Fri Dec 6 10:38:46 2024 +0800

    Remove useless isNeedRewrite call in EncryptProjectionTokenGenerator 
(#33929)
---
 .../generator/projection/EncryptProjectionTokenGenerator.java    | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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 31e2b9826da..b21c0a186be 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
@@ -116,7 +116,7 @@ public final class EncryptProjectionTokenGenerator {
                 ColumnProjection columnProjection = (ColumnProjection) each;
                 boolean newAddedColumn = 
existColumnNames.add(columnProjection.getOriginalTable().getValue() + "." + 
columnProjection.getOriginalColumn().getValue());
                 Optional<EncryptTable> encryptTable = 
rule.findEncryptTable(columnProjection.getOriginalTable().getValue());
-                if (encryptTable.isPresent() && 
encryptTable.get().isEncryptColumn(columnProjection.getOriginalColumn().getValue())
 && isNeedRewrite(selectStatementContext, subqueryType)) {
+                if (encryptTable.isPresent() && 
encryptTable.get().isEncryptColumn(columnProjection.getOriginalColumn().getValue()))
 {
                     EncryptColumn encryptColumn = 
encryptTable.get().getEncryptColumn(columnProjection.getOriginalColumn().getValue());
                     projections.addAll(generateProjections(encryptColumn, 
columnProjection, subqueryType, newAddedColumn));
                     continue;
@@ -130,13 +130,6 @@ public final class EncryptProjectionTokenGenerator {
         return new SubstitutableColumnNameToken(startIndex, 
segment.getStopIndex(), projections, selectStatementContext.getDatabaseType());
     }
     
-    private boolean isNeedRewrite(final SelectStatementContext 
selectStatementContext, final SubqueryType subqueryType) {
-        if (SubqueryType.TABLE == subqueryType) {
-            return true;
-        }
-        return !selectStatementContext.containsTableSubquery();
-    }
-    
     private int getStartIndex(final ColumnProjectionSegment columnSegment) {
         if (columnSegment.getColumn().getLeftParentheses().isPresent()) {
             return 
columnSegment.getColumn().getLeftParentheses().get().getStartIndex();