Skip to content

Commit bad9754

Browse files
ymao1ymao1
committed
Merging in main
2 parents e6034d8 + c8dfb4e commit bad9754

File tree

1,631 files changed

+29961
-9969
lines changed

Some content is hidden

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

1,631 files changed

+29961
-9969
lines changed

‎.buildkite/pipelines/intake.template.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,27 @@ steps:
6363
buildDirectory: /dev/shm/bk
6464
env:
6565
BWC_VERSION: "{{matrix.BWC_VERSION}}"
66+
- group: lucene-compat
67+
steps:
68+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
69+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
70+
timeout_in_minutes: 300
71+
matrix:
72+
setup:
73+
LUCENE_VERSION:
74+
- "10.0.0"
75+
ES_VERSION:
76+
- "9.0.0"
77+
ES_COMMIT:
78+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
79+
agents:
80+
provider: gcp
81+
image: family/elasticsearch-ubuntu-2004
82+
machineType: custom-32-98304
83+
buildDirectory: /dev/shm/bk
84+
env:
85+
ES_VERSION: "{{matrix.ES_VERSION}}"
86+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
6687
- label: rest-compat
6788
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6889
timeout_in_minutes: 300

‎.buildkite/pipelines/intake.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,27 @@ steps:
6464
buildDirectory: /dev/shm/bk
6565
env:
6666
BWC_VERSION: "{{matrix.BWC_VERSION}}"
67+
- group: lucene-compat
68+
steps:
69+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
70+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
71+
timeout_in_minutes: 300
72+
matrix:
73+
setup:
74+
LUCENE_VERSION:
75+
- "10.0.0"
76+
ES_VERSION:
77+
- "9.0.0"
78+
ES_COMMIT:
79+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
80+
agents:
81+
provider: gcp
82+
image: family/elasticsearch-ubuntu-2004
83+
machineType: custom-32-98304
84+
buildDirectory: /dev/shm/bk
85+
env:
86+
ES_VERSION: "{{matrix.ES_VERSION}}"
87+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
6788
- label: rest-compat
6889
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6990
timeout_in_minutes: 300

‎.buildkite/pipelines/periodic.template.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,27 @@ steps:
201201
image: family/elasticsearch-ubuntu-2004
202202
machineType: n2-standard-8
203203
buildDirectory: /dev/shm/bk
204+
- group: lucene-compat
205+
steps:
206+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
207+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
208+
timeout_in_minutes: 300
209+
matrix:
210+
setup:
211+
LUCENE_VERSION:
212+
- "10.0.0"
213+
ES_VERSION:
214+
- "9.0.0"
215+
ES_COMMIT:
216+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
217+
agents:
218+
provider: gcp
219+
image: family/elasticsearch-ubuntu-2004
220+
machineType: custom-32-98304
221+
buildDirectory: /dev/shm/bk
222+
env:
223+
ES_VERSION: "{{matrix.ES_VERSION}}"
224+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
204225
- label: Upload Snyk Dependency Graph
205226
command: .ci/scripts/run-gradle.sh uploadSnykDependencyGraph -PsnykTargetReference=$BUILDKITE_BRANCH
206227
env:

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,27 @@ steps:
582582
image: family/elasticsearch-ubuntu-2004
583583
machineType: n2-standard-8
584584
buildDirectory: /dev/shm/bk
585+
- group: lucene-compat
586+
steps:
587+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
588+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
589+
timeout_in_minutes: 300
590+
matrix:
591+
setup:
592+
LUCENE_VERSION:
593+
- "10.0.0"
594+
ES_VERSION:
595+
- "9.0.0"
596+
ES_COMMIT:
597+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
598+
agents:
599+
provider: gcp
600+
image: family/elasticsearch-ubuntu-2004
601+
machineType: custom-32-98304
602+
buildDirectory: /dev/shm/bk
603+
env:
604+
ES_VERSION: "{{matrix.ES_VERSION}}"
605+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
585606
- label: Upload Snyk Dependency Graph
586607
command: .ci/scripts/run-gradle.sh uploadSnykDependencyGraph -PsnykTargetReference=$BUILDKITE_BRANCH
587608
env:

‎.buildkite/pipelines/pull-request/part-4-entitlements.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ steps:
77
agents:
88
provider: gcp
99
image: family/elasticsearch-ubuntu-2004
10-
machineType: custom-32-98304
10+
machineType: n1-standard-32
1111
buildDirectory: /dev/shm/bk

‎.buildkite/pipelines/pull-request/part-4-fips.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ steps:
77
agents:
88
provider: gcp
99
image: family/elasticsearch-ubuntu-2004
10-
machineType: custom-32-98304
10+
machineType: n1-standard-32
1111
buildDirectory: /dev/shm/bk

‎.buildkite/pipelines/pull-request/part-4.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ steps:
77
agents:
88
provider: gcp
99
image: family/elasticsearch-ubuntu-2004
10-
machineType: custom-32-98304
10+
machineType: n1-standard-32
1111
buildDirectory: /dev/shm/bk

‎benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/TermsReduceBenchmark.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void setup() {
111111
dict[i] = new BytesRef(Long.toString(rand.nextLong()));
112112
}
113113
for (int i = 0; i < numShards; i++) {
114-
aggsList.add(InternalAggregations.from(Collections.singletonList(newTerms(rand, dict, true))));
114+
aggsList.add(InternalAggregations.from(newTerms(rand, dict, true)));
115115
}
116116
}
117117

@@ -124,7 +124,7 @@ private StringTerms newTerms(Random rand, BytesRef[] dict, boolean withNested) {
124124
for (BytesRef term : randomTerms) {
125125
InternalAggregations subAggs;
126126
if (withNested) {
127-
subAggs = InternalAggregations.from(Collections.singletonList(newTerms(rand, dict, false)));
127+
subAggs = InternalAggregations.from(newTerms(rand, dict, false));
128128
} else {
129129
subAggs = InternalAggregations.EMPTY;
130130
}

‎benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/bucket/terms/StringTermsSerializationBenchmark.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ public class StringTermsSerializationBenchmark {
5050

5151
@Setup
5252
public void initResults() {
53-
results = DelayableWriteable.referencing(InternalAggregations.from(List.of(newTerms(true))));
53+
results = DelayableWriteable.referencing(InternalAggregations.from(newTerms(true)));
5454
}
5555

5656
private StringTerms newTerms(boolean withNested) {
5757
List<StringTerms.Bucket> resultBuckets = new ArrayList<>(buckets);
5858
for (int i = 0; i < buckets; i++) {
59-
InternalAggregations inner = withNested ? InternalAggregations.from(List.of(newTerms(false))) : InternalAggregations.EMPTY;
59+
InternalAggregations inner = withNested ? InternalAggregations.from(newTerms(false)) : InternalAggregations.EMPTY;
6060
resultBuckets.add(new StringTerms.Bucket(new BytesRef("test" + i), i, inner, false, 0, DocValueFormat.RAW));
6161
}
6262
return new StringTerms(

‎build-tools-internal/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=7ebdac923867a3cec0098302416d1e3c6c0c729fc4e2e05c10637a8af33a76c5
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
3+
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)