Skip to content

Fix data race in InlineStats #131370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dnhatn merged 2 commits into from
Jul 17, 2025
Merged

Fix data race in InlineStats #131370

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f2b28e
Fix data race in InlineStats
dnhatn Jul 16, 2025
863e315
Merge remote-tracking branch 'elastic/main' into fix-inline-join
dnhatn Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ...gin/esql/compute/src/main/java/org/elasticsearch/compute/operator/ColumnLoadOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.elasticsearch.compute.data.Block;
import org.elasticsearch.compute.data.Page;
import org.elasticsearch.core.ReleasableIterator;
import org.elasticsearch.core.Releasables;

/**
* {@link Block#lookup Looks up} values from a provided {@link Block} and
Expand Down Expand Up @@ -44,8 +45,19 @@ public String describe() {
private final int positionsOrd;

public ColumnLoadOperator(Values values, int positionsOrd) {
this.values = values;
this.positionsOrd = positionsOrd;
this.values = clone(values);
}

// FIXME: Since we don't have a thread-safe RefCounted for blocks/vectors, we have to clone the values block to avoid
// data races of reference when sharing blocks/vectors across threads. Remove this when we have a thread-safe RefCounted
// for blocks/vectors.
static Values clone(Values values) {
final Block block = values.block;
try (var builder = block.elementType().newBlockBuilder(block.getPositionCount(), block.blockFactory())) {
builder.copyFrom(block, 0, block.getPositionCount());
return new Values(values.name, builder.build());
}
}

/**
Expand All @@ -67,6 +79,11 @@ protected ReleasableIterator<Page> receive(Page page) {
return appendBlocks(page, values.block.lookup(page.getBlock(positionsOrd), TARGET_BLOCK_SIZE));
}

@Override
public void close() {
Releasables.closeExpectNoException(values.block, super::close);
}

@Override
public String toString() {
return "ColumnLoad[values=" + values + ", positions=" + positionsOrd + "]";
Expand Down