Handle enum literals in SqlToRowExpressionTranslator

cjjxfli · Oct 23, 2020 · 9c5f9f9 · 9c5f9f9
1 parent c32704a
commit 9c5f9f9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/LiteralEncoder.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/LiteralEncoder.java
@@ -21,13 +21,15 @@
 import com.facebook.presto.common.type.CharType;
 import com.facebook.presto.common.type.DecimalType;
 import com.facebook.presto.common.type.Decimals;
+import com.facebook.presto.common.type.EnumType;
 import com.facebook.presto.common.type.FunctionType;
 import com.facebook.presto.common.type.MapType;
 import com.facebook.presto.common.type.RowType;
 import com.facebook.presto.common.type.SqlDate;
 import com.facebook.presto.common.type.StandardTypes;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeSignature;
+import com.facebook.presto.common.type.VarcharEnumType;
 import com.facebook.presto.common.type.VarcharType;
 import com.facebook.presto.operator.scalar.VarbinaryFunctions;
 import com.facebook.presto.spi.function.Signature;
@@ -37,6 +39,7 @@
 import com.facebook.presto.sql.tree.Cast;
 import com.facebook.presto.sql.tree.DecimalLiteral;
 import com.facebook.presto.sql.tree.DoubleLiteral;
+import com.facebook.presto.sql.tree.EnumLiteral;
 import com.facebook.presto.sql.tree.Expression;
 import com.facebook.presto.sql.tree.FunctionCall;
 import com.facebook.presto.sql.tree.GenericLiteral;
@@ -231,6 +234,10 @@ public Expression toExpression(Object object, Type type)
             // This if condition will evaluate to true: object instanceof Slice && !type.equals(VARCHAR)
         }
 
+        if (type instanceof EnumType) {
+            return new EnumLiteral(type.getTypeSignature().toString(), object);
+        }
+
         Signature signature = getMagicLiteralFunctionSignature(type);
         if (object instanceof Slice) {
             // HACK: we need to serialize VARBINARY in a format that can be embedded in an expression to be
@@ -312,7 +319,7 @@ private static Type typeForMagicLiteral(Type type)
             return DOUBLE;
         }
         if (!clazz.isPrimitive()) {
-            if (type instanceof VarcharType) {
+            if (type instanceof VarcharType || type instanceof VarcharEnumType) {
                 return type;
             }
             else {

diff --git a/...o-main/src/main/java/com/facebook/presto/sql/relational/SqlToRowExpressionTranslator.java b/...o-main/src/main/java/com/facebook/presto/sql/relational/SqlToRowExpressionTranslator.java
@@ -47,6 +47,7 @@
 import com.facebook.presto.sql.tree.DecimalLiteral;
 import com.facebook.presto.sql.tree.DereferenceExpression;
 import com.facebook.presto.sql.tree.DoubleLiteral;
+import com.facebook.presto.sql.tree.EnumLiteral;
 import com.facebook.presto.sql.tree.Expression;
 import com.facebook.presto.sql.tree.FieldReference;
 import com.facebook.presto.sql.tree.FunctionCall;
@@ -287,6 +288,20 @@ protected RowExpression visitBinaryLiteral(BinaryLiteral node, Void context)
             return constant(node.getValue(), VARBINARY);
         }
 
+        @Override
+        protected RowExpression visitEnumLiteral(EnumLiteral node, Void context)
+        {
+            Type type;
+            try {
+                type = functionAndTypeManager.getType(parseTypeSignature(node.getType()));
+            }
+            catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException("Unsupported type: " + node.getType());
+            }
+
+            return constant(node.getValue(), type);
+        }
+
         @Override
         protected RowExpression visitGenericLiteral(GenericLiteral node, Void context)
         {