Skip to content

Commit 70c6260

Browse files
committed
Merge branch 'main' into fstpostingformat-off-heap
2 parents c31ddcf + 7ccabaf commit 70c6260

3,370 files changed

Lines changed: 208928 additions & 95014 deletions

File tree

Some content is hidden

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

.editorconfig

Lines changed: 704 additions & 0 deletions
Large diffs are not rendered by default.

.git-blame-ignore-revs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@
66
2cbf261032dc8aca56c846971c090c991ac594a6
77
# GITHUB#12655 Regen after google java formatter upgrade
88
de3b294be44c2cea51a5e909db05043aa8d15150
9+
# GITHUB#14820 basic editorconfig fixes
10+
53acee98589bf8180d68eb30ec75acbe3e59ba9f
11+
# GITHUB#14832 editorconfig indent fixes
12+
95d019bd881a7a1908a16d3da1eaeb2ab71bafba

.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Ignore all differences in line endings for the lock file.
2-
versions.lock text eol=lf
3-
versions.props text eol=lf
2+
versions.lock text eol=lf
3+
versions.toml text eol=lf
44

55
# Gradle files are always in LF.
66
*.gradle text eol=lf

.github/actions/eclint/action.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Install eclint
2+
description: Installs eclint from cache, or builds it
3+
4+
inputs:
5+
eclint-version:
6+
required: false
7+
description: "eclint version to use"
8+
default: "v0.5.1"
9+
10+
runs:
11+
using: "composite"
12+
steps:
13+
- name: Cache eclint binary
14+
id: cache-eclint
15+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
16+
with:
17+
path: ~/.local/bin/eclint
18+
key: eclint-${{ inputs.eclint-version }}-${{ runner.os }}-${{ runner.arch }}
19+
- name: Setup go
20+
if: steps.cache-eclint.outputs.cache-hit != 'true'
21+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
22+
with:
23+
go-version: '1.24'
24+
cache: false
25+
- name: Install eclint
26+
if: steps.cache-eclint.outputs.cache-hit != 'true'
27+
run: GOBIN=${HOME}/.local/bin go install gitlab.com/greut/eclint/cmd/eclint@${ECLINT_VERSION}
28+
shell: bash
29+
env:
30+
ECLINT_VERSION: ${{ inputs.eclint-version }}
31+
- name: Configure gradle
32+
run: echo "lucene.tool.eclint=eclint" >> build-options.local.properties
33+
shell: bash

.github/actions/gradle-caches/action.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# This composite action is included in other workflows to have a shared setup
2+
# for java, gradle, caches, etc.
3+
4+
name: Prepare Lucene build
5+
description: Creates a shared setup for other workflows
6+
7+
inputs:
8+
java-version:
9+
required: false
10+
default: "24"
11+
description: "The default JDK version to set up."
12+
13+
java-distribution:
14+
required: false
15+
default: "temurin"
16+
description: "The default JDK distribution type"
17+
18+
runs:
19+
using: "composite"
20+
steps:
21+
- name: Set up Java (${{ inputs.java-distribution }}, ${{ inputs.java-version }})"
22+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
23+
with:
24+
distribution: ${{ inputs.java-distribution }}
25+
java-version: ${{ inputs.java-version }}
26+
java-package: jdk
27+
28+
- name: Cache gradle-wrapper.jar
29+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
30+
with:
31+
path: gradle/wrapper/gradle-wrapper.jar
32+
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.jar.sha256') }}
33+
34+
# This includes "smart" caching of gradle dependencies.
35+
- name: Set up Gradle
36+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
37+
with:
38+
# increase expiry time for the temp. develocity token.
39+
# https://github.com/gradle/actions/blob/main/docs/setup-gradle.md#increasing-the-expiry-time-for-develocity-access-tokens
40+
develocity-token-expiry: 8

.github/dependabot.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
open-pull-requests-limit: 25
6+
schedule:
7+
interval: monthly
8+
commit-message:
9+
prefix: ci
10+
labels: [dependencies, skip-changelog]
11+
12+
# python dependencies in /dev-tools/scripts
13+
- package-ecosystem: pip
14+
directory: /dev-tools/scripts/
15+
open-pull-requests-limit: 25
16+
schedule:
17+
interval: monthly
18+
commit-message:
19+
prefix: build(deps)
20+
labels: [dependencies, skip-changelog]
21+
22+
- package-ecosystem: gradle
23+
directory: /
24+
open-pull-requests-limit: 25
25+
schedule:
26+
interval: weekly
27+
day: tuesday
28+
commit-message:
29+
prefix: deps(java)
30+
labels: [dependencies, skip-changelog]

