Skip to content

Commit 613c36b

Browse files
gmarouligmarouli
authored
Merge branch 'main' into downsample-histograms
2 parents c2d10bf + cdf5112 commit 613c36b

File tree

168 files changed

+4755
-2023
lines changed

Some content is hidden

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

168 files changed

+4755
-2023
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

‎build-tools-internal/src/main/resources/minimumGradleVersion‎

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/137920.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 137920
2+
summary: Avoid retrieving unnecessary fields on node-reduce phase
3+
area: "ES|QL"
4+
type: enhancement
5+
issues:
6+
- 134363

‎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/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/reindex/src/main/java/org/elasticsearch/reindex/ReindexPlugin.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.elasticsearch.common.settings.Setting;
2020
import org.elasticsearch.common.settings.Settings;
2121
import org.elasticsearch.common.settings.SettingsFilter;
22+
import org.elasticsearch.common.util.FeatureFlag;
2223
import org.elasticsearch.features.NodeFeature;
2324
import org.elasticsearch.index.reindex.BulkByScrollTask;
2425
import org.elasticsearch.index.reindex.DeleteByQueryAction;
@@ -44,6 +45,11 @@ public class ReindexPlugin extends Plugin implements ActionPlugin {
4445

4546
public static final ActionType<ListTasksResponse> RETHROTTLE_ACTION = new ActionType<>("cluster:admin/reindex/rethrottle");
4647

48+
/**
49+
* Whether the feature flag to guard the work to make reindex more resilient while it is under development.
50+
*/
51+
static boolean REINDEX_RESILIENCE_ENABLED = new FeatureFlag("reindex_resilience").isEnabled();
52+
4753
@Override
4854
public List<ActionHandler> getActions() {
4955
return Arrays.asList(

0 commit comments

Comments
 (0)