[kylin] 19/24: KYLIN-5695 [FOLLOW UP] Collecting model filter expressions without case sensitive, when importing models.

[xxyu]

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

xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit da5b7a1471eee88e56f7ba2e168166743797ecdf
Author: fengguangyuan <qq272101...@gmail.com>
AuthorDate: Fri May 26 19:56:12 2023 +0800

    KYLIN-5695 [FOLLOW UP] Collecting model filter expressions without case 
sensitive, when importing models.
    
    Co-authored-by: Guangyuan Feng <guangyuan.f...@kyligence.io>
---
 .../org/apache/kylin/metadata/model/schema/ModelEdgeCollector.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/schema/ModelEdgeCollector.java
 
b/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/schema/ModelEdgeCollector.java
index 26ee73de23..788243c4fa 100644
--- 
a/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/schema/ModelEdgeCollector.java
+++ 
b/src/core-metadata/src/main/java/org/apache/kylin/metadata/model/schema/ModelEdgeCollector.java
@@ -26,6 +26,7 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.kylin.common.util.CaseInsensitiveStringMap;
 import org.apache.kylin.common.util.Pair;
 import org.apache.kylin.metadata.cube.cuboid.NAggregationGroup;
 import org.apache.kylin.metadata.cube.model.IndexPlan;
@@ -67,8 +68,10 @@ class ModelEdgeCollector {
         effectiveNamedColumns = model.getEffectiveNamedColumns();
         effectiveCols = model.getEffectiveCols();
         effectiveMeasures = model.getEffectiveMeasures();
-        nameColumnIdMap = effectiveNamedColumns.entrySet().stream()
-                .collect(Collectors.toMap(e -> 
e.getValue().getAliasDotColumn(), Map.Entry::getValue));
+
+        Map<String, NDataModel.NamedColumn> fullQualifiedName2ColumnMap = new 
CaseInsensitiveStringMap<>();
+        effectiveNamedColumns.forEach((k, v) -> 
fullQualifiedName2ColumnMap.put(v.getAliasDotColumn(), v));
+        nameColumnIdMap = fullQualifiedName2ColumnMap;
 
         
modelColumnMeasureIdNameMap.putAll(model.getAllMeasures().stream().filter(measure
 -> !measure.isTomb())
                 .collect(Collectors.toMap(NDataModel.Measure::getId, 
NDataModel.Measure::getName)));