From 64cf052f3b56b1fd4449f5454cb88aca7e739d9a Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Thu, 7 Dec 2023 11:00:09 -0800 Subject: [PATCH] Remove AwaitFix HeapAttack tests in 8.11 (#103154) We've made some improvements in memory tracking in ESQL, but due to their complexity, we intentionally chose not to backport them to 8.11. Without these enhancements, some HeapAttack tests are not ready for 8.11. I think we should remove the AwaitsFix tests and focus on 8.13 instead. Closes #100640 --- .../esql/qa/heap_attack/HeapAttackIT.java | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/x-pack/plugin/esql/qa/server/heap-attack/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/heap_attack/HeapAttackIT.java b/x-pack/plugin/esql/qa/server/heap-attack/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/heap_attack/HeapAttackIT.java index fd13de54ebc9d..235ddd7ee107c 100644 --- a/x-pack/plugin/esql/qa/server/heap-attack/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/heap_attack/HeapAttackIT.java +++ b/x-pack/plugin/esql/qa/server/heap-attack/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/heap_attack/HeapAttackIT.java @@ -110,21 +110,6 @@ public void testGroupOnSomeLongs() throws IOException { assertMap(map, matchesMap().entry("columns", columns).entry("values", values)); } - /** - * This groups on 5000 columns which used to throw a {@link StackOverflowError}. - */ - public void testGroupOnManyLongs() throws IOException { - initManyLongs(); - Map map = XContentHelper.convertToMap( - JsonXContent.jsonXContent, - EntityUtils.toString(groupOnManyLongs(5000).getEntity()), - false - ); - ListMatcher columns = matchesList().item(matchesMap().entry("name", "MAX(a)").entry("type", "long")); - ListMatcher values = matchesList().item(List.of(9)); - assertMap(map, matchesMap().entry("columns", columns).entry("values", values)); - } - private Response groupOnManyLongs(int count) throws IOException { logger.info("grouping on {} longs", count); StringBuilder query = makeManyLongs(count); @@ -247,12 +232,6 @@ public void testManyEval() throws IOException { assertMap(map, matchesMap().entry("columns", columns).entry("values", hasSize(10_000))); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/100528") - public void testTooManyEval() throws IOException { - initManyLongs(); - assertCircuitBreaks(() -> manyEval(1000)); - } - private Response manyEval(int evalLines) throws IOException { StringBuilder query = new StringBuilder(); query.append("{\"query\":\"FROM manylongs"); @@ -289,12 +268,6 @@ public void testFetchManyBigFields() throws IOException { fetchManyBigFields(100); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/100528") - public void testFetchTooManyBigFields() throws IOException { - initManyBigFieldsIndex(500); - assertCircuitBreaks(() -> fetchManyBigFields(500)); - } - /** * Fetches documents containing 1000 fields which are {@code 1kb} each. */ @@ -345,12 +318,6 @@ public void testFetchMvLongs() throws IOException { assertMap(map, matchesMap().entry("columns", columns)); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/100528") - public void testFetchTooManyMvLongs() throws IOException { - initMvLongsIndex(500, 100, 1000); - assertCircuitBreaks(() -> fetchMvLongs()); - } - private Response fetchMvLongs() throws IOException { return query("{\"query\": \"FROM mv_longs\"}", "columns"); }