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 ffd499b586c Refactor EncryptRule (#26039)
ffd499b586c is described below
commit ffd499b586cc29155d9487dfb4aa6b8831038f33
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jun 4 12:15:11 2023 +0800
Refactor EncryptRule (#26039)
---
.../command/query/extended/parse/PostgreSQLComParsePacket.java | 10 ++++++----
.../packet/command/query/simple/PostgreSQLComQueryPacket.java | 8 ++++----
.../org/apache/shardingsphere/encrypt/rule/EncryptRule.java | 9 ++++++---
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/parse/PostgreSQLComParsePacket.java
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/parse/PostgreSQLComParsePacket.java
index 11a82680361..50ce124fa6a 100644
---
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/parse/PostgreSQLComParsePacket.java
+++
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/parse/PostgreSQLComParsePacket.java
@@ -17,6 +17,7 @@
package
org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.parse;
+import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.db.protocol.packet.sql.SQLReceivedPacket;
import
org.apache.shardingsphere.db.protocol.postgresql.packet.command.PostgreSQLCommandPacket;
@@ -38,6 +39,7 @@ public final class PostgreSQLComParsePacket extends
PostgreSQLCommandPacket impl
private final String statementId;
+ @Getter(AccessLevel.NONE)
private final String sql;
public PostgreSQLComParsePacket(final PostgreSQLPacketPayload payload) {
@@ -66,12 +68,12 @@ public final class PostgreSQLComParsePacket extends
PostgreSQLCommandPacket impl
}
@Override
- public PostgreSQLIdentifierTag getIdentifier() {
- return PostgreSQLCommandPacketType.PARSE_COMMAND;
+ public String getSQL() {
+ return sql;
}
@Override
- public String getSQL() {
- return sql;
+ public PostgreSQLIdentifierTag getIdentifier() {
+ return PostgreSQLCommandPacketType.PARSE_COMMAND;
}
}
diff --git
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/simple/PostgreSQLComQueryPacket.java
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/simple/PostgreSQLComQueryPacket.java
index ff67da10cf1..5d006a76bdf 100644
---
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/simple/PostgreSQLComQueryPacket.java
+++
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/simple/PostgreSQLComQueryPacket.java
@@ -40,12 +40,12 @@ public final class PostgreSQLComQueryPacket extends
PostgreSQLCommandPacket impl
}
@Override
- public PostgreSQLIdentifierTag getIdentifier() {
- return PostgreSQLCommandPacketType.SIMPLE_QUERY;
+ public String getSQL() {
+ return sql;
}
@Override
- public String getSQL() {
- return sql;
+ public PostgreSQLIdentifierTag getIdentifier() {
+ return PostgreSQLCommandPacketType.SIMPLE_QUERY;
}
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
index 3a38c25674e..5848b67063d 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
@@ -184,7 +184,8 @@ public final class EncryptRule implements DatabaseRule,
TableContainedRule, Colu
@SuppressWarnings("rawtypes")
Optional<StandardEncryptAlgorithm> encryptor =
findStandardEncryptor(tableName, logicColumnName);
ShardingSpherePreconditions.checkState(encryptor.isPresent(), () ->
new MissingEncryptorException(tableName, logicColumnName));
- return encrypt(encryptor.get(), originalValues,
EncryptContextBuilder.build(databaseName, schemaName, tableName,
logicColumnName));
+ EncryptContext context = EncryptContextBuilder.build(databaseName,
schemaName, tableName, logicColumnName);
+ return encrypt(encryptor.get(), originalValues, context);
}
@SuppressWarnings("unchecked")
@@ -265,7 +266,8 @@ public final class EncryptRule implements DatabaseRule,
TableContainedRule, Colu
@SuppressWarnings("rawtypes")
Optional<AssistedEncryptAlgorithm> assistedQueryEncryptor =
findAssistedQueryEncryptor(tableName, logicColumnName);
ShardingSpherePreconditions.checkState(assistedQueryEncryptor.isPresent(), ()
-> new MissingAssistedQueryEncryptorException(tableName, logicColumnName));
- return getEncryptAssistedQueryValues(assistedQueryEncryptor.get(),
originalValues, EncryptContextBuilder.build(databaseName, schemaName,
tableName, logicColumnName));
+ EncryptContext context = EncryptContextBuilder.build(databaseName,
schemaName, tableName, logicColumnName);
+ return getEncryptAssistedQueryValues(assistedQueryEncryptor.get(),
originalValues, context);
}
@SuppressWarnings("unchecked")
@@ -292,7 +294,8 @@ public final class EncryptRule implements DatabaseRule,
TableContainedRule, Colu
@SuppressWarnings("rawtypes")
Optional<LikeEncryptAlgorithm> likeQueryEncryptor =
findLikeQueryEncryptor(tableName, logicColumnName);
ShardingSpherePreconditions.checkState(likeQueryEncryptor.isPresent(),
() -> new MissingLikeQueryEncryptorException(tableName, logicColumnName));
- return getEncryptLikeQueryValues(likeQueryEncryptor.get(),
originalValues, EncryptContextBuilder.build(databaseName, schemaName,
tableName, logicColumnName));
+ EncryptContext context = EncryptContextBuilder.build(databaseName,
schemaName, tableName, logicColumnName);
+ return getEncryptLikeQueryValues(likeQueryEncryptor.get(),
originalValues, context);
}
@SuppressWarnings("unchecked")
