Skip to content

[9.0] Cleanup assert in DownsampleShardIndexer (#124751) #124780

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 1 commit into from
Mar 13, 2025
Merged

[9.0] Cleanup assert in DownsampleShardIndexer (#124751) #124780

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 23 additions & 18 deletions ...n/downsample/src/main/java/org/elasticsearch/xpack/downsample/DownsampleShardIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,24 +457,7 @@ public void collect(int docId, long owningBucketOrd) throws IOException {
);
}

/*
* Sanity checks to ensure that we receive documents in the correct order
* - _tsid must be sorted in ascending order
* - @timestamp must be sorted in descending order within the same _tsid
*/
BytesRef lastTsid = downsampleBucketBuilder.tsid();
assert lastTsid == null || lastTsid.compareTo(tsidHash) <= 0
: "_tsid is not sorted in ascending order: ["
+ DocValueFormat.TIME_SERIES_ID.format(lastTsid)
+ "] -> ["
+ DocValueFormat.TIME_SERIES_ID.format(tsidHash)
+ "]";
assert tsidHash.equals(lastTsid) == false || lastTimestamp >= timestamp
: "@timestamp is not sorted in descending order: ["
+ timestampFormat.format(lastTimestamp)
+ "] -> ["
+ timestampFormat.format(timestamp)
+ "]";
assert assertTsidAndTimestamp(tsidHash, timestamp);
lastTimestamp = timestamp;

if (tsidChanged || downsampleBucketBuilder.timestamp() != lastHistoTimestamp) {
Expand Down Expand Up @@ -532,6 +515,28 @@ void leafBulkCollection() throws IOException {
// buffer.clean() also overwrites all slots with zeros
docIdBuffer.elementsCount = 0;
}

/**
* Sanity checks to ensure that we receive documents in the correct order
* - _tsid must be sorted in ascending order
* - @timestamp must be sorted in descending order within the same _tsid
*/
boolean assertTsidAndTimestamp(BytesRef tsidHash, long timestamp) {
BytesRef lastTsid = downsampleBucketBuilder.tsid();
assert lastTsid == null || lastTsid.compareTo(tsidHash) <= 0
: "_tsid is not sorted in ascending order: ["
+ DocValueFormat.TIME_SERIES_ID.format(lastTsid)
+ "] -> ["
+ DocValueFormat.TIME_SERIES_ID.format(tsidHash)
+ "]";
assert tsidHash.equals(lastTsid) == false || lastTimestamp >= timestamp
: "@timestamp is not sorted in descending order: ["
+ timestampFormat.format(lastTimestamp)
+ "] -> ["
+ timestampFormat.format(timestamp)
+ "]";
return true;
}
}

private void indexBucket(XContentBuilder doc) {
Expand Down