Skip to content

Commit 455b8bb

Browse files
kderussokderusso
authored
Merge branch 'main' into kderusso/refactor-lucene-query-evaluators-to-blocks
2 parents e20b33e + 6d21904 commit 455b8bb

File tree

45 files changed

+940
-223
lines changed

Some content is hidden

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

45 files changed

+940
-223
lines changed

‎.buildkite/pipelines/pull-request-performance-benchmark.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
steps:
2+
- label: ":pipeline: Generate steps"
3+
command: bash .buildkite/scripts/generate-pr-performance-benchmark.sh | buildkite-agent pipeline upload

‎.buildkite/pipelines/pull-request/performance-benchmark.yml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.buildkite/pull-requests.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"set_commit_status": false,
2828
"build_on_commit": false,
2929
"build_on_comment": true,
30-
"trigger_comment_regex": "^(buildkite|@elastic(search)?machine) benchmark this with (?<benchmark>\\w+)( please)?$"
30+
"target_branch": "main",
31+
"trigger_comment_regex": "^(buildkite|@elastic(search)?machine) benchmark this with (?<benchmark>\\S+)( please)?$"
3132
}
3233
]
3334
}

‎.buildkite/scripts/generate-pr-performance-benchmark.sh‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
env_id_baseline=$(python3 -c 'import uuid; print(uuid.uuid4())')
6+
env_id_contender=$(python3 -c 'import uuid; print(uuid.uuid4())')
7+
merge_base=$(git merge-base "${GITHUB_PR_TARGET_BRANCH}" HEAD)
8+
9+
buildkite-agent meta-data set pr_comment:custom-body:body \
10+
"This build attempted two ${GITHUB_PR_COMMENT_VAR_BENCHMARK} benchmarks to evaluate performance impact of this PR."
11+
buildkite-agent meta-data set pr_comment:custom-baseline:head \
12+
"* Baseline: ${merge_base} (env ID ${env_id_baseline})"
13+
buildkite-agent meta-data set pr_comment:custom-contender:head \
14+
"* Contender: ${GITHUB_PR_TRIGGERED_SHA} (env ID ${env_id_contender})"
15+
16+
cat << _EOF_
17+
steps:
18+
- label: Trigger baseline benchmark
19+
trigger: elasticsearch-performance-esbench-pr
20+
build:
21+
message: Baseline benchmark for PR${GITHUB_PR_NUMBER}
22+
branch: master
23+
env:
24+
CONFIGURATION_NAME: ${GITHUB_PR_COMMENT_VAR_BENCHMARK}
25+
ENV_ID: ${env_id_baseline}
26+
REVISION: ${merge_base}
27+
- label: Trigger contender benchmark
28+
trigger: elasticsearch-performance-esbench-pr
29+
build:
30+
message: Contender benchmark for PR${GITHUB_PR_NUMBER}
31+
branch: master
32+
env:
33+
CONFIGURATION_NAME: ${GITHUB_PR_COMMENT_VAR_BENCHMARK}
34+
ENV_ID: ${env_id_contender}
35+
ES_REPO_URL: https://github.com/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}.git
36+
REVISION: ${GITHUB_PR_TRIGGERED_SHA}
37+
- wait: ~
38+
- label: Modify PR comment
39+
command: buildkite-agent meta-data set pr_comment:custom-comparison:head "* [Benchmark results](<https://esbench-metrics.kb.us-east-2.aws.elastic-cloud.com:9243/app/dashboards#/view/d9079962-5866-49ef-b9f5-145f2141cd31?_a=(query:(language:kuery,query:'user-tags.env-id:${env_id_baseline} or user-tags.env-id:${env_id_contender}'))>)"
40+
_EOF_

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
5656
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:third-party:jira");
5757
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:third-party:pagerduty");
5858
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:third-party:slack");
59-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:downsample:qa:with-security");
6059
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search:qa:rest");
6160
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:ccs-rolling-upgrade");
6261
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:correctness");

‎catalog-info.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ spec:
323323
name: elasticsearch / pull-request / performance-benchmark
324324
spec:
325325
repository: elastic/elasticsearch
326-
pipeline_file: .buildkite/pipelines/pull-request/performance-benchmark.yml
326+
pipeline_file: .buildkite/pipelines/pull-request-performance-benchmark.yml
327327
env:
328328
ELASTIC_PR_COMMENTS_ENABLED: "true"
329329
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"

‎distribution/packages/build.gradle‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,6 @@ tasks.register('buildDeb', Deb) {
354354
configure(commonDebConfig('x64'))
355355
}
356356

