Skip to content

Aggregation Execution Context add timestamp provider #85850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 18, 2022
Merged

Aggregation Execution Context add timestamp provider #85850

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
220c86f
cache timestamp
weizijun Apr 13, 2022
6a88a43
add changelog
weizijun Apr 13, 2022
df7a910
spotless
weizijun Apr 13, 2022
b9bf4b1
Merge branch 'master' into AggregationExecutionContext-add-timestamp
elasticmachine Apr 13, 2022
be9d07d
replace CheckedSupplier to Supplier
weizijun Apr 17, 2022
fec8e1a
Merge branch 'master' into AggregationExecutionContext-add-timestamp
elasticmachine Apr 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/85850.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 85850
summary: "Aggregation Execution Context add timestamp provider"
area: TSDB
type: enhancement
issues: []
12 changes: 11 additions & 1 deletion server/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,17 @@
public class AggregationExecutionContext {

private final CheckedSupplier<BytesRef, IOException> tsidProvider;
private final CheckedSupplier<Long, IOException> timestampProvider;
private final LeafReaderContext leafReaderContext;

public AggregationExecutionContext(LeafReaderContext leafReaderContext, CheckedSupplier<BytesRef, IOException> tsidProvider) {
public AggregationExecutionContext(
LeafReaderContext leafReaderContext,
CheckedSupplier<BytesRef, IOException> tsidProvider,
CheckedSupplier<Long, IOException> timestampProvider
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this a checked supplier? Under what condition can it ever throw IOException?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, except I don't think we need IOException there. I suspect we can convert CheckedSupplier to Supplier in case of tsid as well. I think it is CheckedSupplier for purely historical reasons.

Yeah, I also think Supplier is better, I have converted CheckedSupplier to Supplier for timestamp and tsid.

) {
this.leafReaderContext = leafReaderContext;
this.tsidProvider = tsidProvider;
this.timestampProvider = timestampProvider;
}

public LeafReaderContext getLeafReaderContext() {
Expand All @@ -37,4 +43,8 @@ public LeafReaderContext getLeafReaderContext() {
public BytesRef getTsid() throws IOException {
return tsidProvider != null ? tsidProvider.get() : null;
}

public Long getTimestamp() throws IOException {
return timestampProvider.get();
}
}
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ScoreMode scoreMode() {
// TODO: will remove it in a follow up PR
@Override
public final LeafBucketCollector getLeafCollector(LeafReaderContext ctx) throws IOException {
return getLeafCollector(new AggregationExecutionContext(ctx, null));
return getLeafCollector(new AggregationExecutionContext(ctx, null, null));
}

public abstract LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx) throws IOException;
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/org/elasticsearch/search/aggregations/timeseries/TimeSeriesIndexSearcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void search(Query query, BucketCollector bucketCollector) throws IOExcept
// this is needed to trigger actions in some bucketCollectors that bypass the normal iteration logic
// for example, global aggregator triggers a separate iterator that ignores the query but still needs
// to know all leaves
bucketCollector.getLeafCollector(new AggregationExecutionContext(leaf, null));
bucketCollector.getLeafCollector(new AggregationExecutionContext(leaf, null, null));
}
}

Expand Down Expand Up @@ -179,7 +179,7 @@ private static class LeafWalker {
long timestamp;

LeafWalker(LeafReaderContext context, Scorer scorer, BucketCollector bucketCollector, LeafReaderContext leaf) throws IOException {
AggregationExecutionContext aggCtx = new AggregationExecutionContext(leaf, scratch::get);
AggregationExecutionContext aggCtx = new AggregationExecutionContext(leaf, scratch::get, () -> timestamp);
this.collector = bucketCollector.getLeafCollector(aggCtx);
liveDocs = context.reader().getLiveDocs();
this.collector.setScorer(scorer);
Expand Down
3 changes: 3 additions & 0 deletions ...t/java/org/elasticsearch/search/aggregations/timeseries/TimeSeriesIndexSearcherTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ public void collect(int doc, long owningBucketOrd) throws IOException {
assertTrue(timestamp.advanceExact(doc));
BytesRef latestTSID = tsid.lookupOrd(tsid.ordValue());
long latestTimestamp = timestamp.longValue();
assertEquals(latestTSID, aggCtx.getTsid());
assertEquals(latestTimestamp, aggCtx.getTimestamp().longValue());

if (currentTSID != null) {
assertTrue(
currentTSID + "->" + latestTSID.utf8ToString(),
Expand Down