Merge branch 'main' into handle-empty-chunked-infer-input

Author: DonalEvans

docs/changelog/138051.yaml

@@ -0,0 +1,5 @@
+pr: 138051
+summary: Support for parameters in LIKE and RLIKE
+area: ES|QL
+type: enhancement
+issues: []

docs/changelog/138644.yaml

@@ -0,0 +1,5 @@
+pr: 138644
+summary: "Fix: add missing `vector_similarity_support` in InferenceFeatures"
+area: Search
+type: bug
+issues: []

docs/reference/query-languages/esql/_snippets/operators/detailedDescription/like.md

@@ -31,3 +31,15 @@ ROW message = "foobar"
 ```
 
 
+Patterns may be specified with REST query placeholders as well
+
+```esql
+FROM employees
+| WHERE first_name LIKE ?pattern
+| KEEP first_name, last_name
+```
+
+```{applies_to}
+stack: ga 9.3
+```
+

docs/reference/query-languages/esql/_snippets/operators/detailedDescription/rlike.md

@@ -31,3 +31,15 @@ ROW message = "foobar"
 ```
 
 
+Patterns may be specified with REST query placeholders as well
+
+```esql
+FROM employees
+| WHERE first_name RLIKE ?pattern
+| KEEP first_name, last_name
+```
+
+```{applies_to}
+stack: ga 9.3
+```
+

modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java

@@ -38,6 +38,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
@@ -158,7 +159,9 @@ static void assertDatabasesLoaded() throws Exception {
 
             // ensure that the extra config database has been set up, too:
             assertThat(node.get("config_databases"), equalTo(List.of("asn.mmdb")));
-        });
+            // Downloading all four databases may take some time, so we set a longer timeout here.
+            // If 20 seconds prove insufficient, we should first investigate whether we can speed up the database downloader.
+        }, 20, TimeUnit.SECONDS);
     }
 
     @SuppressForbidden(reason = "fixtures use java.io.File based APIs")

modules/reindex/src/test/java/org/elasticsearch/reindex/ClientScrollableHitSourceTests.java

@@ -50,6 +50,7 @@
 import java.util.stream.IntStream;
 
 import static org.apache.lucene.tests.util.TestUtil.randomSimpleString;
+import static org.elasticsearch.common.bytes.BytesReferenceTestUtils.equalBytes;
 import static org.elasticsearch.core.TimeValue.timeValueSeconds;
 import static org.hamcrest.Matchers.instanceOf;
 
