Fix the case sensitivity issue caused by using CaseInsensitiveMap keys.

apache · Oct 11, 2023 · 54be15a · 54be15a
1 parent c2e6330
commit 54be15a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
@@ -150,7 +150,7 @@ public String getLogicColumnByCipherColumn(final String cipherColumnName) {
     public String getLogicColumnByAssistedQueryColumn(final String assistQueryColumnName) {
         for (Entry<String, EncryptColumn> entry : columns.entrySet()) {
             if (entry.getValue().getAssistedQuery().isPresent() && entry.getValue().getAssistedQuery().get().getName().equalsIgnoreCase(assistQueryColumnName)) {
-                return entry.getKey();
+                return entry.getValue().getName();
             }
         }
         throw new EncryptLogicColumnNotFoundException(assistQueryColumnName);

diff --git a/...in/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java b/...in/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
@@ -49,6 +49,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -140,7 +141,18 @@ private void setColumnNames(final Iterator<Result> rows) {
         if (rows.hasNext()) {
             compensateResult = rows.next();
         }
-        columnNames = null == compensateResult ? Arrays.asList(ROW_KEY_COLUMN_NAME, CONTENT_COLUMN_NAME) : parseResult(compensateResult).keySet();
+        columnNames = null == compensateResult ? Arrays.asList(ROW_KEY_COLUMN_NAME, CONTENT_COLUMN_NAME) : parseResultColumnNames(compensateResult);
+    }
+
+    private Collection<String> parseResultColumnNames(final Result result) {
+        Collection<String> columnNames = new LinkedList<>();
+        columnNames.add(ROW_KEY_COLUMN_NAME);
+        for (Cell each : result.listCells()) {
+            String column = new String(CellUtil.cloneQualifier(each), StandardCharsets.UTF_8);
+            columnNames.add(column);
+        }
+        columnNames.add(TIMESTAMP_COLUMN_NAME);
+        return columnNames;
     }
 
     private Map<String, String> parseResult(final Result result) {