Include QueryId in assertDistrubutedQuery failure message

trinodb · Mar 31, 2023 · dad888f · dad888f
1 parent 09280fe
commit dad888f
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/QueryAssertions.java b/testing/trino-testing/src/main/java/io/trino/testing/QueryAssertions.java
@@ -279,7 +279,15 @@ private static void assertDistributedQuery(
             actualResults = resultWithQueryId.getResult().toTestTypes();
         }
         catch (RuntimeException ex) {
-            fail("Execution of 'actual' query failed: " + actual, ex);
+            if (queryId == null && ex instanceof QueryFailedException queryFailedException) {
+                queryId = queryFailedException.getQueryId();
+            }
+            if (queryId != null) {
+                fail("Execution of 'actual' query " + queryId + " failed: " + actual, ex);
+            }
+            else {
+                fail("Execution of 'actual' query failed: " + actual, ex);
+            }
         }
         if (planAssertion.isPresent()) {
             try {