Remove HiveConfig Feature Flag

The native Ion Feature Flag was not being used in Athena and was
causing test failures after the rebase. Since OSS Trino never had
Ion support there is no reason to keep it.

Author: rmarrowstone

Diff for: plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveConfig.java

@@ -111,12 +111,6 @@ public class HiveConfig
 
     private String orcLegacyTimeZone = TimeZone.getDefault().getID();
 
-    // This is a feature flag for Ion native trino integration.
-    // Default value is false and requires explicitly setting it to true to enable Ion native trino integration.
-    // TODO: This should change to default as true in future once we have a complete implementation of Ion native
-    //  trino integration supported.
-    private boolean ionNativeTrinoEnabled;
-
     private String parquetTimeZone = TimeZone.getDefault().getID();
     private boolean useParquetColumnNames = true;
 
@@ -720,19 +714,6 @@ public HiveConfig setOrcLegacyTimeZone(String orcLegacyTimeZone)
         return this;
     }
 
-    public boolean getIonNativeTrinoEnabled()
-    {
-        return ionNativeTrinoEnabled;
-    }
-
-    @Config("hive.ion.nativetrino")
-    @ConfigDescription("Feature flag to enable Ion native trino integration")
-    public HiveConfig setIonNativeTrinoEnabled(boolean ionNativeTrinoEnabled)
-    {
-        this.ionNativeTrinoEnabled = ionNativeTrinoEnabled;
-        return this;
-    }
-
     public DateTimeZone getParquetDateTimeZone()
     {
         TimeZone timeZone = TimeZone.getTimeZone(ZoneId.of(parquetTimeZone));

Diff for: plugin/trino-hive/src/main/java/io/trino/plugin/hive/ion/IonFileWriterFactory.java

@@ -23,7 +23,6 @@
 import io.trino.metastore.StorageFormat;
 import io.trino.plugin.hive.FileWriter;
 import io.trino.plugin.hive.HiveCompressionCodec;
-import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.HiveFileWriterFactory;
 import io.trino.plugin.hive.WriterKind;
 import io.trino.plugin.hive.acid.AcidTransaction;
@@ -52,17 +51,14 @@ public class IonFileWriterFactory
 {
     private final TrinoFileSystemFactory fileSystemFactory;
     private final TypeManager typeManager;
-    private final boolean nativeTrinoEnabled;
 
     @Inject
     public IonFileWriterFactory(
             TrinoFileSystemFactory fileSystemFactory,
-            TypeManager typeManager,
-            HiveConfig hiveConfig)
+            TypeManager typeManager)
     {
         this.fileSystemFactory = fileSystemFactory;
         this.typeManager = typeManager;
-        this.nativeTrinoEnabled = hiveConfig.getIonNativeTrinoEnabled();
     }
 
     @Override
@@ -78,8 +74,7 @@ public Optional<FileWriter> createFileWriter(
             boolean useAcidSchema,
             WriterKind writerKind)
     {
-        if (!nativeTrinoEnabled
-                || !ION_OUTPUT_FORMAT.equals(storageFormat.getOutputFormat())) {
+        if (!ION_OUTPUT_FORMAT.equals(storageFormat.getOutputFormat())) {
             return Optional.empty();
         }
 

Diff for: plugin/trino-hive/src/main/java/io/trino/plugin/hive/ion/IonPageSourceFactory.java

@@ -29,7 +29,6 @@
 import io.trino.hive.formats.line.Column;
 import io.trino.plugin.hive.AcidInfo;
 import io.trino.plugin.hive.HiveColumnHandle;
-import io.trino.plugin.hive.HiveConfig;
 import io.trino.plugin.hive.HivePageSourceFactory;
 import io.trino.plugin.hive.Schema;
 import io.trino.plugin.hive.acid.AcidTransaction;
@@ -57,13 +56,11 @@ public class IonPageSourceFactory
         implements HivePageSourceFactory
 {
     private final TrinoFileSystemFactory trinoFileSystemFactory;
-    private final boolean nativeTrinoEnabled;
 
     @Inject
-    public IonPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory, HiveConfig hiveConfig)
+    public IonPageSourceFactory(TrinoFileSystemFactory trinoFileSystemFactory)
     {
         this.trinoFileSystemFactory = trinoFileSystemFactory;
-        this.nativeTrinoEnabled = hiveConfig.getIonNativeTrinoEnabled();
     }
 
     @Override
@@ -82,8 +79,7 @@ public Optional<ConnectorPageSource> createPageSource(
             boolean originalFile,
             AcidTransaction transaction)
     {
-        if (!nativeTrinoEnabled
-                || !ION_SERDE_CLASS.equals(schema.serializationLibraryName())) {
+        if (!ION_SERDE_CLASS.equals(schema.serializationLibraryName())) {
             return Optional.empty();
         }
 

Diff for: plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveTestUtils.java

@@ -181,9 +181,6 @@ public static Set<HivePageSourceFactory> getDefaultHivePageSourceFactories(HdfsE
     public static Set<HivePageSourceFactory> getDefaultHivePageSourceFactories(TrinoFileSystemFactory fileSystemFactory, HiveConfig hiveConfig)
     {
         FileFormatDataSourceStats stats = new FileFormatDataSourceStats();
-        // set IonNativeTrino as true in hiveConfig for testing
-        // TODO: In future this flag should change to `true` as default and then the following statement can be removed.
-        hiveConfig.setIonNativeTrinoEnabled(true);
         return ImmutableSet.<HivePageSourceFactory>builder()
                 .add(new CsvPageSourceFactory(fileSystemFactory, hiveConfig))
                 .add(new JsonPageSourceFactory(fileSystemFactory, hiveConfig))
@@ -195,7 +192,7 @@ public static Set<HivePageSourceFactory> getDefaultHivePageSourceFactories(Trino
                 .add(new RcFilePageSourceFactory(fileSystemFactory, hiveConfig))
                 .add(new OrcPageSourceFactory(new OrcReaderConfig(), fileSystemFactory, stats, hiveConfig))
                 .add(new ParquetPageSourceFactory(fileSystemFactory, stats, new ParquetReaderConfig(), hiveConfig))
-                .add(new IonPageSourceFactory(fileSystemFactory, hiveConfig))
+                .add(new IonPageSourceFactory(fileSystemFactory))
                 .build();
     }
 
@@ -218,7 +215,7 @@ public static Set<HiveFileWriterFactory> getDefaultHiveFileWriterFactories(HiveC
                 .add(new RcFileFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER, nodeVersion, hiveConfig))
                 .add(new OrcFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER, nodeVersion, new FileFormatDataSourceStats(), new OrcWriterConfig()))
                 .add(new ParquetFileWriterFactory(fileSystemFactory, nodeVersion, TESTING_TYPE_MANAGER, hiveConfig, new FileFormatDataSourceStats()))
-                .add(new IonFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER, hiveConfig))
+                .add(new IonFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER))
                 .build();
     }
 

Diff for: plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConfig.java

@@ -78,7 +78,6 @@ public void testDefaults()
                 .setParallelPartitionedBucketedWrites(true)
                 .setTextMaxLineLength(DataSize.of(100, Unit.MEGABYTE))
                 .setOrcLegacyTimeZone(TimeZone.getDefault().getID())
-                .setIonNativeTrinoEnabled(false)
                 .setParquetTimeZone(TimeZone.getDefault().getID())
                 .setUseParquetColumnNames(true)
                 .setRcfileTimeZone(TimeZone.getDefault().getID())
@@ -163,7 +162,6 @@ public void testExplicitPropertyMappings()
                 .put("hive.max-partition-drops-per-query", "1000")
                 .put("hive.text.max-line-length", "13MB")
                 .put("hive.orc.time-zone", nonDefaultTimeZone().getID())
-                .put("hive.ion.nativetrino", "true")
                 .put("hive.parquet.time-zone", nonDefaultTimeZone().getID())
                 .put("hive.parquet.use-column-names", "false")
                 .put("hive.rcfile.time-zone", nonDefaultTimeZone().getID())
@@ -247,7 +245,6 @@ public void testExplicitPropertyMappings()
                 .setParallelPartitionedBucketedWrites(false)
                 .setTextMaxLineLength(DataSize.of(13, Unit.MEGABYTE))
                 .setOrcLegacyTimeZone(nonDefaultTimeZone().getID())
-                .setIonNativeTrinoEnabled(true)
                 .setParquetTimeZone(nonDefaultTimeZone().getID())
                 .setUseParquetColumnNames(false)
                 .setRcfileTimeZone(nonDefaultTimeZone().getID())

Diff for: plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileFormats.java

@@ -378,17 +378,12 @@ public void testIonWithBinaryEncoding(int rowCount, long fileSizePadding)
                 .filter(tc -> !(tc.type instanceof MapType))
                 .collect(toList());
 
-        HiveConfig hiveConfig = new HiveConfig();
-        // enable Ion native trino integration for testing while the implementation is in progress
-        // TODO: In future this flag should change to `true` as default and then the following statement can be removed.
-        hiveConfig.setIonNativeTrinoEnabled(true);
-
         assertThatFileFormat(ION)
                 .withColumns(testColumns)
                 .withRowsCount(rowCount)
                 .withFileSizePadding(fileSizePadding)
-                .withFileWriterFactory(fileSystemFactory -> new IonFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER, hiveConfig))
-                .isReadableByPageSource(fileSystemFactory -> new IonPageSourceFactory(fileSystemFactory, hiveConfig));
+                .withFileWriterFactory(fileSystemFactory -> new IonFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER))
+                .isReadableByPageSource(fileSystemFactory -> new IonPageSourceFactory(fileSystemFactory));
     }
 
     @Test(dataProvider = "validRowAndFileSizePadding")