@@ -174,7 +175,7 @@ private SearchResponse createSearchResponse() {
     private void assertSameHits(List<? extends ScrollableHitSource.Hit> actual, SearchHit[] expected) {
         assertEquals(actual.size(), expected.length);
         for (int i = 0; i < actual.size(); ++i) {
-            assertEquals(actual.get(i).getSource(), expected[i].getSourceRef());
+            assertThat(expected[i].getSourceRef(), equalBytes(actual.get(i).getSource()));
             assertEquals(actual.get(i).getIndex(), expected[i].getIndex());
             assertEquals(actual.get(i).getVersion(), expected[i].getVersion());
             assertEquals(actual.get(i).getPrimaryTerm(), expected[i].getPrimaryTerm());

modules/reindex/src/test/java/org/elasticsearch/reindex/RoundTripTests.java

@@ -38,6 +38,7 @@
 import java.util.Map;
 
 import static org.apache.lucene.tests.util.TestUtil.randomSimpleString;
+import static org.elasticsearch.common.bytes.BytesReferenceTestUtils.equalBytes;
 
 /**
  * Round trip tests for all {@link Writeable} things declared in this plugin.
@@ -144,7 +145,7 @@ private void assertRequestEquals(ReindexRequest request, ReindexRequest tripped)
             assertNotNull(tripped.getRemoteInfo());
             assertEquals(request.getRemoteInfo().getScheme(), tripped.getRemoteInfo().getScheme());
             assertEquals(request.getRemoteInfo().getHost(), tripped.getRemoteInfo().getHost());
-            assertEquals(request.getRemoteInfo().getQuery(), tripped.getRemoteInfo().getQuery());
+            assertThat(tripped.getRemoteInfo().getQuery(), equalBytes(request.getRemoteInfo().getQuery()));
             assertEquals(request.getRemoteInfo().getUsername(), tripped.getRemoteInfo().getUsername());
             assertEquals(request.getRemoteInfo().getPassword(), tripped.getRemoteInfo().getPassword());
             assertEquals(request.getRemoteInfo().getHeaders(), tripped.getRemoteInfo().getHeaders());

modules/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java

@@ -59,6 +59,7 @@
 import java.util.Collections;
 import java.util.Map;
 
+import static org.elasticsearch.common.bytes.BytesReferenceTestUtils.equalBytes;
 import static org.elasticsearch.common.io.Streams.readFully;
 import static org.elasticsearch.repositories.blobstore.BlobStoreTestUtil.randomPurpose;
 import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.CREDENTIALS_FILE_SETTING;
@@ -219,7 +220,7 @@ public void testWriteFileMultipleOfChunkSize() throws IOException {
             container.writeBlob(randomPurpose(), key, new BytesArray(initialValue), true);
 
             BytesReference reference = readFully(container.readBlob(randomPurpose(), key));
-            assertEquals(new BytesArray(initialValue), reference);
+            assertThat(reference, equalBytes(new BytesArray(initialValue)));
 
             container.deleteBlobsIgnoringIfNotExists(randomPurpose(), Iterators.single(key));
         }

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java

@@ -79,6 +79,7 @@
 
 import static fixture.gcs.TestUtils.createServiceAccount;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.elasticsearch.common.bytes.BytesReferenceTestUtils.equalBytes;
 import static org.elasticsearch.common.io.Streams.readFully;
 import static org.elasticsearch.repositories.blobstore.BlobStoreTestUtil.randomPurpose;
 import static org.elasticsearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase.randomBytes;
@@ -582,7 +583,7 @@ public void testCompareAndExchangeWhenThrottled() throws IOException {
         final OptionalBytesReference updateResult = safeAwait(
             l -> container.compareAndExchangeRegister(randomPurpose(), key, new BytesArray(data), new BytesArray(updatedData), l)
         );
-        assertEquals(new BytesArray(data), updateResult.bytesReference());
+        assertThat(updateResult.bytesReference(), equalBytes(new BytesArray(data)));
 
         assertEquals(0, requestHandlers.size());
         container.delete(randomPurpose());
@@ -601,7 +602,7 @@ public void testContentsChangeWhileStreaming() throws IOException {
         container.writeBlob(randomPurpose(), key, new BytesArray(initialValue), true);
 
         BytesReference reference = readFully(container.readBlob(randomPurpose(), key));
-        assertEquals(new BytesArray(initialValue), reference);
+        assertThat(reference, equalBytes(new BytesArray(initialValue)));
 
         try (InputStream inputStream = container.readBlob(randomPurpose(), key)) {
             // Trigger the first chunk to load

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainerStatsTests.java

@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import static org.elasticsearch.common.bytes.BytesReferenceTestUtils.equalBytes;
 import static org.elasticsearch.repositories.blobstore.BlobStoreTestUtil.randomPurpose;
 import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.APPLICATION_NAME_SETTING;
 import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.CONNECT_TIMEOUT_SETTING;
@@ -138,7 +139,7 @@ public void testSingleMultipartWrite() throws Exception {
         final StatsMap wantStats = new StatsMap(purpose);
         assertStatsEquals(wantStats.add(INSERT, 1), store.stats());
         try (InputStream is = container.readBlob(purpose, blobName)) {
-            assertEquals(blobContents, Streams.readFully(is));
+            assertThat(Streams.readFully(is), equalBytes(blobContents));
         }
         assertStatsEquals(wantStats.add(GET, 1), store.stats());
     }
@@ -164,7 +165,7 @@ public void testResumableWrite() throws Exception {
         assertStatsEquals(wantStats.add(INSERT, 1, totalRequests), store.stats());
 
         try (InputStream is = container.readBlob(purpose, blobName)) {
-            assertEquals(blobContents, Streams.readFully(is));
+            assertThat(Streams.readFully(is), equalBytes(blobContents));
         }
         assertStatsEquals(wantStats.add(GET, 1), store.stats());
     }