[shardingsphere] branch master updated: Refactor EncryptDistSQLStatementVisitor (#28693)

[zhaojinchao]

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 8bd425ce60e Refactor EncryptDistSQLStatementVisitor (#28693)
8bd425ce60e is described below

commit 8bd425ce60eef2e005d4227d1785de5f5ff9893c
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Oct 9 12:46:31 2023 +0800

    Refactor EncryptDistSQLStatementVisitor (#28693)
---
 .../parser/core/EncryptDistSQLStatementVisitor.java        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
 
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
index 39155d1eddb..241649f5a42 100644
--- 
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
+++ 
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
@@ -84,11 +84,15 @@ public final class EncryptDistSQLStatementVisitor extends 
EncryptDistSQLStatemen
     
     @Override
     public ASTNode visitEncryptColumnDefinition(final 
EncryptColumnDefinitionContext ctx) {
-        return new 
EncryptColumnSegment(getIdentifierValue(ctx.columnDefinition().columnName()),
-                new 
EncryptColumnItemSegment(getIdentifierValue(ctx.cipherColumnDefinition().cipherColumnName()),
 (AlgorithmSegment) visit(ctx.encryptAlgorithm().algorithmDefinition())),
-                null == ctx.assistedQueryColumnDefinition() ? null
-                        : new 
EncryptColumnItemSegment(getIdentifierValue(ctx.assistedQueryColumnDefinition().assistedQueryColumnName()),
 getAssistedEncryptor(ctx)),
-                null == ctx.likeQueryColumnDefinition() ? null : new 
EncryptColumnItemSegment(getIdentifierValue(ctx.likeQueryColumnDefinition().likeQueryColumnName()),
 getLikeEncryptor(ctx)));
+        EncryptColumnItemSegment cipher = new EncryptColumnItemSegment(
+                
getIdentifierValue(ctx.cipherColumnDefinition().cipherColumnName()), 
(AlgorithmSegment) visit(ctx.encryptAlgorithm().algorithmDefinition()));
+        EncryptColumnItemSegment assistedQuery = null == 
ctx.assistedQueryColumnDefinition()
+                ? null
+                : new 
EncryptColumnItemSegment(getIdentifierValue(ctx.assistedQueryColumnDefinition().assistedQueryColumnName()),
 getAssistedEncryptor(ctx));
+        EncryptColumnItemSegment likeQuery = null == 
ctx.likeQueryColumnDefinition()
+                ? null
+                : new 
EncryptColumnItemSegment(getIdentifierValue(ctx.likeQueryColumnDefinition().likeQueryColumnName()),
 getLikeEncryptor(ctx));
+        return new 
EncryptColumnSegment(getIdentifierValue(ctx.columnDefinition().columnName()), 
cipher, assistedQuery, likeQuery);
     }
     
     private AlgorithmSegment getAssistedEncryptor(final 
EncryptColumnDefinitionContext ctx) {