Skip to content

Commit c9d03d5

Browse files
committed
Merge branch '9.0' of github.com:elastic/elasticsearch into backport/9.0/pr-125230
2 parents bbb8729 + dd40607 commit c9d03d5

File tree

18 files changed

+763
-28
lines changed

18 files changed

+763
-28
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.nio.file.Path;
2525
import java.nio.file.Paths;
2626
import java.util.ArrayList;
27+
import java.util.Arrays;
2728
import java.util.HashSet;
2829
import java.util.List;
2930
import java.util.Map;
@@ -45,6 +46,8 @@ public abstract class RunTask extends DefaultTestClustersTask {
4546

4647
private Boolean apmServerEnabled = false;
4748

49+
private List<String> plugins = List.of();
50+
4851
private Boolean preserveData = false;
4952

5053
private Path dataDir = null;
@@ -101,6 +104,22 @@ public void setApmServerEnabled(Boolean apmServerEnabled) {
101104
this.apmServerEnabled = apmServerEnabled;
102105
}
103106

107+
@Option(option = "with-plugins", description = "Run distribution with plugins installed")
108+
public void setPlugins(String plugins) {
109+
this.plugins = Arrays.asList(plugins.split(","));
110+
for (var cluster : getClusters()) {
111+
for (String plugin : this.plugins) {
112+
cluster.plugin(":plugins:" + plugin);
113+
}
114+
dependsOn(cluster.getPluginAndModuleConfigurations());
115+
}
116+
}
117+
118+
@Input
119+
public List<String> getPlugins() {
120+
return plugins;
121+
}
122+
104123
@Option(option = "data-dir", description = "Override the base data directory used by the testcluster")
105124
public void setDataDir(String dataDirStr) {
106125
dataDir = Paths.get(dataDirStr).toAbsolutePath();

docs/changelog/125023.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125023
2+
summary: Fix `AlibabaCloudSearchCompletionAction` not accepting `ChatCompletionInputs`
3+
area: Machine Learning
4+
type: bug
5+
issues: []

docs/changelog/125345.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 125345
2+
summary: ESQL - date nanos range bug?
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 125439

libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ public void testFilesEntitlementsWithExclusive() {
508508
assertThat(
509509
iae.getMessage(),
510510
allOf(
511-
containsString("Path [/base/test] is already exclusive"),
511+
containsString("Path [" + testPath1 + "] is already exclusive"),
512512
containsString("[plugin1][test.module1]"),
513513
containsString("[plugin2][test.module2]"),
514514
containsString("cannot add exclusive access")

muted-tests.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,15 @@ tests:
252252
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
253253
method: test {yaml=reference/cat/nodes/line_361}
254254
issue: https://github.com/elastic/elasticsearch/issues/124103
255-
- class: org.elasticsearch.entitlement.runtime.policy.PolicyManagerTests
256-
method: testFilesEntitlementsWithExclusive
257-
issue: https://github.com/elastic/elasticsearch/issues/124420
258255
- class: org.elasticsearch.xpack.restart.MLModelDeploymentFullClusterRestartIT
259256
method: testDeploymentSurvivesRestart {cluster=OLD}
260257
issue: https://github.com/elastic/elasticsearch/issues/124160
258+
- class: org.elasticsearch.xpack.ilm.history.ILMHistoryItemTests
259+
method: testTruncateLongError
260+
issue: https://github.com/elastic/elasticsearch/issues/125216
261+
- class: org.elasticsearch.index.shard.StoreRecoveryTests
262+
method: testAddIndices
263+
issue: https://github.com/elastic/elasticsearch/issues/124104
261264

262265
# Examples:
263266
#
@@ -296,4 +299,4 @@ tests:
296299
# issue: "https://github.com/elastic/elasticsearch/..."
297300
# - class: "org.elasticsearch.xpack.esql.**"
298301
# method: "test {union_types.MultiIndexIpStringStatsInline *}"
299-
# issue: "https://github.com/elastic/elasticsearch/..."
302+
# issue: "https://github.com/elastic/elasticsearch/..."

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/querydsl/query/SingleValueMatchQuery.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,17 @@
3737
import java.util.Objects;
3838

3939
/**
40-
* Finds all fields with a single-value. If a field has a multi-value, it emits a {@link Warnings}.
40+
* Finds all fields with a single-value. If a field has a multi-value, it emits
41+
* a {@link Warnings warning}.
42+
* <p>
43+
* Warnings are only emitted if the {@link TwoPhaseIterator#matches}. Meaning that,
44+
* if the other query skips the doc either because the index doesn't match or because it's
45+
* {@link TwoPhaseIterator#matches} doesn't match, then we won't log warnings. So it's
46+
* most safe to say that this will emit a warning if the document would have
47+
* matched but for having a multivalued field. If the document doesn't match but
48+
* "almost" matches in some fairly lucene-specific ways then it *might* emit
49+
* a warning.
50+
* </p>
4151
*/
4252
public final class SingleValueMatchQuery extends Query {
4353

0 commit comments

Comments
 (0)