Compare types ignoring cases. This is not complete solution and shoul…

…d be reverted once prestodb#2863 is resolved.
twitter-forks · Oct 2, 2015 · ec109d1 · ec109d1 · syed72 · Nov 3, 2015
1 parent eff7e3b
commit ec109d1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/metadata/FunctionRegistry.java b/presto-main/src/main/java/com/facebook/presto/metadata/FunctionRegistry.java
@@ -449,7 +449,7 @@ public FunctionInfo resolveFunction(QualifiedName name, List<TypeSignature> para
                 RowType rowType = RowParametricType.ROW.createType(resolveTypes(typeSignature.getParameters(), typeManager), typeSignature.getLiteralParameters());
                 // search for exact match
                 for (ParametricFunction function : RowParametricType.ROW.createFunctions(rowType)) {
-                    if (!function.getSignature().getName().equals(name.toString())) {
+                    if (!function.getSignature().getName().equalsIgnoreCase(name.toString())) {
                         continue;
                     }
                     Map<String, Type> boundTypeParameters = function.getSignature().bindTypeParameters(resolvedTypes, false, typeManager);

diff --git a/presto-main/src/main/java/com/facebook/presto/operator/scalar/RowFieldReference.java b/presto-main/src/main/java/com/facebook/presto/operator/scalar/RowFieldReference.java
@@ -28,7 +28,6 @@
 
 import java.lang.invoke.MethodHandle;
 import java.util.Map;
-import java.util.Optional;
 
 import static com.facebook.presto.sql.QueryUtil.mangleFieldReference;
 import static com.facebook.presto.type.RowType.RowField;
@@ -59,7 +58,7 @@ public RowFieldReference(RowType type, String fieldName)
         Type returnType = null;
         int index = 0;
         for (RowField field : type.getFields()) {
-            if (field.getName().equals(Optional.of(fieldName))) {
+            if (field.getName().get().equalsIgnoreCase(fieldName)) {
                 returnType = field.getType();
                 break;
             }

diff --git a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java
@@ -318,7 +318,7 @@ private Type tryVisitRowFieldAccessor(QualifiedNameReference node)
                 RowType rowType = checkType(field.getType(), RowType.class, "field.getType()");
                 Type rowFieldType = null;
                 for (RowField rowField : rowType.getFields()) {
-                    if (rowField.getName().equals(Optional.of(node.getName().getSuffix()))) {
+                    if (rowField.getName().get().equalsIgnoreCase(node.getName().getSuffix())) {
                         rowFieldType = rowField.getType();
                         break;
                     }

diff --git a/presto-main/src/main/java/com/facebook/presto/type/RowParametricType.java b/presto-main/src/main/java/com/facebook/presto/type/RowParametricType.java
@@ -65,7 +65,7 @@ public List<ParametricFunction> createFunctions(Type type)
         ImmutableList.Builder<ParametricFunction> builder = ImmutableList.builder();
         for (RowField field : rowType.getFields()) {
             field.getName()
-                    .ifPresent(name -> builder.add(new RowFieldReference(rowType, field.getName().get())));
+                    .ifPresent(name -> builder.add(new RowFieldReference(rowType, field.getName().get().toLowerCase())));
         }
         return builder.build();
     }

diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/type/TypeSignature.java b/presto-spi/src/main/java/com/facebook/presto/spi/type/TypeSignature.java
@@ -189,7 +189,7 @@ private static Object parseLiteral(String literal)
     {
         if (literal.startsWith("'") || literal.endsWith("'")) {
             checkArgument(literal.startsWith("'") && literal.endsWith("'"), "Bad literal: '%s'", literal);
-            return literal.substring(1, literal.length() - 1);
+            return literal.substring(1, literal.length() - 1).toLowerCase();
         }
         else {
             return Long.parseLong(literal);