Skip to content

Commit 49ecb9d

Browse files
committed
Fix merge
1 parent beadd8c commit 49ecb9d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/FilterOperatorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public EvalOperator.ExpressionEvaluator get(DriverContext context) {
6666
public String toString() {
6767
return "SameLastDigit[lhs=0, rhs=1]";
6868
}
69-
});
69+
}, false);
7070
}
7171

7272
@Override
@@ -113,7 +113,7 @@ public void testReadFromBlock() {
113113
new SequenceBooleanBlockSourceOperator(context.blockFactory(), List.of(true, false, true, false))
114114
);
115115
List<Page> results = drive(
116-
new FilterOperator.FilterOperatorFactory(dvrCtx -> new EvalOperatorTests.LoadFromPage(0)).get(context),
116+
new FilterOperator.FilterOperatorFactory(dvrCtx -> new EvalOperatorTests.LoadFromPage(0), false).get(context),
117117
input.iterator(),
118118
context
119119
);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.elasticsearch.xpack.esql.common.Failures;
1818
import org.elasticsearch.xpack.esql.core.expression.Expression;
1919
import org.elasticsearch.xpack.esql.core.expression.FoldContext;
20-
import org.elasticsearch.xpack.esql.core.expression.MetadataAttribute;
2120
import org.elasticsearch.xpack.esql.core.expression.Nullability;
2221
import org.elasticsearch.xpack.esql.core.expression.TypeResolutions;
2322
import org.elasticsearch.xpack.esql.core.expression.function.Function;

0 commit comments

Comments
 (0)