This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 082f720ffd4 Refactor AssistedQueryColumnItem and LikeQueryColumnItem
(#26497)
082f720ffd4 is described below
commit 082f720ffd43156b988a84a5280b920d6104b543
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jun 22 18:19:14 2023 +0800
Refactor AssistedQueryColumnItem and LikeQueryColumnItem (#26497)
---
.../parameter/rewriter/EncryptAssignmentParameterRewriter.java | 4 ++--
.../EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java | 4 ++--
.../parameter/rewriter/EncryptInsertValueParameterRewriter.java | 4 ++--
.../rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java | 4 ++--
.../rewrite/token/generator/EncryptAssignmentTokenGenerator.java | 4 ++--
.../token/generator/EncryptPredicateRightValueTokenGenerator.java | 4 ++--
.../token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java | 4 ++--
.../token/generator/insert/EncryptInsertValuesTokenGenerator.java | 4 ++--
.../encrypt/rule/column/item/AssistedQueryColumnItem.java | 4 ++--
.../shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java | 4 ++--
10 files changed, 20 insertions(+), 20 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 bfe8702095d..dce63f639f9 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
@@ -100,11 +100,11 @@ public final class EncryptAssignmentParameterRewriter
implements ParameterRewrit
paramBuilder.addReplacedParameters(parameterMarkerIndex, cipherValue);
Collection<Object> addedParams = new LinkedList<>();
if (encryptColumn.getAssistedQuery().isPresent()) {
-
addedParams.add(encryptColumn.getAssistedQuery().get().getEncryptAssistedQueryValues(
+ addedParams.add(encryptColumn.getAssistedQuery().get().encrypt(
databaseName, schemaName, tableName, columnName,
Collections.singletonList(originalValue)).iterator().next());
}
if (encryptColumn.getLikeQuery().isPresent()) {
-
addedParams.add(encryptColumn.getLikeQuery().get().getEncryptLikeQueryValues(databaseName,
schemaName, tableName, columnName,
Collections.singletonList(originalValue)).iterator().next());
+
addedParams.add(encryptColumn.getLikeQuery().get().encrypt(databaseName,
schemaName, tableName, columnName,
Collections.singletonList(originalValue)).iterator().next());
}
if (!addedParams.isEmpty()) {
paramBuilder.addAddedParameters(parameterMarkerIndex, addedParams);
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
index 37a000bb530..58c7b394b2c 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
@@ -84,10 +84,10 @@ public final class
EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
private Collection<Object> buildAddedParams(final String schemaName, final
String tableName, final EncryptColumn encryptColumn, final String
logicColumnName, final Object plainValue) {
Collection<Object> result = new LinkedList<>();
if (encryptColumn.getAssistedQuery().isPresent()) {
-
result.add(encryptColumn.getAssistedQuery().get().getEncryptAssistedQueryValue(databaseName,
schemaName, tableName, logicColumnName, plainValue));
+
result.add(encryptColumn.getAssistedQuery().get().encrypt(databaseName,
schemaName, tableName, logicColumnName, plainValue));
}
if (encryptColumn.getLikeQuery().isPresent()) {
-
result.add(encryptColumn.getLikeQuery().get().getEncryptLikeQueryValue(databaseName,
schemaName, tableName, logicColumnName, plainValue));
+
result.add(encryptColumn.getLikeQuery().get().encrypt(databaseName, schemaName,
tableName, logicColumnName, plainValue));
}
return result;
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
index e398e11a8be..45284e8b7e7 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
@@ -111,10 +111,10 @@ public final class EncryptInsertValueParameterRewriter
implements ParameterRewri
paramBuilder.addReplacedParameters(paramIndex,
encryptColumn.getCipher().encrypt(databaseName, schemaName, tableName,
columnName, originalValue));
Collection<Object> addedParams = new LinkedList<>();
if (encryptColumn.getAssistedQuery().isPresent()) {
-
addedParams.add(encryptColumn.getAssistedQuery().get().getEncryptAssistedQueryValue(databaseName,
schemaName, tableName, columnName, originalValue));
+
addedParams.add(encryptColumn.getAssistedQuery().get().encrypt(databaseName,
schemaName, tableName, columnName, originalValue));
}
if (encryptColumn.getLikeQuery().isPresent()) {
-
addedParams.add(encryptColumn.getLikeQuery().get().getEncryptLikeQueryValue(databaseName,
schemaName, tableName, columnName, originalValue));
+
addedParams.add(encryptColumn.getLikeQuery().get().encrypt(databaseName,
schemaName, tableName, columnName, originalValue));
}
if (!addedParams.isEmpty()) {
if
(!paramBuilder.getAddedIndexAndParameters().containsKey(paramIndex)) {
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 6c8ddea03a9..9d3d8c15f44 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
@@ -69,10 +69,10 @@ public final class EncryptPredicateParameterRewriter
implements ParameterRewrite
EncryptTable encryptTable = encryptRule.getEncryptTable(tableName);
EncryptColumn encryptColumn =
encryptTable.getEncryptColumn(columnName);
if (encryptCondition instanceof EncryptBinaryCondition &&
"LIKE".equals(((EncryptBinaryCondition) encryptCondition).getOperator()) &&
encryptColumn.getLikeQuery().isPresent()) {
- return
encryptColumn.getLikeQuery().get().getEncryptLikeQueryValues(databaseName,
schemaName, tableName, columnName, originalValues);
+ return encryptColumn.getLikeQuery().get().encrypt(databaseName,
schemaName, tableName, columnName, originalValues);
}
return encryptColumn.getAssistedQuery().isPresent()
- ?
encryptColumn.getAssistedQuery().get().getEncryptAssistedQueryValues(databaseName,
schemaName, tableName, columnName, originalValues)
+ ? encryptColumn.getAssistedQuery().get().encrypt(databaseName,
schemaName, tableName, columnName, originalValues)
: encryptColumn.getCipher().encrypt(databaseName, schemaName,
tableName, columnName, originalValues);
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
index 4e7b0e3149a..0e622b201a0 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
@@ -128,7 +128,7 @@ public final class EncryptAssignmentTokenGenerator
implements CollectionSQLToken
final AssignmentSegment
assignmentSegment, final EncryptLiteralAssignmentToken token) {
Object originalValue = ((LiteralExpressionSegment)
assignmentSegment.getValue()).getLiterals();
if (encryptColumn.getAssistedQuery().isPresent()) {
- Object assistedQueryValue =
encryptColumn.getAssistedQuery().get().getEncryptAssistedQueryValues(databaseName,
schemaName,
+ Object assistedQueryValue =
encryptColumn.getAssistedQuery().get().encrypt(databaseName, schemaName,
encryptTable.getTable(),
assignmentSegment.getColumns().get(0).getIdentifier().getValue(),
Collections.singletonList(originalValue)).iterator().next();
token.addAssignment(encryptColumn.getAssistedQuery().get().getName(),
assistedQueryValue);
}
@@ -138,7 +138,7 @@ public final class EncryptAssignmentTokenGenerator
implements CollectionSQLToken
final AssignmentSegment assignmentSegment,
final EncryptLiteralAssignmentToken token) {
Object originalValue = ((LiteralExpressionSegment)
assignmentSegment.getValue()).getLiterals();
if (encryptColumn.getLikeQuery().isPresent()) {
- Object assistedQueryValue =
encryptColumn.getLikeQuery().get().getEncryptLikeQueryValues(databaseName,
schemaName,
+ Object assistedQueryValue =
encryptColumn.getLikeQuery().get().encrypt(databaseName, schemaName,
encryptTable.getTable(),
assignmentSegment.getColumns().get(0).getIdentifier().getValue(),
Collections.singletonList(originalValue)).iterator().next();
token.addAssignment(encryptColumn.getLikeQuery().get().getName(),
assistedQueryValue);
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
index 6a8483e3af2..81b058db0e8 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptPredicateRightValueTokenGenerator.java
@@ -108,10 +108,10 @@ public final class
EncryptPredicateRightValueTokenGenerator
if (encryptCondition instanceof EncryptBinaryCondition &&
"LIKE".equalsIgnoreCase(((EncryptBinaryCondition)
encryptCondition).getOperator())) {
Optional<LikeQueryColumnItem> likeQueryColumnItem =
encryptColumn.getLikeQuery();
ShardingSpherePreconditions.checkState(likeQueryColumnItem.isPresent(), () ->
new UnsupportedEncryptSQLException("LIKE"));
- return
likeQueryColumnItem.get().getEncryptLikeQueryValues(databaseName, schemaName,
encryptCondition.getTableName(), encryptCondition.getColumnName(),
originalValues);
+ return likeQueryColumnItem.get().encrypt(databaseName, schemaName,
encryptCondition.getTableName(), encryptCondition.getColumnName(),
originalValues);
}
return encryptColumn.getAssistedQuery()
- .map(optional ->
optional.getEncryptAssistedQueryValues(databaseName, schemaName,
encryptCondition.getTableName(), encryptCondition.getColumnName(),
originalValues))
+ .map(optional -> optional.encrypt(databaseName, schemaName,
encryptCondition.getTableName(), encryptCondition.getColumnName(),
originalValues))
.orElseGet(() ->
encryptColumn.getCipher().encrypt(databaseName, schemaName,
encryptCondition.getTableName(), encryptCondition.getColumnName(),
originalValues));
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
index 200fad34fce..3e5ed2b3c93 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertOnUpdateTokenGenerator.java
@@ -173,7 +173,7 @@ public final class EncryptInsertOnUpdateTokenGenerator
implements CollectionSQLT
final AssignmentSegment
assignmentSegment, final EncryptLiteralAssignmentToken token) {
encryptColumn.getAssistedQuery().ifPresent(optional -> {
Object originalValue = ((LiteralExpressionSegment)
assignmentSegment.getValue()).getLiterals();
- Object assistedQueryValue = optional.getEncryptAssistedQueryValues(
+ Object assistedQueryValue = optional.encrypt(
databaseName, schemaName, tableName,
assignmentSegment.getColumns().get(0).getIdentifier().getValue(),
Collections.singletonList(originalValue)).iterator().next();
token.addAssignment(optional.getName(), assistedQueryValue);
});
@@ -183,7 +183,7 @@ public final class EncryptInsertOnUpdateTokenGenerator
implements CollectionSQLT
final AssignmentSegment assignmentSegment,
final EncryptLiteralAssignmentToken token) {
encryptColumn.getLikeQuery().ifPresent(optional -> {
Object originalValue = ((LiteralExpressionSegment)
assignmentSegment.getValue()).getLiterals();
- Object likeValue = optional.getEncryptLikeQueryValues(
+ Object likeValue = optional.encrypt(
databaseName, schemaName, tableName,
assignmentSegment.getColumns().get(0).getIdentifier().getValue(),
Collections.singletonList(originalValue)).iterator().next();
token.addAssignment(optional.getName(), likeValue);
});
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertValuesTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertValuesTokenGenerator.java
index ab3d4f2f36b..ccd5ad42ac7 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertValuesTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertValuesTokenGenerator.java
@@ -165,7 +165,7 @@ public final class EncryptInsertValuesTokenGenerator
implements OptionalSQLToken
final InsertValueContext
insertValueContext, final InsertValue insertValueToken, final int columnIndex,
final int indexDelta, final Object originalValue) {
Optional<AssistedQueryColumnItem> assistedQueryColumnItem =
encryptColumn.getAssistedQuery();
Preconditions.checkState(assistedQueryColumnItem.isPresent());
- Object derivedValue =
assistedQueryColumnItem.get().getEncryptAssistedQueryValue(databaseName,
schemaName, tableName, encryptColumn.getName(), originalValue);
+ Object derivedValue =
assistedQueryColumnItem.get().encrypt(databaseName, schemaName, tableName,
encryptColumn.getName(), originalValue);
addDerivedColumn(insertValueContext, insertValueToken, columnIndex,
indexDelta, derivedValue);
}
@@ -173,7 +173,7 @@ public final class EncryptInsertValuesTokenGenerator
implements OptionalSQLToken
final InsertValueContext
insertValueContext, final InsertValue insertValueToken, final int columnIndex,
final int indexDelta, final Object originalValue) {
Optional<LikeQueryColumnItem> likeQueryColumnItem =
encryptColumn.getLikeQuery();
Preconditions.checkState(likeQueryColumnItem.isPresent());
- Object derivedValue =
likeQueryColumnItem.get().getEncryptLikeQueryValue(databaseName, schemaName,
tableName, encryptColumn.getName(), originalValue);
+ Object derivedValue = likeQueryColumnItem.get().encrypt(databaseName,
schemaName, tableName, encryptColumn.getName(), originalValue);
addDerivedColumn(insertValueContext, insertValueToken, columnIndex,
indexDelta, derivedValue);
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
index 621167be01b..dc9412bff7b 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
@@ -49,7 +49,7 @@ public final class AssistedQueryColumnItem {
* @return assisted query values
*/
@SuppressWarnings("unchecked")
- public Object getEncryptAssistedQueryValue(final String databaseName,
final String schemaName, final String tableName, final String logicColumnName,
final Object originalValue) {
+ public Object encrypt(final String databaseName, final String schemaName,
final String tableName, final String logicColumnName, final Object
originalValue) {
if (null == originalValue) {
return null;
}
@@ -68,7 +68,7 @@ public final class AssistedQueryColumnItem {
* @return assisted query values
*/
@SuppressWarnings("unchecked")
- public List<Object> getEncryptAssistedQueryValues(final String
databaseName, final String schemaName, final String tableName, final String
logicColumnName, final List<Object> originalValues) {
+ public List<Object> encrypt(final String databaseName, final String
schemaName, final String tableName, final String logicColumnName, final
List<Object> originalValues) {
EncryptContext context = EncryptContextBuilder.build(databaseName,
schemaName, tableName, logicColumnName);
List<Object> result = new LinkedList<>();
for (Object each : originalValues) {
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
index ecdc7190e00..1971682f05e 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
@@ -49,7 +49,7 @@ public final class LikeQueryColumnItem {
* @return like query values
*/
@SuppressWarnings("unchecked")
- public Object getEncryptLikeQueryValue(final String databaseName, final
String schemaName, final String tableName, final String logicColumnName, final
Object originalValue) {
+ public Object encrypt(final String databaseName, final String schemaName,
final String tableName, final String logicColumnName, final Object
originalValue) {
if (null == originalValue) {
return null;
}
@@ -68,7 +68,7 @@ public final class LikeQueryColumnItem {
* @return like query values
*/
@SuppressWarnings("unchecked")
- public List<Object> getEncryptLikeQueryValues(final String databaseName,
final String schemaName, final String tableName, final String logicColumnName,
final List<Object> originalValues) {
+ public List<Object> encrypt(final String databaseName, final String
schemaName, final String tableName, final String logicColumnName, final
List<Object> originalValues) {
EncryptContext context = EncryptContextBuilder.build(databaseName,
schemaName, tableName, logicColumnName);
List<Object> result = new LinkedList<>();
for (Object each : originalValues) {
