Skip to content

Commit 771f983

Browse files
committed
Merge branch 'main' into plugins/fix_authorization_example
2 parents 303af06 + 04c04cc commit 771f983

File tree

41 files changed

+389
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+389
-151
lines changed

docs/reference/esql/functions/kibana/definition/kql.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/definition/match.json

Lines changed: 59 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/definition/match_operator.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/definition/qstr.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/docs/kql.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/docs/match.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/docs/match_operator.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/esql/functions/kibana/docs/qstr.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

muted-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,6 @@ tests:
370370
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
371371
method: test {p0=search.vectors/42_knn_search_int4_flat/Vector similarity with filter only}
372372
issue: https://github.com/elastic/elasticsearch/issues/121412
373-
- class: org.elasticsearch.xpack.inference.common.InferenceServiceNodeLocalRateLimitCalculatorTests
374-
issue: https://github.com/elastic/elasticsearch/issues/121294
375373
- class: org.elasticsearch.xpack.ml.integration.ClassificationIT
376374
method: testDependentVariableIsAliasToKeyword
377375
issue: https://github.com/elastic/elasticsearch/issues/121492
@@ -396,6 +394,12 @@ tests:
396394
- class: org.elasticsearch.search.CrossClusterSearchUnavailableClusterIT
397395
method: testSearchSkipUnavailable
398396
issue: https://github.com/elastic/elasticsearch/issues/121497
397+
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
398+
method: testStopQueryLocal
399+
issue: https://github.com/elastic/elasticsearch/issues/121672
400+
- class: org.elasticsearch.xpack.esql.heap_attack.HeapAttackIT
401+
method: testLookupExplosionBigStringManyMatches
402+
issue: https://github.com/elastic/elasticsearch/issues/121465
399403

400404
# Examples:
401405
#

test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,21 @@ private XContentTester(
145145
public void test() throws IOException {
146146
for (int runs = 0; runs < numberOfTestRuns; runs++) {
147147
XContentType xContentType = randomFrom(XContentType.values()).canonical();
148-
T testInstance = instanceSupplier.apply(xContentType);
148+
T testInstance = null;
149149
try {
150+
if (xContentType.equals(XContentType.YAML)) {
151+
testInstance = randomValueOtherThanMany(instance -> {
152+
// unicode character U+0085 (NEXT LINE (NEL)) doesn't survive YAML round trip tests (see #97716)
153+
// get a new random instance if we detect this character in the xContent output
154+
try {
155+
return toXContent.apply(instance, xContentType).utf8ToString().contains("\u0085");
156+
} catch (IOException e) {
157+
throw new AssertionError(e);
158+
}
159+
}, () -> instanceSupplier.apply(xContentType));
160+
} else {
161+
testInstance = instanceSupplier.apply(xContentType);
162+
}
150163
BytesReference originalXContent = toXContent.apply(testInstance, xContentType);
151164
BytesReference shuffledContent = insertRandomFieldsAndShuffle(
152165
originalXContent,
@@ -173,7 +186,9 @@ public void test() throws IOException {
173186
dispose.accept(parsed);
174187
}
175188
} finally {
176-
dispose.accept(testInstance);
189+
if (testInstance != null) {
190+
dispose.accept(testInstance);
191+
}
177192
}
178193
}
179194
}

0 commit comments

Comments
 (0)