Skip to content

An alternative approach to supporting union-types on stats grouping field #110600

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
craigtaverner merged 2 commits into from
Jul 9, 2024
Merged

An alternative approach to supporting union-types on stats grouping field #110600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1805baa
Added union-types field extration to ordinals aggregation
craigtaverner Jul 4, 2024
d1a27eb
Revert previous approach to getting union-types working in aggregations
craigtaverner Jul 8, 2024
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
7 changes: 4 additions & 3 deletions .../src/test/java/org/elasticsearch/compute/lucene/ValueSourceReaderTypeConversionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,12 +1687,13 @@ public StoredFieldsSpec rowStrideStoredFieldSpec() {

@Override
public boolean supportsOrdinals() {
return delegate.supportsOrdinals();
// Fields with mismatching types cannot use ordinals for uniqueness determination, but must convert the values first
return false;
}

@Override
public SortedSetDocValues ordinals(LeafReaderContext context) throws IOException {
return delegate.ordinals(context);
public SortedSetDocValues ordinals(LeafReaderContext context) {
throw new IllegalArgumentException("Ordinals are not supported for type conversion");
}

@Override
Expand Down
10 changes: 1 addition & 9 deletions ...esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
import org.elasticsearch.xpack.esql.planner.AbstractPhysicalOperationProviders;
import org.elasticsearch.xpack.esql.planner.EsqlTranslatorHandler;
import org.elasticsearch.xpack.esql.stats.SearchStats;
import org.elasticsearch.xpack.esql.type.MultiTypeEsField;

import java.nio.ByteOrder;
import java.util.ArrayList;
Expand Down Expand Up @@ -194,10 +193,7 @@ public PhysicalPlan apply(PhysicalPlan plan) {
* it loads the field lazily. If we have more than one field we need to
* make sure the fields are loaded for the standard hash aggregator.
*/
if (p instanceof AggregateExec agg
&& agg.groupings().size() == 1
&& (isMultiTypeFieldAttribute(agg.groupings().get(0)) == false) // Union types rely on field extraction.
) {
if (p instanceof AggregateExec agg && agg.groupings().size() == 1) {
var leaves = new LinkedList<>();
// TODO: this seems out of place
agg.aggregates()
Expand All @@ -221,10 +217,6 @@ public PhysicalPlan apply(PhysicalPlan plan) {
return plan;
}

private static boolean isMultiTypeFieldAttribute(Expression attribute) {
return attribute instanceof FieldAttribute fa && fa.field() instanceof MultiTypeEsField;
}

private static Set<Attribute> missingAttributes(PhysicalPlan p) {
var missing = new LinkedHashSet<Attribute>();
var input = p.inputSet();
Expand Down
10 changes: 6 additions & 4 deletions ...esql/src/main/java/org/elasticsearch/xpack/esql/planner/EsPhysicalOperationProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,9 @@ public final Operator.OperatorFactory ordinalGroupingOperatorFactory(
// The grouping-by values are ready, let's group on them directly.
// Costin: why are they ready and not already exposed in the layout?
boolean isUnsupported = attrSource.dataType() == DataType.UNSUPPORTED;
var unionTypes = findUnionTypes(attrSource);
return new OrdinalsGroupingOperator.OrdinalsGroupingOperatorFactory(
shardIdx -> shardContexts.get(shardIdx).blockLoader(attrSource.name(), isUnsupported, NONE),
shardIdx -> getBlockLoaderFor(shardIdx, attrSource.name(), isUnsupported, NONE, unionTypes),
vsShardContexts,
groupElementType,
docChannel,
Expand Down Expand Up @@ -434,12 +435,13 @@ public StoredFieldsSpec rowStrideStoredFieldSpec() {

@Override
public boolean supportsOrdinals() {
return delegate.supportsOrdinals();
// Fields with mismatching types cannot use ordinals for uniqueness determination, but must convert the values first
return false;
}

@Override
public SortedSetDocValues ordinals(LeafReaderContext context) throws IOException {
return delegate.ordinals(context);
public SortedSetDocValues ordinals(LeafReaderContext context) {
throw new IllegalArgumentException("Ordinals are not supported for type conversion");
}

@Override
Expand Down