Skip to content

[8.x] Add semantic_text to mapping_all_types and switch to TranslationAware in PushFiltersToSource (#118982) #119635

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 1 commit into from
Jan 7, 2025
Merged

[8.x] Add semantic_text to mapping_all_types and switch to TranslationAware in PushFiltersToSource (#118982) #119635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions x-pack/plugin/esql/qa/testFixtures/src/main/resources/mapping-all-types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
},
"wildcard": {
"type": "wildcard"
},
"semantic_text": {
"type": "semantic_text",
"inference_id": "foo_inference_id"
}
}
}
3 changes: 0 additions & 3 deletions ...java/org/elasticsearch/xpack/esql/optimizer/rules/physical/local/PushFiltersToSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.elasticsearch.xpack.esql.core.util.CollectionUtils;
import org.elasticsearch.xpack.esql.core.util.Queries;
import org.elasticsearch.xpack.esql.expression.function.fulltext.FullTextFunction;
import org.elasticsearch.xpack.esql.expression.function.fulltext.Term;
import org.elasticsearch.xpack.esql.expression.function.scalar.ip.CIDRMatch;
import org.elasticsearch.xpack.esql.expression.function.scalar.spatial.BinarySpatialFunction;
import org.elasticsearch.xpack.esql.expression.function.scalar.spatial.SpatialRelatesFunction;
Expand Down Expand Up @@ -252,8 +251,6 @@ static boolean canPushToSource(Expression exp, LucenePushdownPredicates lucenePu
&& Expressions.foldable(cidrMatch.matches());
} else if (exp instanceof SpatialRelatesFunction spatial) {
return canPushSpatialFunctionToSource(spatial, lucenePushdownPredicates);
} else if (exp instanceof Term term) {
return term.field() instanceof FieldAttribute && DataType.isString(term.field().dataType());
} else if (exp instanceof FullTextFunction) {
return true;
}
Expand Down
5 changes: 0 additions & 5 deletions ...src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,11 +1401,6 @@ private void checkMatchFunctionPushDown(
var analyzer = makeAnalyzer("mapping-all-types.json", new EnrichResolution());
// Check for every possible query data type
for (DataType fieldDataType : fieldDataTypes) {
// TODO: semantic_text is not present in mapping-all-types.json so we skip it for now
if (fieldDataType == DataType.SEMANTIC_TEXT) {
continue;
}

var queryValue = randomQueryValue(fieldDataType);

String fieldName = fieldDataType == DataType.DATETIME ? "date" : fieldDataType.name().toLowerCase(Locale.ROOT);
Expand Down