Add licenses, fix features config

tdcmeehan · tdcmeehan · commit 3df11c7ecaeb · 2025-10-29T05:52:22.000-04:00
diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplit.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplit.java
@@ -16,19 +16,21 @@
 import com.facebook.airlift.bootstrap.Bootstrap;
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.json.JsonModule;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
 import com.facebook.presto.block.BlockJsonSerde;
 import com.facebook.presto.common.block.Block;
 import com.facebook.presto.common.block.BlockEncoding;
 import com.facebook.presto.common.block.BlockEncodingManager;
 import com.facebook.presto.common.block.BlockEncodingSerde;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.hive.metastore.Column;
 import com.facebook.presto.hive.metastore.Storage;
 import com.facebook.presto.hive.metastore.StorageFormat;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.metadata.HandleResolver;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
 import com.facebook.presto.spi.ColumnHandle;
 import com.facebook.presto.spi.HostAddress;
 import com.facebook.presto.spi.SplitWeight;
@@ -153,8 +155,10 @@ private JsonCodec<HiveSplit> getJsonCodec()
     {
         Module module = binder -> {
             binder.install(new JsonModule());
+            binder.install(new ThriftCodecModule());
+            binder.install(new HandleJsonModule());
             configBinder(binder).bindConfig(FeaturesConfig.class);
-            binder.install(new TestingHandleJsonModule());
+            binder.bind(ConnectorManager.class).toProvider(() -> null);
             FunctionAndTypeManager functionAndTypeManager = createTestFunctionAndTypeManager();
             binder.bind(TypeManager.class).toInstance(functionAndTypeManager);
             jsonBinder(binder).addDeserializerBinding(Type.class).to(TypeDeserializer.class);
diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/CodecDeserializer.java b/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;
diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/CodecSerializer.java b/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;
diff --git a/presto-main-base/src/test/java/com/facebook/presto/catalogserver/TestCatalogServerResponse.java b/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);
     }
 
diff --git a/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryInfo.java b/presto-main-base/src/test/java/com/facebook/presto/execution/TestQueryInfo.java
@@ -16,14 +16,16 @@
 import com.facebook.airlift.bootstrap.Bootstrap;
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.json.JsonModule;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
 import com.facebook.presto.common.plan.PlanCanonicalizationStrategy;
 import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.common.transaction.TransactionId;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.cost.StatsAndCosts;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.server.SliceDeserializer;
 import com.facebook.presto.server.SliceSerializer;
 import com.facebook.presto.spi.ConnectorId;
@@ -132,10 +134,12 @@ private static JsonCodec<QueryInfo> createJsonCodec()
             SqlParser sqlParser = new SqlParser();
             FunctionAndTypeManager functionAndTypeManager = createTestFunctionAndTypeManager();
             binder.install(new JsonModule());
-            binder.install(new TestingHandleJsonModule());
+            binder.install(new ThriftCodecModule());
+            binder.install(new HandleJsonModule());
             binder.bind(SqlParser.class).toInstance(sqlParser);
             binder.bind(TypeManager.class).toInstance(functionAndTypeManager);
             configBinder(binder).bindConfig(FeaturesConfig.class);
+            binder.bind(ConnectorManager.class).toProvider(() -> null);
             newSetBinder(binder, Type.class);
             jsonBinder(binder).addSerializerBinding(Slice.class).to(SliceSerializer.class);
             jsonBinder(binder).addDeserializerBinding(Slice.class).to(SliceDeserializer.class);
diff --git a/presto-main-base/src/test/java/com/facebook/presto/metadata/TestingHandleJsonModule.java b/presto-main-base/src/test/java/com/facebook/presto/metadata/TestingHandleJsonModule.java
@@ -13,23 +13,21 @@
  */
 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.install(new ThriftCodecModule());
         binder.install(new HandleJsonModule());
     }
 }
diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/TestRowExpressionSerde.java b/presto-main-base/src/test/java/com/facebook/presto/sql/TestRowExpressionSerde.java
@@ -17,6 +17,7 @@
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.json.JsonModule;
 import com.facebook.airlift.stats.cardinality.HyperLogLog;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
 import com.facebook.presto.block.BlockJsonSerde;
 import com.facebook.presto.common.block.Block;
 import com.facebook.presto.common.block.BlockEncoding;
@@ -29,10 +30,11 @@
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
 import com.facebook.presto.common.type.VarcharType;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.metadata.Metadata;
 import com.facebook.presto.metadata.MetadataManager;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
 import com.facebook.presto.spi.WarningCollector;
 import com.facebook.presto.spi.function.FunctionHandle;
 import com.facebook.presto.spi.relation.ConstantExpression;
