Skip to content

[8.18] ESQL: Fix FieldAttribute name usage in InferNonNullAggConstraint (#128910) #129272

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
merged 2 commits into from
Jun 11, 2025
Merged

[8.18] ESQL: Fix FieldAttribute name usage in InferNonNullAggConstraint (#128910) #129272

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6c42af
ESQL: Fix FieldAttribute name usage in InferNonNullAggConstraint (#12…
alex-spies Jun 11, 2025
36ebba2
[CI] Auto commit changes from spotless
elasticsearchmachine Jun 11, 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
Prev Previous commit
[CI] Auto commit changes from spotless
  • Loading branch information
@elasticsearchmachine
elasticsearchmachine committed Jun 11, 2025
commit 36ebba2b712d46a25c42952cdab1271e1d76f54f
1 change: 0 additions & 1 deletion x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/stats/SearchContextStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.elasticsearch.index.mapper.TextFieldMapper;
import org.elasticsearch.index.query.SearchExecutionContext;
import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
import org.elasticsearch.xpack.esql.core.expression.FieldAttribute.FieldName;
import org.elasticsearch.xpack.esql.core.type.DataType;

Expand Down
1 change: 0 additions & 1 deletion x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/stats/SearchStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.elasticsearch.xpack.esql.stats;

import org.apache.lucene.util.BytesRef;
import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
import org.elasticsearch.xpack.esql.core.expression.FieldAttribute.FieldName;
import org.elasticsearch.xpack.esql.core.type.DataType;

Expand Down
7 changes: 1 addition & 6 deletions .../src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalLogicalPlanOptimizerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,12 +658,7 @@ private static Analyzer analyzerWithUnionTypeMapping() {
IndexResolution getIndexResult = IndexResolution.valid(test);

return new Analyzer(
new AnalyzerContext(
EsqlTestUtils.TEST_CFG,
new EsqlFunctionRegistry(),
getIndexResult,
EsqlTestUtils.emptyPolicyResolution()
),
new AnalyzerContext(EsqlTestUtils.TEST_CFG, new EsqlFunctionRegistry(), getIndexResult, EsqlTestUtils.emptyPolicyResolution()),
TEST_VERIFIER
);
}
Expand Down
3 changes: 2 additions & 1 deletion ...ql/src/test/java/org/elasticsearch/xpack/esql/planner/TestPhysicalOperationProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,8 @@ private Block getBlockForMultiType(DocBlock indexDoc, MultiTypeEsField multiType
var field = (FieldAttribute) conversion.field();
return indexPage.columnIndex(field.fieldName().string()).isEmpty()
? nulls.get()
: TypeConverter.fromConvertFunction(conversion).convert(extractBlockForSingleDoc(indexDoc, field.fieldName().string(), blockCopier));
: TypeConverter.fromConvertFunction(conversion)
.convert(extractBlockForSingleDoc(indexDoc, field.fieldName().string(), blockCopier));
}

private Block extractBlockForSingleDoc(DocBlock docBlock, String columnName, TestBlockCopier blockCopier) {
Expand Down