[shardingsphere] branch master updated: Remove duplicate assertion (#26415)

[panjuan]

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

panjuan 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 7668dc320a6 Remove duplicate assertion (#26415)
7668dc320a6 is described below

commit 7668dc320a62331d764e5725c25efc6eac1e8586
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jun 18 21:43:50 2023 +0800

    Remove duplicate assertion (#26415)
---
 .../parameter/rewriter/EncryptAssignmentParameterRewriter.java      | 6 ++----
 .../update/DropDefaultShardingStrategyStatementUpdaterTest.java     | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
index 17f4428db08..26effa30224 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
@@ -101,12 +101,10 @@ public final class EncryptAssignmentParameterRewriter 
implements ParameterRewrit
         Collection<Object> addedParams = new LinkedList<>();
         Optional<EncryptTable> encryptTable = 
encryptRule.findEncryptTable(tableName);
         if (encryptTable.isPresent() && 
encryptTable.get().findAssistedQueryColumn(columnName).isPresent()) {
-            Object assistedQueryValue = 
encryptRule.getEncryptAssistedQueryValues(databaseName, schemaName, tableName, 
columnName, Collections.singletonList(originalValue)).iterator().next();
-            addedParams.add(assistedQueryValue);
+            
addedParams.add(encryptRule.getEncryptAssistedQueryValues(databaseName, 
schemaName, tableName, columnName, 
Collections.singletonList(originalValue)).iterator().next());
         }
         if (encryptTable.isPresent() && 
encryptTable.get().findLikeQueryColumn(columnName).isPresent()) {
-            Object likeValue = 
encryptRule.getEncryptLikeQueryValues(databaseName, schemaName, tableName, 
columnName, Collections.singletonList(originalValue)).iterator().next();
-            addedParams.add(likeValue);
+            
addedParams.add(encryptRule.getEncryptLikeQueryValues(databaseName, schemaName, 
tableName, columnName, 
Collections.singletonList(originalValue)).iterator().next());
         }
         if (!addedParams.isEmpty()) {
             paramBuilder.addAddedParameters(parameterMarkerIndex, addedParams);
diff --git 
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java
 
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java
index 29048f516d4..9c7da53e4e6 100644
--- 
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java
+++ 
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java
@@ -87,7 +87,6 @@ class DropDefaultShardingStrategyStatementUpdaterTest {
         
assertFalse(updater.updateCurrentRuleConfiguration(createSQLStatement("Database"),
 currentRuleConfig));
         
assertTrue(updater.updateCurrentRuleConfiguration(createSQLStatement("Table"), 
currentRuleConfig));
         assertNull(currentRuleConfig.getDefaultTableShardingStrategy());
-        assertNull(currentRuleConfig.getDefaultTableShardingStrategy());
         assertTrue(currentRuleConfig.getShardingAlgorithms().isEmpty());
     }