merged conflict

Author: mridula-s109

CONTRIBUTING.md

@@ -168,16 +168,13 @@ You can import the Elasticsearch project into IntelliJ IDEA via:
 
 #### Checkstyle
 
-If you have the [Checkstyle] plugin installed, you can configure IntelliJ to
-check the Elasticsearch code. However, the Checkstyle configuration file does
-not work by default with the IntelliJ plugin, so instead an IDE-specific config
-file is generated automatically after IntelliJ finishes syncing. You can
-manually generate the file with `./gradlew configureIdeCheckstyle` in case
-it is removed due to a `./gradlew clean` or other action.
-
-IntelliJ should be automatically configured to use the generated rules after
-import via the `.idea/checkstyle-idea.xml` configuration file. No further
-action is required.
+IntelliJ should automatically configure checkstyle. It does so by running
+`configureIdeCheckstyle` on import. That makes `.idea/checkstyle-idea.xml`
+configuration file. IntelliJ points checkstyle at that.
+
+Things like `./gradlew clean` or `git clean -xdf` can nuke the file. You can
+regenerate it by running `./gradlew -Didea.active=true configureIdeCheckstyle`,
+but generally shouldn't have to.
 
 #### Formatting
 

docs/changelog/129223.yaml

@@ -0,0 +1,5 @@
+pr: 129223
+summary: Fix text similarity reranker does not propagate min score correctly
+area: Search
+type: bug
+issues: []

docs/changelog/129278.yaml

@@ -0,0 +1,5 @@
+pr: 129278
+summary: Fix constant keyword optimization
+area: ES|QL
+type: bug
+issues: []

docs/changelog/129326.yaml

@@ -0,0 +1,6 @@
+pr: 129326
+summary: Check positions on `MultiPhraseQueries` as well as phrase queries
+area: Search
+type: bug
+issues:
+ - 123871

docs/reference/enrich-processor/normalize-for-stream.md

@@ -40,6 +40,7 @@ If the document is not OpenTelemetry-compliant, the processor normalizes it as f
   | `trace.id`  | `trace_id`                     |
   | `message`   | `body.text`                    |
   | `log.level` | `severity_text`                |
+
   The processor first looks for the nested form of the ECS field and if such does not exist, it looks for a top-level field with the dotted field name.
 * Other specific ECS fields that describe resources and have corresponding counterparts in the OpenTelemetry Semantic Conventions are moved to the `resource.attribtues` map. Fields that are considered resource attributes are such that conform to the following conditions:
     * They are ECS fields that have corresponding counterparts (either with

modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml

@@ -200,3 +200,50 @@
                 query: quick brown
                 operator: and
   - match: { hits.total: 2 }
+---
+# Tests that this returns 400, and not 500 (#123871)
+"Test multi_match phrase with no positions":
+  - requires:
+      cluster_features: [ "search.multi.match.checks.positions" ]
+      reason: "This previously resulted in a 5xx error code"
+  - do:
+      indices.create:
+        index: test
+        body:
+          settings:
+            analysis:
+              filter:
+                syns:
+                  type: synonym
+                  synonyms: [ "quick,fast" ]
+              analyzer:
+                syns:
+                  tokenizer: standard
+                  filter: [ "syns" ]
+          mappings:
+            properties:
+              field1:
+                type: text
+                index_options: freqs
+                analyzer: syns
+
+  - do:
+      index:
+        index: test
+        id: "1"
+        body:
+          field1: the quick brown fox
+
+  - do:
+      catch: bad_request
+      search:
+        body:
+          query:
+            multi_match:
+              query: the fast brown
+              type: phrase
+              fields:
+                - field1
+  - match: { status: 400 }
+  - match: { error.root_cause.0.type: query_shard_exception }
+  - match: { error.root_cause.0.reason: "failed to create query: field:[field1] was indexed without position data; cannot run MultiPhraseQuery" }

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java

@@ -362,7 +362,7 @@ public Query prefixQuery(
 
         private void checkForPositions() {
             if (getTextSearchInfo().hasPositions() == false) {
-                throw new IllegalStateException("field:[" + name() + "] was indexed without position data; cannot run PhraseQuery");
+                throw new IllegalArgumentException("field:[" + name() + "] was indexed without position data; cannot run PhraseQuery");
             }
         }
 

muted-tests.yml

@@ -520,6 +520,9 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
   method: test {lookup-join.MultipleBatches*
   issue: https://github.com/elastic/elasticsearch/issues/129210
+- class: org.elasticsearch.xpack.autoscaling.storage.ReactiveStorageIT
+  method: testScaleDuringSplitOrClone
+  issue: https://github.com/elastic/elasticsearch/issues/129335
 
 # Examples:
 #

server/src/internalClusterTest/java/org/elasticsearch/search/query/QueryStringIT.java

@@ -178,9 +178,9 @@ public void testPhraseQueryOnFieldWithNoPositions() throws Exception {
             Exception.class,
             prepareSearch("test").setQuery(queryStringQuery("f4:\"eggplant parmesan\"").lenient(false))
         );
-        IllegalStateException ise = (IllegalStateException) ExceptionsHelper.unwrap(exc, IllegalStateException.class);
-        assertNotNull(ise);
-        assertThat(ise.getMessage(), containsString("field:[f4] was indexed without position data; cannot run PhraseQuery"));
+        IllegalArgumentException iae = (IllegalArgumentException) ExceptionsHelper.unwrap(exc, IllegalArgumentException.class);
+        assertNotNull(iae);
+        assertThat(iae.getMessage(), containsString("field:[f4] was indexed without position data; cannot run PhraseQuery"));
     }
 
     public void testBooleanStrictQuery() throws Exception {

server/src/main/java/org/elasticsearch/common/lucene/search/CaseInsensitiveTermQuery.java

@@ -28,6 +28,15 @@ public CaseInsensitiveTermQuery(Term term) {
 
     @Override
     public String toString(String field) {
-        return this.getClass().getSimpleName() + "{" + field + ":" + term.text() + "}";
+        StringBuilder buffer = new StringBuilder();
+        buffer.append(getClass().getSimpleName());
+        buffer.append('{');
+        if (term.field().equals(field) == false) {
+            buffer.append(term.field());
+            buffer.append(':');
+        }
+        buffer.append(term.text());
+        buffer.append('}');
+        return buffer.toString();
     }
 }