Test improvements: classloader usage, field name verification, and E2E test

Author: mehradpk

presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergTypes.java

@@ -286,6 +286,68 @@ public void testMixedHyphenatedAndNormalFieldNames()
         }
     }
 
+    /**
+     * End-to-end test that writes to an Iceberg table with hyphenated struct fields
+     * and reads it back, verifying the complete write→read cycle works correctly.
+     * This test validates the full integration of:
+     * 1. PrimitiveTypeMapBuilder.makeCompatibleName() for writing hex-encoded field names
+     * 2. ColumnIOConverter.constructField() for reading with makeCompatibleName()
+     * 3. IcebergPageSourceProvider.getColumnType() for SYNTHESIZED column handling
+     */
+    @Test
+    public void testEndToEndWriteReadWithHyphenatedStructFields()
+    {
+        String tableName = "test_e2e_hyphenated_struct";
+        try {
+            // Create table with multiple hyphenated fields in struct
+            assertUpdate("CREATE TABLE " + tableName + " (" +
+                    "id INT, " +
+                    "application ROW(" +
+                    "  \"aws-region\" VARCHAR, " +
+                    "  \"user-id\" INT, " +
+                    "  \"data-center\" VARCHAR, " +
+                    "  \"zone-id\" INT, " +
+                    "  normal_field VARCHAR" +
+                    ")" +
+                    ")");
+
+            // Write data - tests PrimitiveTypeMapBuilder.makeCompatibleName()
+            assertUpdate("INSERT INTO " + tableName + " VALUES " +
+                    "(1, ROW('us-west-2', 1001, 'dc-west-01', 100, 'normal1')), " +
+                    "(2, ROW('eu-central-1', 1002, 'dc-eu-01', 200, 'normal2')), " +
+                    "(3, ROW('ap-south-1', 1003, 'dc-ap-01', 300, 'normal3'))", 3);
+
+            // Read back - tests ColumnIOConverter.constructField() with makeCompatibleName()
+            // Test individual field access (SYNTHESIZED path)
+            assertQuery(
+                    "SELECT id, application.\"aws-region\", application.\"user-id\", application.\"data-center\" FROM " + tableName,
+                    "VALUES (1, 'us-west-2', 1001, 'dc-west-01'), " +
+                    "(2, 'eu-central-1', 1002, 'dc-eu-01'), " +
+                    "(3, 'ap-south-1', 1003, 'dc-ap-01')");
+
+            // Test all fields including normal field
+            assertQuery(
+                    "SELECT application.\"aws-region\", application.\"user-id\", application.\"data-center\", " +
+                    "application.\"zone-id\", application.normal_field FROM " + tableName,
+                    "VALUES ('us-west-2', 1001, 'dc-west-01', 100, 'normal1'), " +
+                    "('eu-central-1', 1002, 'dc-eu-01', 200, 'normal2'), " +
+                    "('ap-south-1', 1003, 'dc-ap-01', 300, 'normal3')");
+
+            // Test with WHERE clause on hyphenated field
+            assertQuery(
+                    "SELECT id, application.\"aws-region\" FROM " + tableName + " WHERE application.\"user-id\" = 1002",
+                    "VALUES (2, 'eu-central-1')");
+
+            // Test with ORDER BY on hyphenated field
+            assertQuery(
+                    "SELECT id, application.\"zone-id\" FROM " + tableName + " ORDER BY application.\"zone-id\" DESC",
+                    "VALUES (3, 300), (2, 200), (1, 100)");
+        }
+        finally {
+            assertUpdate("DROP TABLE IF EXISTS " + tableName);
+        }
+    }
+
     /**
      * Test top level hyphenated column names still work correctly.
      * Top level columns use field ID based lookup so they were never broken.

presto-parquet/src/test/java/com/facebook/presto/parquet/TestParquetTypeUtils.java

@@ -24,9 +24,11 @@
 import org.testng.annotations.Test;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 
 import static com.facebook.presto.parquet.ParquetTypeUtils.lookupColumnByName;
 import static com.facebook.presto.parquet.ParquetTypeUtils.makeCompatibleName;
+import static java.util.Objects.requireNonNull;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
@@ -82,10 +84,12 @@ public void testMakeCompatibleName()
      */
     @Test
     public void testReadPreCannedParquetWithHyphenatedFields()
