Revert "Support type bound in TypeVariableConstraint"

This reverts commit f99842b.

presto-docs/src/main/sphinx/develop/functions.rst

@@ -116,11 +116,8 @@ To make our previous example work with any type we need the following:
   The ``@TypeParameter`` annotation is used to declare a type parameter which can
   be used in the argument types ``@SqlType`` annotation, or return type of the function.
   It can also be used to annotate a parameter of type ``Type``. At runtime, the engine
-  will bind the concrete type to this parameter. Optionally, the type parameter
-  can be constrained to descendants of a particular type by providing a ``boundedBy``
-  type class to ``@TypeParameter``.
-  ``@OperatorDependency`` may be used to declare that an additional function
-  for operating on the given type parameter is needed.
+  will bind the concrete type to this parameter. ``@OperatorDependency`` may be used
+  to declare that an additional function for operating on the given type parameter is needed.
   For example, the following function will only bind to types which have an equals function
   defined:
 

presto-main/src/main/java/com/facebook/presto/metadata/SignatureBinder.java

@@ -323,8 +323,7 @@ private boolean appendConstraintSolvers(
                     actualType,
                     typeVariableConstraint.isComparableRequired(),
                     typeVariableConstraint.isOrderableRequired(),
-                    Optional.ofNullable(typeVariableConstraint.getVariadicBound()),
-                    typeVariableConstraint.getTypeBound()));
+                    Optional.ofNullable(typeVariableConstraint.getVariadicBound())));
             return true;
         }
 
@@ -596,22 +595,14 @@ private class TypeParameterSolver
         private final boolean comparableRequired;
         private final boolean orderableRequired;
         private final Optional<String> requiredBaseName;
-        private final Class<? extends Type> typeBound;
-
-        public TypeParameterSolver(
-                String typeParameter,
-                Type actualType,
-                boolean comparableRequired,
-                boolean orderableRequired,
-                Optional<String> requiredBaseName,
-                Class<? extends Type> typeBound)
+
+        public TypeParameterSolver(String typeParameter, Type actualType, boolean comparableRequired, boolean orderableRequired, Optional<String> requiredBaseName)
         {
             this.typeParameter = typeParameter;
             this.actualType = actualType;
             this.comparableRequired = comparableRequired;
             this.orderableRequired = orderableRequired;
             this.requiredBaseName = requiredBaseName;
-            this.typeBound = typeBound;
         }
 
         @Override
@@ -648,9 +639,6 @@ private boolean satisfiesConstraints(Type type)
             if (orderableRequired && !type.isOrderable()) {
                 return false;
             }
