Fixing some unit tests

linkedin · Oct 26, 2022 · fd5c41a · fd5c41a
1 parent f1afa31
commit fd5c41a
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 57 deletions.
diff --git a/coral-trino/src/test/java/com/linkedin/coral/trino/rel2trino/RelToTrinoConverterTest.java b/coral-trino/src/test/java/com/linkedin/coral/trino/rel2trino/RelToTrinoConverterTest.java
@@ -5,7 +5,16 @@
  */
 package com.linkedin.coral.trino.rel2trino;
 
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.tools.FrameworkConfig;
+import org.apache.commons.io.FileUtils;
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.metastore.api.MetaException;
+import org.apache.hadoop.hive.ql.metadata.HiveException;
+import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -25,23 +34,35 @@
 // This makes it easier to generate RelNodes for testing. The input sql is
 // in Calcite sql syntax (not Hive)
 // Disabled tests are failing tests
-@Test(enabled = false,
+@Test(
     description = "pending migration to hive tables and corresponding queries to use standardised CoralSqlNode and CoralRelNode representations in the translation path")
 public class RelToTrinoConverterTest {
 
   static FrameworkConfig config;
+  private HiveConf conf;
   static final SqlParser trinoParser = new SqlParser();
   static final String tableOne = TABLE_ONE.getTableName();
   static final String tableTwo = TABLE_TWO.getTableName();
   static final String tableThree = TABLE_THREE.getTableName();
   static final String tableFour = TABLE_FOUR.getTableName();
 
+  @BeforeTest
+  public void beforeClass() throws IOException, HiveException, MetaException {
+    conf = TestUtils.loadResourceHiveConf();
+    TestUtils.initializeViews(conf);
+  }
+
   @BeforeTest
   public static void beforeTest() {
     TestUtils.turnOffRelSimplification();
     config = TestUtils.createFrameworkConfig(TABLE_ONE, TABLE_TWO, TABLE_THREE, TABLE_FOUR);
   }
 
+  @AfterTest
+  public void afterClass() throws IOException {
+    FileUtils.deleteDirectory(new File(conf.get(TestUtils.CORAL_TRINO_TEST_DIR)));
+  }
+
   private void testConversion(String inputSql, String expectedSql) {
     String trinoSql = toTrinoSql(inputSql);
     validate(trinoSql, expectedSql);
@@ -137,17 +158,17 @@ public void testMapSelection() {
     testConversion(sql, expected);
   }
 
-  @Test(enabled = false)
+  @Test
   public void testConstantExpressions() {
     {
       String sql = "SELECT 1";
       String expected = formatSql("SELECT 1 FROM (VALUES  (0)) AS \"t\" (\"ZERO\")");
-      testConversion(sql, expected);
+      testHiveToTrinoConversion(sql, expected);
     }
     {
       String sql = "SELECT 5 + 2 * 10 / 4";
       String expected = formatSql("SELECT 5 + 2 * 10 / 4 FROM (VALUES  (0)) AS \"t\" (\"ZERO\")");
-      testConversion(sql, expected);
+      testHiveToTrinoConversion(sql, expected);
     }
   }
 
@@ -494,25 +515,35 @@ public void testDataTypeSpecRewrite() {
     testConversion(sql3, expectedSql3);
   }
 
-  @Test(enabled = false)
+  @Test
   public void testCurrentUser() {
     String sql = "SELECT current_user";
-    String expected = formatSql("SELECT CURRENT_USER AS \"CURRENT_USER\"\nFROM (VALUES  (0)) AS \"t\" (\"ZERO\")");
-    testConversion(sql, expected);
+    String expected = formatSql("SELECT CURRENT_USER AS \"current_user\"\nFROM (VALUES  (0)) AS \"t\" (\"ZERO\")");
+
+    testHiveToTrinoConversion(sql, expected);
   }
 
-  @Test(enabled = false)
+  @Test
   public void testCurrentTimestamp() {
     String sql = "SELECT current_timestamp";
-    String expected = formatSql(
-        "SELECT CAST(CURRENT_TIMESTAMP AS TIMESTAMP(3)) AS \"CURRENT_TIMESTAMP\"\nFROM (VALUES  (0)) AS \"t\" (\"ZERO\")");
-    testConversion(sql, expected);
+    String expected =
+        formatSql("SELECT CAST(CURRENT_TIMESTAMP AS TIMESTAMP(3))\nFROM (VALUES  (0)) AS \"t\" (\"ZERO\")");
+
+    testHiveToTrinoConversion(sql, expected);
   }
 
-  @Test(enabled = false)
+  @Test
   public void testCurrentDate() {
     String sql = "SELECT current_date";
-    String expected = formatSql("SELECT CURRENT_DATE AS \"CURRENT_DATE\"\nFROM (VALUES  (0)) AS \"t\" (\"ZERO\")");
-    testConversion(sql, expected);
+    String expected = formatSql("SELECT CURRENT_DATE\nFROM (VALUES  (0)) AS \"t\" (\"ZERO\")");
+
+    testHiveToTrinoConversion(sql, expected);
+  }
+
+  private void testHiveToTrinoConversion(String inputSql, String expectedSql) {
+    RelNode relNode = hiveToRelConverter.convertSql(inputSql);
+    RelToTrinoConverter relToTrinoConverter = new RelToTrinoConverter();
+    String expandedSql = relToTrinoConverter.convert(relNode);
+    assertEquals(expandedSql, expectedSql);
   }
 }
diff --git a/coral-trino/src/test/java/com/linkedin/coral/trino/trino2rel/ToRelTestUtils.java b/coral-trino/src/test/java/com/linkedin/coral/trino/trino2rel/ToRelTestUtils.java
@@ -58,6 +58,7 @@ public static void initializeViews(HiveConf conf) throws HiveException, MetaExce
     run(driver, "CREATE TABLE IF NOT EXISTS default.my_table(x array<int>, y array<array<int>>, z int)");
     run(driver, "CREATE TABLE IF NOT EXISTS default.a(b int, id int, x int)");
     run(driver, "CREATE TABLE IF NOT EXISTS default.b(foobar int, id int, y int)");
+    run(driver, "CREATE TABLE IF NOT EXISTS default.table_with_struct_arr(a int, b array<struct<b1:string, b2:int>>)");
   }
 
   public static HiveConf loadResourceHiveConf() {