[kylin] 15/37: KYLIN-5566 Fix case insensitiveness when checking model existence

[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 4556d12103ca2f77b666adf2233318e3305eadc1
Author: DorrisRuixuanZhang <dorriszh...@hotmail.com>
AuthorDate: Wed Mar 15 17:13:52 2023 +0800

    KYLIN-5566 Fix case insensitiveness when checking model existence
---
 .../java/org/apache/kylin/rest/service/FusionModelService.java   | 3 ++-
 .../org/apache/kylin/rest/service/FusionModelServiceTest.java    | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git 
a/src/modeling-service/src/main/java/org/apache/kylin/rest/service/FusionModelService.java
 
b/src/modeling-service/src/main/java/org/apache/kylin/rest/service/FusionModelService.java
index 2d68ea7de1..5bea1e95e9 100644
--- 
a/src/modeling-service/src/main/java/org/apache/kylin/rest/service/FusionModelService.java
+++ 
b/src/modeling-service/src/main/java/org/apache/kylin/rest/service/FusionModelService.java
@@ -253,6 +253,7 @@ public class FusionModelService extends 
AbstractModelService implements TableFus
     }
 
     public boolean modelExists(String modelAlias, String project) {
-        return getManager(NDataModelManager.class, 
project).listAllModelAlias().contains(modelAlias);
+        return getManager(NDataModelManager.class, project).listAllModelAlias()
+                .contains(modelAlias.toLowerCase(Locale.ROOT));
     }
 }
diff --git 
a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/FusionModelServiceTest.java
 
b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/FusionModelServiceTest.java
index 8cbb4be88e..38116b69a7 100644
--- 
a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/FusionModelServiceTest.java
+++ 
b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/FusionModelServiceTest.java
@@ -200,8 +200,8 @@ public class FusionModelServiceTest extends SourceTestCase {
         Assert.assertFalse(fusionModel.isHasBaseAggIndex());
         request.setWithBaseIndex(true);
         fusionModelService.updateDataModelSemantic("streaming_test", request);
-        fusionModel = modelService.getModels("stream_merge", "streaming_test", 
false, null, Lists.newArrayList(),
-                null, false, null, null, null, true).get(0);
+        fusionModel = modelService.getModels("stream_merge", "streaming_test", 
false, null, Lists.newArrayList(), null,
+                false, null, null, null, true).get(0);
         Assert.assertFalse(fusionModel.isHasBaseAggIndex());
         Assert.assertFalse(fusionModel.isHasBaseTableIndex());
     }
@@ -463,4 +463,9 @@ public class FusionModelServiceTest extends SourceTestCase {
     public void testModelExists() {
         Assert.assertTrue(fusionModelService.modelExists("stream_merge1", 
"streaming_test"));
     }
+
+    @Test
+    public void testModelExistsIgnoreCase() {
+        Assert.assertTrue(fusionModelService.modelExists("Stream_Merge1", 
"streaming_test"));
+    }
 }