.github/labeler.yml

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
# This file defines module label mappings for the Lucene project.
2+
# Each module is associated with a set of file globs that, when matched,
3+
# will trigger the corresponding label to be applied to pull requests.
4+
#
5+
# This configuration is used by the workflow defined in .github/workflows/label-pull-request.yml.
6+
# If we are adding new labels or refactoring modules, we will need to modify this file globs here to ensure that the correct labels are applied.
7+
8+
# For more information on how to define globs, visit: https://github.com/actions/labeler
9+
10+
module:build-infra:
11+
- changed-files:
12+
- any-glob-to-any-file: ['build-tools/build-infra/**', 'build-tools/build-infra-shadow/**', '**/*.gradle']
13+
14+
module:analysis:
15+
- changed-files:
16+
- any-glob-to-any-file: 'lucene/analysis/**'
17+
18+
module:benchmark:
19+
- changed-files:
20+
- any-glob-to-any-file: 'lucene/benchmark/**'
21+
22+
module:classification:
23+
- changed-files:
24+
- any-glob-to-any-file: 'lucene/classification/**'
25+
26+
module:core/codecs:
27+
- changed-files:
28+
- any-glob-to-any-file: ['lucene/core/src/java/org/apache/lucene/codecs/**', 'lucene/core/src/test/org/apache/lucene/codecs/**']
29+
30+
module:core/FSTs:
31+
- changed-files:
32+
- any-glob-to-any-file: ['lucene/core/src/java/org/apache/lucene/util/fst/**', 'lucene/core/src/test/org/apache/lucene/util/fst/**']
33+
34+
module:core/hnsw:
35+
- changed-files:
36+
- any-glob-to-any-file: ['lucene/core/src/java/org/apache/lucene/util/hnsw/**', 'lucene/core/src/test/org/apache/lucene/util/hnsw/**']
37+
38+
module:core/index:
39+
- changed-files:
40+
- any-glob-to-any-file: ['lucene/core/src/java/org/apache/lucene/index/**', 'lucene/core/src/test/org/apache/lucene/index/**']
41+
42+
module:core/search:
43+
- changed-files:
44+
- any-glob-to-any-file: ['lucene/core/src/java/org/apache/lucene/search/**', 'lucene/core/src/test/org/apache/lucene/search/**']
45+
46+
module:core/store:
47+
- changed-files:
48+
- any-glob-to-any-file: ['lucene/core/src/java/org/apache/lucene/store/**', 'lucene/core/src/test/org/apache/lucene/store/**']
49+
50+
module:core/other:
51+
- all:
52+
- changed-files:
53+
- any-glob-to-any-file: ['lucene/core/**']
54+
- all-globs-to-all-files:
55+
- '!lucene/core/src/java/org/apache/lucene/codecs/**'
56+
- '!lucene/core/src/test/org/apache/lucene/codecs/**'
57+
- '!lucene/core/src/java/org/apache/lucene/util/fst/**'
58+
- '!lucene/core/src/test/org/apache/lucene/util/fst/**'
59+
- '!lucene/core/src/java/org/apache/lucene/util/hnsw/**'
60+
- '!lucene/core/src/test/org/apache/lucene/util/hnsw/**'
61+
- '!lucene/core/src/java/org/apache/lucene/index/**'
62+
- '!lucene/core/src/test/org/apache/lucene/index/**'
63+
- '!lucene/core/src/java/org/apache/lucene/search/**'
64+
- '!lucene/core/src/test/org/apache/lucene/search/**'
65+
- '!lucene/core/src/java/org/apache/lucene/store/**'
66+
- '!lucene/core/src/test/org/apache/lucene/store/**'
67+
68+
module:demo:
69+
- changed-files:
70+
- any-glob-to-any-file: 'lucene/demo/**'
71+
72+
module:expressions:
73+
- changed-files:
74+
- any-glob-to-any-file: 'lucene/expressions/**'
75+
76+
module:facet:
77+
- changed-files:
78+
- any-glob-to-any-file: 'lucene/facet/**'
79+
80+
module:grouping:
81+
- changed-files:
82+
- any-glob-to-any-file: 'lucene/grouping/**'
83+
84+
module:highlighter:
85+
- changed-files:
86+
- any-glob-to-any-file: 'lucene/highlighter/**'
87+
88+
module:join:
89+
- changed-files:
90+
- any-glob-to-any-file: 'lucene/join/**'
91+
92+
module:luke:
93+
- changed-files:
94+
- any-glob-to-any-file: 'lucene/luke/**'
95+
96+
module:misc:
97+
- changed-files:
98+
- any-glob-to-any-file: 'lucene/misc/**'
99+
100+
module:monitor:
101+
- changed-files:
102+
- any-glob-to-any-file: 'lucene/monitor/**'
103+
104+
module:queries:
105+
- changed-files:
106+
- any-glob-to-any-file: 'lucene/queries/**'
107+
108+
module:queryparser:
109+
- changed-files:
110+
- any-glob-to-any-file: 'lucene/queryparser/**'
111+
112+
module:replicator:
113+
- changed-files:
114+
- any-glob-to-any-file: 'lucene/replicator/**'
115+
116+
module:sandbox:
117+
- changed-files:
118+
- any-glob-to-any-file: 'lucene/sandbox/**'
119+
120+
module:spatial:
121+
- changed-files:
122+
- any-glob-to-any-file: ['lucene/spatial-extras/**', 'lucene/spatial-test-fixtures/**']
123+
124+
module:spatial3d:
125+
- changed-files:
126+
- any-glob-to-any-file: 'lucene/spatial3d/**'
127+
128+
module:suggest:
129+
- changed-files:
130+
- any-glob-to-any-file: 'lucene/suggest/**'
131+
132+
module:test-framework:
133+
- changed-files:
134+
- any-glob-to-any-file: 'lucene/test-framework/**'
Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# a list of known committer names and their aliases, to highlight
2+
# commits from non-committers in the activity-report.
3+
dependabot
4+
guofeng.my
5+
gf2121
6+
Benjamin Trent
7+
ChrisHegarty
8+
Mike McCandless
9+
Andrzej Bialecki
10+
Alessandro Benedetti
11+
Armin Braun
12+
Adriano Crestani Campos
13+
Ramkumar Aiyengar
14+
Anshum Gupta
15+
Alexandre Rafalovitch
16+
Areek Zillur
17+
Atri Sharma
18+
Ben Trent
19+
William Au
20+
Benson Margulies
21+
Bernhard Messer
22+
Bruno Roustant
23+
Michael Busch
24+
Chris Hegarty
25+
Christopher John Male
26+
Christian Moen
27+
Christine Poerschke
28+
Cassandra Targett
29+
Doug Cutting
30+
Cao Mạnh Đạt
31+
Nhat Nguyen
32+
Peter Gromov
33+
Doron Cohen
34+
Dennis Gove
35+
Scott Blum
36+
David Smiley
37+
Dawid Weiss
38+
Erik Hatcher
39+
Shawn Heisey
40+
Eric Pugh
41+
Erick Erickson
42+
Greg Bowyer
43+
Gregory Chanan
44+
Jason Gerlowski
45+
Grant Ingersoll
46+
Greg Miller
47+
Guo Feng
48+
Gus Heck
49+
Han Jiang
50+
Hrishikesh Gadre
51+
Chris M. Hostetter
52+
Houston Putman
53+
Ilan Ginzburg
54+
Ahmet Arslan
55+
Ishan Chattopadhyaya
56+
Ignacio Vera
57+
Ankit Jain
58+
Jan Høydahl
59+
Luca Cavanna
60+
Joel Bernstein
61+
James Dyer
62+
Jim Ferenczi
63+
Adrien Grand
64+
Julie Tibshirani
65+
Koji Sekiguchi
66+
Kevin Risden
67+
Karl Wright
68+
Lu Xugang
69+
Michael Gibney
70+
Mark Robert Miller
71+
Mayya Sharipova
72+
Mike Drob
73+
Mark Harwood
74+
Michael McCandless
75+
Mikhail Khludnev
76+
Michael Froh
77+
Munendra S N
78+
Martijn van Groningen
79+
Namgyu Kim
80+
Nick Knize
81+
Noble Paul
82+
Otis Gospodnetic
83+
Patrick Zhai
84+
Ryan Ernst
85+
Robert Muir
86+
Alan Woodward
87+
Ryan McKinley
88+
Steven Rowe
89+
Shai Erera
90+
Shalin Shekhar Mangar
91+
Simon Willnauer
92+
Sami Siren
93+
Michael Sokolov
94+
Stanisław Osiński
95+
Stefan Matheis
96+
Tim Allison
97+
Tomas Eduardo Fernandez Lobbe
98+
Timothy Potter
99+
Toke Eskildsen
100+
Tommaso Teofili
101+
Tomoko Uchida
102+
Upayavira
103+
Uwe Schindler
104+
Andi Vajda
105+
Varun Thacker
106+
Vigya Sharma
107+
Stefan Vodita
108+
Wolfgang Hoschek
109+
Yonik Seeley
110+
Zach Chen
111+
Chao Zhang

0 commit comments

Comments
 (0)