@@ -244,8 +246,10 @@ private JsonCodec<RowExpression> getJsonCodec()
     {
         Module module = binder -> {
             binder.install(new JsonModule());
-            binder.install(new TestingHandleJsonModule());
+            binder.install(new ThriftCodecModule());
+            binder.install(new HandleJsonModule());
             configBinder(binder).bindConfig(FeaturesConfig.class);
+            binder.bind(ConnectorManager.class).toProvider(() -> null);
 
             FunctionAndTypeManager functionAndTypeManager = createTestFunctionAndTypeManager();
             binder.bind(TypeManager.class).toInstance(functionAndTypeManager);
diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestFeaturesConfig.java b/presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/TestFeaturesConfig.java
@@ -272,7 +272,8 @@ public void testDefaults()
                 .setInEqualityJoinPushdownEnabled(false)
                 .setRewriteMinMaxByToTopNEnabled(false)
                 .setPrestoSparkExecutionEnvironment(false)
-                .setMaxSerializableObjectSize(1000));
+                .setMaxSerializableObjectSize(1000)
+                .setUseConnectorProvidedSerializationCodecs(false));
     }
 
     @Test
@@ -492,6 +493,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()
@@ -709,7 +711,8 @@ public void testExplicitPropertyMappings()
                 .setRewriteMinMaxByToTopNEnabled(true)
                 .setInnerJoinPushdownEnabled(true)
                 .setPrestoSparkExecutionEnvironment(true)
-                .setMaxSerializableObjectSize(50);
+                .setMaxSerializableObjectSize(50)
+                .setUseConnectorProvidedSerializationCodecs(true);
         assertFullMapping(properties, expected);
     }
 
diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/plan/TestStatisticsWriterNode.java b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/plan/TestStatisticsWriterNode.java
@@ -30,6 +30,7 @@
 import com.facebook.presto.spi.plan.ValuesNode;
 import com.facebook.presto.spi.relation.VariableReferenceExpression;
 import com.facebook.presto.spi.statistics.ColumnStatisticType;
+import com.facebook.presto.sql.analyzer.FeaturesConfig;
 import com.facebook.presto.sql.parser.SqlParser;
 import com.facebook.presto.testing.TestingHandleResolver;
 import com.facebook.presto.testing.TestingMetadata.TestingTableHandle;
@@ -127,6 +128,7 @@ private JsonCodec<StatisticsWriterNode> getJsonCodec()
             FunctionAndTypeManager functionAndTypeManager = createTestFunctionAndTypeManager();
             binder.install(new JsonModule());
             binder.install(new TestingHandleJsonModule());
+            binder.bind(FeaturesConfig.class).toInstance(new FeaturesConfig());
             binder.bind(SqlParser.class).toInstance(sqlParser);
             binder.bind(TypeManager.class).toInstance(functionAndTypeManager);
             newSetBinder(binder, Type.class);
diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/plan/TestWindowNode.java b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/plan/TestWindowNode.java
@@ -16,11 +16,13 @@
 import com.facebook.airlift.bootstrap.Bootstrap;
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.json.JsonModule;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
 import com.facebook.presto.common.block.SortOrder;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.server.SliceDeserializer;
 import com.facebook.presto.server.SliceSerializer;
 import com.facebook.presto.spi.VariableAllocator;
@@ -159,8 +161,10 @@ private JsonCodec<WindowNode> getJsonCodec()
             SqlParser sqlParser = new SqlParser();
             FunctionAndTypeManager functionAndTypeManager = createTestFunctionAndTypeManager();
             binder.install(new JsonModule());
+            binder.install(new ThriftCodecModule());
+            binder.install(new HandleJsonModule());
             configBinder(binder).bindConfig(FeaturesConfig.class);
-            binder.install(new TestingHandleJsonModule());
+            binder.bind(ConnectorManager.class).toProvider(() -> null);
             binder.bind(SqlParser.class).toInstance(sqlParser);
             binder.bind(TypeManager.class).toInstance(functionAndTypeManager);
             newSetBinder(binder, Type.class);
diff --git a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTask.java
@@ -36,6 +36,7 @@
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
 import com.facebook.presto.connector.ConnectorCodecManager;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.execution.Lifespan;
 import com.facebook.presto.execution.NodeTaskMap;
 import com.facebook.presto.execution.QueryManagerConfig;
