Merge branch 'main' into rn-test2

Author: lcawl

.buildkite/pipelines/periodic-java-ea.template.yml

@@ -74,7 +74,7 @@ steps:
           machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
-          GRADLE_PARAMS: "-Druntime.java=$$JAVA_EA_VERSION"
+          GRADLE_PARAMS: "-Druntime.java=$JAVA_EA_VERSION"
           GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
       - label: "{{matrix.BWC_VERSION}} / matrix-bwc"
         command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION  -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest

.buildkite/pipelines/periodic-java-ea.yml

@@ -550,7 +550,7 @@ steps:
           machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
-          GRADLE_PARAMS: "-Druntime.java=$$JAVA_EA_VERSION"
+          GRADLE_PARAMS: "-Druntime.java=$JAVA_EA_VERSION"
           GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
       - label: "{{matrix.BWC_VERSION}} / matrix-bwc"
         command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION  -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest

benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java

@@ -96,7 +96,8 @@ public void setup() {
             false,
             AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.getDefault(Settings.EMPTY),
             AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.get(Settings.EMPTY),
-            null
+            null,
+            Map.of()
         );
 
         var fields = 10_000;

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/AggregatorBenchmark.java

@@ -199,8 +199,11 @@ private static Operator operator(DriverContext driverContext, String grouping, S
             default -> throw new IllegalArgumentException("unsupported grouping [" + grouping + "]");
         };
         return new HashAggregationOperator(
+            AggregatorMode.SINGLE,
             List.of(supplier(op, dataType, filter).groupingAggregatorFactory(AggregatorMode.SINGLE, List.of(groups.size()))),
             () -> BlockHash.build(groups, driverContext.blockFactory(), 16 * 1024, false),
+            Integer.MAX_VALUE,
+            1.0,
             driverContext
         );
     }

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java

@@ -376,7 +376,8 @@ private static Configuration configuration() {
             false,
             AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_MAX_SIZE.getDefault(Settings.EMPTY),
             AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.getDefault(Settings.EMPTY),
-            null
+            null,
+            Map.of()
         );
     }
 

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/ValuesAggregatorBenchmark.java

@@ -122,8 +122,11 @@ private static Operator operator(DriverContext driverContext, int groups, String
         }
         List<BlockHash.GroupSpec> groupSpec = List.of(new BlockHash.GroupSpec(0, ElementType.LONG));
         return new HashAggregationOperator(
+            mode,
             List.of(supplier(dataType).groupingAggregatorFactory(mode, List.of(1))),
             () -> BlockHash.build(groupSpec, driverContext.blockFactory(), 16 * 1024, false),
+            Integer.MAX_VALUE,
+            1.0,
             driverContext
         ) {
             @Override

branches.json

@@ -20,10 +20,6 @@
     {
       "branch" : "8.19",
       "version" : "8.19.11"
-    },
-    {
-      "branch" : "7.17",
-      "version" : "7.17.30"
     }
   ]
 }

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/AbstractTransportVersionFuncTest.groovy

@@ -167,6 +167,10 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
         execute("git init")
         execute('git config user.email "build-tool@elastic.co"')
         execute('git config user.name "Build tool"')
+        file(".gitignore") << """
+        .gradle/
+        build/
+        """.stripIndent()
         execute("git add .")
         execute('git commit -m "Initial"')
     }

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/ResolveTransportVersionConflictFuncTest.groovy

@@ -117,7 +117,6 @@ class ResolveTransportVersionConflictFuncTest extends AbstractTransportVersionFu
         execute("git add .")
         execute("git commit -m branch")
         // and finally initiate the merge
-        System.out.println("Merging commit " + toMerge);
         execute("git merge " + toMerge, testProjectDir.root, true);
 
         when:
@@ -127,4 +126,62 @@ class ResolveTransportVersionConflictFuncTest extends AbstractTransportVersionFu
         assertResolveAndValidateSuccess(result)
         assertUpperBound("9.2", "branch_new_tv,8125000")
     }
+
+    def "resolve on release branch with no conflicts is a noop"() {
+        given:
+        file("myserver/build.gradle") << """
+            tasks.named('resolveTransportVersionConflict') {
+                currentUpperBoundName = '9.1'
+            }
+        """
+
+        when:
+        def result = runResolveAndValidateTask().build()
+
+        then:
+        assertResolveAndValidateSuccess(result)
+        assertUpperBound("9.1", "existing_92,8012001")
+    }
+
+    def "resolve on release branch accepts upstream"() {
+        given:
+        // setup main with 2 commits, but we will only cherry pick the second one
+        execute("git checkout main")
+        referableAndReferencedTransportVersion("upstream_new_tv1", "8124000")
+        transportVersionUpperBound("9.2", "upstream_new_tv1", "8124000")
+        execute("git add .")
+        execute("git commit -m update1")
+        referableAndReferencedTransportVersion("upstream_new_tv2", "8125000,8012002")
+        transportVersionUpperBound("9.2", "upstream_new_tv2", "8125000")
+        transportVersionUpperBound("9.1", "upstream_new_tv2", "8012002")
+        execute("git add .")
+        execute("git commit -m update2")
+        String toCherryPick = execute("git rev-parse HEAD")
+        execute("git checkout test") // test is a faux 9.1 branch
+        file("myserver/build.gradle") << """
+            tasks.named('resolveTransportVersionConflict') {
+                currentUpperBoundName = '9.1'
+            }
+            tasks.named('validateTransportVersionResources') {
+                currentUpperBoundName = '9.1'
+            }
+        """
+        execute("git commit -a -m update-branch")
+        execute("git cherry-pick " + toCherryPick, testProjectDir.root, true);
+
+        when:
+        def result = runResolveAndValidateTask().build()
+
+        then:
+        assertResolveAndValidateSuccess(result)
+        assertReferableDefinition("upstream_new_tv2", "8125000,8012002")
+        assertUpperBound("9.2", "upstream_new_tv2,8125000")
+        assertUpperBound("9.1", "upstream_new_tv2,8012002")
+
+        when:
+        execute("git cherry-pick --continue")
+
+        then:
+        execute("git status --porcelain").strip().isEmpty()
+    }
 }

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

@@ -154,6 +154,25 @@ public List<Version> getUnreleased() {
         return unreleased.keySet().stream().sorted().toList();
     }
 
+    public Optional<UnreleasedVersionInfo> getUnmaintainedPreviousMajor() {
+
+        return getUnreleased().stream()
+            .filter(v -> v.getMajor() == currentVersion.getMajor() - 1)
+            .min(Comparator.reverseOrder())
+            .isPresent()
+                ? Optional.empty()
+                : getReleased().stream()
+                    .filter(v -> v.getMajor() == currentVersion.getMajor() - 1)
+                    .min(Comparator.reverseOrder())
+                    .map(
+                        version -> new UnreleasedVersionInfo(
+                            version,
+                            String.format("%d.%d", version.getMajor(), version.getMinor()),
+                            ":distribution:bwc:major1"
+                        )
+                    );
+    }
+
     public void compareToAuthoritative(List<Version> authoritativeReleasedVersions) {
         Set<Version> notReallyReleased = new HashSet<>(getReleased());
         notReallyReleased.removeAll(authoritativeReleasedVersions);
@@ -178,7 +197,7 @@ public void compareToAuthoritative(List<Version> authoritativeReleasedVersions)
         }
     }
 
-    private List<Version> getReleased() {
+    public List<Version> getReleased() {
         return versions.stream()
             .filter(v -> v.getMajor() >= currentVersion.getMajor() - 1)
             .filter(v -> unreleased.containsKey(v) == false)