(shardingsphere) branch master updated: Fix sonar issue on EncryptPredicateValueTokenGenerator (#34380)

[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 88b2488e18d Fix sonar issue on EncryptPredicateValueTokenGenerator 
(#34380)
88b2488e18d is described below

commit 88b2488e18dae66225efe9de57825fe61f9b233a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Jan 17 10:35:01 2025 +0800

    Fix sonar issue on EncryptPredicateValueTokenGenerator (#34380)
    
    * Fix sonar issue on EncryptPredicateValueTokenGenerator
    
    * Add log on CRC32SingleTableInventoryCalculator
---
 .../token/generator/predicate/EncryptPredicateValueTokenGenerator.java  | 2 +-
 .../table/calculator/CRC32SingleTableInventoryCalculator.java           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateValueTokenGenerator.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateValueTokenGenerator.java
index 28ae7293826..bf963a3f665 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateValueTokenGenerator.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateValueTokenGenerator.java
@@ -102,12 +102,12 @@ public final class EncryptPredicateValueTokenGenerator 
implements CollectionSQLT
     private List<Object> getEncryptedValues(final String schemaName, final 
EncryptTable encryptTable, final EncryptCondition encryptCondition, final 
List<Object> originalValues) {
         String columnName = 
encryptCondition.getColumnSegment().getIdentifier().getValue();
         EncryptColumn encryptColumn = 
encryptTable.getEncryptColumn(columnName);
-        String tableName = 
encryptCondition.getColumnSegment().getColumnBoundInfo().getOriginalTable().getValue();
         if (encryptCondition instanceof EncryptBinaryCondition && 
"LIKE".equalsIgnoreCase(((EncryptBinaryCondition) 
encryptCondition).getOperator())) {
             LikeQueryColumnItem likeQueryColumnItem = 
encryptColumn.getLikeQuery()
                     .orElseThrow(() -> new 
MissingMatchedEncryptQueryAlgorithmException(encryptTable.getTable(), 
columnName, "LIKE"));
             return likeQueryColumnItem.encrypt(database.getName(), schemaName, 
encryptCondition.getTableName(), columnName, originalValues);
         }
+        String tableName = 
encryptCondition.getColumnSegment().getColumnBoundInfo().getOriginalTable().getValue();
         return encryptColumn.getAssistedQuery()
                 .map(optional -> optional.encrypt(database.getName(), 
schemaName, tableName, 
encryptCondition.getColumnSegment().getIdentifier().getValue(), originalValues))
                 .orElseGet(() -> 
encryptColumn.getCipher().encrypt(database.getName(), schemaName, tableName, 
encryptCondition.getColumnSegment().getIdentifier().getValue(), 
originalValues));
diff --git 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/CRC32SingleTableInventoryCalculator.java
 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/CRC32SingleTableInventoryCalculator.java
index dc198b0c04d..2763123283b 100644
--- 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/CRC32SingleTableInventoryCalculator.java
+++ 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/CRC32SingleTableInventoryCalculator.java
@@ -61,6 +61,7 @@ public final class CRC32SingleTableInventoryCalculator 
extends AbstractSingleTab
             int recordsCount = resultSet.getInt(2);
             return new CalculatedItem(crc32, recordsCount);
         } catch (final SQLException ex) {
+            log.error("Calculate CRC32 failed, sql={}", sql, ex);
             throw new 
PipelineTableDataConsistencyCheckLoadingFailedException(param.getTable(), ex);
         }
     }