deniskuzZ commented on code in PR #5793:
URL: https://github.com/apache/hive/pull/5793#discussion_r2186211992
##########
standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java:
##########
@@ -1984,14 +1984,28 @@ private StringBuilder
appendSimpleCondition(StringBuilder builder,
private StringBuilder appendCondition(StringBuilder builder,
String fieldName, String[] elements, boolean pattern, List<String>
parameters) {
+ return appendCondition(builder, fieldName, elements, pattern, parameters,
false);
+ }
+
+ private StringBuilder appendPatternConditionCaseSensitive(StringBuilder
builder,
+ String fieldName, String elements, List<String> parameters) {
+ elements = normalizeIdentifier(elements);
+ return appendCondition(builder, fieldName, elements.split("\\|"), true,
parameters, true);
Review Comment:
Can we keep 1 `appendPatternCondition` method
````
Subject: [PATCH] tt
---
Index:
standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
(revision 39c88d7c1742b6ab0c87d58d333d81aefedeba3d)
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
(date 1751672519756)
@@ -1012,11 +1012,10 @@
openTransaction();
// Take the pattern and split it on the | to get all the composing
// patterns
- String[] subpatterns = pattern.trim().split("\\|");
StringBuilder filterBuilder = new StringBuilder();
- List<String> parameterVals = new ArrayList<>(subpatterns.length);
+ List<String> parameterVals = new ArrayList<>();
appendSimpleCondition(filterBuilder, "catalogName", new String[]
{catName}, parameterVals);
- appendPatternCondition(filterBuilder, "name", subpatterns,
parameterVals);
+ appendPatternCondition(filterBuilder, "name", pattern, parameterVals);
query = pm.newQuery(MDatabase.class, filterBuilder.toString());
query.setResult("name");
query.setOrdering("name ascending");
@@ -1064,8 +1063,7 @@
List<String> parameterVals = new ArrayList<>();
appendSimpleCondition(filterBuilder, "catalogName", new
String[]{catName}, parameterVals);
if (!(pattern == null || pattern.equals("*"))) {
- String[] subpatterns = pattern.trim().split("\\|");
- appendPatternCondition(filterBuilder, "name", subpatterns,
parameterVals);
+ appendPatternCondition(filterBuilder, "name", pattern,
parameterVals);
}
query = pm.newQuery(MDatabase.class, filterBuilder.toString());
query.setOrdering("name ascending");
@@ -1854,7 +1852,7 @@
appendPatternCondition(filterBuilder, "tableName", pattern,
parameterVals);
}
if(tableType != null) {
- appendPatternCondition(filterBuilder, "tableType", new String[]
{tableType.toString()}, parameterVals);
+ appendSimpleCondition(filterBuilder, "tableType", new String[]
{tableType.toString()}, parameterVals);
}
query = pm.newQuery(MTable.class, filterBuilder.toString());
@@ -2017,11 +2015,6 @@
return metas;
}
- private StringBuilder appendPatternCondition(StringBuilder filterBuilder,
String fieldName,
- String[] elements, List<String> parameterVals) {
- return appendCondition(filterBuilder, fieldName, elements, true,
parameterVals);
- }
-
protected StringBuilder appendPatternCondition(StringBuilder builder,
String fieldName, String elements, List<String> parameters) {
elements = normalizeIdentifier(elements);
@@ -2042,7 +2035,7 @@
int length = builder.length();
for (String element : elements) {
if (pattern) {
- element = "(?i)" + element.replaceAll("\\*", ".*");
+ element = element.replaceAll("\\*", ".*");
}
parameters.add(element);
if (builder.length() > length) {
@@ -2149,7 +2142,6 @@
try {
openTransaction();
- db = normalizeIdentifier(db);
catName = normalizeIdentifier(catName);
List<String> lowered_tbl_names = new ArrayList<>();
@@ -2162,7 +2154,7 @@
StringBuilder filterBuilder = new StringBuilder();
List<String> parameterVals = new ArrayList<>();
- appendPatternCondition(filterBuilder, "database.name", new String[]
{db}, parameterVals);
+ appendPatternCondition(filterBuilder, "database.name", db,
parameterVals);
appendSimpleCondition(filterBuilder, "database.catalogName", new
String[] {catName}, parameterVals);
if(tbl_names != null){
appendSimpleCondition(filterBuilder, "tableName",
lowered_tbl_names.toArray(new String[0]), parameterVals);
````
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org
For additional commands, e-mail: gitbox-h...@hive.apache.org
