Skip to content

Commit e3958c0

Browse files
committed
Fix failing test
1 parent 79a9669 commit e3958c0

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

x-pack/plugin/esql/qa/testFixtures/src/main/resources/query_task.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"id" : 5326,
44
"type" : "transport",
55
"action" : "indices:data/read/esql",
6+
"status" : "Ks5ApyqMTtWj5LrKigmCjQ",
67
"description" : "FROM test | STATS MAX(d) by a, b", <1>
78
"start_time" : "2023-07-31T15:46:32.328Z",
89
"start_time_in_millis" : 1690818392328,

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlDocIdStatus.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package org.elasticsearch.xpack.esql.plugin;
99

10+
import org.elasticsearch.common.Strings;
1011
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1112
import org.elasticsearch.common.io.stream.StreamInput;
1213
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -47,6 +48,6 @@ public void writeTo(StreamOutput out) throws IOException {
4748

4849
@Override
4950
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
50-
return builder.rawValue(id);
51+
return builder.rawValue(Strings.format("\"%s\"", id));
5152
}
5253
}

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryRequestTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.elasticsearch.xpack.esql.parser.ParsingException;
3939
import org.elasticsearch.xpack.esql.parser.QueryParam;
4040
import org.elasticsearch.xpack.esql.parser.QueryParams;
41+
import org.elasticsearch.xpack.esql.plugin.EsqlDocIdStatus;
4142

4243
import java.io.IOException;
4344
import java.util.ArrayList;
@@ -621,6 +622,8 @@ public void testTask() throws IOException {
621622
.replaceAll("FROM test \\| STATS MAX\\(d\\) by a, b", query)
622623
.replaceAll("5326", Integer.toString(id))
623624
.replaceAll("2j8UKw1bRO283PMwDugNNg", localNode)
625+
.replaceAll("Ks5ApyqMTtWj5LrKigmCjQ", ((EsqlDocIdStatus) taskInfo.status()).id())
626+
.replaceAll("2023-07-31T15:46:32\\.328Z", DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.formatMillis(taskInfo.startTime()))
624627
.replaceAll("2023-07-31T15:46:32\\.328Z", DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.formatMillis(taskInfo.startTime()))
625628
.replaceAll("1690818392328", Long.toString(taskInfo.startTime()))
626629
.replaceAll("41.7ms", TimeValue.timeValueNanos(taskInfo.runningTimeNanos()).toString())

0 commit comments

Comments
 (0)