You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ch...@apache.org on 2026/03/26 01:12:15 UTC

(shardingsphere) branch master updated: Minor refactor EncryptGroupByItemTokenGenerator and EncryptPredicateParameterRewriter (#38556)

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 c98139ff46a Minor refactor EncryptGroupByItemTokenGenerator and EncryptPredicateParameterRewriter (#38556)
c98139ff46a is described below

commit c98139ff46a8fddd0d76318e2d512d065c4d9ef7
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Thu Mar 26 09:12:08 2026 +0800

    Minor refactor EncryptGroupByItemTokenGenerator and EncryptPredicateParameterRewriter (#38556)
    
    * Minor refactor EncryptGroupByItemTokenGenerator and EncryptPredicateParameterRewriter
    
    * Fix checkstyle
    
    * Fix checkstyle
---
 .../EncryptParameterRewritersRegistry.java         |  4 ++--
 .../EncryptInsertPredicateParameterRewriter.java   |  4 +---
 .../EncryptPredicateParameterRewriter.java         | 22 +++++++++++-----------
 .../select/EncryptGroupByItemTokenGenerator.java   |  5 +++--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java
index f22d02d6461..0300e7dee96 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewritersRegistry.java
@@ -49,8 +49,8 @@ public final class EncryptParameterRewritersRegistry implements ParameterRewrite
         String databaseName = sqlRewriteContext.getDatabase().getName();
         return Arrays.asList(
                 new EncryptAssignmentParameterRewriter(rule, databaseName),
-                new EncryptPredicateParameterRewriter(rule, databaseName, encryptConditions),
-                new EncryptInsertPredicateParameterRewriter(rule, databaseName, encryptConditions),
+                new EncryptPredicateParameterRewriter(rule, encryptConditions),
+                new EncryptInsertPredicateParameterRewriter(rule, encryptConditions),
                 new EncryptInsertValueParameterRewriter(rule, databaseName),
                 new EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter(rule, databaseName));
     }
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertPredicateParameterRewriter.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertPredicateParameterRewriter.java
index 207cf453391..249b8a9c307 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertPredicateParameterRewriter.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertPredicateParameterRewriter.java
@@ -36,8 +36,6 @@ public final class EncryptInsertPredicateParameterRewriter implements ParameterR
     
     private final EncryptRule rule;
     
-    private final String databaseName;
-    
     private final Collection<EncryptCondition> encryptConditions;
     
     @Override
@@ -48,7 +46,7 @@ public final class EncryptInsertPredicateParameterRewriter implements ParameterR
     
     @Override
     public void rewrite(final ParameterBuilder paramBuilder, final SQLStatementContext sqlStatementContext, final List<Object> params) {
-        EncryptPredicateParameterRewriter rewriter = new EncryptPredicateParameterRewriter(rule, databaseName, encryptConditions);
+        EncryptPredicateParameterRewriter rewriter = new EncryptPredicateParameterRewriter(rule, encryptConditions);
         rewriter.rewrite(paramBuilder, ((InsertStatementContext) sqlStatementContext).getInsertSelectContext().getSelectStatementContext(), params);
     }
 }
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
index 14d0a720da4..2f328a4c375 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.encrypt.rewrite.parameter.rewriter;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
 import org.apache.shardingsphere.encrypt.exception.metadata.MissingMatchedEncryptQueryAlgorithmException;
 import org.apache.shardingsphere.encrypt.rewrite.condition.EncryptCondition;
 import org.apache.shardingsphere.encrypt.rewrite.condition.EncryptConditionValues;
@@ -32,6 +31,7 @@ import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
 import org.apache.shardingsphere.infra.rewrite.parameter.builder.ParameterBuilder;
 import org.apache.shardingsphere.infra.rewrite.parameter.builder.impl.StandardParameterBuilder;
 import org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.bound.ColumnSegmentBoundInfo;
 
 import java.util.Collection;
 import java.util.List;
@@ -46,8 +46,6 @@ public final class EncryptPredicateParameterRewriter implements ParameterRewrite
     
     private final EncryptRule rule;
     
-    private final String databaseName;
-    
     private final Collection<EncryptCondition> encryptConditions;
     
     @Override
@@ -57,27 +55,29 @@ public final class EncryptPredicateParameterRewriter implements ParameterRewrite
     
     @Override
     public void rewrite(final ParameterBuilder paramBuilder, final SQLStatementContext sqlStatementContext, final List<Object> params) {
-        String schemaName = sqlStatementContext.getTablesContext().getSchemaName()
-                .orElseGet(() -> new DatabaseTypeRegistry(sqlStatementContext.getSqlStatement().getDatabaseType()).getDefaultSchemaName(databaseName));
         for (EncryptCondition each : encryptConditions) {
-            encryptParameters(paramBuilder, each.getPositionIndexMap(), getEncryptedValues(schemaName, each, new EncryptConditionValues(each).get(params)));
+            encryptParameters(paramBuilder, each.getPositionIndexMap(), getEncryptedValues(each, new EncryptConditionValues(each).get(params)));
         }
     }
     
-    private List<Object> getEncryptedValues(final String schemaName, final EncryptCondition encryptCondition, final List<Object> originalValues) {
-        String tableName = encryptCondition.getColumnSegment().getColumnBoundInfo().getOriginalTable().getValue();
-        String columnName = encryptCondition.getColumnSegment().getColumnBoundInfo().getOriginalColumn().getValue();
+    private List<Object> getEncryptedValues(final EncryptCondition encryptCondition, final List<Object> originalValues) {
+        ColumnSegmentBoundInfo columnBoundInfo = encryptCondition.getColumnSegment().getColumnBoundInfo();
+        String databaseName = columnBoundInfo.getOriginalDatabase().getValue();
+        String schemaName = columnBoundInfo.getOriginalSchema().getValue();
+        String tableName = columnBoundInfo.getOriginalTable().getValue();
+        String columnName = columnBoundInfo.getOriginalColumn().getValue();
         EncryptTable encryptTable = rule.getEncryptTable(tableName);
         EncryptColumn encryptColumn = encryptTable.getEncryptColumn(columnName);
         if (encryptCondition instanceof EncryptBinaryCondition && containsLikeOperator((EncryptBinaryCondition) encryptCondition)) {
-            return getEncryptedLikeValues(schemaName, originalValues, encryptColumn, tableName, columnName);
+            return getEncryptedLikeValues(databaseName, schemaName, originalValues, encryptColumn, tableName, columnName);
         }
         return encryptColumn.getAssistedQuery().isPresent()
                 ? encryptColumn.getAssistedQuery().get().encrypt(databaseName, schemaName, tableName, columnName, originalValues)
                 : encryptColumn.getCipher().encrypt(databaseName, schemaName, tableName, columnName, originalValues);
     }
     
-    private List<Object> getEncryptedLikeValues(final String schemaName, final List<Object> originalValues, final EncryptColumn encryptColumn, final String tableName, final String columnName) {
+    private List<Object> getEncryptedLikeValues(final String databaseName, final String schemaName, final List<Object> originalValues,
+                                                final EncryptColumn encryptColumn, final String tableName, final String columnName) {
         ShardingSpherePreconditions.checkState(encryptColumn.getLikeQuery().isPresent() || encryptColumn.getCipher().getEncryptor().getMetaData().isSupportLike(),
                 () -> new MissingMatchedEncryptQueryAlgorithmException(tableName, columnName, "LIKE"));
         return encryptColumn.getLikeQuery()
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 1e68fecd904..463c020eadc 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
@@ -79,14 +79,15 @@ public final class EncryptGroupByItemTokenGenerator implements CollectionSQLToke
             for (OrderByItem item : each.getItems()) {
                 if (item.getSegment() instanceof ColumnOrderByItemSegment) {
                     ColumnSegment columnSegment = ((ColumnOrderByItemSegment) item.getSegment()).getColumn();
-                    generateSQLToken(columnSegment, sqlStatementContext.getSqlStatement().getDatabaseType()).ifPresent(result::add);
+                    generateSQLToken(columnSegment, sqlStatementContext).ifPresent(result::add);
                 }
             }
         }
         return result;
     }
     
-    private Optional<SubstitutableColumnNameToken> generateSQLToken(final ColumnSegment columnSegment, final DatabaseType databaseType) {
+    private Optional<SubstitutableColumnNameToken> generateSQLToken(final ColumnSegment columnSegment, final SelectStatementContext selectStatementContext) {
+        DatabaseType databaseType = selectStatementContext.getSqlStatement().getDatabaseType();
         Optional<EncryptTable> encryptTable = rule.findEncryptTable(columnSegment.getColumnBoundInfo().getOriginalTable().getValue());
         String columnName = columnSegment.getColumnBoundInfo().getOriginalColumn().getValue();
         if (!encryptTable.isPresent() || !encryptTable.get().isEncryptColumn(columnName)) {