Skip to content

Commit 6b48ac9

Browse files
sandeshkr419sandeshkr419
authored
Merge branch 'main' into issue/17530
Signed-off-by: Sandesh Kumar <[email protected]>
2 parents 1f94f4f + 4a07236 commit 6b48ac9

File tree

530 files changed

+22229
-2333
lines changed

Some content is hidden

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

530 files changed

+22229
-2333
lines changed

‎.ci/bwcVersions‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ BWC_VERSION:
5151
- "3.1.0"
5252
- "3.2.0"
5353
- "3.3.0"
54+
- "3.3.1"
55+
- "3.3.2"

‎.github/benchmark-configs.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"SINGLE_NODE_CLUSTER": "true",
4242
"MIN_DISTRIBUTION": "true",
4343
"TEST_WORKLOAD": "big5",
44-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
44+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.1\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
4545
"CAPTURE_NODE_STAT": "true",
4646
"TEST_PROCEDURE": "restore-from-snapshot"
4747
},
@@ -91,7 +91,7 @@
9191
"MIN_DISTRIBUTION": "true",
9292
"TEST_WORKLOAD": "big5",
9393
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.enabled:true",
94-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
94+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.1\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
9595
"CAPTURE_NODE_STAT": "true",
9696
"TEST_PROCEDURE": "restore-from-snapshot"
9797
},
@@ -109,7 +109,7 @@
109109
"MIN_DISTRIBUTION": "true",
110110
"TEST_WORKLOAD": "big5",
111111
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.mode:all",
112-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
112+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.1\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
113113
"CAPTURE_NODE_STAT": "true",
114114
"TEST_PROCEDURE": "restore-from-snapshot"
115115
},
@@ -127,7 +127,7 @@
127127
"MIN_DISTRIBUTION": "true",
128128
"TEST_WORKLOAD": "big5",
129129
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.mode:auto",
130-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
130+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.1\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
131131
"CAPTURE_NODE_STAT": "true",
132132
"TEST_PROCEDURE": "restore-from-snapshot"
133133
},
@@ -145,7 +145,7 @@
145145
"MIN_DISTRIBUTION": "true",
146146
"TEST_WORKLOAD": "big5",
147147
"ADDITIONAL_CONFIG": "opensearch.experimental.feature.approximate_point_range_query.enabled:true",
148-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
148+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.1\",\"snapshot_name\":\"big5_1_shard_single_client\"}",
149149
"CAPTURE_NODE_STAT": "true",
150150
"TEST_PROCEDURE": "restore-from-snapshot"
151151
},
@@ -178,7 +178,7 @@
178178
"SINGLE_NODE_CLUSTER": "true",
179179
"MIN_DISTRIBUTION": "true",
180180
"TEST_WORKLOAD": "http_logs",
181-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"http_logs_1_shard\"}",
181+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.1\",\"snapshot_name\":\"http_logs_1_shard\"}",
182182
"CAPTURE_NODE_STAT": "true",
183183
"TEST_PROCEDURE": "restore-from-snapshot"
184184
},
@@ -195,7 +195,7 @@
195195
"SINGLE_NODE_CLUSTER": "true",
196196
"MIN_DISTRIBUTION": "true",
197197
"TEST_WORKLOAD": "nyc_taxis",
198-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.0\",\"snapshot_name\":\"nyc_taxis_1_shard\"}",
198+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.3.1\",\"snapshot_name\":\"nyc_taxis_1_shard\"}",
199199
"CAPTURE_NODE_STAT": "true",
200200
"TEST_PROCEDURE": "restore-from-snapshot"
201201
},

‎.github/workflows/assemble.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
java: [ 21, 24 ]
10+
java: [ 21, 25 ]
1111
os: [ubuntu-latest, windows-latest, macos-13, ubuntu-24.04-arm]
1212
steps:
1313
- uses: actions/checkout@v5
@@ -33,7 +33,7 @@ jobs:
3333
shell: bash
3434
if: runner.os != 'macos'
3535
run: |
36-
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE
36+
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE
3737
- name: Run Gradle (assemble)
3838
if: runner.os == 'macos' && steps.setup_docker.outcome == 'success'
3939
run: |

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
distribution: temurin
4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v3
46+
uses: github/codeql-action/init@v4
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
5454
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5555
# If this step fails, then you should remove it and run the build manually (see below)
5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v3
57+
uses: github/codeql-action/autobuild@v4
5858

5959
# ℹ️ Command-line programs to run using the OS shell.
6060
# 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
6868
# make release
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v3
71+
uses: github/codeql-action/analyze@v4

‎.github/workflows/create-documentation-issue.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
3030
- name: Create Issue From File
3131
id: create-issue
32-
uses: peter-evans/create-issue-from-file@v5
32+
uses: peter-evans/create-issue-from-file@v6
3333
with:
3434
title: Add documentation related to new feature
3535
content-filepath: ./ci/documentation/issue.md

