@@ -73,43 +73,48 @@ private DenseVectorFieldMapper.DenseVectorIndexOptions randomIndexOptionsNonQuan
7373 }
7474
7575 public static DenseVectorFieldMapper .DenseVectorIndexOptions randomIndexOptionsAll () {
76- List <DenseVectorFieldMapper .DenseVectorIndexOptions > options = new ArrayList <>(Arrays .asList (
77- new DenseVectorFieldMapper .HnswIndexOptions (randomIntBetween (1 , 100 ), randomIntBetween (1 , 10_000 )),
78- new DenseVectorFieldMapper .Int8HnswIndexOptions (
79- randomIntBetween (1 , 100 ),
80- randomIntBetween (1 , 10_000 ),
81- randomFrom ((Float ) null , 0f , (float ) randomDoubleBetween (0.9 , 1.0 , true )),
82- randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
83- ),
84- new DenseVectorFieldMapper .Int4HnswIndexOptions (
85- randomIntBetween (1 , 100 ),
86- randomIntBetween (1 , 10_000 ),
87- randomFrom ((Float ) null , 0f , (float ) randomDoubleBetween (0.9 , 1.0 , true )),
88- randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
89- ),
90- new DenseVectorFieldMapper .FlatIndexOptions (),
91- new DenseVectorFieldMapper .Int8FlatIndexOptions (
92- randomFrom ((Float ) null , 0f , (float ) randomDoubleBetween (0.9 , 1.0 , true )),
93- randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
94- ),
95- new DenseVectorFieldMapper .Int4FlatIndexOptions (
96- randomFrom ((Float ) null , 0f , (float ) randomDoubleBetween (0.9 , 1.0 , true )),
97- randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
98- ),
99- new DenseVectorFieldMapper .BBQHnswIndexOptions (
100- randomIntBetween (1 , 100 ),
101- randomIntBetween (1 , 10_000 ),
102- randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
103- ),
104- new DenseVectorFieldMapper .BBQFlatIndexOptions (randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ()))
105- ));
76+ List <DenseVectorFieldMapper .DenseVectorIndexOptions > options = new ArrayList <>(
77+ Arrays .asList (
78+ new DenseVectorFieldMapper .HnswIndexOptions (randomIntBetween (1 , 100 ), randomIntBetween (1 , 10_000 )),
79+ new DenseVectorFieldMapper .Int8HnswIndexOptions (
80+ randomIntBetween (1 , 100 ),
81+ randomIntBetween (1 , 10_000 ),
82+ randomFrom ((Float ) null , 0f , (float ) randomDoubleBetween (0.9 , 1.0 , true )),
83+ randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
84+ ),
85+ new DenseVectorFieldMapper .Int4HnswIndexOptions (
86+ randomIntBetween (1 , 100 ),
87+ randomIntBetween (1 , 10_000 ),
88+ randomFrom ((Float ) null , 0f , (float ) randomDoubleBetween (0.9 , 1.0 , true )),
89+ randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
90+ ),
91+ new DenseVectorFieldMapper .FlatIndexOptions (),
92+ new DenseVectorFieldMapper .Int8FlatIndexOptions (
93+ randomFrom ((Float ) null , 0f , (float ) randomDoubleBetween (0.9 , 1.0 , true )),
94+ randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
95+ ),
96+ new DenseVectorFieldMapper .Int4FlatIndexOptions (
97+ randomFrom ((Float ) null , 0f , (float ) randomDoubleBetween (0.9 , 1.0 , true )),
98+ randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
99+ ),
100+ new DenseVectorFieldMapper .BBQHnswIndexOptions (
101+ randomIntBetween (1 , 100 ),
102+ randomIntBetween (1 , 10_000 ),
103+ randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
104+ ),
105+ new DenseVectorFieldMapper .BBQFlatIndexOptions (
106+ randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
107+ )
108+ )
109+ );
106110
107- if (IVF_FORMAT .isEnabled ()) {
111+ if (IVF_FORMAT .isEnabled ()) {
108112 options .add (
109113 new DenseVectorFieldMapper .BBQIVFIndexOptions (
110114 randomIntBetween (MIN_VECTORS_PER_CLUSTER , MAX_VECTORS_PER_CLUSTER ),
111115 randomFloatBetween (0.0f , 100.0f , true ),
112- randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ()))
116+ randomFrom ((DenseVectorFieldMapper .RescoreVector ) null , randomRescoreVector ())
117+ )
113118 );
114119 }
115120
@@ -262,9 +267,11 @@ public void testCreateNestedKnnQuery() {
262267 if (field .getIndexOptions ().isFlat ()) {
263268 assertThat (query , instanceOf (DiversifyingParentBlockQuery .class ));
264269 } else {
265- assertTrue (query instanceof DiversifyingChildrenFloatKnnVectorQuery
266- || query instanceof PatienceKnnVectorQuery
267- || query instanceof DiversifyingChildrenIVFKnnFloatVectorQuery );
270+ assertTrue (
271+ query instanceof DiversifyingChildrenFloatKnnVectorQuery
272+ || query instanceof PatienceKnnVectorQuery
273+ || query instanceof DiversifyingChildrenIVFKnnFloatVectorQuery
274+ );
268275 }
269276 }
270277 {
@@ -495,9 +502,11 @@ public void testCreateKnnQueryMaxDims() {
495502 if (fieldWith4096dims .getIndexOptions ().isFlat ()) {
496503 assertThat (query , instanceOf (DenseVectorQuery .Floats .class ));
497504 } else {
498- assertTrue (query instanceof KnnFloatVectorQuery
499- || query instanceof PatienceKnnVectorQuery
500- || query instanceof IVFKnnFloatVectorQuery );
505+ assertTrue (
506+ query instanceof KnnFloatVectorQuery
507+ || query instanceof PatienceKnnVectorQuery
508+ || query instanceof IVFKnnFloatVectorQuery
509+ );
501510 }
502511 }
503512
0 commit comments