Skip to content

Commit 5b7d782

Browse files
tlrxtlrx
committed
Merge branch 'main' into 2024/03/11/shared-blob-cache-adjustments
2 parents d64ffea + ab8f435 commit 5b7d782

File tree

290 files changed

+10051
-2716
lines changed

Some content is hidden

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

290 files changed

+10051
-2716
lines changed

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
import java.io.UncheckedIOException;
3131
import java.nio.file.Files;
3232
import java.nio.file.Path;
33+
import java.util.ArrayList;
34+
import java.util.Collections;
35+
import java.util.List;
3336
import java.util.Map;
3437
import java.util.regex.Matcher;
3538
import java.util.regex.Pattern;
@@ -56,24 +59,41 @@ public void apply(Project project) {
5659
var javaExtension = project.getExtensions().getByType(JavaPluginExtension.class);
5760

5861
var srcDir = project.getProjectDir().toPath().resolve("src");
62+
List<Integer> mainVersions = new ArrayList<>();
5963
try (var subdirStream = Files.list(srcDir)) {
6064
for (Path sourceset : subdirStream.toList()) {
6165
assert Files.isDirectory(sourceset);
6266
String sourcesetName = sourceset.getFileName().toString();
6367
Matcher sourcesetMatcher = MRJAR_SOURCESET_PATTERN.matcher(sourcesetName);
6468
if (sourcesetMatcher.matches()) {
65-
int javaVersion = Integer.parseInt(sourcesetMatcher.group(1));
66-
addMrjarSourceset(project, javaExtension, sourcesetName, javaVersion);
69+
mainVersions.add(Integer.parseInt(sourcesetMatcher.group(1)));
6770
}
6871
}
6972
} catch (IOException e) {
7073
throw new UncheckedIOException(e);
7174
}
75+
76+
Collections.sort(mainVersions);
77+
List<String> parentSourceSets = new ArrayList<>();
78+
parentSourceSets.add(SourceSet.MAIN_SOURCE_SET_NAME);
79+
for (int javaVersion : mainVersions) {
80+
String sourcesetName = "main" + javaVersion;
81+
addMrjarSourceset(project, javaExtension, sourcesetName, parentSourceSets, javaVersion);
82+
parentSourceSets.add(sourcesetName);
83+
}
7284
}
7385

74-
private void addMrjarSourceset(Project project, JavaPluginExtension javaExtension, String sourcesetName, int javaVersion) {
86+
private void addMrjarSourceset(
87+
Project project,
88+
JavaPluginExtension javaExtension,
89+
String sourcesetName,
90+
List<String> parentSourceSets,
91+
int javaVersion
92+
) {
7593
SourceSet sourceSet = javaExtension.getSourceSets().maybeCreate(sourcesetName);
76-
GradleUtils.extendSourceSet(project, SourceSet.MAIN_SOURCE_SET_NAME, sourcesetName);
94+
for (String parentSourceSetName : parentSourceSets) {
95+
GradleUtils.extendSourceSet(project, parentSourceSetName, sourcesetName);
96+
}
7797

7898
var jarTask = project.getTasks().withType(Jar.class).named(JavaPlugin.JAR_TASK_NAME);
7999
jarTask.configure(task -> {

‎docs/changelog/105393.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 105393
2+
summary: Adding support for hex-encoded byte vectors on knn-search
3+
area: Vector Search
4+
type: feature
5+
issues: []

‎docs/changelog/105442.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 105442
2+
summary: Handling exceptions on watcher reload
3+
area: Watcher
4+
type: bug
5+
issues:
6+
- 69842

‎docs/changelog/105470.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 105470
2+
summary: Add retrievers using the parser-only approach
3+
area: Ranking
4+
type: enhancement
5+
issues: []

‎docs/changelog/106094.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 106094
2+
summary: "ESQL: Support partially folding CASE"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/106150.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 106150
2+
summary: Use correct system index bulk executor
3+
area: CRUD
4+
type: bug
5+
issues: []

‎docs/changelog/106171.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 106171
2+
summary: Do not log error on node restart when the transform is already failed
3+
area: Transform
4+
type: enhancement
5+
issues:
6+
- 106168

‎docs/changelog/106189.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 106189
2+
summary: Fix numeric sorts in `_cat/nodes`
3+
area: CAT APIs
4+
type: bug
5+
issues:
6+
- 48070

‎docs/changelog/106247.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 106247
2+
summary: Fix a downsample persistent task assignment bug
3+
area: Downsampling
4+
type: bug
5+
issues: []

‎docs/changelog/97561.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 97561
2+
summary: Add index forecasts to /_cat/allocation output
3+
area: Allocation
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)