‎.github/workflows/dependabot_pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
./gradlew updateSHAs
3636
3737
- name: Commit the changes
38-
uses: stefanzweifel/git-auto-commit-action@v6
38+
uses: stefanzweifel/git-auto-commit-action@v7
3939
with:
4040
commit_message: Updating SHAs
4141
branch: ${{ github.head_ref }}
@@ -48,7 +48,7 @@ jobs:
4848
./gradlew spotlessApply
4949
5050
- name: Commit the changes
51-
uses: stefanzweifel/git-auto-commit-action@v6
51+
uses: stefanzweifel/git-auto-commit-action@v7
5252
with:
5353
commit_message: Spotless formatting
5454
branch: ${{ github.head_ref }}
@@ -62,7 +62,7 @@ jobs:
6262
version: 'Unreleased 3.x'
6363

6464
- name: Commit the changes
65-
uses: stefanzweifel/git-auto-commit-action@v6
65+
uses: stefanzweifel/git-auto-commit-action@v7
6666
with:
6767
commit_message: "Update changelog"
6868
branch: ${{ github.head_ref }}

‎.github/workflows/gradle-check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122

123123
- name: Create Comment Success
124124
if: ${{ github.event_name == 'pull_request_target' && success() && env.result == 'SUCCESS' }}
125-
uses: peter-evans/create-or-update-comment@v4
125+
uses: peter-evans/create-or-update-comment@v5
126126
with:
127127
issue-number: ${{ env.pr_number }}
128128
body: |
@@ -145,7 +145,7 @@ jobs:
145145
146146
- name: Create Comment Flaky
147147
if: ${{ github.event_name == 'pull_request_target' && success() && env.result != 'SUCCESS' }}
148-
uses: peter-evans/create-or-update-comment@v4
148+
uses: peter-evans/create-or-update-comment@v5
149149
with:
150150
issue-number: ${{ env.pr_number }}
151151
body: |
@@ -155,7 +155,7 @@ jobs:
155155
156156
- name: Create Comment Failure
157157
if: ${{ github.event_name == 'pull_request_target' && failure() }}
158-
uses: peter-evans/create-or-update-comment@v4
158+
uses: peter-evans/create-or-update-comment@v5
159159
with:
160160
issue-number: ${{ env.pr_number }}
161161
body: |

‎.github/workflows/lucene-snapshots.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ on:
1111
type: string
1212
required: false
1313
default: 'main'
14+
java_version:
15+
description: 'Java version to use'
16+
type: string
17+
required: false
18+
default: '25'
1419

1520
jobs:
1621
publish-snapshots:
@@ -28,23 +33,18 @@ jobs:
2833
repository: 'apache/lucene'
2934
ref: ${{ github.event.inputs.ref }}
3035

31-
- name: Get Java Min Version and Lucene Revision from Lucene Repository
36+
- name: Get Lucene Revision
3237
run: |
33-
java_version=`cat build.gradle | grep minJavaVersion | head -1 | grep -Eo '_[0-9]+$' | tr -d '_'`
34-
echo "JAVA_VERSION=$java_version" >> $GITHUB_ENV
3538
echo "REVISION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
3639
37-
- name: Setup JDK ${{ env.JAVA_VERSION }}
40+
- name: Setup JDK ${{ github.event.inputs.java_version }}
3841
uses: actions/setup-java@v5
3942
with:
40-
java-version: ${{ env.JAVA_VERSION }}
43+
java-version: ${{ github.event.inputs.java_version }}
4144
distribution: 'temurin'
4245

43-
- name: Initialize gradle settings
44-
run: ./gradlew localSettings
45-
4646
- name: Publish Lucene to local maven repo.
47-
run: ./gradlew publishJarsPublicationToMavenLocal -Pversion.suffix=snapshot-${{ env.REVISION }}
47+
run: ./gradlew publishJarsPublicationToMavenLocal -Pversion.suffix=snapshot-${{ env.REVISION }} -x javadoc
4848

4949
- name: Configure AWS credentials
5050
uses: aws-actions/configure-aws-credentials@v5

‎.github/workflows/poc-checklist.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
issues: write
1212
steps:
1313
- name: Add comment
14-
uses: peter-evans/create-or-update-comment@v4
14+
uses: peter-evans/create-or-update-comment@v5
1515
with:
1616
issue-number: ${{ github.event.issue.number }}
1717
body: |

‎.github/workflows/precommit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
java: [ 21, 24 ]
10+
java: [ 21, 25 ]
1111
os: [ubuntu-latest, windows-latest, macos-latest, macos-13, ubuntu-24.04-arm]
1212
include:
1313
- java: 21

0 commit comments

Comments
 (0)