Fixes

Author: Kubik42

docs/changelog/134582.yaml

@@ -0,0 +1,6 @@
+pr: 134582
+summary: Fixed match only text block loader not working when a keyword multi field
+  is present
+area: Mapping
+type: bug
+issues: []

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldTypeTests.java

@@ -243,7 +243,7 @@ public void test_block_loader_uses_stored_fields_for_loading_when_synthetic_sour
 
         // then
         // verify that we delegate block loading to the synthetic source delegate
-        assertTrue(blockLoader instanceof MatchOnlyTextFieldType.BytesFromMixedStringsBytesRefBlockLoader);
+        assertThat(blockLoader, Matchers.instanceOf(MatchOnlyTextFieldType.BytesFromMixedStringsBytesRefBlockLoader.class));
     }
 
     public void test_block_loader_uses_synthetic_source_delegate_when_ignore_above_is_not_set() {
@@ -271,7 +271,7 @@ public void test_block_loader_uses_synthetic_source_delegate_when_ignore_above_i
 
         // then
         // verify that we delegate block loading to the synthetic source delegate
-        assertTrue(blockLoader instanceof BlockLoader.Delegating);
+        assertThat(blockLoader, Matchers.instanceOf(BlockLoader.Delegating.class));
     }
 
     public void test_block_loader_does_not_use_synthetic_source_delegate_when_ignore_above_is_set() {
@@ -319,7 +319,7 @@ public void test_block_loader_does_not_use_synthetic_source_delegate_when_ignore
 
         // then
         // verify that we don't delegate anything
-        assertFalse(blockLoader instanceof BlockLoader.Delegating);
+        assertThat(blockLoader, Matchers.not(Matchers.instanceOf(BlockLoader.Delegating.class)));
     }
 
     public void test_block_loader_does_not_use_synthetic_source_delegate_when_ignore_above_is_set_at_index_level() {
@@ -367,6 +367,6 @@ public void test_block_loader_does_not_use_synthetic_source_delegate_when_ignore
 
         // then
         // verify that we don't delegate anything
-        assertFalse(blockLoader instanceof BlockLoader.Delegating);
+        assertThat(blockLoader, Matchers.not(Matchers.instanceOf(BlockLoader.Delegating.class)));
     }
 }

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldType.java

@@ -75,7 +75,7 @@ public class PatternTextFieldType extends TextFamilyFieldType {
         boolean isSyntheticSource,
         boolean isWithinMultiField
     ) {
-        // Though this type is based on doc_values, hasDocValues is set to false as the patterned_text type is not aggregatable.
+        // Though this type is based on doc_values, hasDocValues is set to false as the pattern_text type is not aggregatable.
         // This does not stop its child .template type from being aggregatable.
         super(name, true, false, false, tsi, meta, isSyntheticSource, isWithinMultiField);
         this.indexAnalyzer = Objects.requireNonNull(indexAnalyzer);