(shardingsphere) branch master updated: Refactor EncryptPredicateColumnTokenGenerator (#32378)

[zhangliang]

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 0245d0168d3 Refactor EncryptPredicateColumnTokenGenerator (#32378)
0245d0168d3 is described below

commit 0245d0168d334d5d01c991d52718a9f4e30cbc0a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Aug 3 15:35:45 2024 +0800

    Refactor EncryptPredicateColumnTokenGenerator (#32378)
---
 .../token/generator/predicate/EncryptPredicateColumnTokenGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a74a80eb755..d3a94f72ea6 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
@@ -89,7 +89,7 @@ public final class EncryptPredicateColumnTokenGenerator 
implements CollectionSQL
                                                    final Map<String, String> 
columnExpressionTableNames, final Collection<WhereSegment> whereSegments, final 
DatabaseType databaseType) {
         Collection<SQLToken> result = new 
LinkedHashSet<>(columnSegments.size(), 1F);
         for (ColumnSegment each : columnSegments) {
-            String tableName = 
Optional.ofNullable(columnExpressionTableNames.get(each.getExpression())).orElse("");
+            String tableName = 
columnExpressionTableNames.getOrDefault(each.getExpression(), "");
             Optional<EncryptTable> encryptTable = 
encryptRule.findEncryptTable(tableName);
             if (encryptTable.isPresent() && 
encryptTable.get().isEncryptColumn(each.getIdentifier().getValue())) {
                 
result.add(buildSubstitutableColumnNameToken(encryptTable.get().getEncryptColumn(each.getIdentifier().getValue()),
 each, whereSegments, databaseType));