瀏覽代碼

Fix release tests diskbbq update (#132405)

closes: https://github.com/elastic/elasticsearch/issues/131795
Benjamin Trent 2 月之前
父節點
當前提交
390e4f2d73
共有 2 個文件被更改,包括 137 次插入123 次删除
  1. 0 3
      muted-tests.yml
  2. 137 120
      server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java

+ 0 - 3
muted-tests.yml

@@ -473,9 +473,6 @@ tests:
 - class: org.elasticsearch.packaging.test.DockerTests
   method: test151MachineDependentHeapWithSizeOverride
   issue: https://github.com/elastic/elasticsearch/issues/123437
-- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapperTests
-  method: testUpdates
-  issue: https://github.com/elastic/elasticsearch/issues/131795
 - class: org.elasticsearch.xpack.restart.FullClusterRestartIT
   method: testWatcherWithApiKey {cluster=UPGRADED}
   issue: https://github.com/elastic/elasticsearch/issues/131964

+ 137 - 120
server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java

@@ -342,21 +342,24 @@ public class DenseVectorFieldMapperTests extends SyntheticVectorsMapperTestCase
                 .endObject(),
             m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
         );
-        checker.registerUpdateCheck(
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "flat")
-                .endObject(),
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_disk")
-                .endObject(),
-            m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
-        );
+        if (IVF_FORMAT.isEnabled()) {
+            checker.registerUpdateCheck(
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "flat")
+                    .endObject(),
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_disk")
+                    .endObject(),
+                m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
+            );
+        }
+
         // update for int8_flat
         checker.registerUpdateCheck(
             b -> b.field("type", "dense_vector")
@@ -467,21 +470,23 @@ public class DenseVectorFieldMapperTests extends SyntheticVectorsMapperTestCase
                 .endObject(),
             m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
         );
-        checker.registerUpdateCheck(
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "int8_flat")
-                .endObject(),
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_disk")
-                .endObject(),
-            m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
-        );
+        if (IVF_FORMAT.isEnabled()) {
+            checker.registerUpdateCheck(
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "int8_flat")
+                    .endObject(),
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_disk")
+                    .endObject(),
+                m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
+            );
+        }
         // update for hnsw
         checker.registerUpdateCheck(
             b -> b.field("type", "dense_vector")
@@ -641,21 +646,23 @@ public class DenseVectorFieldMapperTests extends SyntheticVectorsMapperTestCase
                 .endObject(),
             m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
         );
-        checker.registerUpdateCheck(
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "hnsw")
-                .endObject(),
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_disk")
-                .endObject(),
-            m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
-        );
+        if (IVF_FORMAT.isEnabled()) {
+            checker.registerUpdateCheck(
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "hnsw")
+                    .endObject(),
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_disk")
+                    .endObject(),
+                m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
+            );
+        }
         // update for int8_hnsw
         checker.registerUpdateCheck(
             b -> b.field("type", "dense_vector")
@@ -801,21 +808,23 @@ public class DenseVectorFieldMapperTests extends SyntheticVectorsMapperTestCase
                 .endObject(),
             m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
         );
-        checker.registerUpdateCheck(
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "int8_hnsw")
-                .endObject(),
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_disk")
-                .endObject(),
-            m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
-        );
+        if (IVF_FORMAT.isEnabled()) {
+            checker.registerUpdateCheck(
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "int8_hnsw")
+                    .endObject(),
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_disk")
+                    .endObject(),
+                m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
+            );
+        }
         // update for int4_flat
         checker.registerUpdateCheck(
             b -> b.field("type", "dense_vector")
@@ -932,21 +941,23 @@ public class DenseVectorFieldMapperTests extends SyntheticVectorsMapperTestCase
                 .endObject(),
             m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
         );
-        checker.registerUpdateCheck(
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "int4_flat")
-                .endObject(),
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_disk")
-                .endObject(),
-            m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
-        );
+        if (IVF_FORMAT.isEnabled()) {
+            checker.registerUpdateCheck(
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "int4_flat")
+                    .endObject(),
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_disk")
+                    .endObject(),
+                m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
+            );
+        }
         // update for int4_hnsw
         checker.registerUpdateCheck(
             b -> b.field("type", "dense_vector")
@@ -1157,21 +1168,23 @@ public class DenseVectorFieldMapperTests extends SyntheticVectorsMapperTestCase
                 .endObject(),
             m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
         );
-        checker.registerUpdateCheck(
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "int4_hnsw")
-                .endObject(),
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_disk")
-                .endObject(),
-            m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
-        );
+        if (IVF_FORMAT.isEnabled()) {
+            checker.registerUpdateCheck(
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "int4_hnsw")
+                    .endObject(),
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_disk")
+                    .endObject(),
+                m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
+            );
+        }
         // update for bbq_flat
         checker.registerUpdateCheck(
             b -> b.field("type", "dense_vector")
@@ -1302,21 +1315,23 @@ public class DenseVectorFieldMapperTests extends SyntheticVectorsMapperTestCase
                     .endObject()
             )
         );
-        checker.registerUpdateCheck(
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_flat")
-                .endObject(),
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_disk")
-                .endObject(),
-            m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
-        );
+        if (IVF_FORMAT.isEnabled()) {
+            checker.registerUpdateCheck(
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_flat")
+                    .endObject(),
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_disk")
+                    .endObject(),
+                m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
+            );
+        }
         // update for bbq_hnsw
         checker.registerConflictCheck(
             "index_options",
@@ -1432,21 +1447,23 @@ public class DenseVectorFieldMapperTests extends SyntheticVectorsMapperTestCase
                     .endObject()
             )
         );
-        checker.registerUpdateCheck(
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_hnsw")
-                .endObject(),
-            b -> b.field("type", "dense_vector")
-                .field("dims", dims * 16)
-                .field("index", true)
-                .startObject("index_options")
-                .field("type", "bbq_disk")
-                .endObject(),
-            m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
-        );
+        if (IVF_FORMAT.isEnabled()) {
+            checker.registerUpdateCheck(
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_hnsw")
+                    .endObject(),
+                b -> b.field("type", "dense_vector")
+                    .field("dims", dims * 16)
+                    .field("index", true)
+                    .startObject("index_options")
+                    .field("type", "bbq_disk")
+                    .endObject(),
+                m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
+            );
+        }
     }
 
     @Override