Skip to content

Commit f658283

Browse files
committed
fix merge error
1 parent bd97da0 commit f658283

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/approximate/ApproximateTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.elasticsearch.xpack.esql.core.expression.NamedExpression;
2727
import org.elasticsearch.xpack.esql.core.tree.Source;
2828
import org.elasticsearch.xpack.esql.expression.Foldables;
29+
import org.elasticsearch.xpack.esql.inference.InferenceService;
2930
import org.elasticsearch.xpack.esql.optimizer.LogicalPlanPreOptimizer;
3031
import org.elasticsearch.xpack.esql.optimizer.LogicalPreOptimizerContext;
3132
import org.elasticsearch.xpack.esql.parser.EsqlParser;
@@ -48,13 +49,14 @@
4849
import static org.hamcrest.CoreMatchers.not;
4950
import static org.hamcrest.Matchers.equalTo;
5051
import static org.hamcrest.Matchers.hasSize;
52+
import static org.mockito.Mockito.mock;
5153

5254
public class ApproximateTests extends ESTestCase {
5355

5456
private static final EsqlParser parser = new EsqlParser();
5557
private static final Analyzer analyzer = AnalyzerTestUtils.defaultAnalyzer();
5658
private static final LogicalPlanPreOptimizer preOptimizer = new LogicalPlanPreOptimizer(
57-
new LogicalPreOptimizerContext(FoldContext.small())
59+
new LogicalPreOptimizerContext(FoldContext.small(), mock(InferenceService.class))
5860
);
5961
private static final CircuitBreaker breaker = newLimitedBreaker(ByteSizeValue.ofGb(1));
6062
private static final BigArrays bigArrays = new MockBigArrays(PageCacheRecycler.NON_RECYCLING_INSTANCE, ByteSizeValue.ofGb(1));

0 commit comments

Comments
 (0)