[ES|QL] Convert PackedValuesBlockHash.bytes to BreakingBytesRefBuilder for better memory tracking
#140171
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| pr: 140171 | ||
| summary: Converted `PackedValuesBlockHash.bytes` to `BreakingBytesRefBuilder` for | ||
| better memory tracking | ||
| area: ES|QL | ||
| type: enhancement | ||
| issues: [] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.compute.aggregation.blockhash; | ||
|
|
||
| import org.apache.lucene.util.BytesRef; | ||
| import org.elasticsearch.common.breaker.CircuitBreaker; | ||
| import org.elasticsearch.common.breaker.CircuitBreakingException; | ||
| import org.elasticsearch.common.breaker.NoopCircuitBreaker; | ||
| import org.elasticsearch.common.unit.ByteSizeValue; | ||
| import org.elasticsearch.common.util.BigArrays; | ||
| import org.elasticsearch.common.util.MockBigArrays; | ||
| import org.elasticsearch.compute.aggregation.GroupingAggregatorFunction; | ||
| import org.elasticsearch.compute.data.Block; | ||
| import org.elasticsearch.compute.data.BlockFactory; | ||
| import org.elasticsearch.compute.data.BytesRefBlock; | ||
| import org.elasticsearch.compute.data.ElementType; | ||
| import org.elasticsearch.compute.data.IntArrayBlock; | ||
| import org.elasticsearch.compute.data.IntBigArrayBlock; | ||
| import org.elasticsearch.compute.data.IntVector; | ||
| import org.elasticsearch.compute.data.Page; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static org.elasticsearch.common.util.MockBigArrays.ERROR_MESSAGE; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
|
|
||
| public class PackedValuesBlockHashCircuitBreakerTests extends BlockHashTestCase { | ||
|
|
||
| /** | ||
| * Set the breaker limit low enough, and test that adding many(1000) groups of BYTES_REF into bytes {@code BreakingBytesRefBuilder} | ||
| * , which is reused for each grouping set, will trigger CBE. CBE happens when adding around 11th group to bytes. | ||
| */ | ||
| public void testCircuitBreakerWithManyGroups() { | ||
| CircuitBreaker bytesBreaker = new MockBigArrays.LimitedBreaker(CircuitBreaker.REQUEST, ByteSizeValue.ofKb(1)); | ||
| BlockFactory blockFactory = BlockFactory.getInstance(new NoopCircuitBreaker("test"), BigArrays.NON_RECYCLING_INSTANCE); | ||
|
|
||
| // 1000 group keys of BYTES_REF | ||
| List<BlockHash.GroupSpec> groupSpecs = new ArrayList<>(); | ||
| for (int i = 0; i < 1000; i++) { | ||
| groupSpecs.add(new BlockHash.GroupSpec(i, ElementType.BYTES_REF)); | ||
| } | ||
|
|
||
| try ( | ||
| PackedValuesBlockHash blockHash = new PackedValuesBlockHash(groupSpecs, blockFactory, bytesBreaker, 32); | ||
| BytesRefBlock.Builder builder = blockFactory.newBytesRefBlockBuilder(1) | ||
| ) { | ||
| builder.appendBytesRef(new BytesRef("test")); | ||
| Block block = builder.build(); | ||
| Block[] blocks = new Block[1000]; | ||
| for (int i = 0; i < 1000; i++) { | ||
| blocks[i] = block; | ||
| } | ||
| Page page = new Page(blocks); | ||
|
|
||
| CircuitBreakingException e = expectThrows( | ||
| CircuitBreakingException.class, | ||
| () -> blockHash.add(page, new GroupingAggregatorFunction.AddInput() { | ||
| @Override | ||
| public void add(int positionOffset, IntArrayBlock groupIds) {} | ||
|
|
||
| @Override | ||
| public void add(int positionOffset, IntBigArrayBlock groupIds) {} | ||
|
|
||
| @Override | ||
| public void add(int positionOffset, IntVector groupIds) {} | ||
|
|
||
| @Override | ||
| public void close() {} | ||
| }) | ||
| ); | ||
| assertThat(e.getMessage(), equalTo(ERROR_MESSAGE)); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The primary ctor can call this one like
this(specs, blockFactory, blockFactory.circiutBreaker(), emitBatchSize).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point! More refactor is needed. :)