Add max_serializable_object_size session property

Author: Raaghav0

presto-hive/src/test/java/com/facebook/presto/hive/AbstractTestHiveClient.java

@@ -1250,6 +1250,12 @@ public ConnectorSession forConnectorId(ConnectorId connectorId)
             {
                 return this;
             }
+
+            @Override
+            public long getMaxSerializableObjectSize()
+            {
+                return session.getMaxSerializableObjectSize();
+            }
         };
     }
 

presto-main-base/src/main/java/com/facebook/presto/FullConnectorSession.java

@@ -31,6 +31,7 @@
 import java.util.Optional;
 import java.util.Set;
 
+import static com.facebook.presto.SystemSessionProperties.MAX_SERIALIZABLE_OBJECT_SIZE;
 import static com.facebook.presto.SystemSessionProperties.isExploitConstraints;
 import static com.facebook.presto.spi.StandardErrorCode.INVALID_SESSION_PROPERTY;
 import static com.google.common.base.MoreObjects.toStringHelper;
@@ -184,6 +185,7 @@ public String toString()
                 .add("locale", getLocale())
                 .add("startTime", getStartTime())
                 .add("properties", properties)
+                .add("maxSerializableObjectSize", getMaxSerializableObjectSize())
                 .omitNullValues()
                 .toString();
     }
@@ -205,4 +207,10 @@ public ConnectorSession forConnectorId(ConnectorId connectorId)
     {
         return new FullConnectorSession(session, identity);
     }
+
+    @Override
+    public long getMaxSerializableObjectSize()
+    {
+        return session.getSystemProperty(MAX_SERIALIZABLE_OBJECT_SIZE, Long.class);
+    }
 }

presto-main-base/src/main/java/com/facebook/presto/SystemSessionProperties.java

@@ -338,6 +338,7 @@ public final class SystemSessionProperties
     public static final String ADD_DISTINCT_BELOW_SEMI_JOIN_BUILD = "add_distinct_below_semi_join_build";
     public static final String PUSHDOWN_SUBFIELDS_FOR_MAP_SUBSET = "pushdown_subfields_for_map_subset";
     public static final String PUSHDOWN_SUBFIELDS_FOR_MAP_FUNCTIONS = "pushdown_subfields_for_map_functions";
+    public static final String MAX_SERIALIZABLE_OBJECT_SIZE = "max_serializable_object_size";
 
     // TODO: Native execution related session properties that are temporarily put here. They will be relocated in the future.
     public static final String NATIVE_AGGREGATION_SPILL_ALL = "native_aggregation_spill_all";
@@ -1926,6 +1927,10 @@ public SystemSessionProperties(
                         "Enable subfield pruning for map functions, currently include map_subset and map_filter",
                         featuresConfig.isPushdownSubfieldForMapFunctions(),
                         false),