@@ -53,10 +54,10 @@
 import com.facebook.presto.execution.buffer.OutputBuffers;
 import com.facebook.presto.execution.scheduler.TableWriteInfo;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.metadata.HandleResolver;
 import com.facebook.presto.metadata.InternalNode;
 import com.facebook.presto.metadata.Split;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
 import com.facebook.presto.server.InternalCommunicationConfig;
 import com.facebook.presto.server.TaskUpdateRequest;
 import com.facebook.presto.server.thrift.ConnectorSplitThriftCodec;
@@ -361,12 +362,13 @@ private static HttpRemoteTaskFactory createHttpRemoteTaskFactory(TestingTaskReso
                 new JsonModule(),
                 new SmileModule(),
                 new ThriftCodecModule(),
-                new TestingHandleJsonModule(),
+                new HandleJsonModule(),
                 new Module()
                 {
                     @Override
                     public void configure(Binder binder)
                     {
+                        binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
                         binder.bind(JsonMapper.class);
                         binder.bind(ThriftMapper.class);
                         configBinder(binder).bindConfig(FeaturesConfig.class);
diff --git a/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java b/presto-main/src/test/java/com/facebook/presto/server/remotetask/TestHttpRemoteTaskWithEventLoop.java
@@ -35,6 +35,7 @@
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
 import com.facebook.presto.connector.ConnectorCodecManager;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.execution.Lifespan;
 import com.facebook.presto.execution.NodeTaskMap;
 import com.facebook.presto.execution.QueryManagerConfig;
@@ -51,10 +52,10 @@
 import com.facebook.presto.execution.buffer.OutputBuffers;
 import com.facebook.presto.execution.scheduler.TableWriteInfo;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.metadata.HandleResolver;
 import com.facebook.presto.metadata.InternalNode;
 import com.facebook.presto.metadata.Split;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
 import com.facebook.presto.server.InternalCommunicationConfig;
 import com.facebook.presto.server.TaskUpdateRequest;
 import com.facebook.presto.server.thrift.ConnectorSplitThriftCodec;
@@ -369,12 +370,13 @@ private static HttpRemoteTaskFactory createHttpRemoteTaskFactory(TestingTaskReso
                 new JsonModule(),
                 new SmileModule(),
                 new ThriftCodecModule(),
-                new TestingHandleJsonModule(),
+                new HandleJsonModule(),
                 new Module()
                 {
                     @Override
                     public void configure(Binder binder)
                     {
+                        binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
                         binder.bind(JsonMapper.class);
                         binder.bind(ThriftMapper.class);
                         configBinder(binder).bindConfig(FeaturesConfig.class);
diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierModule.java
@@ -19,6 +19,7 @@
 import com.facebook.presto.common.block.BlockEncodingSerde;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.metadata.CatalogManager;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
 import com.facebook.presto.metadata.HandleJsonModule;
@@ -112,6 +113,9 @@ protected final void setup(Binder binder)
         // catalog
         binder.bind(CatalogManager.class).in(Scopes.SINGLETON);
 
+        // connector
+        binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
+
         // function
         binder.bind(FunctionAndTypeManager.class).in(SINGLETON);
         binder.bind(TableFunctionRegistry.class).in(SINGLETON);

Original file line number	Diff line number	Diff line change
`@@ -13,23 +13,21 @@`
`13`	`13`	`*/`
`14`	`14`	`package com.facebook.presto.metadata;`
`15`	`15`
	`16`	`+import com.facebook.drift.codec.guice.ThriftCodecModule;`
`16`	`17`	`import com.facebook.presto.connector.ConnectorManager;`
`17`		`-import com.facebook.presto.sql.analyzer.FeaturesConfig;`
`18`	`18`	`import com.google.inject.Binder;`
`19`	`19`	`import com.google.inject.Module;`
`20`	`20`	`import com.google.inject.Scopes;`
`21`	`21`
`22`		`-import static com.facebook.airlift.configuration.ConfigBinder.configBinder;`
`23`		`-`
`24`	`22`	`public class TestingHandleJsonModule`
`25`	`23`	`implements Module`
`26`	`24`	`{`
`27`	`25`	`@Override`
`28`	`26`	`public void configure(Binder binder)`
`29`	`27`	`{`
`30`	`28`	`binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);`
`31`		`- configBinder(binder).bindConfig(FeaturesConfig.class);`
`32`	`29`
	`30`	`+ binder.install(new ThriftCodecModule());`
`33`	`31`	`binder.install(new HandleJsonModule());`
`34`	`32`	`}`
`35`	`33`	`}`