Add licenses, fix features config

Author: tdcmeehan

presto-main-base/src/main/java/com/facebook/presto/metadata/CodecDeserializer.java

@@ -1,3 +1,16 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.facebook.presto.metadata;
 
 import com.facebook.presto.spi.ConnectorCodec;

presto-main-base/src/main/java/com/facebook/presto/metadata/CodecSerializer.java

@@ -1,3 +1,16 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.facebook.presto.metadata;
 
 import com.facebook.presto.spi.ConnectorCodec;

presto-main-base/src/test/java/com/facebook/presto/catalogserver/TestCatalogServerResponse.java

@@ -13,8 +13,6 @@
  */
 package com.facebook.presto.catalogserver;
 
-import com.facebook.airlift.configuration.ConfigurationFactory;
-import com.facebook.airlift.configuration.ConfigurationModule;
 import com.facebook.airlift.json.JsonModule;
 import com.facebook.presto.common.QualifiedObjectName;
 import com.facebook.presto.common.transaction.TransactionId;
@@ -30,7 +28,6 @@
 import com.facebook.presto.spi.connector.ConnectorTransactionHandle;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import org.testng.annotations.BeforeTest;
@@ -55,8 +52,7 @@ public class TestCatalogServerResponse
     public void setup()
     {
         this.testingCatalogServerClient = new TestingCatalogServerClient();
-        ConfigurationFactory configurationFactory = new ConfigurationFactory(ImmutableMap.of());
-        Injector injector = Guice.createInjector(new ConfigurationModule(configurationFactory), new JsonModule(), new TestingHandleJsonModule());
+        Injector injector = Guice.createInjector(new JsonModule(), new TestingHandleJsonModule());
         this.objectMapper = injector.getInstance(ObjectMapper.class);
     }
 

presto-main-base/src/test/java/com/facebook/presto/metadata/TestingHandleJsonModule.java

@@ -13,23 +13,23 @@
  */
 package com.facebook.presto.metadata;
 
+import com.facebook.drift.codec.guice.ThriftCodecModule;
 import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.sql.analyzer.FeaturesConfig;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
 
-import static com.facebook.airlift.configuration.ConfigBinder.configBinder;
-
 public class TestingHandleJsonModule
         implements Module
 {
     @Override
     public void configure(Binder binder)
     {
         binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
-        configBinder(binder).bindConfig(FeaturesConfig.class);
+        binder.bind(FeaturesConfig.class).toInstance(new FeaturesConfig());
 
+        binder.install(new ThriftCodecModule());
         binder.install(new HandleJsonModule());
     }
 }

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

@@ -269,7 +269,8 @@ public void testDefaults()
                 .setInEqualityJoinPushdownEnabled(false)
                 .setRewriteMinMaxByToTopNEnabled(false)
                 .setPrestoSparkExecutionEnvironment(false)
-                .setMaxSerializableObjectSize(1000));
+                .setMaxSerializableObjectSize(1000)
+                .setUseConnectorProvidedSerializationCodecs(false));
     }
 
     @Test
@@ -486,6 +487,7 @@ public void testExplicitPropertyMappings()
                 .put("optimizer.utilize-unique-property-in-query-planning", "false")
                 .put("optimizer.add-exchange-below-partial-aggregation-over-group-id", "true")
                 .put("max_serializable_object_size", "50")
+                .put("use-connector-provided-serialization-codecs", "true")
                 .build();
 
         FeaturesConfig expected = new FeaturesConfig()
@@ -700,7 +702,8 @@ public void testExplicitPropertyMappings()
                 .setRewriteMinMaxByToTopNEnabled(true)
                 .setInnerJoinPushdownEnabled(true)
                 .setPrestoSparkExecutionEnvironment(true)
-                .setMaxSerializableObjectSize(50);
+                .setMaxSerializableObjectSize(50)
+                .setUseConnectorProvidedSerializationCodecs(true);
         assertFullMapping(properties, expected);
     }