Merge branch '132810_fix_sparse_vector_field_tests' of github.com:mromaios/elasticsearch into 132810_fix_sparse_vector_field_tests

mromaios · mromaios · commit 8c01df1ca073 · 2025-08-15T13:39:40.000+02:00
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java
@@ -801,7 +801,10 @@ private PruningScenario getEffectivePruningScenario(
         }
 
         if (shouldPrune == null) {
-            shouldPrune = indexVersion.between(SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT_BACKPORT_8_X, UPGRADE_TO_LUCENE_10_0_0) || indexVersion.onOrAfter(SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT);
+            shouldPrune = indexVersion.between(
+                SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT_BACKPORT_8_X,
+                UPGRADE_TO_LUCENE_10_0_0
+            ) || indexVersion.onOrAfter(SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT);
         }
 
         PruningScenario pruningScenario = PruningScenario.NO_PRUNING;

Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,10 @@ private PruningScenario getEffectivePruningScenario(`
`801`	`801`	`}`
`802`	`802`
`803`	`803`	`if (shouldPrune == null) {`
`804`		`- shouldPrune = indexVersion.between(SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT_BACKPORT_8_X, UPGRADE_TO_LUCENE_10_0_0) \|\| indexVersion.onOrAfter(SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT);`
	`804`	`+ shouldPrune = indexVersion.between(`
	`805`	`+ SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT_BACKPORT_8_X,`
	`806`	`+ UPGRADE_TO_LUCENE_10_0_0`
	`807`	`+ ) \|\| indexVersion.onOrAfter(SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT);`
`805`	`808`	`}`
`806`	`809`
`807`	`810`	`PruningScenario pruningScenario = PruningScenario.NO_PRUNING;`