Refactor EncryptDistSQLStatementVisitor (#28693)

apache · Oct 9, 2023 · 8bd425c · 8bd425c
1 parent 05d088e
commit 8bd425c
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/...org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java b/...org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
@@ -84,11 +84,15 @@ public ASTNode visitEncryptRuleDefinition(final EncryptRuleDefinitionContext ctx
 
     @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) {