-            throws IOException
+            throws IOException, URISyntaxException
     {
-        String parquetFilePath = "src/test/resources/hyphenated-fields/hyphenated_struct_fields.parquet";
-        Path path = new Path(parquetFilePath);
+        Path path = new Path(requireNonNull(
+                getClass().getClassLoader()
+                        .getResource("hyphenated-fields/hyphenated_struct_fields.parquet"))
+                .toURI());
         Configuration conf = new Configuration(false);
 
         ParquetMetadata parquetMetadata = ParquetFileReader.readFooter(conf, path);
@@ -118,10 +122,12 @@ public void testReadPreCannedParquetWithHyphenatedFields()
      */
     @Test
     public void testLookupWithMakeCompatibleNameFindsFields()
-            throws IOException
+            throws IOException, URISyntaxException
     {
-        String parquetFilePath = "src/test/resources/hyphenated-fields/hyphenated_struct_fields.parquet";
-        Path path = new Path(parquetFilePath);
+        Path path = new Path(requireNonNull(
+                getClass().getClassLoader()
+                        .getResource("hyphenated-fields/hyphenated_struct_fields.parquet"))
+                .toURI());
         Configuration conf = new Configuration(false);
 
         ParquetMetadata parquetMetadata = ParquetFileReader.readFooter(conf, path);
@@ -132,11 +138,12 @@ public void testLookupWithMakeCompatibleNameFindsFields()
         org.apache.parquet.io.GroupColumnIO applicationColumnIO =
                 (org.apache.parquet.io.GroupColumnIO) messageColumnIO.getChild(1);
 
-        // WITH makeCompatibleName() - fields should be found
-        assertNotNull(lookupColumnByName(applicationColumnIO, makeCompatibleName("aws-region")));
-        assertNotNull(lookupColumnByName(applicationColumnIO, makeCompatibleName("user-id")));
-        assertNotNull(lookupColumnByName(applicationColumnIO, makeCompatibleName("data-center")));
-        assertNotNull(lookupColumnByName(applicationColumnIO, makeCompatibleName("normal_field")));
+        // WITH makeCompatibleName() - fields should be found and names should match
+        assertEquals(requireNonNull(lookupColumnByName(applicationColumnIO, makeCompatibleName("aws-region"))).getName(), "aws_x2Dregion");
+        assertEquals(requireNonNull(lookupColumnByName(applicationColumnIO, makeCompatibleName("user-id"))).getName(), "user_x2Did");
+        assertEquals(requireNonNull(lookupColumnByName(applicationColumnIO, makeCompatibleName("data-center"))).getName(), "data_x2Dcenter");
+        assertEquals(requireNonNull(lookupColumnByName(applicationColumnIO, makeCompatibleName("normal_field"))).getName(), "normal_field");
+        assertEquals(requireNonNull(lookupColumnByName(applicationColumnIO, makeCompatibleName("aws_x2Dregion_2"))).getName(), "aws_x2Dregion_2");
     }
 
     /**
@@ -145,10 +152,12 @@ public void testLookupWithMakeCompatibleNameFindsFields()
      */
     @Test
     public void testLookupWithoutEncodingDoesNotFindFields()
-            throws IOException
+            throws IOException, URISyntaxException
     {
-        String parquetFilePath = "src/test/resources/hyphenated-fields/hyphenated_struct_fields.parquet";
-        Path path = new Path(parquetFilePath);
+        Path path = new Path(requireNonNull(
+                getClass().getClassLoader()
+                        .getResource("hyphenated-fields/hyphenated_struct_fields.parquet"))
+                .toURI());
         Configuration conf = new Configuration(false);
 
         ParquetMetadata parquetMetadata = ParquetFileReader.readFooter(conf, path);