use negative lookbehind pattern

wecharyu · Sep 14, 2024 · 2aa6179 · 2aa6179
1 parent 14e9f76
commit 2aa6179
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 13 deletions.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java
@@ -45,7 +45,7 @@ public int execute() throws HiveException {
     List<String> databases = context.getDb().getAllDatabases();
     if (desc.getPattern() != null) {
       LOG.debug("pattern: {}", desc.getPattern());
-      Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern(), true), Pattern.CASE_INSENSITIVE);
+      Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE);
       databases = databases.stream().filter(name -> pattern.matcher(name).matches()).collect(Collectors.toList());
     }
 

diff --git a/...rc/java/org/apache/hadoop/hive/ql/ddl/dataconnector/show/ShowDataConnectorsOperation.java b/...rc/java/org/apache/hadoop/hive/ql/ddl/dataconnector/show/ShowDataConnectorsOperation.java
@@ -45,7 +45,7 @@ public int execute() throws HiveException {
     List<String> connectors = context.getDb().getAllDataConnectorNames();
     if (desc.getPattern() != null) {
       LOG.debug("pattern: {}", desc.getPattern());
-      Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern(), true), Pattern.CASE_INSENSITIVE);
+      Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE);
       connectors = connectors.stream().filter(name -> pattern.matcher(name).matches()).collect(Collectors.toList());
     }
 

diff --git a/...c/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java b/...c/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java
@@ -63,7 +63,7 @@ public int execute() throws HiveException {
       LOG.debug("pattern: {}", desc.getPattern());
       List<String> tableNames = context.getDb().getTablesForDb(desc.getDbName(), null);
       if (desc.getPattern() != null) {
-        Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern(), true), Pattern.CASE_INSENSITIVE);
+        Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE);
         tableNames = tableNames.stream()
             .filter(name -> pattern.matcher(name).matches())
             .collect(Collectors.toList());

diff --git a/.../org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java b/.../org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java
@@ -53,7 +53,7 @@ public int execute() throws HiveException {
     List<Table> viewObjects = new ArrayList<>(
         context.getDb().getMaterializedViewObjectsByPattern(desc.getDbName(), null));
     if (desc.getPattern() != null) {
-      Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern(), true), Pattern.CASE_INSENSITIVE);
+      Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE);
       viewObjects = viewObjects.stream()
           .filter(object -> pattern.matcher(object.getTableName()).matches())
           .collect(Collectors.toList());

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
@@ -858,7 +858,7 @@ public static Set<String> getFunctionNamesByLikePattern(String funcPatternStr) {
     Set<String> allFuncs = getFunctionNames();
     String[] subpatterns = funcPatternStr.trim().split("\\|");
     for (String subpattern : subpatterns) {
-      subpattern = "(?i)" + UDFLike.likePatternToRegExp(subpattern, true);
+      subpattern = "(?i)" + UDFLike.likePatternToRegExp(subpattern);
       try {
         Pattern patternObj = Pattern.compile(subpattern);
         for (String funcName : allFuncs) {

diff --git a/...va/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java b/...va/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java
@@ -82,7 +82,7 @@ String format(String pattern) {
     COMPLEX(ComplexChecker.class) {
       @Override
       String format(String pattern) {
-        return "^" + UDFLike.likePatternToRegExp(pattern, true) + "$";
+        return "^" + UDFLike.likePatternToRegExp(pattern) + "$";
       }
     },
     // Accepts chained LIKE patterns without escaping like "abc%def%ghi%" and

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java
@@ -321,7 +321,7 @@ public List<String> getTables(String dbName, String tablePattern) throws MetaExc
     if (tables == null || tables.size() == 0) {
       return tableNames;
     }
-    tablePattern = tablePattern.replaceAll("\\.\\*", "\\*").replaceAll("\\*", ".*");
+    tablePattern = tablePattern.replaceAll("(?<!\\.)\\*", ".*");
     Pattern pattern = Pattern.compile(tablePattern);
     Matcher matcher = pattern.matcher("");
     Set<String> combinedTableNames = new HashSet<String>();
@@ -351,7 +351,7 @@ public List<String> getTables(String dbname, String tablePattern, TableType tabl
       if (tables == null || tables.size() == 0) {
         return tableNames;
       }
-      tablePattern = tablePattern.replaceAll("\\.\\*", "\\*").replaceAll("\\*", ".*");
+      tablePattern = tablePattern.replaceAll("(?<!\\.)\\*", ".*");
       Pattern pattern = Pattern.compile(tablePattern);
       Matcher matcher = pattern.matcher("");
       Set<String> combinedTableNames = new HashSet<String>();

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFLike.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFLike.java
@@ -61,7 +61,11 @@ private enum PatternType {
   public UDFLike() {
   }
 
-  public static String likePatternToRegExp(String likePattern, boolean quote) {
+  public static String likePatternToRegExp(String likePattern) {
+    return likePatternToRegExp(likePattern, true);
+  }
+
+  public static String likePatternToRegExp(String likePattern, boolean literalize) {
     if (likePattern == null) {
       return null;
     }
@@ -80,9 +84,9 @@ public static String likePatternToRegExp(String likePattern, boolean quote) {
       if (n == '_') {
         sb.append(".");
       } else if (n == '%') {
-        sb.append(".*");
+        sb.append(".*?");
       } else {
-        sb.append(quote ? Pattern.quote(Character.toString(n)) : n);
+        sb.append(literalize ? Pattern.quote(Character.toString(n)) : n);
       }
     }
     return sb.toString();
@@ -187,7 +191,7 @@ public BooleanWritable evaluate(Text s, Text likePattern) {
 
       parseSimplePattern(strLikePattern);
       if (type == PatternType.COMPLEX) {
-        p = Pattern.compile(likePatternToRegExp(strLikePattern, true), Pattern.DOTALL);
+        p = Pattern.compile(likePatternToRegExp(strLikePattern), Pattern.DOTALL);
       }
     }
 

diff --git a/.../metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/.../metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -2929,7 +2929,7 @@ public List<String> getTables(String catName, String dbName, String tablePattern
       // We need unify the pattern definition, see HIVE-28297 for details.
       String[] patterns = tablePattern.split("\\|");
       for (String pattern : patterns) {
-        pattern = "(?i)" + pattern.replaceAll("\\.\\*", "\\*").replaceAll("\\*", ".*");
+        pattern = "(?i)" + pattern.replaceAll("(?<!\\.)\\*", ".*");
         String filter = String.format("%s like \"%s\"", hive_metastoreConstants.HIVE_FILTER_FIELD_TABLE_NAME, pattern);
         tables.addAll(listTableNamesByFilter(catName, dbName, filter, (short) -1));
       }