Merge branch 'main' into add-base64-encoded-float32-support

Author: benwtrent

docs/changelog/136632.yaml

@@ -0,0 +1,6 @@
+pr: 136632
+summary: Field caps transport changes to return for each original expression what
+  it was resolved to
+area: Search
+type: enhancement
+issues: []

docs/changelog/137220.yaml

@@ -0,0 +1,5 @@
+pr: 137220
+summary: Skip dataframes when disabled
+area: Machine Learning
+type: bug
+issues: []

libs/simdvec/src/main21/java/org/elasticsearch/simdvec/internal/vectorization/MSDibitToInt4ESNextOSQVectorsScorer.java

@@ -43,7 +43,7 @@ public MemorySegmentESNextOSQVectorsScorer(
         } else if (queryBits == 4 && indexBits == 4) {
             this.scorer = new MSInt4SymmetricESNextOSQVectorsScorer(in, dimensions, dataLength, memorySegment);
         } else if (queryBits == 4 && indexBits == 2) {
-            throw new IllegalArgumentException("Only symmetric 4-bit query and 1-bit index supported");
+            this.scorer = new MSDibitToInt4ESNextOSQVectorsScorer(in, dimensions, dataLength, memorySegment);
         } else {
             throw new IllegalArgumentException("Only asymmetric 4-bit query and 1-bit index supported");
         }
@@ -102,7 +102,8 @@ public float scoreBulk(
         );
     }
 
-    abstract static sealed class MemorySegmentScorer permits MSBitToInt4ESNextOSQVectorsScorer, MSInt4SymmetricESNextOSQVectorsScorer {
+    abstract static sealed class MemorySegmentScorer permits MSBitToInt4ESNextOSQVectorsScorer, MSDibitToInt4ESNextOSQVectorsScorer,
+        MSInt4SymmetricESNextOSQVectorsScorer {
 
         static final int BULK_SIZE = MemorySegmentESNextOSQVectorsScorer.BULK_SIZE;
         static final float FOUR_BIT_SCALE = 1f / ((1 << 4) - 1);

libs/simdvec/src/main21/java/org/elasticsearch/simdvec/internal/vectorization/MemorySegmentESNextOSQVectorsScorer.java

@@ -36,11 +36,10 @@ public ESVectorUtilSupport getVectorUtilSupport() {
     @Override
     public ESNextOSQVectorsScorer newESNextOSQVectorsScorer(IndexInput input, byte queryBits, byte indexBits, int dimension, int dataLength)
         throws IOException {
-        // TODO: Extend to other bit configurations as needed (2 and 4 bit index vectors)
         if (PanamaESVectorUtilSupport.HAS_FAST_INTEGER_VECTORS
             && input instanceof MemorySegmentAccessInput msai
             && queryBits == 4
-            && (indexBits == 1 || indexBits == 4)) {
+            && (indexBits == 1 || indexBits == 2 || indexBits == 4)) {
             MemorySegment ms = msai.segmentSliceOrNull(0, input.length());
             if (ms != null) {
                 return new MemorySegmentESNextOSQVectorsScorer(input, queryBits, indexBits, dimension, dataLength, ms);

libs/simdvec/src/main21/java/org/elasticsearch/simdvec/internal/vectorization/PanamaESVectorizationProvider.java

@@ -15,6 +15,7 @@
 import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
 import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
 import org.elasticsearch.action.admin.indices.shrink.ResizeType;
+import org.elasticsearch.action.admin.indices.shrink.TransportResizeAction;
 import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.delete.DeleteRequest;
@@ -44,6 +45,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.elasticsearch.action.admin.indices.ResizeIndexTestUtils.resizeRequest;
 import static org.elasticsearch.test.MapMatcher.assertMap;
 import static org.elasticsearch.test.MapMatcher.matchesMap;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
@@ -267,12 +269,10 @@ public void testIndexingGettingAndSearchingShrunkIndex() throws Exception {
         assertThat(updateSettingsResponse.isAcknowledged(), is(true));
 
         String shrunkenTarget = "k8s-shrunken";
-        var shrinkIndexResponse = client().admin()
-            .indices()
-            .prepareResizeIndex(sourceIndex, shrunkenTarget)
-            .setResizeType(ResizeType.SHRINK)
-            .setSettings(indexSettings(2, 0).build())
-            .get();
+        final var shrinkIndexResponse = client().execute(
+            TransportResizeAction.TYPE,
+            resizeRequest(ResizeType.SHRINK, sourceIndex, shrunkenTarget, indexSettings(2, 0))
+        ).actionGet();
         assertThat(shrinkIndexResponse.isAcknowledged(), is(true));
         assertThat(shrinkIndexResponse.index(), equalTo(shrunkenTarget));
 

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBPassthroughIndexingIT.java

@@ -678,4 +678,9 @@ protected SyntheticSourceSupport syntheticSourceSupport(boolean ignoreMalformed)
     protected IngestScriptSupport ingestScriptSupport() {
         throw new AssumptionViolatedException("not supported");
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }

modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapperTests.java

@@ -385,4 +385,9 @@ public void testLoadSyntheticSourceFromStringOrBytesRef() throws IOException {
             }
         }
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }

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

@@ -215,4 +215,9 @@ protected SyntheticSourceSupport syntheticSourceSupport(boolean ignoreMalformed)
     protected IngestScriptSupport ingestScriptSupport() {
         throw new AssumptionViolatedException("not supported");
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }

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

@@ -209,4 +209,9 @@ protected SyntheticSourceSupport syntheticSourceSupport(boolean syntheticSource)
     protected IngestScriptSupport ingestScriptSupport() {
         throw new AssumptionViolatedException("not supported");
     }
+
+    @Override
+    protected List<SortShortcutSupport> getSortShortcutSupport() {
+        return List.of();
+    }
 }