Skip to content

Commit 20245b6

Browse files
Fix merge error
1 parent 8e9d34b commit 20245b6

File tree

1 file changed

+2
-3
lines changed
  • x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext

1 file changed

+2
-3
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/FullTextFunction.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
5757
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
5858
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isNotNull;
59+
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isString;
5960
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
6061
import static org.elasticsearch.xpack.esql.core.type.DataType.DENSE_VECTOR;
6162
import static org.elasticsearch.xpack.esql.expression.function.FunctionUtils.postOptimizationVerificationQuery;
@@ -112,9 +113,7 @@ protected TypeResolution resolveParams() {
112113
* @return type resolution for the query parameter
113114
*/
114115
protected TypeResolution resolveQuery(TypeResolutions.ParamOrdinal queryOrdinal) {
115-
TypeResolution result = isType(query(), dt -> dt == DENSE_VECTOR, sourceText(), SECOND, "dense_vector").and(
116-
isNotNull(query(), sourceText(), SECOND)
117-
);
116+
TypeResolution result = isString(query(), sourceText(), queryOrdinal).and(isNotNull(query(), sourceText(), queryOrdinal));
118117
if (result.unresolved()) {
119118
return result;
120119
}

0 commit comments

Comments
 (0)