Skip to content

Tightening rate verification for RateTests #131114

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 2 commits into from
Jul 15, 2025
Merged

Tightening rate verification for RateTests #131114

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c97ce6
Tightening rate verification
pabloem Jul 11, 2025
6e9fa29
Merge branch 'main' into pabloem-ratetests
pabloem Jul 15, 2025
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
18 changes: 16 additions & 2 deletions ...l/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/RateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,22 @@ private static TestCaseSupplier makeSupplier(TestCaseSupplier.TypedDataSupplier
if (dataRows.size() < 2) {
matcher = Matchers.nullValue();
} else {
// TODO: check the value?
matcher = Matchers.allOf(Matchers.greaterThanOrEqualTo(0.0), Matchers.lessThan(Double.POSITIVE_INFINITY));
var maxrate = switch (fieldTypedData.type().widenSmallNumeric()) {
case INTEGER, COUNTER_INTEGER -> dataRows.stream().mapToInt(v -> (Integer) v).max().orElse(0);
case LONG, COUNTER_LONG -> dataRows.stream().mapToLong(v -> (Long) v).max().orElse(0L);
case DOUBLE, COUNTER_DOUBLE -> dataRows.stream().mapToDouble(v -> (Double) v).max().orElse(0.0);
default -> throw new IllegalStateException("Unexpected value: " + fieldTypedData.type());
};
var minrate = switch (fieldTypedData.type().widenSmallNumeric()) {
case INTEGER, COUNTER_INTEGER -> dataRows.stream().mapToInt(v -> (Integer) v).min().orElse(0);
case LONG, COUNTER_LONG -> dataRows.stream().mapToLong(v -> (Long) v).min().orElse(0L);
case DOUBLE, COUNTER_DOUBLE -> dataRows.stream().mapToDouble(v -> (Double) v).min().orElse(0.0);
default -> throw new IllegalStateException("Unexpected value: " + fieldTypedData.type());
};
// If the minrate is greater than 0, we need to adjust the maxrate accordingly
Copy link
Contributor

@kkrik-es kkrik-es Jul 14, 2025

Choose a reason for hiding this comment

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

Interesting.. I would've thought that counters are INTEGER or LONG, and only COUNTER_INTEGER and COUNTER_LONG can be input to rate. Also, I haven't thought about negative values - though OTLP has the notion of up/down counters:

https://opentelemetry.io/docs/specs/otel/metrics/supplementary-guidelines/#instrument-selection

Maybe we should restrict the current rate implementation to non-negative counter values and check for that? @dnhatn for thoughts.

Copy link
Member

@dnhatn dnhatn Jul 14, 2025

Choose a reason for hiding this comment

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

Maybe we should restrict the current rate implementation to non-negative counter values and check for that?

I think the current rate implementation does not work correctly with up/down counters.

Copy link
Contributor

@kkrik-es kkrik-es Jul 14, 2025

Choose a reason for hiding this comment

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

Hm there's no check for negative values, though.. Shall we add a check and error out, if a negative counter value is detected?

Copy link
Contributor Author

@pabloem pabloem Jul 15, 2025

Choose a reason for hiding this comment

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

hi team! how would these address changes to my PR? what should we address here?

Copy link
Member

@dnhatn dnhatn Jul 15, 2025

Choose a reason for hiding this comment

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

I don't think we need to address the issue here.

minrate = Math.min(minrate, 0);
maxrate = Math.max(maxrate, maxrate - minrate);
matcher = Matchers.allOf(Matchers.greaterThanOrEqualTo(minrate), Matchers.lessThanOrEqualTo(maxrate));
}
return new TestCaseSupplier.TestCase(
List.of(fieldTypedData, timestampsField),
Expand Down