Skip to content

Commit edd88b1

Browse files
committed
Merge branch 'main' of github.com:elasticsearch/elasticsearch into stop_datafeed_close_job_param
2 parents 42a855e + 933354b commit edd88b1

File tree

182 files changed

+4632
-2158
lines changed

Some content is hidden

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

182 files changed

+4632
-2158
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
3+
distributionSha256Sum=f86344275d1b194688dd330abf9f6f2344cd02872ffee035f2d1ea2fd60cf7f3
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.2.0
1+
9.2.1

docs/changelog/138051.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138051
2+
summary: Support for parameters in LIKE and RLIKE
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/138624.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 138624
2+
summary: Handle individual doc parsing failure in bulk request with pipeline
3+
area: Ingest Node
4+
type: bug
5+
issues:
6+
- 138445

docs/changelog/138644.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138644
2+
summary: "Fix: add missing `vector_similarity_support` in InferenceFeatures"
3+
area: Search
4+
type: bug
5+
issues: []

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,15 @@ ROW message = "foobar"
3131
```
3232

3333

34+
Patterns may be specified with REST query placeholders as well
35+
36+
```esql
37+
FROM employees
38+
| WHERE first_name LIKE ?pattern
39+
| KEEP first_name, last_name
40+
```
41+
42+
```{applies_to}
43+
stack: ga 9.3
44+
```
45+

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,15 @@ ROW message = "foobar"
3131
```
3232

3333

34+
Patterns may be specified with REST query placeholders as well
35+
36+
```esql
37+
FROM employees
38+
| WHERE first_name RLIKE ?pattern
39+
| KEEP first_name, last_name
40+
```
41+
42+
```{applies_to}
43+
stack: ga 9.3
44+
```
45+

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
3+
distributionSha256Sum=f86344275d1b194688dd330abf9f6f2344cd02872ffee035f2d1ea2fd60cf7f3
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DerParser.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,12 @@ private int getLength() throws IOException {
138138
int n = derInputStream.read(bytes);
139139
if (n < num) throw new IOException("Invalid DER: length too short");
140140

141-
return new BigInteger(1, bytes).intValue();
141+
int len = new BigInteger(1, bytes).intValue();
142+
if (len < 0) {
143+
throw new IOException("Invalid DER: length larger than max-int");
144+
}
145+
146+
return len;
142147
}
143148

144149
/**

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.List;
3939
import java.util.Map;
4040
import java.util.Objects;
41+
import java.util.concurrent.TimeUnit;
4142

4243
import static org.hamcrest.Matchers.containsInAnyOrder;
4344
import static org.hamcrest.Matchers.equalTo;
@@ -158,7 +159,9 @@ static void assertDatabasesLoaded() throws Exception {
158159

159160
// ensure that the extra config database has been set up, too:
160161
assertThat(node.get("config_databases"), equalTo(List.of("asn.mmdb")));
161-
});
162+
// Downloading all four databases may take some time, so we set a longer timeout here.
163+
// If 20 seconds prove insufficient, we should first investigate whether we can speed up the database downloader.
164+
}, 20, TimeUnit.SECONDS);
162165
}
163166

164167
@SuppressForbidden(reason = "fixtures use java.io.File based APIs")

0 commit comments

Comments
 (0)