From 84f47d9cbdf668143a3b46b8d592d286d80c81eb Mon Sep 17 00:00:00 2001
From: "Mateusz \"Serafin\" Gajewski" <github@wendigo.pl>
Date: Tue, 18 Mar 2025 11:15:49 -0700
Subject: [PATCH] Use java-string-similarity and JaroWinkler for fuzzy matching

---
 core/trino-main/pom.xml                        | 18 ++++++++++++------
 .../execution/SessionPropertyEvaluator.java    | 17 ++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/core/trino-main/pom.xml b/core/trino-main/pom.xml
index 2eea8abec3bd..75794d495c15 100644
--- a/core/trino-main/pom.xml
+++ b/core/trino-main/pom.xml
@@ -84,6 +84,18 @@
             <artifactId>failsafe</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>info.debatty</groupId>
+            <artifactId>java-string-similarity</artifactId>
+            <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.jcip</groupId>
+                    <artifactId>jcip-annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>aircompressor-v3</artifactId>
@@ -329,12 +341,6 @@
             <artifactId>joda-time</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>me.xdrop</groupId>
-            <artifactId>fuzzywuzzy</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
diff --git a/core/trino-main/src/main/java/io/trino/execution/SessionPropertyEvaluator.java b/core/trino-main/src/main/java/io/trino/execution/SessionPropertyEvaluator.java
index 3973010271de..13f9cb9a3d2c 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SessionPropertyEvaluator.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SessionPropertyEvaluator.java
@@ -14,6 +14,8 @@
 package io.trino.execution;
 
 import com.google.inject.Inject;
+import info.debatty.java.stringsimilarity.JaroWinkler;
+import info.debatty.java.stringsimilarity.interfaces.StringSimilarity;
 import io.trino.Session;
 import io.trino.metadata.SessionPropertyManager;
 import io.trino.security.AccessControl;
@@ -28,7 +30,6 @@
 import io.trino.sql.tree.NodeRef;
 import io.trino.sql.tree.Parameter;
 import io.trino.sql.tree.QualifiedName;
-import me.xdrop.fuzzywuzzy.FuzzySearch;
 
 import java.util.List;
 import java.util.Map;
@@ -44,11 +45,13 @@
 import static io.trino.spi.StandardErrorCode.INVALID_SESSION_PROPERTY;
 import static io.trino.sql.analyzer.SemanticExceptions.semanticException;
 import static java.lang.String.format;
-import static java.util.Comparator.comparingInt;
+import static java.util.Comparator.comparingDouble;
 import static java.util.Objects.requireNonNull;
 
 public class SessionPropertyEvaluator
 {
+    private static final StringSimilarity SIMILARITY = new JaroWinkler();
+
     private final PlannerContext plannerContext;
     private final AccessControl accessControl;
     private final SessionPropertyManager sessionPropertyManager;
@@ -120,20 +123,20 @@ public static List<PropertyMetadata<?>> findSimilar(String propertyName, Set<Pro
     {
         return candidates.stream()
                 .filter(property -> !property.isHidden())
-                .map(candidate -> new Match(candidate, FuzzySearch.ratio(candidate.getName(), propertyName)))
-                .filter(match -> match.ratio() > 75)
-                .sorted(comparingInt(Match::ratio).reversed())
+                .map(candidate -> new Match(candidate, SIMILARITY.similarity(candidate.getName(), propertyName)))
+                .filter(match -> match.ratio() > 0.85)
+                .sorted(comparingDouble(Match::ratio).reversed())
                 .limit(count)
                 .map(Match::metadata)
                 .collect(toImmutableList());
     }
 
-    private record Match(PropertyMetadata<?> metadata, int ratio)
+    private record Match(PropertyMetadata<?> metadata, double ratio)
     {
         public Match
         {
             requireNonNull(metadata, "metadata is null");
-            verify(ratio >= 0 && ratio < 100, "ratio must be in the [0, 100) range");
+            verify(ratio >= 0.0 && ratio <= 1.0, "ratio must be in the [0, 1.0] range");
         }
     }