Simplify convert util

* 현재 metastore 에 pushdown 되는 케이스가 integral value / string /
date 타입 뿐이고, glue catalog는 date type도 string 형태로 받으므로 db의
파티션 키 정보 없이 단순 변환 하도록 로직을 단순화

Author: kimtkyeom

aws-glue-datacatalog-client-common/src/main/java/com/amazonaws/glue/catalog/converters/ConverterUtils.java

@@ -1,15 +1,12 @@
 package com.amazonaws.glue.catalog.converters;
 
-import com.amazonaws.glue.catalog.metastore.AWSGlueClientFactory;
-import org.apache.commons.lang3.StringUtils;
 import com.amazonaws.services.glue.model.Table;
-
 import com.google.gson.Gson;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.hive.metastore.HiveMetaStore;
 import org.apache.hadoop.hive.metastore.PartFilterExprUtil;
 import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.metastore.parser.ExpressionTree;
-import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.log4j.Logger;
 
 public class ConverterUtils {
@@ -40,22 +37,19 @@ public static String convertLocationScheme(String location, String targetScheme)
   public static class PartitionFilterConverter extends ExpressionTree.TreeVisitor {
     private static final Logger logger = Logger.getLogger(PartitionFilterConverter.class);
 
-    // Need to be convert to hive metastore api model
-    private final org.apache.hadoop.hive.metastore.api.Table table;
     private final ExpressionTree.FilterBuilder filterBuffer;
 
-    private PartitionFilterConverter(Table table, String dbname) {
-      this.table = CatalogToHiveConverter.convertTable(table, dbname);
+    private PartitionFilterConverter() {
       this.filterBuffer = new ExpressionTree.FilterBuilder(false);
     }
 
     // hive 에서 넘어온 partition filter expr을 glue catalog 맥락으로 전환
     // 이 과정에서 모종의 이슈가 발생 할 경우 로그로 정보만 남기고 null 리턴 (이 경우 partition pruning을 하지 않도록 fallback)
-    public static String convertHiveToCatalog(Table table, String dbname, String filter) {
+    public static String convertHiveToCatalog(String filter) {
       try {
         final ExpressionTree tree = (filter != null && !filter.isEmpty())
                 ? PartFilterExprUtil.getFilterParser(filter).tree : ExpressionTree.EMPTY_TREE;
-        PartitionFilterConverter visitor = new PartitionFilterConverter(table, dbname);
+        PartitionFilterConverter visitor = new PartitionFilterConverter();
         tree.accept(visitor);
 
         // (kimtkyeom) TODO: Need to throw?
@@ -99,17 +93,6 @@ private static enum FilterType {
 
       Invalid;
 
-      static FilterType fromType(String colTypeStr) {
-        if (colTypeStr.equals(serdeConstants.STRING_TYPE_NAME)) {
-          return FilterType.String;
-        } else if (colTypeStr.equals(serdeConstants.DATE_TYPE_NAME)) {
-          return FilterType.Date;
-        } else if (serdeConstants.IntegralTypes.contains(colTypeStr)) {
-          return FilterType.Integral;
-        }
-        return FilterType.Invalid;
-      }
-
       public static FilterType fromClass(Object value) {
         if (value instanceof String) {
           return FilterType.String;
@@ -124,16 +107,6 @@ public static FilterType fromClass(Object value) {
 
     @Override
     public void visit(ExpressionTree.LeafNode node) throws MetaException {
-      int partColIndex = node.getPartColIndexForFilter(table, filterBuffer);
-      if (filterBuffer.hasError()) return;
-
-      // We skipped 'like', other ops should all work as long as the types are right.
-      String colTypeStr = table.getPartitionKeys().get(partColIndex).getType();
-      FilterType colType = FilterType.fromType(colTypeStr);
-      if (colType == FilterType.Invalid) {
-        filterBuffer.setError("Filter pushdown not supported for type " + colTypeStr);
-        return;
-      }
       FilterType valType = FilterType.fromClass(node.value);
       Object nodeValue = node.value;
       if (valType == FilterType.Invalid) {
@@ -142,15 +115,11 @@ public void visit(ExpressionTree.LeafNode node) throws MetaException {
       }
 
       String partFilterExpr = "";
-      if (colType == FilterType.Integral) {
+      if (valType == FilterType.Integral) {
         partFilterExpr = node.keyName + node.operator.getOp() + node.value;
-      } else if (colType == FilterType.String) {
-        partFilterExpr = node.keyName + node.operator.getOp() + "'" + node.value + "'";
-      } else if (colType == FilterType.Date && valType == FilterType.String) {
-        // (kimtkyeom) directSql 로 들어오는 partition pruning expr 중 string 형태로 filter value가 들어오는 경우가 있음.
-        // Glue는 unquoted date str을 받지 않으므로 quote를 추가해주는 대응을 한다.
+      } else if (valType == FilterType.String) {
         partFilterExpr = node.keyName + node.operator.getOp() + "'" + node.value + "'";
-      } else if (colType == FilterType.Date && valType == FilterType.Date) {
+      } else if (valType == FilterType.Date) {
         // (kimtkyeom) Date type 필터가 date type value로 들어온 경우, string으로 format
         String dateFormatted = HiveMetaStore.PARTITION_DATE_FORMAT.get().format((java.sql.Date) nodeValue);
         partFilterExpr = node.keyName + node.operator.getOp() + "'" + dateFormatted + "'";

aws-glue-datacatalog-client-common/src/main/java/com/amazonaws/glue/catalog/metastore/DefaultAWSGlueMetastore.java

@@ -316,7 +316,7 @@ private List<Partition> getCatalogPartitions(String databaseName, String tableNa
         Table table = getTable(databaseName, tableName);
         String convertedExpr = ConverterUtils
                 .PartitionFilterConverter
-                .convertHiveToCatalog(table, databaseName, expression);
+                .convertHiveToCatalog(expression);
 
         String nextToken = null;
         do {