Fix adaptation from Slice to Object stack type

trinodb · Aug 5, 2020 · 8131d34 · 8131d34
1 parent 94f2ae2
commit 8131d34
Show file tree

Hide file tree

Showing 2 changed files with 197 additions and 39 deletions.
diff --git a/presto-main/src/main/java/io/prestosql/metadata/ScalarFunctionAdapter.java b/presto-main/src/main/java/io/prestosql/metadata/ScalarFunctionAdapter.java
@@ -423,7 +423,7 @@ private MethodHandle adaptParameter(
 
         // caller will pass boolean true in the next argument for SQL null
         if (expectedArgumentConvention == BLOCK_POSITION) {
-            MethodHandle getBlockValue = getBlockValue(argumentType);
+            MethodHandle getBlockValue = getBlockValue(argumentType, methodHandle.type().parameterType(parameterIndex));
 
             if (actualArgumentConvention == NEVER_NULL) {
                 if (nullAdaptationPolicy == UNDEFINED_VALUE_FOR_NULL) {
@@ -487,7 +487,7 @@ private MethodHandle adaptParameter(
         throw new IllegalArgumentException("Unsupported expected argument convention: " + expectedArgumentConvention);
     }
 
-    private static MethodHandle getBlockValue(Type argumentType)
+    private static MethodHandle getBlockValue(Type argumentType, Class<?> expectedType)
     {
         Class<?> methodArgumentType = argumentType.getJavaType();
         String getterName;
@@ -511,7 +511,7 @@ else if (methodArgumentType == Slice.class) {
         try {
             MethodHandle getValue = lookup().findVirtual(Type.class, getterName, methodType(methodArgumentType, Block.class, int.class))
                     .bindTo(argumentType);
-            return explicitCastArguments(getValue, getValue.type().changeReturnType(argumentType.getJavaType()));
+            return explicitCastArguments(getValue, getValue.type().changeReturnType(expectedType));
         }
         catch (ReflectiveOperationException e) {
             throw new AssertionError(e);