357-
tasks.named('assemble'){
358-
dependsOn 'buildDeb', 'buildAarch64Deb'
359-
}
360-
361357
Closure commonRpmConfig(String architecture) {
362358
return {
363359
configure(commonPackageConfig('rpm', architecture))
@@ -391,11 +387,6 @@ tasks.register('buildRpm', Rpm) {
391387
configure(commonRpmConfig('x64'))
392388
}
393389

394-
tasks.named('assemble'){
395-
dependsOn 'buildRpm', 'buildAarch64Rpm'
396-
}
397-
398-
399390
Closure dpkgExists = { it -> new File('/bin/dpkg-deb').exists() || new File('/usr/bin/dpkg-deb').exists() || new File('/usr/local/bin/dpkg-deb').exists() }
400391
Closure rpmExists = { it -> new File('/bin/rpm').exists() || new File('/usr/bin/rpm').exists() || new File('/usr/local/bin/rpm').exists() }
401392

@@ -409,6 +400,11 @@ subprojects {
409400

410401
String buildTask = "build${it.name.replaceAll(/-[a-z]/) { it.substring(1).toUpperCase() }.capitalize()}"
411402
ext.buildDist = parent.tasks.named(buildTask)
403+
tasks.named('assemble').configure {
404+
dependsOn buildDist
405+
}
406+
407+
// deprecated here for backwards compatibility of DistroTestPlugin and DistributionDownloadPlugin
412408
artifacts {
413409
'default' buildDist
414410
}

‎docs/changelog/132738.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 132738
2+
summary: Fix `AsyncOperator` status values and add emitted rows
3+
area: ES|QL
4+
type: bug
5+
issues: []

‎docs/changelog/74274.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 74274
2+
summary: Introduce new rescorer based on script
3+
area: Search
4+
type: feature
5+
issues:
6+
- 52338

‎muted-tests.yml‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,6 @@ tests:
299299
- class: org.elasticsearch.compute.operator.LimitOperatorTests
300300
method: testEarlyTermination
301301
issue: https://github.com/elastic/elasticsearch/issues/128721
302-
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
303-
method: test {csv-spec:lookup-join.EnrichLookupStatsBug}
304-
issue: https://github.com/elastic/elasticsearch/issues/129228
305-
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
306-
method: test {lookup-join.MultipleBatches*
307-
issue: https://github.com/elastic/elasticsearch/issues/129210
308302
- class: org.elasticsearch.entitlement.runtime.policy.FileAccessTreeTests
309303
method: testWindowsMixedCaseAccess
310304
issue: https://github.com/elastic/elasticsearch/issues/129167
@@ -405,9 +399,6 @@ tests:
405399
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
406400
method: testFromEvalStats
407401
issue: https://github.com/elastic/elasticsearch/issues/131503
408-
- class: org.elasticsearch.xpack.downsample.DownsampleWithBasicRestIT
409-
method: test {p0=downsample-with-security/10_basic/Downsample index}
410-
issue: https://github.com/elastic/elasticsearch/issues/131513
411402
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
412403
method: testCancellationViaTimeoutWithAllowPartialResultsSetToFalse
413404
issue: https://github.com/elastic/elasticsearch/issues/131248
@@ -465,15 +456,12 @@ tests:
465456
- class: org.elasticsearch.xpack.ml.integration.RevertModelSnapshotIT
466457
method: testRevertModelSnapshot_DeleteInterveningResults
467458
issue: https://github.com/elastic/elasticsearch/issues/132349
468-
- class: org.elasticsearch.xpack.ml.integration.TextEmbeddingQueryIT
469-
method: testHybridSearch
470-
issue: https://github.com/elastic/elasticsearch/issues/132703
459+
#- class: org.elasticsearch.xpack.ml.integration.TextEmbeddingQueryIT
460+
# method: testHybridSearch
461+
# issue: https://github.com/elastic/elasticsearch/issues/132703
471462
- class: org.elasticsearch.xpack.ml.integration.RevertModelSnapshotIT
472463
method: testRevertModelSnapshot
473464
issue: https://github.com/elastic/elasticsearch/issues/132733
474-
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
475-
method: test {csv-spec:lookup-join.MvJoinKeyFromRowExpanded}
476-
issue: https://github.com/elastic/elasticsearch/issues/132778
477465
- class: org.elasticsearch.gradle.internal.transport.TransportVersionManagementPluginFuncTest
478466
method: definitions have primary ids which cannot change
479467
issue: https://github.com/elastic/elasticsearch/issues/132788
@@ -588,15 +576,6 @@ tests:
588576
- class: org.elasticsearch.gradle.internal.transport.TransportVersionValidationFuncTest
589577
method: definitions have primary ids which cannot change
590578
issue: https://github.com/elastic/elasticsearch/issues/133131
591-
- class: org.elasticsearch.index.mapper.blockloader.IpFieldBlockLoaderTests
592-
method: testBlockLoader {preference=Params[syntheticSource=true, preference=NONE]}
593-
issue: https://github.com/elastic/elasticsearch/issues/133216
594-
- class: org.elasticsearch.index.mapper.blockloader.IpFieldBlockLoaderTests
595-
method: testBlockLoader {preference=Params[syntheticSource=true, preference=DOC_VALUES]}
596-
issue: https://github.com/elastic/elasticsearch/issues/133217
597-
- class: org.elasticsearch.index.mapper.blockloader.IpFieldBlockLoaderTests
598-
method: testBlockLoader {preference=Params[syntheticSource=true, preference=STORED]}
599-
issue: https://github.com/elastic/elasticsearch/issues/133218
600579
- class: org.elasticsearch.xpack.esql.action.RandomizedTimeSeriesIT
601580
method: testGroupBySubset
602581
issue: https://github.com/elastic/elasticsearch/issues/133220
@@ -615,6 +594,15 @@ tests:
615594
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
616595
method: test {p0=search.vectors/100_knn_nested_search/nested kNN search inner_hits & profiling}
617596
issue: https://github.com/elastic/elasticsearch/issues/133273
597+
- class: org.elasticsearch.xpack.security.authc.AuthenticationServiceTests
598+
method: testInvalidToken
599+
issue: https://github.com/elastic/elasticsearch/issues/133328
600+
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
601+
method: test {p0=search/160_exists_query/Test exists query on unmapped byte field}
602+
issue: https://github.com/elastic/elasticsearch/issues/133331
603+
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
604+
method: test {csv-spec:change_point.Values null column}
605+
issue: https://github.com/elastic/elasticsearch/issues/133334
618606

619607
# Examples:
620608
#

0 commit comments

Comments
 (0)