Skip to content

Fixing doctests result matchers #135979

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
pabloem merged 5 commits into from
Oct 8, 2025
Merged

Fixing doctests result matchers #135979

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7810f9d
Fixing doctests result matchers
pabloem Oct 3, 2025
84d474b
fxup
pabloem Oct 4, 2025
7f16f83
fixup
pabloem Oct 8, 2025
aa75358
Merge branch 'main' into pem-fix-doctests
pabloem Oct 8, 2025
7cf17df
fixup
pabloem Oct 8, 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
24 changes: 0 additions & 24 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,36 +558,12 @@ tests:
- class: org.elasticsearch.indices.recovery.IndexRecoveryIT
method: testUsesFileBasedRecoveryIfOperationsBasedRecoveryWouldBeUnreasonable
issue: https://github.com/elastic/elasticsearch/issues/135737
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.IncreaseTests
method: testGroupingAggregate {TestCase=<small positive doubles>}
issue: https://github.com/elastic/elasticsearch/issues/135752
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.IncreaseTests
method: testGroupingAggregate {TestCase=<positive ints>}
issue: https://github.com/elastic/elasticsearch/issues/135753
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.IncreaseTests
method: testGroupingAggregate {TestCase=<positive longs>}
issue: https://github.com/elastic/elasticsearch/issues/135754
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.IncreaseTests
method: testGroupingAggregate {TestCase=<big positive doubles>}
issue: https://github.com/elastic/elasticsearch/issues/135755
- class: org.elasticsearch.xpack.esql.ccq.AllSupportedFieldsIT
method: testFetchDenseVector {pref=null mode=time_series}
issue: https://github.com/elastic/elasticsearch/issues/135762
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.IrateTests
method: testGroupingAggregate {TestCase=<positive longs>}
issue: https://github.com/elastic/elasticsearch/issues/135775
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
method: test
issue: https://github.com/elastic/elasticsearch/issues/135787
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.IrateTests
method: testGroupingAggregate {TestCase=<positive ints>}
issue: https://github.com/elastic/elasticsearch/issues/135814
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.IrateTests
method: testGroupingAggregate {TestCase=<small positive doubles>}
issue: https://github.com/elastic/elasticsearch/issues/135757
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.IrateTests
method: testGroupingAggregate {TestCase=<big positive doubles>}
issue: https://github.com/elastic/elasticsearch/issues/135756
- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
method: test
issue: https://github.com/elastic/elasticsearch/issues/135787
Expand Down
9 changes: 4 additions & 5 deletions ...c/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/IncreaseTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.Objects;
import java.util.function.Supplier;

import static org.hamcrest.Matchers.closeTo;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;

Expand Down Expand Up @@ -127,17 +126,17 @@ private static TestCaseSupplier makeSupplier(TestCaseSupplier.TypedDataSupplier
matcher = Matchers.nullValue();
} else {
double increase = 0.0;
for (int i = 1; i < nonNullDataRows.size(); i++) {
double previous = ((Number) nonNullDataRows.get(i - 1)).doubleValue();
double current = ((Number) nonNullDataRows.get(i)).doubleValue();
for (int i = nonNullDataRows.size() - 1; i > 0; i--) {
double previous = ((Number) nonNullDataRows.get(i)).doubleValue();
double current = ((Number) nonNullDataRows.get(i - 1)).doubleValue();
if (current >= previous) {
increase += current - previous;
} else {
// Counter reset
increase += current;
}
}
matcher = closeTo(increase, 0.1 * increase);
matcher = Matchers.allOf(Matchers.greaterThanOrEqualTo(increase * 0.9), Matchers.lessThanOrEqualTo(increase * 1.5));
}

return new TestCaseSupplier.TestCase(
Expand Down
34 changes: 13 additions & 21 deletions .../src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/IrateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,30 +122,22 @@ private static TestCaseSupplier makeSupplier(TestCaseSupplier.TypedDataSupplier
);

List<Object> nonNullDataRows = dataRows.stream().filter(Objects::nonNull).toList();
Object maxValue = null;
Object minValue = null;

for (int i = dataRows.size() - 1; i >= 0; i--) {
if (dataRows.get(i) != null) {
if (maxValue == null) {
maxValue = dataRows.get(i);
} else if (((Comparable) dataRows.get(i)).compareTo(maxValue) > 0) {
maxValue = dataRows.get(i);
}
if (minValue == null) {
minValue = dataRows.get(i);
} else if (((Comparable) dataRows.get(i)).compareTo(minValue) < 0) {
minValue = dataRows.get(i);
}
}
}

final Matcher<?> matcher;
Matcher<?> matcher;
if (nonNullDataRows.size() < 2) {
matcher = Matchers.nullValue();
} else {
var maxDiff = ((Number) maxValue).doubleValue() - ((Number) minValue).doubleValue();
matcher = Matchers.allOf(Matchers.greaterThanOrEqualTo(-maxDiff), Matchers.lessThanOrEqualTo(maxDiff));
var lastValue = ((Number) nonNullDataRows.getFirst()).doubleValue();
var secondLastValue = ((Number) nonNullDataRows.get(1)).doubleValue();
var increase = lastValue >= secondLastValue ? lastValue - secondLastValue : lastValue;
var largestTimestamp = timestamps.get(0);
var secondLargestTimestamp = timestamps.get(1);
var smallestTimestamp = timestamps.getLast();
matcher = Matchers.allOf(
Matchers.greaterThanOrEqualTo(increase / (largestTimestamp - smallestTimestamp) * 1000 * 0.9),
Matchers.lessThanOrEqualTo(
increase / (largestTimestamp - secondLargestTimestamp) * (largestTimestamp - smallestTimestamp) * 1000
)
);
}

return new TestCaseSupplier.TestCase(
Expand Down