[shardingsphere] branch master updated: Refactor EncryptShowColumnsMergedResult (#26519)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 8775c365405 Refactor EncryptShowColumnsMergedResult (#26519)
8775c365405 is described below

commit 8775c365405e616273b09d4d132fcb61f60a392f
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Jun 24 19:23:44 2023 +0800

    Refactor EncryptShowColumnsMergedResult (#26519)
---
 .../encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
index 74e2e0b0804..e7cd7d4e3b8 100644
--- 
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
+++ 
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
@@ -61,7 +61,7 @@ public abstract class EncryptShowColumnsMergedResult 
implements MergedResult {
             return false;
         }
         String columnName = getOriginalValue(COLUMN_FIELD_INDEX, 
String.class).toString();
-        while (encryptTable.get().isAssistedQueryColumn(columnName) || 
encryptTable.get().isLikeQueryColumn(columnName)) {
+        while (isDerivedColumn(encryptTable.get(), columnName)) {
             hasNext = nextValue();
             if (!hasNext) {
                 return false;
@@ -71,6 +71,10 @@ public abstract class EncryptShowColumnsMergedResult 
implements MergedResult {
         return true;
     }
     
+    private boolean isDerivedColumn(final EncryptTable encryptTable, final 
String columnName) {
+        return encryptTable.isAssistedQueryColumn(columnName) || 
encryptTable.isLikeQueryColumn(columnName);
+    }
+    
     @Override
     public final Object getValue(final int columnIndex, final Class<?> type) 
throws SQLException {
         if (COLUMN_FIELD_INDEX == columnIndex) {