This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 def40c05def Refactor EncryptPredicateRightValueTokenGenerator (#32384)
def40c05def is described below
commit def40c05def1e66f4c9eca32ff6535cc2b0d5dfd
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Aug 3 20:20:55 2024 +0800
Refactor EncryptPredicateRightValueTokenGenerator (#32384)
---
.../predicate/EncryptPredicateRightValueTokenGenerator.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateRightValueTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateRightValueTokenGenerator.java
index da884430264..afa8cc3ab32 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateRightValueTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/predicate/EncryptPredicateRightValueTokenGenerator.java
@@ -80,14 +80,10 @@ public final class EncryptPredicateRightValueTokenGenerator
implements Collectio
}
private SQLToken generateSQLToken(final String schemaName, final
EncryptTable encryptTable, final EncryptCondition encryptCondition) {
- List<Object> originalValues = encryptCondition.getValues(parameters);
- return generateSQLToken(schemaName, encryptTable, encryptCondition,
originalValues);
- }
-
- private SQLToken generateSQLToken(final String schemaName, final
EncryptTable encryptTable, final EncryptCondition encryptCondition, final
List<Object> originalValues) {
int startIndex = encryptCondition.getStartIndex();
int stopIndex = encryptCondition.getStopIndex();
- Map<Integer, Object> indexValues =
getPositionValues(encryptCondition.getPositionValueMap().keySet(),
getEncryptedValues(schemaName, encryptTable, encryptCondition, originalValues));
+ Map<Integer, Object> indexValues = getPositionValues(
+ encryptCondition.getPositionValueMap().keySet(),
getEncryptedValues(schemaName, encryptTable, encryptCondition,
encryptCondition.getValues(parameters)));
Collection<Integer> parameterMarkerIndexes =
encryptCondition.getPositionIndexMap().keySet();
if (encryptCondition instanceof EncryptBinaryCondition &&
((EncryptBinaryCondition) encryptCondition).getExpressionSegment() instanceof
FunctionSegment) {
return new EncryptPredicateFunctionRightValueToken(startIndex,
stopIndex,
