address review

dengzhhu653 · Feb 23, 2024 · 075da06 · 075da06
1 parent 089ee48
commit 075da06
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 31 deletions.
diff --git a/...tore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java b/...tore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java
@@ -759,22 +759,6 @@ public Object getBoolean(boolean val) {
     return val;
   }
 
-  public Object convertDateValue(Object dateValue) {
-    assert dateValue instanceof String;
-    Date date = MetaStoreUtils.convertStringToDate((String)dateValue);
-    Object result = MetaStoreUtils.convertDateToString(date);
-    return result;
-  }
-
-  public Object convertTimestampValue(Object timestampValue) {
-    assert timestampValue instanceof String;
-    MetaStoreUtils.convertStringToTimestamp((String) timestampValue);
-    // The timestampValue looks valid now, for Postgres/SQLServer/Oracle, return timestampValue as it is,
-    // otherwise we may run into different results on SQL and JDO, check the partition_timestamp3.q
-    // for such case.
-    return timestampValue;
-  }
-
   /**
    * Get the max rows in a query with paramSize.
    * @param batch the configured batch size

diff --git a/...e/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java b/...e/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
@@ -1427,7 +1427,9 @@ public void visit(LeafNode node) throws MetaException {
       // type mismatch when string col is filtered by a string that looks like date.
       if (colType == FilterType.Date) {
         try {
-          nodeValue = dbType.convertDateValue(nodeValue);
+          // check the nodeValue is a valid date
+          nodeValue = MetaStoreUtils.convertDateToString(
+              MetaStoreUtils.convertStringToDate((String) nodeValue));
           valType = FilterType.Date;
           if (dbType.isPOSTGRES() || dbType.isORACLE()) {
             nodeValue0 = "date '" + nodeValue + "'";
@@ -1437,18 +1439,18 @@ public void visit(LeafNode node) throws MetaException {
         }
       } else if (colType == FilterType.Timestamp) {
         if (dbType.isDERBY() || dbType.isMYSQL()) {
-          filterBuffer.setError("Filter pushdown not supported for timestamp on " + dbType.dbType.name());
+          filterBuffer.setError("Filter pushdown on timestamp not supported for " + dbType.dbType.name());
           return;
         }
         try {
-          nodeValue = dbType.convertTimestampValue(nodeValue);
+          // check the nodeValue is a valid timestamp
+          MetaStoreUtils.convertStringToTimestamp((String) nodeValue);
           valType = FilterType.Timestamp;
           if (dbType.isPOSTGRES() || dbType.isORACLE()) {
             nodeValue0 = "timestamp '" + nodeValue + "'";
             nodeValue = null;
           }
-        } catch (Exception e) {
-          // The nodeValue could be '__HIVE_DEFAULT_PARTITION__'
+        } catch (Exception e) { //nodeValue could be '__HIVE_DEFAULT_PARTITION__'
         }
       }
 

diff --git a/...etastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java b/...etastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java
@@ -34,6 +34,7 @@
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 
 /**
@@ -273,20 +274,12 @@ public String toString() {
      */
     public static int getPartColIndexForFilter(String partitionKeyName,
         List<FieldSchema> partitionKeys, FilterBuilder filterBuilder) throws MetaException {
-      assert (partitionKeys.size() > 0);
-      int partitionColumnIndex;
-      for (partitionColumnIndex = 0; partitionColumnIndex < partitionKeys.size();
-           ++partitionColumnIndex) {
-        if (partitionKeys.get(partitionColumnIndex).getName().equalsIgnoreCase(partitionKeyName)) {
-          break;
-        }
-      }
-      if( partitionColumnIndex == partitionKeys.size()) {
+      int partitionColumnIndex = Iterables.indexOf(partitionKeys, key -> partitionKeyName.equalsIgnoreCase(key.getName()));
+      if( partitionColumnIndex < 0) {
         filterBuilder.setError("Specified key <" + partitionKeyName +
             "> is not a partitioning key for the table");
         return -1;
       }
-
       return partitionColumnIndex;
     }
   }