Skip to content

Commit f1097a1

Browse files
authored
Rename processing -> process in LuceneOperator status (#123359)
1 parent f0f0eeb commit f1097a1

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public static class Status implements Operator.Status {
254254
private final int processedSlices;
255255
private final Set<String> processedQueries;
256256
private final Set<String> processedShards;
257-
private final long processingNanos;
257+
private final long processNanos;
258258
private final int totalSlices;
259259
private final int pagesEmitted;
260260
private final int sliceIndex;
@@ -266,7 +266,7 @@ public static class Status implements Operator.Status {
266266
private Status(LuceneOperator operator) {
267267
processedSlices = operator.processedSlices;
268268
processedQueries = operator.processedQueries.stream().map(Query::toString).collect(Collectors.toCollection(TreeSet::new));
269-
processingNanos = operator.processingNanos;
269+
processNanos = operator.processingNanos;
270270
processedShards = new TreeSet<>(operator.processedShards);
271271
sliceIndex = operator.sliceIndex;
272272
totalSlices = operator.sliceQueue.totalSlices();
@@ -293,7 +293,7 @@ private Status(LuceneOperator operator) {
293293
int processedSlices,
294294
Set<String> processedQueries,
295295
Set<String> processedShards,
296-
long processingNanos,
296+
long processNanos,
297297
int sliceIndex,
298298
int totalSlices,
299299
int pagesEmitted,
@@ -305,7 +305,7 @@ private Status(LuceneOperator operator) {
305305
this.processedSlices = processedSlices;
306306
this.processedQueries = processedQueries;
307307
this.processedShards = processedShards;
308-
this.processingNanos = processingNanos;
308+
this.processNanos = processNanos;
309309
this.sliceIndex = sliceIndex;
310310
this.totalSlices = totalSlices;
311311
this.pagesEmitted = pagesEmitted;
@@ -324,7 +324,7 @@ private Status(LuceneOperator operator) {
324324
processedQueries = Collections.emptySet();
325325
processedShards = Collections.emptySet();
326326
}
327-
processingNanos = in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0) ? in.readVLong() : 0;
327+
processNanos = in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0) ? in.readVLong() : 0;
328328
sliceIndex = in.readVInt();
329329
totalSlices = in.readVInt();
330330
pagesEmitted = in.readVInt();
@@ -346,7 +346,7 @@ public void writeTo(StreamOutput out) throws IOException {
346346
out.writeCollection(processedShards, StreamOutput::writeString);
347347
}
348348
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) {
349-
out.writeVLong(processingNanos);
349+
out.writeVLong(processNanos);
350350
}
351351
out.writeVInt(sliceIndex);
352352
out.writeVInt(totalSlices);
@@ -377,7 +377,7 @@ public Set<String> processedShards() {
377377
}
378378

379379
public long processNanos() {
380-
return processingNanos;
380+
return processNanos;
381381
}
382382

383383
public int sliceIndex() {
@@ -414,9 +414,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
414414
builder.field("processed_slices", processedSlices);
415415
builder.field("processed_queries", processedQueries);
416416
builder.field("processed_shards", processedShards);
417-
builder.field("processing_nanos", processingNanos);
417+
builder.field("process_nanos", processNanos);
418418
if (builder.humanReadable()) {
419-
builder.field("processing_time", TimeValue.timeValueNanos(processingNanos));
419+
builder.field("process_time", TimeValue.timeValueNanos(processNanos));
420420
}
421421
builder.field("slice_index", sliceIndex);
422422
builder.field("total_slices", totalSlices);
@@ -436,7 +436,7 @@ public boolean equals(Object o) {
436436
return processedSlices == status.processedSlices
437437
&& processedQueries.equals(status.processedQueries)
438438
&& processedShards.equals(status.processedShards)
439-
&& processingNanos == status.processingNanos
439+
&& processNanos == status.processNanos
440440
&& sliceIndex == status.sliceIndex
441441
&& totalSlices == status.totalSlices
442442
&& pagesEmitted == status.pagesEmitted

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneSourceOperatorStatusTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public static String simpleToJson() {
4646
"a:0",
4747
"a:1"
4848
],
49-
"processing_nanos" : 1002,
50-
"processing_time" : "1micros",
49+
"process_nanos" : 1002,
50+
"process_time" : "1micros",
5151
"slice_index" : 0,
5252
"total_slices" : 1,
5353
"pages_emitted" : 5,

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ private String checkOperatorProfile(Map<String, Object> o) {
565565
.entry("current", DocIdSetIterator.NO_MORE_DOCS)
566566
.entry("pages_emitted", greaterThan(0))
567567
.entry("rows_emitted", greaterThan(0))
568-
.entry("processing_nanos", greaterThan(0))
568+
.entry("process_nanos", greaterThan(0))
569569
.entry("processed_queries", List.of("*:*"));
570570
case "ValuesSourceReaderOperator" -> basicProfile().entry("readers_built", matchesMap().extraOk());
571571
case "AggregationOperator" -> matchesMap().entry("pages_processed", greaterThan(0))
@@ -599,7 +599,7 @@ private String checkOperatorProfile(Map<String, Object> o) {
599599
.entry("total_slices", greaterThan(0))
600600
.entry("slice_max", 0)
601601
.entry("slice_min", 0)
602-
.entry("processing_nanos", greaterThan(0))
602+
.entry("process_nanos", greaterThan(0))
603603
.entry("processed_queries", List.of("*:*"))
604604
.entry("slice_index", 0);
605605
default -> throw new AssertionError("unexpected status: " + o);

0 commit comments

Comments
 (0)