Retry Hive view tests on HS2 failure

testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/AbstractTestHiveViews.java

@@ -63,6 +63,7 @@ public abstract class AbstractTestHiveViews
         extends HiveProductTest
 {
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testSelectOnView()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_test_view");
@@ -78,6 +79,7 @@ public void testSelectOnView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testArrayIndexingInView()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS test_hive_view_array_index_table");
@@ -100,6 +102,7 @@ public void testArrayIndexingInView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testCommonTableExpression()
     {
         onHive().executeQuery(
@@ -113,6 +116,7 @@ public void testCommonTableExpression()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedCommonTableExpression()
     {
         onHive().executeQuery(
@@ -127,6 +131,7 @@ public void testNestedCommonTableExpression()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testArrayConstructionInView()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS test_array_construction_view");
@@ -139,6 +144,7 @@ public void testArrayConstructionInView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testMapConstructionInView()
     {
         onHive().executeQuery(
@@ -158,6 +164,7 @@ public void testMapConstructionInView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testSelectOnViewFromDifferentSchema()
     {
         onHive().executeQuery("DROP SCHEMA IF EXISTS test_schema CASCADE");
@@ -171,6 +178,7 @@ public void testSelectOnViewFromDifferentSchema()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testViewReferencingTableInDifferentSchema()
     {
         String schemaX = "test_view_table_in_different_schema_x" + randomNameSuffix();
@@ -191,6 +199,7 @@ public void testViewReferencingTableInDifferentSchema()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testViewReferencingTableInTheSameSchemaWithoutQualifier()
     {
         String schemaX = "test_view_table_same_schema_without_qualifier_schema" + randomNameSuffix();
@@ -209,6 +218,7 @@ public void testViewReferencingTableInTheSameSchemaWithoutQualifier()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     // TODO (https://github.com/trinodb/trino/issues/5911) the test does not test view coercion
     public void testViewWithUnsupportedCoercion()
     {
@@ -220,6 +230,7 @@ public void testViewWithUnsupportedCoercion()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testOuterParentheses()
     {
         if (getHiveVersionMajor() <= 1) {
@@ -235,6 +246,7 @@ public void testOuterParentheses()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testDateFunction()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS hive_table_date_function");
@@ -250,6 +262,7 @@ public void testDateFunction()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testPmodFunction()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS hive_table_pmod_function");
@@ -265,6 +278,7 @@ public void testPmodFunction()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     // TODO (https://github.com/trinodb/trino/issues/5911) the test does not test view coercion
     public void testWithUnsupportedFunction()
     {
@@ -276,6 +290,7 @@ public void testWithUnsupportedFunction()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testExistingView()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_duplicate_view");
@@ -286,6 +301,7 @@ public void testExistingView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testShowCreateView()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_show_view");
@@ -349,6 +365,7 @@ public void testRichSqlSyntax()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testIdentifierThatStartWithDigit()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS \"7_table_with_number\"");
@@ -363,6 +380,7 @@ public void testIdentifierThatStartWithDigit()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testHiveViewInInformationSchema()
     {
         onHive().executeQuery("DROP SCHEMA IF EXISTS test_schema CASCADE");
@@ -389,6 +407,7 @@ public void testHiveViewInInformationSchema()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testHiveViewWithParametrizedTypes()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_view_parametrized");
@@ -409,6 +428,7 @@ public void testHiveViewWithParametrizedTypes()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testHiveViewWithTextualTypes()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS hive_view_textual");
@@ -436,6 +456,7 @@ public void testHiveViewWithTextualTypes()
     protected abstract List<QueryAssert.Row> getExpectedHiveViewTextualColumnsTypes();
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedHiveViews()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS nested_base_view");
@@ -452,6 +473,7 @@ public void testNestedHiveViews()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testSelectFromHiveViewWithoutDefaultCatalogAndSchema()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS no_catalog_schema_view");
@@ -465,6 +487,7 @@ public void testSelectFromHiveViewWithoutDefaultCatalogAndSchema()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testTimestampHiveView()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS timestamp_hive_table");
@@ -497,6 +520,7 @@ public void testTimestampHiveView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testCurrentUser()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS current_user_hive_view");
@@ -508,6 +532,7 @@ public void testCurrentUser()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedGroupBy()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS test_nested_group_by_view");
@@ -596,6 +621,7 @@ public void testUnionDistinctViews()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testHivePartitionViews()
     {
         onHive().executeQuery("DROP VIEW IF EXISTS test_view_partitioned_column");
@@ -615,6 +641,7 @@ public void testHivePartitionViews()
      * any potential view translation to follow redirections.
      */
     @Test(groups = {HIVE_ICEBERG_REDIRECTIONS, PROFILE_SPECIFIC_TESTS})
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testViewReferencingHiveAndIcebergTables()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS iceberg.default.view_iceberg_table_actual_data");
@@ -698,6 +725,7 @@ public void testViewReferencingHiveAndIcebergTables()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testViewWithColumnAliasesDifferingInCase()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS test_hive_namesake_column_name_a");
@@ -724,6 +752,7 @@ public void testViewWithColumnAliasesDifferingInCase()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testRunAsInvoker()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS run_as_invoker");

testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViews.java

@@ -19,6 +19,7 @@
 import io.trino.tempto.assertions.QueryAssert;
 import io.trino.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableNationTable;
 import io.trino.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableOrdersTable;
+import io.trino.testng.services.Flaky;
 import org.assertj.core.api.Assertions;
 import org.testng.annotations.Test;
 
@@ -29,6 +30,8 @@
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
 import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_VIEWS;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -53,6 +56,7 @@ protected List<QueryAssert.Row> getExpectedHiveViewTextualColumnsTypes()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testFailingHiveViewsWithMetadataListing()
     {
         setupBrokenView();
@@ -164,6 +168,7 @@ private static void setupBrokenView()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testLateralViewExplode()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS pageAds");
@@ -199,6 +204,7 @@ public void testLateralViewExplode()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testLateralViewExplodeArrayOfStructs()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS pageAdsStructs");
@@ -235,6 +241,7 @@ public void testLateralViewExplodeArrayOfStructs()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testLateralViewJsonTupleAs()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_json_tuple_table");
@@ -253,6 +260,7 @@ public void testLateralViewJsonTupleAs()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testFromUtcTimestamp()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_from_utc_timestamp_source");
@@ -388,6 +396,7 @@ public void testFromUtcTimestamp()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testFromUtcTimestampInvalidTimeZone()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_from_utc_timestamp_invalid_time_zone_source");
@@ -413,6 +422,7 @@ public void testFromUtcTimestampInvalidTimeZone()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedFieldWithReservedKeyNames()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_nested_field_with_reserved_key_names_source");
@@ -446,6 +456,7 @@ public void testNestedFieldWithReservedKeyNames()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testFromUtcTimestampCornerCases()
     {
         onTrino().executeQuery("DROP TABLE IF EXISTS test_from_utc_timestamp_corner_cases_source");
@@ -506,6 +517,7 @@ private boolean isObsoleteFromUtcTimestampSemantics()
     }
 
     @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testCastTimestampAsDecimal()
     {
         onHive().executeQuery("DROP TABLE IF EXISTS cast_timestamp_as_decimal");

testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveViewsLegacy.java

@@ -20,6 +20,7 @@
 import io.trino.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableNationTable;
 import io.trino.tempto.fulfillment.table.hive.tpch.ImmutableTpchTablesRequirements.ImmutableOrdersTable;
 import io.trino.tempto.query.QueryExecutor;
+import io.trino.testng.services.Flaky;
 import org.testng.annotations.Test;
 
 import java.math.BigDecimal;
@@ -28,6 +29,8 @@
 import static io.trino.tempto.assertions.QueryAssert.Row.row;
 import static io.trino.tempto.assertions.QueryAssert.assertThat;
 import static io.trino.tests.product.TestGroups.HIVE_VIEWS;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_ISSUES;
+import static io.trino.tests.product.utils.HadoopTestUtils.RETRYABLE_FAILURES_MATCH;
 import static io.trino.tests.product.utils.QueryExecutors.onHive;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -118,20 +121,26 @@ public void testArrayIndexingInView()
     }
 
     @Override
+    @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testArrayConstructionInView()
     {
         assertThatThrownBy(super::testArrayConstructionInView)
                 .hasMessageContaining("Function 'array' not registered");
     }
 
     @Override
+    @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testMapConstructionInView()
     {
         assertThatThrownBy(super::testMapConstructionInView)
                 .hasMessageContaining("Unexpected parameters (varchar(15), varchar(15)) for function map");
     }
 
     @Override
+    @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testPmodFunction()
     {
         assertThatThrownBy(super::testPmodFunction)
@@ -151,6 +160,8 @@ protected List<QueryAssert.Row> getExpectedHiveViewTextualColumnsTypes()
     }
 
     @Override
+    @Test(groups = HIVE_VIEWS)
+    @Flaky(issue = RETRYABLE_FAILURES_ISSUES, match = RETRYABLE_FAILURES_MATCH)
     public void testNestedHiveViews()
     {
         assertThatThrownBy(super::testNestedHiveViews)