Skip to content

Commit df788db

Browse files
Fix tests
1 parent 44ea6fc commit df788db

File tree

2 files changed

+54
-3
lines changed

2 files changed

+54
-3
lines changed

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/slowlog/EsqlSlowLogTests.java

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
import org.elasticsearch.common.settings.ClusterSettings;
1717
import org.elasticsearch.common.settings.Settings;
1818
import org.elasticsearch.core.TimeValue;
19+
import org.elasticsearch.index.IndexSettings;
20+
import org.elasticsearch.index.SlowLogFieldProvider;
21+
import org.elasticsearch.index.SlowLogFields;
1922
import org.elasticsearch.test.ESTestCase;
2023
import org.elasticsearch.xpack.esql.MockAppender;
2124
import org.elasticsearch.xpack.esql.action.EsqlExecutionInfo;
@@ -27,6 +30,7 @@
2730
import java.util.Arrays;
2831
import java.util.HashSet;
2932
import java.util.List;
33+
import java.util.Map;
3034
import java.util.concurrent.TimeUnit;
3135

3236
import static org.elasticsearch.xpack.esql.slowlog.EsqlSlowLog.ELASTICSEARCH_SLOWLOG_PLANNING_TOOK;
@@ -82,7 +86,7 @@ public static void cleanup() {
8286
}
8387

8488
public void testPrioritiesOnSuccess() {
85-
EsqlSlowLog slowLog = new EsqlSlowLog(settings);
89+
EsqlSlowLog slowLog = new EsqlSlowLog(settings, mockFieldProvider());
8690
String query = "from " + randomAlphaOfLength(10);
8791

8892
long[] actualTook = {
@@ -126,8 +130,32 @@ public void testPrioritiesOnSuccess() {
126130
}
127131
}
128132

133+
private SlowLogFieldProvider mockFieldProvider() {
134+
return new SlowLogFieldProvider() {
135+
@Override
136+
public SlowLogFields create(IndexSettings indexSettings) {
137+
return create();
138+
}
139+
140+
@Override
141+
public SlowLogFields create() {
142+
return new SlowLogFields() {
143+
@Override
144+
public Map<String, String> indexFields() {
145+
return Map.of();
146+
}
147+
148+
@Override
149+
public Map<String, String> searchFields() {
150+
return Map.of();
151+
}
152+
};
153+
}
154+
};
155+
}
156+
129157
public void testPrioritiesOnFailure() {
130-
EsqlSlowLog slowLog = new EsqlSlowLog(settings);
158+
EsqlSlowLog slowLog = new EsqlSlowLog(settings, mockFieldProvider());
131159
String query = "from " + randomAlphaOfLength(10);
132160

133161
long[] actualTook = {

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/telemetry/PlanExecutorMetricsTests.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
import org.elasticsearch.common.settings.ClusterSettings;
2020
import org.elasticsearch.common.settings.Settings;
2121
import org.elasticsearch.index.IndexMode;
22+
import org.elasticsearch.index.IndexSettings;
23+
import org.elasticsearch.index.SlowLogFieldProvider;
24+
import org.elasticsearch.index.SlowLogFields;
2225
import org.elasticsearch.indices.IndicesExpressionGrouper;
2326
import org.elasticsearch.license.XPackLicenseState;
2427
import org.elasticsearch.telemetry.metric.MeterRegistry;
@@ -97,7 +100,27 @@ EsqlSlowLog mockSlowLog() {
97100
)
98101
)
99102
);
100-
return new EsqlSlowLog(clusterSettings);
103+
return new EsqlSlowLog(clusterSettings, new SlowLogFieldProvider() {
104+
@Override
105+
public SlowLogFields create(IndexSettings indexSettings) {
106+
return create();
107+
}
108+
109+
@Override
110+
public SlowLogFields create() {
111+
return new SlowLogFields() {
112+
@Override
113+
public Map<String, String> indexFields() {
114+
return Map.of();
115+
}
116+
117+
@Override
118+
public Map<String, String> searchFields() {
119+
return Map.of();
120+
}
121+
};
122+
}
123+
});
101124
}
102125

103126
public void testFailedMetric() {

0 commit comments

Comments
 (0)