Remove unused TableParameterCodec

trinodb · Mar 11, 2019 · f6754be · f6754be
1 parent 7662f71
commit f6754be
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 55 deletions.
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveClientModule.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveClientModule.java
@@ -87,7 +87,6 @@ public void configure(Binder binder)
         newSetBinder(binder, EventClient.class).addBinding().to(HiveEventClient.class).in(Scopes.SINGLETON);
         binder.bind(HivePartitionManager.class).in(Scopes.SINGLETON);
         binder.bind(LocationService.class).to(HiveLocationService.class).in(Scopes.SINGLETON);
-        binder.bind(TableParameterCodec.class).in(Scopes.SINGLETON);
         binder.bind(HiveMetadataFactory.class).in(Scopes.SINGLETON);
         binder.bind(new TypeLiteral<Supplier<TransactionalMetadata>>() {}).to(HiveMetadataFactory.class).in(Scopes.SINGLETON);
         binder.bind(HiveTransactionManager.class).in(Scopes.SINGLETON);

diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java
@@ -237,7 +237,6 @@ public class HiveMetadata
     private final DateTimeZone timeZone;
     private final TypeManager typeManager;
     private final LocationService locationService;
-    private final TableParameterCodec tableParameterCodec;
     private final JsonCodec<PartitionUpdate> partitionUpdateCodec;
     private final boolean writesToNonManagedTablesEnabled;
     private final boolean createsOfNonManagedTablesEnabled;
@@ -256,7 +255,6 @@ public HiveMetadata(
             boolean createsOfNonManagedTablesEnabled,
             TypeManager typeManager,
             LocationService locationService,
-            TableParameterCodec tableParameterCodec,
             JsonCodec<PartitionUpdate> partitionUpdateCodec,
             TypeTranslator typeTranslator,
             String prestoVersion,
@@ -271,7 +269,6 @@ public HiveMetadata(
         this.timeZone = requireNonNull(timeZone, "timeZone is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.locationService = requireNonNull(locationService, "locationService is null");
-        this.tableParameterCodec = requireNonNull(tableParameterCodec, "tableParameterCodec is null");
         this.partitionUpdateCodec = requireNonNull(partitionUpdateCodec, "partitionUpdateCodec is null");
         this.writesToNonManagedTablesEnabled = writesToNonManagedTablesEnabled;
         this.createsOfNonManagedTablesEnabled = createsOfNonManagedTablesEnabled;
@@ -495,9 +492,6 @@ private ConnectorTableMetadata doGetTableMetadata(SchemaTableName tableName)
             properties.put(AVRO_SCHEMA_URL, avroSchemaUrl);
         }
 
-        // Hook point for extended versions of the Hive Plugin
-        properties.putAll(tableParameterCodec.decode(table.get().getParameters()));
-
         Optional<String> comment = Optional.ofNullable(table.get().getParameters().get(TABLE_COMMENT));
 
         return new ConnectorTableMetadata(tableName, columns.build(), properties.build(), comment);
@@ -742,9 +736,6 @@ private Map<String, String> getEmptyTableProperties(ConnectorTableMetadata table
     {
         ImmutableMap.Builder<String, String> tableProperties = ImmutableMap.builder();
 
-        // Hook point for extended versions of the Hive Plugin
-        tableProperties.putAll(tableParameterCodec.encode(tableMetadata.getProperties()));
-
         // ORC format specific properties
         List<String> columns = getOrcBloomFilterColumns(tableMetadata.getProperties());
         if (columns != null && !columns.isEmpty()) {

diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadataFactory.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadataFactory.java
@@ -48,7 +48,6 @@ public class HiveMetadataFactory
     private final DateTimeZone timeZone;
     private final TypeManager typeManager;
     private final LocationService locationService;
-    private final TableParameterCodec tableParameterCodec;
     private final JsonCodec<PartitionUpdate> partitionUpdateCodec;
     private final BoundedExecutor renameExecution;
     private final TypeTranslator typeTranslator;
@@ -64,7 +63,6 @@ public HiveMetadataFactory(
             @ForHiveClient ExecutorService executorService,
             TypeManager typeManager,
             LocationService locationService,
-            TableParameterCodec tableParameterCodec,
             JsonCodec<PartitionUpdate> partitionUpdateCodec,
             TypeTranslator typeTranslator,
             NodeVersion nodeVersion)
@@ -84,7 +82,6 @@ public HiveMetadataFactory(
                 hiveClientConfig.getMaxPartitionsPerScan(),
                 typeManager,
                 locationService,
-                tableParameterCodec,
                 partitionUpdateCodec,
                 executorService,
                 typeTranslator,
@@ -106,7 +103,6 @@ public HiveMetadataFactory(
             int maxPartitions,
             TypeManager typeManager,
             LocationService locationService,
-            TableParameterCodec tableParameterCodec,
             JsonCodec<PartitionUpdate> partitionUpdateCodec,
             ExecutorService executorService,
             TypeTranslator typeTranslator,
@@ -125,7 +121,6 @@ public HiveMetadataFactory(
         this.timeZone = requireNonNull(timeZone, "timeZone is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.locationService = requireNonNull(locationService, "locationService is null");
-        this.tableParameterCodec = requireNonNull(tableParameterCodec, "tableParameterCodec is null");
         this.partitionUpdateCodec = requireNonNull(partitionUpdateCodec, "partitionUpdateCodec is null");
         this.typeTranslator = requireNonNull(typeTranslator, "typeTranslator is null");
         this.prestoVersion = requireNonNull(prestoVersion, "prestoVersion is null");
@@ -161,7 +156,6 @@ public HiveMetadata get()
                 createsOfNonManagedTablesEnabled,
                 typeManager,
                 locationService,
-                tableParameterCodec,
                 partitionUpdateCodec,
                 typeTranslator,
                 prestoVersion,

diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/TableParameterCodec.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/TableParameterCodec.java
diff --git a/presto-hive/src/test/java/io/prestosql/plugin/hive/AbstractTestHiveClient.java b/presto-hive/src/test/java/io/prestosql/plugin/hive/AbstractTestHiveClient.java
@@ -745,7 +745,6 @@ protected final void setup(String databaseName, HiveClientConfig hiveClientConfi
                 getHiveClientConfig().getMaxPartitionsPerScan(),
                 TYPE_MANAGER,
                 locationService,
-                new TableParameterCodec(),
                 partitionUpdateCodec,
                 newFixedThreadPool(2),
                 new HiveTypeTranslator(),

diff --git a/presto-hive/src/test/java/io/prestosql/plugin/hive/AbstractTestHiveFileSystem.java b/presto-hive/src/test/java/io/prestosql/plugin/hive/AbstractTestHiveFileSystem.java
@@ -178,7 +178,6 @@ protected void setup(String host, int port, String databaseName, Function<HiveCl
                 newDirectExecutorService(),
                 TYPE_MANAGER,
                 locationService,
-                new TableParameterCodec(),
                 partitionUpdateCodec,
                 new HiveTypeTranslator(),
                 new NodeVersion("test_version"));