+                longProperty(MAX_SERIALIZABLE_OBJECT_SIZE,
+                        "Configure the maximum byte size of a serializable object in expression interpreters",
+                        featuresConfig.getMaxSerializableObjectSize(),
+                        false),
                 new PropertyMetadata<>(
                         QUERY_CLIENT_TIMEOUT,
                         "Configures how long the query runs without contact from the client application, such as the CLI, before it's abandoned",
@@ -3309,4 +3314,9 @@ public static boolean isOptimizeConditionalApproxDistinctEnabled(Session session
     {
         return session.getSystemProperty(OPTIMIZE_CONDITIONAL_CONSTANT_APPROXIMATE_DISTINCT, Boolean.class);
     }
+
+    public static long getMaxSerializableObjectSize(Session session)
+    {
+        return session.getSystemProperty(MAX_SERIALIZABLE_OBJECT_SIZE, Long.class);
+    }
 }

presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/FeaturesConfig.java

@@ -308,6 +308,7 @@ public class FeaturesConfig
     private boolean addExchangeBelowPartialAggregationOverGroupId;
     private boolean addDistinctBelowSemiJoinBuild;
     private boolean pushdownSubfieldForMapFunctions = true;
+    private long maxSerializableObjectSize = 1000;
 
     public enum PartitioningPrecisionStrategy
     {
@@ -3083,4 +3084,17 @@ public boolean isPushdownSubfieldForMapFunctions()
     {
         return pushdownSubfieldForMapFunctions;
     }
+
+    @Config("max_serializable_object_size")
+    @ConfigDescription("Configure the maximum byte size of a serializable object in expression interpreters")
+    public FeaturesConfig setMaxSerializableObjectSize(long maxSerializableObjectSize)
+    {
+        this.maxSerializableObjectSize = maxSerializableObjectSize;
+        return this;
+    }
+
+    public long getMaxSerializableObjectSize()
+    {
+        return maxSerializableObjectSize;
+    }
 }

presto-main-base/src/main/java/com/facebook/presto/sql/planner/ExpressionInterpreter.java

@@ -160,7 +160,6 @@
 @Deprecated
 public class ExpressionInterpreter
 {
-    private static final long MAX_SERIALIZABLE_OBJECT_SIZE = 1000;
     private final Expression expression;
     private final Metadata metadata;
     private final LiteralEncoder literalEncoder;
@@ -1318,7 +1317,7 @@ private boolean isSerializable(Object value, Type type)
         {
             requireNonNull(type, "type is null");
             // If value is already Expression, literal values contained inside should already have been made serializable. Otherwise, we make sure the object is small and serializable.
-            return value instanceof Expression || (isSupportedLiteralType(type) && estimatedSizeInBytes(value) <= MAX_SERIALIZABLE_OBJECT_SIZE);
+            return value instanceof Expression || (isSupportedLiteralType(type) && estimatedSizeInBytes(value) <= connectorSession.getMaxSerializableObjectSize());
         }
 
         private List<Expression> toExpressions(List<Object> values, List<Type> types)

presto-main-base/src/main/java/com/facebook/presto/sql/planner/RowExpressionInterpreter.java

@@ -122,7 +122,6 @@
 
 public class RowExpressionInterpreter
 {
-    private static final long MAX_SERIALIZABLE_OBJECT_SIZE = 1000;
     private final RowExpression expression;
     private final ConnectorSession session;
     private final Level optimizationLevel;
@@ -779,7 +778,7 @@ private RowExpression toRowExpression(Object value, RowExpression originalRowExp
         private boolean isSerializable(Object value, Type type)
         {
             // If value is already RowExpression, constant values contained inside should already have been made serializable. Otherwise, we make sure the object is small and serializable.
-            return value instanceof RowExpression || (isSupportedLiteralType(type) && estimatedSizeInBytes(value) <= MAX_SERIALIZABLE_OBJECT_SIZE);
+            return value instanceof RowExpression || (isSupportedLiteralType(type) && estimatedSizeInBytes(value) <= session.getMaxSerializableObjectSize());
         }
 
         private SpecialCallResult tryHandleArrayConstructor(CallExpression callExpression, List<Object> argumentValues)

presto-main-base/src/main/java/com/facebook/presto/testing/TestingConnectorSession.java

@@ -63,6 +63,7 @@ public class TestingConnectorSession
     private final SqlFunctionProperties sqlFunctionProperties;
     private final Optional<String> schema;
     private final Map<SqlFunctionId, SqlInvokedFunction> sessionFunctions;
+    private final long maxSerializableObjectSize;
 
     public TestingConnectorSession(List<PropertyMetadata<?>> properties)
     {
@@ -125,6 +126,7 @@ public TestingConnectorSession(
                 .build();
         this.schema = requireNonNull(schema, "schema is null");
         this.sessionFunctions = sessionFunctions;
+        this.maxSerializableObjectSize = 1000;
     }
 
     @Override
@@ -245,6 +247,12 @@ public ConnectorSession forConnectorId(ConnectorId connectorId)
                 sessionFunctions);
     }
 
+    @Override
+    public long getMaxSerializableObjectSize()
+    {
+        return maxSerializableObjectSize;
+    }
+
     @Override
     public String toString()
     {
@@ -258,6 +266,7 @@ public String toString()
                 .add("sqlFunctionProperties", sqlFunctionProperties)
                 .add("properties", propertyValues)
                 .add("clientInfo", clientInfo)
+                .add("maxSerializableObjectSize", maxSerializableObjectSize)
                 .omitNullValues()
                 .toString();
     }

presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestFeaturesConfig.java

@@ -265,7 +265,8 @@ public void testDefaults()
                 .setBroadcastSemiJoinForDelete(true)
                 .setInEqualityJoinPushdownEnabled(false)
                 .setRewriteMinMaxByToTopNEnabled(false)
-                .setPrestoSparkExecutionEnvironment(false));
+                .setPrestoSparkExecutionEnvironment(false)
+                .setMaxSerializableObjectSize(1000));
     }
 
     @Test
@@ -478,6 +479,7 @@ public void testExplicitPropertyMappings()
                 .put("optimizer.add-distinct-below-semi-join-build", "true")
                 .put("optimizer.pushdown-subfield-for-map-functions", "false")
                 .put("optimizer.add-exchange-below-partial-aggregation-over-group-id", "true")
+                .put("max_serializable_object_size", "50")
                 .build();
 
         FeaturesConfig expected = new FeaturesConfig()
@@ -688,7 +690,8 @@ public void testExplicitPropertyMappings()
                 .setBroadcastSemiJoinForDelete(false)
                 .setRewriteMinMaxByToTopNEnabled(true)
                 .setInnerJoinPushdownEnabled(true)
-                .setPrestoSparkExecutionEnvironment(true);
+                .setPrestoSparkExecutionEnvironment(true)
+                .setMaxSerializableObjectSize(50);
         assertFullMapping(properties, expected);
     }
 

presto-spi/src/main/java/com/facebook/presto/spi/ConnectorSession.java

@@ -72,4 +72,10 @@ default boolean isReadConstraints()
      * @return
      */
     ConnectorSession forConnectorId(ConnectorId connectorId);
+
+    /**
+     * returns the max size of a serializable object in bytes
+     * @return
+     */
+    long getMaxSerializableObjectSize();
 }

presto-spi/src/test/java/com/facebook/presto/spi/TestingSession.java

@@ -136,6 +136,12 @@ public ConnectorSession forConnectorId(ConnectorId connectorId)
         {
             return this;
         }
+
+        @Override
+        public long getMaxSerializableObjectSize()
+        {
+            return 1000;
+        }
     };
 
     private TestingSession() {}