Diff for: plugin/trino-hive/src/test/java/io/trino/plugin/hive/ion/IonPageSourceSmokeTest.java

@@ -141,7 +141,7 @@ public void testStrictAndLaxPathTyping()
         TestFixture strictFixture = new TestFixture(FOO_BAR_COLUMNS);
         strictFixture.withSerdeProperty(STRICT_PATH_TYPING_PROPERTY, "true");
 
-        Assertions.assertThrows(TrinoException.class, () ->
+        Assertions.assertThrows(RuntimeException.class, () ->
                 strictFixture.assertRowCount("37 null.timestamp []", 3));
     }
 
@@ -218,23 +218,6 @@ public void testPageSourceTelemetryCompressed()
         Assertions.assertTrue(pageSource.getReadTimeNanos() > 0);
     }
 
-    @Test
-    public void testNativeTrinoDisabled()
-            throws IOException
-    {
-        TestFixture fixture = new TestFixture(FOO_BAR_COLUMNS)
-                .withNativeIonDisabled();
-
-        Assertions.assertTrue(
-                fixture.getOptionalFileWriter().isEmpty(),
-                "Expected empty file writer when native trino is disabled");
-
-        fixture.writeIonTextFile("");
-        Assertions.assertTrue(
-                fixture.getOptionalPageSource().isEmpty(),
-                "Expected empty page source when native trino is disabled");
-    }
-
     private static Stream<Map.Entry<String, String>> propertiesWithDefaults()
     {
         return Stream.of(
@@ -367,7 +350,6 @@ private static class TestFixture
     {
         private TrinoFileSystemFactory fileSystemFactory = new MemoryFileSystemFactory();
         private Location fileLocation = Location.of(TEST_ION_LOCATION);
-        private HiveConfig hiveConfig = new HiveConfig();
         private Map<String, String> tableProperties = new HashMap<>();
         private List<HiveColumnHandle> columns;
         private List<HiveColumnHandle> projections;
@@ -389,14 +371,6 @@ private static class TestFixture
             tableProperties.put(LIST_COLUMN_TYPES, columns.stream().map(HiveColumnHandle::getHiveType)
                     .map(HiveType::toString)
                     .collect(Collectors.joining(",")));
-            // the default at runtime is false, but most of our testing obviously assumes it is enabled.
-            hiveConfig.setIonNativeTrinoEnabled(true);
-        }
-
-        TestFixture withNativeIonDisabled()
-        {
-            hiveConfig.setIonNativeTrinoEnabled(false);
-            return this;
         }
 
         TestFixture withSerdeProperty(String key, String value)
@@ -408,7 +382,7 @@ TestFixture withSerdeProperty(String key, String value)
         Optional<ConnectorPageSource> getOptionalPageSource()
                 throws IOException
         {
-            IonPageSourceFactory pageSourceFactory = new IonPageSourceFactory(fileSystemFactory, hiveConfig);
+            IonPageSourceFactory pageSourceFactory = new IonPageSourceFactory(fileSystemFactory);
 
             long length = fileSystemFactory.create(getSession()).newInputFile(fileLocation).length();
             long nowMillis = Instant.now().toEpochMilli();
@@ -453,7 +427,7 @@ ConnectorPageSource getPageSource()
         ConnectorSession getSession()
         {
             if (session == null) {
-                session = getHiveSession(hiveConfig);
+                session = getHiveSession(new HiveConfig());
             }
             return session;
         }
@@ -483,7 +457,7 @@ int writeZstdCompressedIonText(String ionText)
 
         Optional<FileWriter> getOptionalFileWriter()
         {
-            return new IonFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER, hiveConfig)
+            return new IonFileWriterFactory(fileSystemFactory, TESTING_TYPE_MANAGER)
                     .createFileWriter(
                             fileLocation,
                             columns.stream().map(HiveColumnHandle::getName).collect(toList()),