Release discarded pages in mutateInstance (elastic#100472)

EsqlQueryResponseTests.testEqualsAndHashcode failed on CI because we did not release pages were discarded by randomValueOtherThan while mutating the testing instance.
danielmitterdorfer · Oct 9, 2023 · db4f92f · db4f92f
1 parent a12195c
commit db4f92f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java b/...plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java
@@ -28,6 +28,7 @@
 import org.elasticsearch.compute.data.LongBlock;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.lucene.UnsupportedValueSource;
+import org.elasticsearch.core.Releasables;
 import org.elasticsearch.test.AbstractChunkedSerializingTestCase;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentType;
@@ -136,11 +137,12 @@ protected EsqlQueryResponse mutateInstance(EsqlQueryResponse instance) {
             case 1 -> new EsqlQueryResponse(instance.columns(), deepCopyOfPages(instance), false == instance.columnar());
             case 2 -> {
                 int noPages = instance.pages().size();
-                yield new EsqlQueryResponse(
-                    instance.columns(),
-                    randomValueOtherThan(instance.pages(), () -> randomList(noPages, noPages, () -> randomPage(instance.columns()))),
-                    instance.columnar()
-                );
+                List<Page> differentPages = List.of();
+                do {
+                    differentPages.forEach(p -> Releasables.closeExpectNoException(p::releaseBlocks));
+                    differentPages = randomList(noPages, noPages, () -> randomPage(instance.columns()));
+                } while (differentPages.equals(instance.pages()));
+                yield new EsqlQueryResponse(instance.columns(), differentPages, instance.columnar());
             }
             default -> throw new IllegalArgumentException();
         };