Update

nik9000 · Oct 3, 2023 · f6f74d1 · f6f74d1
1 parent 240d39c
commit f6f74d1
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 9 deletions.
diff --git a/distribution/src/config/log4j2.properties b/distribution/src/config/log4j2.properties
@@ -52,6 +52,9 @@ appender.rolling_old.strategy.action.condition.nested_condition.type = IfAccumul
 appender.rolling_old.strategy.action.condition.nested_condition.exceeds = 2GB
 ################################################
 
+logger.esql.name = org.elasticsearch.xpack.esql
+logger.esql.level = trace
+
 rootLogger.level = info
 rootLogger.appenderRef.console.ref = console
 rootLogger.appenderRef.rolling.ref = rolling

diff --git a/docs/reference/esql/functions/signature/case.svg b/docs/reference/esql/functions/signature/case.svg
diff --git a/docs/reference/esql/functions/signature/coalesce.svg b/docs/reference/esql/functions/signature/coalesce.svg
diff --git a/docs/reference/esql/functions/signature/concat.svg b/docs/reference/esql/functions/signature/concat.svg
diff --git a/docs/reference/esql/functions/signature/date_parse.svg b/docs/reference/esql/functions/signature/date_parse.svg
diff --git a/docs/reference/esql/functions/signature/greatest.svg b/docs/reference/esql/functions/signature/greatest.svg
diff --git a/docs/reference/esql/functions/signature/least.svg b/docs/reference/esql/functions/signature/least.svg
diff --git a/...plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/ProjectOperator.java b/...plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/ProjectOperator.java
@@ -70,10 +70,17 @@ protected Page process(Page page) {
             var block = page.getBlock(source);
             blocks[b++] = block;
         }
-        // iterate the blocks to see which one isn't used
+        closeUnused(page, blocks);
+        return new Page(page.getPositionCount(), blocks);
+    }
+
+    /**
+     * Close all {@link Block}s that are in {@code page} but are not in {@code blocks}.
+     */
+    public static void closeUnused(Page page, Block[] blocks) {
         List<Releasable> blocksToRelease = new ArrayList<>();
 
-        for (int i = 0; i < blockCount; i++) {
+        for (int i = 0; i < page.getBlockCount(); i++) {
             boolean used = false;
             var current = page.getBlock(i);
             for (int j = 0; j < blocks.length; j++) {
@@ -87,7 +94,6 @@ protected Page process(Page page) {
             }
         }
         Releasables.close(blocksToRelease);
-        return new Page(page.getPositionCount(), blocks);
     }
 
     @Override

diff --git a/...-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/HeapAttackIT.java b/...-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/HeapAttackIT.java
@@ -18,6 +18,9 @@
 import org.elasticsearch.test.ListMatcher;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.xcontent.json.JsonXContent;
+import org.elasticsearch.xpack.esql.qa.rest.EsqlSpecTestCase;
+import org.junit.After;
+import org.junit.Before;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -264,4 +267,10 @@ private void initIndex(String name, String bulk) throws IOException {
             equalTo("{\"_shards\":{\"total\":2,\"successful\":1,\"failed\":0}}")
         );
     }
+
+    @Before
+    @After
+    public void assertRequestBreakerEmpty() throws Exception {
+        EsqlSpecTestCase.assertRequestBreakerEmpty();
+    }
 }
diff --git a/...plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java b/...plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java
@@ -30,6 +30,7 @@
 import org.elasticsearch.compute.operator.Operator;
 import org.elasticsearch.compute.operator.Operator.OperatorFactory;
 import org.elasticsearch.compute.operator.OutputOperator.OutputOperatorFactory;
+import org.elasticsearch.compute.operator.ProjectOperator;
 import org.elasticsearch.compute.operator.RowOperator.RowOperatorFactory;
 import org.elasticsearch.compute.operator.ShowOperator;
 import org.elasticsearch.compute.operator.SinkOperator;
@@ -333,6 +334,7 @@ private static Function<Page, Page> alignPageToAttributes(List<Attribute> attrs,
             for (int i = 0; i < blocks.length; i++) {
                 blocks[i] = p.getBlock(mappedPosition[i]);
             }
+            ProjectOperator.closeUnused(p, blocks);
             return new Page(blocks);
         } : Function.identity();