Merge branch 'main' into multi-project/security-migration/2

Author: tvernum

benchmarks/src/main/java/org/elasticsearch/benchmark/common/network/IpAddressesBenchmarks.java

@@ -0,0 +1,142 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.benchmark.common.network;
+
+import org.elasticsearch.common.network.InetAddresses;
+import org.elasticsearch.xcontent.Text;
+import org.elasticsearch.xcontent.XContentString;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+@Warmup(iterations = 2)
+@Measurement(iterations = 3)
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.SECONDS)
+@State(Scope.Benchmark)
+@Fork(1)
+public class IpAddressesBenchmarks {
+
+    @Param("1000")
+    private int size;
+    private String[] ipV6Addresses;
+    private String[] ipV4Addresses;
+    private XContentString[] ipV6AddressesBytes;
+    private XContentString[] ipV4AddressesBytes;
+
+    @Setup
+    public void setup() throws UnknownHostException {
+        Random random = new Random();
+        ipV6Addresses = new String[size];
+        ipV4Addresses = new String[size];
+        ipV6AddressesBytes = new XContentString[size];
+        ipV4AddressesBytes = new XContentString[size];
+        byte[] ipv6Bytes = new byte[16];
+        byte[] ipv4Bytes = new byte[4];
+        for (int i = 0; i < size; i++) {
+            random.nextBytes(ipv6Bytes);
+            random.nextBytes(ipv4Bytes);
+            String ipv6String = InetAddresses.toAddrString(InetAddress.getByAddress(ipv6Bytes));
+            String ipv4String = InetAddresses.toAddrString(InetAddress.getByAddress(ipv4Bytes));
+            ipV6Addresses[i] = ipv6String;
+            ipV4Addresses[i] = ipv4String;
+            ipV6AddressesBytes[i] = new Text(ipv6String);
+            ipV4AddressesBytes[i] = new Text(ipv4String);
+        }
+    }
+
+    @Benchmark
+    public boolean isInetAddressIpv6() {
+        boolean b = true;
+        for (int i = 0; i < size; i++) {
+            b ^= InetAddresses.isInetAddress(ipV6Addresses[i]);
+        }
+        return b;
+    }
+
+    @Benchmark
+    public boolean isInetAddressIpv4() {
+        boolean b = true;
+        for (int i = 0; i < size; i++) {
+            b ^= InetAddresses.isInetAddress(ipV4Addresses[i]);
+        }
+        return b;
+    }
+
+    @Benchmark
+    public void getIpOrHostIpv6(Blackhole blackhole) {
+        for (int i = 0; i < size; i++) {
+            blackhole.consume(InetAddresses.getIpOrHost(ipV6Addresses[i]));
+        }
+    }
+
+    @Benchmark
+    public void getIpOrHostIpv4(Blackhole blackhole) {
+        for (int i = 0; i < size; i++) {
+            blackhole.consume(InetAddresses.forString(ipV4Addresses[i]));
+        }
+    }
+
+    @Benchmark
+    public void forStringIpv6String(Blackhole blackhole) {
+        for (int i = 0; i < size; i++) {
+            blackhole.consume(InetAddresses.forString(ipV6Addresses[i]));
+        }
+    }
+
+    @Benchmark
+    public void forStringIpv4String(Blackhole blackhole) {
+        for (int i = 0; i < size; i++) {
+            blackhole.consume(InetAddresses.forString(ipV4Addresses[i]));
+        }
+    }
+
+    @Benchmark
+    public void forStringIpv6Bytes(Blackhole blackhole) {
+        for (int i = 0; i < size; i++) {
+            blackhole.consume(InetAddresses.forString(ipV6AddressesBytes[i].bytes()));
+        }
+    }
+
+    @Benchmark
+    public void forStringIpv4Bytes(Blackhole blackhole) {
+        for (int i = 0; i < size; i++) {
+            blackhole.consume(InetAddresses.forString(ipV4AddressesBytes[i].bytes()));
+        }
+    }
+
+    @Benchmark
+    public void encodeAsIpv6WithIpv6(Blackhole blackhole) {
+        for (int i = 0; i < size; i++) {
+            blackhole.consume(InetAddresses.encodeAsIpv6(ipV6AddressesBytes[i]));
+        }
+    }
+
+    @Benchmark
+    public void encodeAsIpv6WithIpv4(Blackhole blackhole) {
+        for (int i = 0; i < size; i++) {
+            blackhole.consume(InetAddresses.encodeAsIpv6(ipV4AddressesBytes[i]));
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=443c9c8ee2ac1ee0e11881a40f2376d79c66386264a44b24a9f8ca67e633375f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
+distributionSha256Sum=f759b8dd5204e2e3fa4ca3e73f452f087153cf81bac9561eeb854229cc2c5365
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractRestResourcesFuncTest.groovy

@@ -53,8 +53,10 @@ abstract class AbstractRestResourcesFuncTest extends AbstractGradleFuncTest {
         }
         """
 
-        subProject(":distribution:archives:integ-test-zip") << "configurations.create('extracted')\n"
-        subProject(":distribution:archives:integ-test-zip") << "configurations.create('default')\n"
+        subProject(":distribution:archives:integ-test-zip") << """
+apply plugin: 'base'
+configurations.create('extracted')
+"""
     }
 
     void setupRestResources(List<String> apis, List<String> tests = [], List<String> xpackTests = []) {

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

@@ -80,11 +80,8 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT
     def "registered distribution provides archives and directory variant"() {
         given:
         file('someFile.txt') << "some content"
-
-        settingsFile << """
-            include ':consumer'
-            include ':producer-tar'
-        """
+        subProject("consumer")
+        subProject("producer-tar")
 
         buildFile << """
         import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
@@ -154,9 +151,7 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT
     def "builds extracted distribution via extractedAssemble"() {
         given:
         file('someFile.txt') << "some content"
-        settingsFile << """
-            include ':producer-tar'
-        """
+        subProject("producer-tar")
 
         buildFile << """
         import org.gradle.api.artifacts.type.ArtifactTypeDefinition;

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

@@ -117,5 +117,4 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
         result.output.contains("nested folder /distribution/bwc/minor/build/bwc/checkout-8.x/" +
                         "distribution/archives/darwin-tar/build/install/elasticsearch-8.4.0-SNAPSHOT")
     }
-
 }

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

@@ -9,15 +9,15 @@
 
 package org.elasticsearch.gradle.internal
 
-import spock.lang.Ignore
+
+import spock.lang.Unroll
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
 import org.gradle.api.GradleException
-import spock.lang.Unroll
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -66,8 +66,12 @@ tasks.register("buildBZip2Tar", SymbolicLinkPreservingTar) { SymbolicLinkPreserv
   from fileTree("archiveRoot")
 
   into('config') {
-    dirMode 0750
-    fileMode 0660
+    dirPermissions {
+        unix(0750)
+    }
+    filePermissions {
+        unix(0660)
+    }
     from "real-folder2"
   }
 }
@@ -118,8 +122,10 @@ tasks.register("buildTar", SymbolicLinkPreservingTar) { SymbolicLinkPreservingTa
         preserverTimestamp << [true, false]
     }
 
-    private boolean assertTar(final File archive, final Function<? super FileInputStream, ? extends InputStream> wrapper, boolean preserveFileTimestamps)
-            throws IOException {
+    private boolean assertTar(final File archive,
+                              final Function<? super FileInputStream, ? extends InputStream> wrapper,
+                              boolean preserveFileTimestamps)
+        throws IOException {
         try (TarArchiveInputStream tar = new TarArchiveInputStream(wrapper.apply(new FileInputStream(archive)))) {
             TarArchiveEntry entry = tar.getNextTarEntry();
             boolean realFolderEntry = false;
@@ -132,7 +138,7 @@ tasks.register("buildTar", SymbolicLinkPreservingTar) { SymbolicLinkPreservingTa
                 if (entry.getName().equals("real-folder/")) {
                     assert entry.isDirectory()
                     realFolderEntry = true
-                }  else if (entry.getName().equals("real-folder/file")) {
+                } else if (entry.getName().equals("real-folder/file")) {
                     assert entry.isFile()
                     fileEntry = true
                 } else if (entry.getName().equals("real-folder/link-to-file")) {
@@ -145,7 +151,7 @@ tasks.register("buildTar", SymbolicLinkPreservingTar) { SymbolicLinkPreservingTa
                 } else if (entry.getName().equals("config/sub/")) {
                     assert entry.isDirectory()
                     assert entry.getMode() == 16872
-                }else if (entry.getName().equals("link-in-folder/")) {
+                } else if (entry.getName().equals("link-in-folder/")) {
                     assert entry.isDirectory()
                     linkInFolderEntry = true
                 } else if (entry.getName().equals("link-in-folder/link-to-file")) {