Changes following review

finos · May 17, 2024 · 648a7d2 · 648a7d2
1 parent 093e5c9
commit 648a7d2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/...an-dependencies/src/main/java/org/finos/legend/engine/plan/dependencies/util/Library.java b/...an-dependencies/src/main/java/org/finos/legend/engine/plan/dependencies/util/Library.java
@@ -1784,7 +1784,7 @@ public static double jaroWinklerSimilarity(String str1, String str2)
         return new JaroWinklerSimilarity().apply(str1, str2);
     }
 
-    public static int levenshteinDistance(String str1, String str2)
+    public static long levenshteinDistance(String str1, String str2)
     {
         return new LevenshteinDistance().apply(str1, str2);
     }

diff --git a/...s/core_java_platform_binding/legendJavaPlatformBinding/planConventions/stringLibrary.pure b/...s/core_java_platform_binding/legendJavaPlatformBinding/planConventions/stringLibrary.pure
@@ -89,7 +89,7 @@ function meta::pure::executionPlan::platformBinding::legendJava::library::string
 
          fc2(hash_String_1__HashType_1__String_1_,                               {ctx,text,hashType          | $library->j_invoke('hash', [$text, $hashType], javaString())}),
          fc2(jaroWinklerSimilarity_String_1__String_1__Float_1_,                 {ctx,str1,str2              | $library->j_invoke('jaroWinklerSimilarity',[$str1, $str2], javaFloat())}),
-         fc2(levenshteinDistance_String_1__String_1__Integer_1_,                 {ctx,str1,str2              | $library->j_invoke('levenshteinDistance',[$str1, $str2], javaInt())})
+         fc2(levenshteinDistance_String_1__String_1__Integer_1_,                 {ctx,str1,str2              | $library->j_invoke('levenshteinDistance',[$str1, $str2], javaLong())})
       ]);
 
    $conventions->registerLibrary($lib);

diff --git a/...rc/main/resources/core_relational_duckdb/relational/sqlQueryToString/duckdbExtension.pure b/...rc/main/resources/core_relational_duckdb/relational/sqlQueryToString/duckdbExtension.pure
@@ -42,6 +42,7 @@ function <<access.private>> meta::relational::functions::sqlQueryToString::duckD
 {
   let allStates = allGenerationStates();
   [
+    dynaFnToSql('jaroWinklerSimilarity',  $allStates,            ^ToSql(format='JARO_WINKLER_SIMILARITY(%s, %s)'))
   ];
 }
 

diff --git a/...n/resources/core_relational_snowflake/relational/sqlQueryToString/snowflakeExtension.pure b/...n/resources/core_relational_snowflake/relational/sqlQueryToString/snowflakeExtension.pure
@@ -158,7 +158,7 @@ function <<access.private>> meta::relational::functions::sqlQueryToString::snowf
     dynaFnToSql('hour',                   $allStates,            ^ToSql(format='date_part(\'hour\', %s)')),
     dynaFnToSql('indexOf',                $allStates,            ^ToSql(format='CHARINDEX(%s)', transform={p:String[2] | $p->at(1) + ', ' + $p->at(0)})),
     dynaFnToSql('isAlphaNumeric',         $allStates,            ^ToSql(format=regexpPattern('%s'), transform={p:String[1]|$p->transformAlphaNumericParamsDefault()})),
-    dynaFnToSql('jaroWinklerSimilarity',  $allStates,            ^ToSql(format='JAROWINKLER_SIMILARITY(%s, %s)')),
+    dynaFnToSql('jaroWinklerSimilarity',  $allStates,            ^ToSql(format='ROUND(JAROWINKLER_SIMILARITY(%s, %s)/100, 2)')),
     dynaFnToSql('joinStrings',            $allStates,            ^ToSql(format='listagg(%s, %s)')),
     dynaFnToSql('log10',                  $allStates,            ^ToSql(format='log(10, %s)')),
     dynaFnToSql('length',                 $allStates,            ^ToSql(format='length(%s)')),

diff --git a/...re_relational_snowflake/relational/transform/fromPure/tests/testSnowflakeToSQLString.pure b/...re_relational_snowflake/relational/transform/fromPure/tests/testSnowflakeToSQLString.pure
@@ -230,7 +230,7 @@ function <<test.Test>> meta::relational::tests::sqlToString::snowflake::testJaro
          ->project(p|$p.firstName->jaroWinklerSimilarity('John'), 'similarity')
    , simpleRelationalMapping, DatabaseType.Snowflake, meta::relational::extension::relationalExtensions());
 
-   assertEquals('select JAROWINKLER_SIMILARITY("root".FIRSTNAME, \'John\') as "similarity" from personTable as "root"', $sql);
+   assertEquals('select ROUND(JAROWINKLER_SIMILARITY("root".FIRSTNAME, \'John\')/100, 2) as "similarity" from personTable as "root"', $sql);
 }
 
 function <<test.Test>> meta::relational::tests::sqlToString::snowflake::testLevenshteinDistance():Boolean[1]

diff --git a/...resources/core_relational/relational/sqlQueryToString/testSuite/dynaFunctions/string.pure b/...resources/core_relational/relational/sqlQueryToString/testSuite/dynaFunctions/string.pure
@@ -374,7 +374,7 @@ function <<paramTest.Test>> meta::relational::tests::dbSpecificTests::sqlQueryTe
 function <<paramTest.Test>> meta::relational::tests::dbSpecificTests::sqlQueryTests::dynaFunctions::jaroWinklerSimilarity::testJaroWinklerSimilarity(config:DbTestConfig[1]):Boolean[1]
 {
   let dynaFunc = ^DynaFunction(name='jaroWinklerSimilarity', parameters=[^Literal(value='John Smith'), ^Literal(value = 'Jane Smith')]);
-  let expected = ^Literal(value=88);
+  let expected = ^Literal(value=0.88);
   runDynaFunctionDatabaseTest($dynaFunc, $expected, $config);
 }