Skip to content

Commit 5d9621e

Browse files
javannajavanna
committed
rename
1 parent 415c1cf commit 5d9621e

14 files changed

+66
-66
lines changed

‎server/src/main/java/org/elasticsearch/action/search/RankFeaturePhase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ private SearchPhaseController.ReducedQueryPhase newReducedQueryPhaseResults(
252252
reducedQueryPhase.size(),
253253
reducedQueryPhase.from(),
254254
reducedQueryPhase.isEmptyResult(),
255-
reducedQueryPhase.rangeTimestampFrom()
255+
reducedQueryPhase.rangeTimestampFromMillis()
256256
);
257257
}
258258

‎server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ static ReducedQueryPhase reducedQueryPhase(
517517
: Collections.emptyMap();
518518
int from = 0;
519519
int size = 0;
520-
Long rangeTimestampFrom = null;
520+
Long rangeTimestampFromMillis = null;
521521
DocValueFormat[] sortValueFormats = null;
522522
for (QuerySearchResult result : nonNullResults) {
523523
from = result.from();
@@ -527,13 +527,13 @@ static ReducedQueryPhase reducedQueryPhase(
527527
sortValueFormats = result.sortValueFormats();
528528
}
529529

530-
if (rangeTimestampFrom == null) {
530+
if (rangeTimestampFromMillis == null) {
531531
// we simply take the first one: we should get the same value from all shards anyway
532-
rangeTimestampFrom = result.getRangeTimestampFrom();
532+
rangeTimestampFromMillis = result.getRangeTimestampFromMillis();
533533
}
534-
assert rangeTimestampFrom == null
535-
|| result.getRangeTimestampFrom() == null
536-
|| rangeTimestampFrom.equals(result.getRangeTimestampFrom()) : rangeTimestampFrom + " != " + result.getRangeTimestampFrom();
534+
assert rangeTimestampFromMillis == null
535+
|| result.getRangeTimestampFromMillis() == null
536+
|| rangeTimestampFromMillis.equals(result.getRangeTimestampFromMillis()) : rangeTimestampFromMillis + " != " + result.getRangeTimestampFromMillis();
537537

538538
if (hasSuggest) {
539539
assert result.suggest() != null;
@@ -590,7 +590,7 @@ static ReducedQueryPhase reducedQueryPhase(
590590
size,
591591
from,
592592
false,
593-
rangeTimestampFrom
593+
rangeTimestampFromMillis
594594
);
595595
}
596596

@@ -674,7 +674,7 @@ public record ReducedQueryPhase(
674674
int from,
675675
// <code>true</code> iff the query phase had no results. Otherwise <code>false</code>
676676
boolean isEmptyResult,
677-
Long rangeTimestampFrom
677+
Long rangeTimestampFromMillis
678678
) {
679679

680680
public ReducedQueryPhase {
@@ -696,7 +696,7 @@ public SearchResponseSections buildResponse(SearchHits hits, Collection<? extend
696696
terminatedEarly,
697697
buildSearchProfileResults(fetchResults),
698698
numReducePhases,
699-
rangeTimestampFrom
699+
rangeTimestampFromMillis
700700
);
701701
}
702702

‎server/src/main/java/org/elasticsearch/action/search/SearchRequestAttributesExtractor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ public static Map<String, Object> extractAttributes(SearchRequest searchRequest,
5353
/**
5454
* Introspects the provided shard search request and extracts metadata from it about some of its characteristics.
5555
*/
56-
public static Map<String, Object> extractAttributes(ShardSearchRequest shardSearchRequest, Long rangeTimestampFrom, long nowInMillis) {
56+
public static Map<String, Object> extractAttributes(ShardSearchRequest shardSearchRequest, Long rangeTimestampFromMillis, long nowInMillis) {
5757
Map<String, Object> attributes = extractAttributes(
5858
shardSearchRequest.source(),
5959
shardSearchRequest.scroll(),
60-
rangeTimestampFrom,
60+
rangeTimestampFromMillis,
6161
nowInMillis,
6262
shardSearchRequest.shardId().getIndexName()
6363
);
@@ -69,7 +69,7 @@ public static Map<String, Object> extractAttributes(ShardSearchRequest shardSear
6969
private static Map<String, Object> extractAttributes(
7070
SearchSourceBuilder searchSourceBuilder,
7171
TimeValue scroll,
72-
Long rangeTimestampFrom,
72+
Long rangeTimestampFromMillis,
7373
long nowInMillis,
7474
String... localIndices
7575
) {
@@ -108,8 +108,8 @@ private static Map<String, Object> extractAttributes(
108108

109109
final boolean hasKnn = searchSourceBuilder.knnSearch().isEmpty() == false || queryMetadataBuilder.knnQuery;
110110
String timestampRangeFilter = null;
111-
if (rangeTimestampFrom != null) {
112-
timestampRangeFilter = introspectTimeRange(rangeTimestampFrom, nowInMillis);
111+
if (rangeTimestampFromMillis != null) {
112+
timestampRangeFilter = introspectTimeRange(rangeTimestampFromMillis, nowInMillis);
113113
}
114114
return buildAttributesMap(
115115
target,
@@ -350,9 +350,9 @@ public static void addTimeRangeAttribute(Long timeRangeFrom, long nowInMillis, M
350350
}
351351
}
352352

353-
static String introspectTimeRange(long timeRangeFrom, long nowInMillis) {
353+
static String introspectTimeRange(long timeRangeFromMillis, long nowInMillis) {
354354
for (TimeRangeBucket value : TimeRangeBucket.values()) {
355-
if (timeRangeFrom >= nowInMillis - value.millis) {
355+
if (timeRangeFromMillis >= nowInMillis - value.millis) {
356356
return value.bucketName;
357357
}
358358
}

‎server/src/main/java/org/elasticsearch/action/search/SearchResponse.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public class SearchResponse extends ActionResponse implements ChunkedToXContentO
8888
private final Clusters clusters;
8989
private final long tookInMillis;
9090
// only used for telemetry purposes on the coordinating node, where the search response gets created
91-
private transient Long rangeTimestampFrom;
91+
private transient Long rangeTimestampFromMillis;
9292

9393
private final RefCounted refCounted = LeakTracker.wrap(new SimpleRefCounted());
9494

@@ -189,7 +189,7 @@ public SearchResponse(
189189
clusters,
190190
pointInTimeId
191191
);
192-
this.rangeTimestampFrom = searchResponseSections.rangeTimestampFrom;
192+
this.rangeTimestampFromMillis = searchResponseSections.rangeTimestampFromMillis;
193193
}
194194

195195
public SearchResponse(
@@ -467,8 +467,8 @@ public void writeTo(StreamOutput out) throws IOException {
467467
out.writeOptionalBytesReference(pointInTimeId);
468468
}
469469

470-
public Long getRangeTimestampFrom() {
471-
return rangeTimestampFrom;
470+
public Long getRangeTimestampFromMillis() {
471+
return rangeTimestampFromMillis;
472472
}
473473

474474
@Override

‎server/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class SearchResponseSections implements Releasable {
5252
protected final boolean timedOut;
5353
protected final Boolean terminatedEarly;
5454
protected final int numReducePhases;
55-
protected final Long rangeTimestampFrom;
55+
protected final Long rangeTimestampFromMillis;
5656

5757
public SearchResponseSections(
5858
SearchHits hits,
@@ -62,7 +62,7 @@ public SearchResponseSections(
6262
Boolean terminatedEarly,
6363
SearchProfileResults profileResults,
6464
int numReducePhases,
65-
Long rangeTimestampFrom
65+
Long rangeTimestampFromMillis
6666
) {
6767
this.hits = hits;
6868
this.aggregations = aggregations;
@@ -71,7 +71,7 @@ public SearchResponseSections(
7171
this.timedOut = timedOut;
7272
this.terminatedEarly = terminatedEarly;
7373
this.numReducePhases = numReducePhases;
74-
this.rangeTimestampFrom = rangeTimestampFrom;
74+
this.rangeTimestampFromMillis = rangeTimestampFromMillis;
7575
}
7676

7777
public final SearchHits hits() {

‎server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2094,7 +2094,7 @@ public void onResponse(SearchResponse searchResponse) {
20942094
try {
20952095
searchResponseMetrics.recordTookTime(
20962096
searchResponse.getTookInMillis(),
2097-
searchResponse.getRangeTimestampFrom(),
2097+
searchResponse.getRangeTimestampFromMillis(),
20982098
nowInMillis,
20992099
searchRequestAttributes
21002100
);

‎server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ public static Query dateRangeQuery(
805805
++l;
806806
}
807807
if (fieldName.equals(DataStream.TIMESTAMP_FIELD_NAME)) {
808-
context.setRangeTimestampFrom(l);
808+
context.setRangeTimestampFromMillis(l);
809809
}
810810
}
811811
if (upperTerm == null) {
@@ -997,7 +997,7 @@ public Relation isFieldWithinQuery(
997997
++fromInclusive;
998998
}
999999
if (fieldName.equals(DataStream.TIMESTAMP_FIELD_NAME)) {
1000-
context.setRangeTimestampFrom(fromInclusive);
1000+
context.setRangeTimestampFromMillis(fromInclusive);
10011001
}
10021002
}
10031003

‎server/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,11 @@ protected Query doToQuery(SearchExecutionContext context) throws IOException {
302302
addBooleanClauses(context, booleanQueryBuilder, mustClauses, BooleanClause.Occur.MUST);
303303
try {
304304
// disable tracking of the @timestamp range for must_not and should clauses
305-
context.setTrackRangeTimestampFrom(false);
305+
context.setTrackRangeTimestampFromMillis(false);
306306
addBooleanClauses(context, booleanQueryBuilder, mustNotClauses, BooleanClause.Occur.MUST_NOT);
307307
addBooleanClauses(context, booleanQueryBuilder, shouldClauses, BooleanClause.Occur.SHOULD);
308308
} finally {
309-
context.setTrackRangeTimestampFrom(true);
309+
context.setTrackRangeTimestampFromMillis(true);
310310
}
311311
addBooleanClauses(context, booleanQueryBuilder, filterClauses, BooleanClause.Occur.FILTER);
312312
BooleanQuery booleanQuery = booleanQueryBuilder.build();
@@ -357,18 +357,18 @@ protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws
357357

358358
try {
359359
// disable tracking of the @timestamp range for must_not clauses
360-
queryRewriteContext.setTrackRangeTimestampFrom(false);
360+
queryRewriteContext.setTrackRangeTimestampFromMillis(false);
361361
changed |= rewriteClauses(queryRewriteContext, mustNotClauses, newBuilder::mustNot);
362362
} finally {
363-
queryRewriteContext.setTrackRangeTimestampFrom(true);
363+
queryRewriteContext.setTrackRangeTimestampFromMillis(true);
364364
}
365365
changed |= rewriteClauses(queryRewriteContext, filterClauses, newBuilder::filter);
366366
try {
367367
// disable tracking of the @timestamp range for should clauses
368-
queryRewriteContext.setTrackRangeTimestampFrom(false);
368+
queryRewriteContext.setTrackRangeTimestampFromMillis(false);
369369
changed |= rewriteClauses(queryRewriteContext, shouldClauses, newBuilder::should);
370370
} finally {
371-
queryRewriteContext.setTrackRangeTimestampFrom(true);
371+
queryRewriteContext.setTrackRangeTimestampFromMillis(true);
372372
}
373373

374374
// early termination when must clause is empty and optional clauses is returning MatchNoneQueryBuilder

‎server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public class QueryRewriteContext {
7777
private QueryRewriteInterceptor queryRewriteInterceptor;
7878
private final Boolean ccsMinimizeRoundTrips;
7979
private final boolean isExplain;
80-
private Long rangeTimestampFrom;
81-
private boolean trackRangeTimestampFrom = true;
80+
private Long rangeTimestampFromMillis;
81+
private boolean trackRangeTimestampFromMillis = true;
8282

8383
public QueryRewriteContext(
8484
final XContentParserConfiguration parserConfiguration,
@@ -520,34 +520,34 @@ public void setQueryRewriteInterceptor(QueryRewriteInterceptor queryRewriteInter
520520
/**
521521
* Returns the minimum lower bound across the time ranges filters against the @timestamp field included in the query
522522
*/
523-
public Long getRangeTimestampFrom() {
524-
return rangeTimestampFrom;
523+
public Long getRangeTimestampFromMillis() {
524+
return rangeTimestampFromMillis;
525525
}
526526

527527
/**
528528
* Records the lower bound of a time range filter against the @timestamp field included in the query. For telemetry purposes.
529529
*/
530-
public void setRangeTimestampFrom(long rangeTimestampFrom) {
531-
if (trackRangeTimestampFrom) {
530+
public void setRangeTimestampFromMillis(long rangeTimestampFromMillis) {
531+
if (trackRangeTimestampFromMillis) {
532532
// if we got a timestamp with nanoseconds precision, round it down to millis
533-
if (rangeTimestampFrom > 1_000_000_000_000_000L) {
534-
rangeTimestampFrom = rangeTimestampFrom / 1_000_000;
533+
if (rangeTimestampFromMillis > 1_000_000_000_000_000L) {
534+
rangeTimestampFromMillis = rangeTimestampFromMillis / 1_000_000;
535535
}
536-
if (this.rangeTimestampFrom == null) {
537-
this.rangeTimestampFrom = rangeTimestampFrom;
536+
if (this.rangeTimestampFromMillis == null) {
537+
this.rangeTimestampFromMillis = rangeTimestampFromMillis;
538538
} else {
539539
// if there's more range filters on timestamp, we'll take the lowest of the lower bounds
540-
this.rangeTimestampFrom = Math.min(rangeTimestampFrom, this.rangeTimestampFrom);
540+
this.rangeTimestampFromMillis = Math.min(rangeTimestampFromMillis, this.rangeTimestampFromMillis);
541541
}
542542
}
543543
}
544544

545545
/**
546546
* Enables or disables the tracking of the lower bound for time range filters against the @timestamp field,
547-
* done via {@link #setRangeTimestampFrom(long)}. Tracking is enabled by default, and explicitly disabled to ensure
547+
* done via {@link #setRangeTimestampFromMillis(long)}. Tracking is enabled by default, and explicitly disabled to ensure
548548
* we don't record the bound for range queries within should and must_not clauses.
549549
*/
550-
public void setTrackRangeTimestampFrom(boolean trackRangeTimestampFrom) {
551-
this.trackRangeTimestampFrom = trackRangeTimestampFrom;
550+
public void setTrackRangeTimestampFromMillis(boolean trackRangeTimestampFromMillis) {
551+
this.trackRangeTimestampFromMillis = trackRangeTimestampFromMillis;
552552
}
553553
}

‎server/src/main/java/org/elasticsearch/index/search/stats/ShardSearchPhaseAPMMetrics.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ public void onDfsPhase(SearchContext searchContext, long tookInNanos) {
5656
@Override
5757
public void onQueryPhase(SearchContext searchContext, long tookInNanos) {
5858
SearchExecutionContext searchExecutionContext = searchContext.getSearchExecutionContext();
59-
Long rangeTimestampFrom = searchExecutionContext.getRangeTimestampFrom();
60-
recordPhaseLatency(queryPhaseMetric, tookInNanos, searchContext.request(), rangeTimestampFrom);
59+
Long rangeTimestampFromMillis = searchExecutionContext.getRangeTimestampFromMillis();
60+
recordPhaseLatency(queryPhaseMetric, tookInNanos, searchContext.request(), rangeTimestampFromMillis);
6161
}
6262

6363
@Override
6464
public void onFetchPhase(SearchContext searchContext, long tookInNanos) {
6565
SearchExecutionContext searchExecutionContext = searchContext.getSearchExecutionContext();
66-
Long rangeTimestampFrom = searchExecutionContext.getRangeTimestampFrom();
67-
recordPhaseLatency(fetchPhaseMetric, tookInNanos, searchContext.request(), rangeTimestampFrom);
66+
Long rangeTimestampFromMillis = searchExecutionContext.getRangeTimestampFromMillis();
67+
recordPhaseLatency(fetchPhaseMetric, tookInNanos, searchContext.request(), rangeTimestampFromMillis);
6868
}
6969

7070
private static void recordPhaseLatency(LongHistogram histogramMetric, long tookInNanos) {
@@ -75,11 +75,11 @@ private static void recordPhaseLatency(
7575
LongHistogram histogramMetric,
7676
long tookInNanos,
7777
ShardSearchRequest request,
78-
Long rangeTimestampFrom
78+
Long rangeTimestampFromMillis
7979
) {
8080
Map<String, Object> attributes = SearchRequestAttributesExtractor.extractAttributes(
8181
request,
82-
rangeTimestampFrom,
82+
rangeTimestampFromMillis,
8383
request.nowInMillis()
8484
);
8585
histogramMetric.record(TimeUnit.NANOSECONDS.toMillis(tookInNanos), attributes);

0 commit comments

Comments
 (0)