-            if (!typeBound.isInstance(type)) {
-                return false;
-            }
             if (requiredBaseName.isPresent() && !UNKNOWN.equals(type) && !requiredBaseName.get().equals(type.getTypeSignature().getBase())) {
                 // TODO: the case below should be properly handled:
                 // * `type` does not have the `requiredBaseName` but can be coerced to some type that has the `requiredBaseName`.

presto-main/src/main/java/com/facebook/presto/operator/annotations/FunctionsParserHelper.java

@@ -57,6 +57,9 @@
 import static com.facebook.presto.common.function.OperatorType.LESS_THAN_OR_EQUAL;
 import static com.facebook.presto.common.function.OperatorType.NOT_EQUAL;
 import static com.facebook.presto.operator.annotations.ImplementationDependency.isImplementationDependencyAnnotation;
+import static com.facebook.presto.spi.function.Signature.comparableTypeParameter;
+import static com.facebook.presto.spi.function.Signature.orderableTypeParameter;
+import static com.facebook.presto.spi.function.Signature.typeVariable;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
@@ -109,13 +112,13 @@ public static List<TypeVariableConstraint> createTypeVariableConstraints(Iterabl
         for (TypeParameter typeParameter : typeParameters) {
             String name = typeParameter.value();
             if (orderableRequired.contains(name)) {
-                typeVariableConstraints.add(new TypeVariableConstraint(name, false, true, null, typeParameter.boundedBy()));
+                typeVariableConstraints.add(orderableTypeParameter(name));
             }
             else if (comparableRequired.contains(name)) {
-                typeVariableConstraints.add(new TypeVariableConstraint(name, true, false, null, typeParameter.boundedBy()));
+                typeVariableConstraints.add(comparableTypeParameter(name));
             }
             else {
-                typeVariableConstraints.add(new TypeVariableConstraint(name, false, false, null, typeParameter.boundedBy()));
+                typeVariableConstraints.add(typeVariable(name));
             }
         }
         return typeVariableConstraints.build();

presto-spi/src/main/java/com/facebook/presto/spi/function/TypeParameter.java

@@ -13,8 +13,6 @@
  */
 package com.facebook.presto.spi.function;
 
-import com.facebook.presto.common.type.Type;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -30,6 +28,4 @@
 public @interface TypeParameter
 {
     String value();
-
-    Class<? extends Type> boundedBy() default Type.class;
 }

presto-spi/src/main/java/com/facebook/presto/spi/function/TypeVariableConstraint.java

@@ -27,30 +27,18 @@ public class TypeVariableConstraint
     private final boolean comparableRequired;
     private final boolean orderableRequired;
     private final String variadicBound;
-    private final Class<? extends Type> typeBound;
 
     @JsonCreator
     public TypeVariableConstraint(
             @JsonProperty("name") String name,
             @JsonProperty("comparableRequired") boolean comparableRequired,
             @JsonProperty("orderableRequired") boolean orderableRequired,
-            @JsonProperty("variadicBound") @Nullable String variadicBound,
-            @JsonProperty("boundedBy") Class<? extends Type> typeBound)
+            @JsonProperty("variadicBound") @Nullable String variadicBound)
     {
         this.name = name;
         this.comparableRequired = comparableRequired;
         this.orderableRequired = orderableRequired;
         this.variadicBound = variadicBound;
-        this.typeBound = typeBound;
-    }
-
-    public TypeVariableConstraint(
-            @JsonProperty("name") String name,
-            @JsonProperty("comparableRequired") boolean comparableRequired,
-            @JsonProperty("orderableRequired") boolean orderableRequired,
-            @JsonProperty("variadicBound") @Nullable String variadicBound)
-    {
-        this(name, comparableRequired, orderableRequired, variadicBound, Type.class);
     }
 
     @JsonProperty
@@ -77,12 +65,6 @@ public String getVariadicBound()
         return variadicBound;
     }
 
-    @JsonProperty
-    public Class<? extends Type> getTypeBound()
-    {
-        return typeBound;
-    }
-
     public boolean canBind(Type type)
     {
         if (comparableRequired && !type.isComparable()) {
@@ -91,9 +73,6 @@ public boolean canBind(Type type)
         if (orderableRequired && !type.isOrderable()) {
             return false;
         }
-        if (!typeBound.isInstance(type)) {
-            return false;
-        }
         if (variadicBound != null && !type.getTypeSignature().getBase().equals(variadicBound)) {
             return false;
         }
@@ -113,9 +92,6 @@ public String toString()
         if (variadicBound != null) {
             value += ":" + variadicBound + "<*>";
         }
-        if (!typeBound.equals(Type.class)) {
-            value += " extends " + typeBound.getSimpleName();
-        }
         return value;
     }
 
@@ -132,13 +108,12 @@ public boolean equals(Object o)
         return comparableRequired == that.comparableRequired &&
                 orderableRequired == that.orderableRequired &&
                 Objects.equals(name, that.name) &&
-                Objects.equals(variadicBound, that.variadicBound) &&
-                Objects.equals(typeBound, that.typeBound);
+                Objects.equals(variadicBound, that.variadicBound);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(name, comparableRequired, orderableRequired, variadicBound, typeBound);
+        return Objects.hash(name, comparableRequired, orderableRequired, variadicBound);
     }
 }