Merge branch 'main' into enrich-source-change-bug

Author: joegallo

docs/changelog/133722.yaml

@@ -0,0 +1,5 @@
+pr: 133722
+summary: Fix disk usage estimation for SORTED_SET doc values
+area: Codec
+type: bug
+issues: []

server/src/main/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzer.java

@@ -277,6 +277,7 @@ void analyzeDocValues(SegmentReader reader, IndexDiskUsageStats stats) throws IO
                     SortedSetDocValues sortedSet = iterateDocValues(maxDocs, () -> docValuesReader.getSortedSet(field), dv -> {
                         for (int i = 0; i < dv.docValueCount(); i++) {
                             cancellationChecker.logEvent();
+                            dv.nextOrd();
                         }
                     });
                     if (sortedSet.getValueCount() > 0) {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/vector/VectorSimilarityFunctionsIT.java

@@ -131,7 +131,7 @@ public void testSimilarityBetweenConstantVectorAndField() {
             valuesList.forEach(values -> {
                 float[] left = readVector((List<Float>) values.get(0));
                 Double similarity = (Double) values.get(1);
-                if (left == null) {
+                if (left == null || randomVector == null) {
                     assertNull(similarity);
                 } else {
                     assertNotNull(similarity);