Skip to content

Commit 390e4f2

Browse files
benwtrentbenwtrent
authored
Fix release tests diskbbq update (#132405)
closes: #131795
1 parent ccfbf49 commit 390e4f2

File tree

2 files changed

+137
-123
lines changed

2 files changed

+137
-123
lines changed

‎muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,6 @@ tests:
473473
- class: org.elasticsearch.packaging.test.DockerTests
474474
method: test151MachineDependentHeapWithSizeOverride
475475
issue: https://github.com/elastic/elasticsearch/issues/123437
476-
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapperTests
477-
method: testUpdates
478-
issue: https://github.com/elastic/elasticsearch/issues/131795
479476
- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
480477
method: testWatcherWithApiKey {cluster=UPGRADED}
481478
issue: https://github.com/elastic/elasticsearch/issues/131964

‎server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java

Lines changed: 137 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -342,21 +342,24 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
342342
.endObject(),
343343
m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
344344
);
345-
checker.registerUpdateCheck(
346-
b -> b.field("type", "dense_vector")
347-
.field("dims", dims * 16)
348-
.field("index", true)
349-
.startObject("index_options")
350-
.field("type", "flat")
351-
.endObject(),
352-
b -> b.field("type", "dense_vector")
353-
.field("dims", dims * 16)
354-
.field("index", true)
355-
.startObject("index_options")
356-
.field("type", "bbq_disk")
357-
.endObject(),
358-
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
359-
);
345+
if (IVF_FORMAT.isEnabled()) {
346+
checker.registerUpdateCheck(
347+
b -> b.field("type", "dense_vector")
348+
.field("dims", dims * 16)
349+
.field("index", true)
350+
.startObject("index_options")
351+
.field("type", "flat")
352+
.endObject(),
353+
b -> b.field("type", "dense_vector")
354+
.field("dims", dims * 16)
355+
.field("index", true)
356+
.startObject("index_options")
357+
.field("type", "bbq_disk")
358+
.endObject(),
359+
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
360+
);
361+
}
362+
360363
// update for int8_flat
361364
checker.registerUpdateCheck(
362365
b -> b.field("type", "dense_vector")
@@ -467,21 +470,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
467470
.endObject(),
468471
m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
469472
);
470-
checker.registerUpdateCheck(
471-
b -> b.field("type", "dense_vector")
472-
.field("dims", dims * 16)
473-
.field("index", true)
474-
.startObject("index_options")
475-
.field("type", "int8_flat")
476-
.endObject(),
477-
b -> b.field("type", "dense_vector")
478-
.field("dims", dims * 16)
479-
.field("index", true)
480-
.startObject("index_options")
481-
.field("type", "bbq_disk")
482-
.endObject(),
483-
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
484-
);
473+
if (IVF_FORMAT.isEnabled()) {
474+
checker.registerUpdateCheck(
475+
b -> b.field("type", "dense_vector")
476+
.field("dims", dims * 16)
477+
.field("index", true)
478+
.startObject("index_options")
479+
.field("type", "int8_flat")
480+
.endObject(),
481+
b -> b.field("type", "dense_vector")
482+
.field("dims", dims * 16)
483+
.field("index", true)
484+
.startObject("index_options")
485+
.field("type", "bbq_disk")
486+
.endObject(),
487+
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
488+
);
489+
}
485490
// update for hnsw
486491
checker.registerUpdateCheck(
487492
b -> b.field("type", "dense_vector")
@@ -641,21 +646,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
641646
.endObject(),
642647
m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
643648
);
644-
checker.registerUpdateCheck(
645-
b -> b.field("type", "dense_vector")
646-
.field("dims", dims * 16)
647-
.field("index", true)
648-
.startObject("index_options")
649-
.field("type", "hnsw")
650-
.endObject(),
651-
b -> b.field("type", "dense_vector")
652-
.field("dims", dims * 16)
653-
.field("index", true)
654-
.startObject("index_options")
655-
.field("type", "bbq_disk")
656-
.endObject(),
657-
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
658-
);
649+
if (IVF_FORMAT.isEnabled()) {
650+
checker.registerUpdateCheck(
651+
b -> b.field("type", "dense_vector")
652+
.field("dims", dims * 16)
653+
.field("index", true)
654+
.startObject("index_options")
655+
.field("type", "hnsw")
656+
.endObject(),
657+
b -> b.field("type", "dense_vector")
658+
.field("dims", dims * 16)
659+
.field("index", true)
660+
.startObject("index_options")
661+
.field("type", "bbq_disk")
662+
.endObject(),
663+
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
664+
);
665+
}
659666
// update for int8_hnsw
660667
checker.registerUpdateCheck(
661668
b -> b.field("type", "dense_vector")
@@ -801,21 +808,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
801808
.endObject(),
802809
m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
803810
);
804-
checker.registerUpdateCheck(
805-
b -> b.field("type", "dense_vector")
806-
.field("dims", dims * 16)
807-
.field("index", true)
808-
.startObject("index_options")
809-
.field("type", "int8_hnsw")
810-
.endObject(),
811-
b -> b.field("type", "dense_vector")
812-
.field("dims", dims * 16)
813-
.field("index", true)
814-
.startObject("index_options")
815-
.field("type", "bbq_disk")
816-
.endObject(),
817-
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
818-
);
811+
if (IVF_FORMAT.isEnabled()) {
812+
checker.registerUpdateCheck(
813+
b -> b.field("type", "dense_vector")
814+
.field("dims", dims * 16)
815+
.field("index", true)
816+
.startObject("index_options")
817+
.field("type", "int8_hnsw")
818+
.endObject(),
819+
b -> b.field("type", "dense_vector")
820+
.field("dims", dims * 16)
821+
.field("index", true)
822+
.startObject("index_options")
823+
.field("type", "bbq_disk")
824+
.endObject(),
825+
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
826+
);
827+
}
819828
// update for int4_flat
820829
checker.registerUpdateCheck(
821830
b -> b.field("type", "dense_vector")
@@ -932,21 +941,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
932941
.endObject(),
933942
m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
934943
);
935-
checker.registerUpdateCheck(
936-
b -> b.field("type", "dense_vector")
937-
.field("dims", dims * 16)
938-
.field("index", true)
939-
.startObject("index_options")
940-
.field("type", "int4_flat")
941-
.endObject(),
942-
b -> b.field("type", "dense_vector")
943-
.field("dims", dims * 16)
944-
.field("index", true)
945-
.startObject("index_options")
946-
.field("type", "bbq_disk")
947-
.endObject(),
948-
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
949-
);
944+
if (IVF_FORMAT.isEnabled()) {
945+
checker.registerUpdateCheck(
946+
b -> b.field("type", "dense_vector")
947+
.field("dims", dims * 16)
948+
.field("index", true)
949+
.startObject("index_options")
950+
.field("type", "int4_flat")
951+
.endObject(),
952+
b -> b.field("type", "dense_vector")
953+
.field("dims", dims * 16)
954+
.field("index", true)
955+
.startObject("index_options")
956+
.field("type", "bbq_disk")
957+
.endObject(),
958+
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
959+
);
960+
}
950961
// update for int4_hnsw
951962
checker.registerUpdateCheck(
952963
b -> b.field("type", "dense_vector")
@@ -1157,21 +1168,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
11571168
.endObject(),
11581169
m -> assertTrue(m.toString().contains("\"type\":\"bbq_hnsw\""))
11591170
);
1160-
checker.registerUpdateCheck(
1161-
b -> b.field("type", "dense_vector")
1162-
.field("dims", dims * 16)
1163-
.field("index", true)
1164-
.startObject("index_options")
1165-
.field("type", "int4_hnsw")
1166-
.endObject(),
1167-
b -> b.field("type", "dense_vector")
1168-
.field("dims", dims * 16)
1169-
.field("index", true)
1170-
.startObject("index_options")
1171-
.field("type", "bbq_disk")
1172-
.endObject(),
1173-
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
1174-
);
1171+
if (IVF_FORMAT.isEnabled()) {
1172+
checker.registerUpdateCheck(
1173+
b -> b.field("type", "dense_vector")
1174+
.field("dims", dims * 16)
1175+
.field("index", true)
1176+
.startObject("index_options")
1177+
.field("type", "int4_hnsw")
1178+
.endObject(),
1179+
b -> b.field("type", "dense_vector")
1180+
.field("dims", dims * 16)
1181+
.field("index", true)
1182+
.startObject("index_options")
1183+
.field("type", "bbq_disk")
1184+
.endObject(),
1185+
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
1186+
);
1187+
}
11751188
// update for bbq_flat
11761189
checker.registerUpdateCheck(
11771190
b -> b.field("type", "dense_vector")
@@ -1302,21 +1315,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
13021315
.endObject()
13031316
)
13041317
);
1305-
checker.registerUpdateCheck(
1306-
b -> b.field("type", "dense_vector")
1307-
.field("dims", dims * 16)
1308-
.field("index", true)
1309-
.startObject("index_options")
1310-
.field("type", "bbq_flat")
1311-
.endObject(),
1312-
b -> b.field("type", "dense_vector")
1313-
.field("dims", dims * 16)
1314-
.field("index", true)
1315-
.startObject("index_options")
1316-
.field("type", "bbq_disk")
1317-
.endObject(),
1318-
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
1319-
);
1318+
if (IVF_FORMAT.isEnabled()) {
1319+
checker.registerUpdateCheck(
1320+
b -> b.field("type", "dense_vector")
1321+
.field("dims", dims * 16)
1322+
.field("index", true)
1323+
.startObject("index_options")
1324+
.field("type", "bbq_flat")
1325+
.endObject(),
1326+
b -> b.field("type", "dense_vector")
1327+
.field("dims", dims * 16)
1328+
.field("index", true)
1329+
.startObject("index_options")
1330+
.field("type", "bbq_disk")
1331+
.endObject(),
1332+
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
1333+
);
1334+
}
13201335
// update for bbq_hnsw
13211336
checker.registerConflictCheck(
13221337
"index_options",
@@ -1432,21 +1447,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
14321447
.endObject()
14331448
)
14341449
);
1435-
checker.registerUpdateCheck(
1436-
b -> b.field("type", "dense_vector")
1437-
.field("dims", dims * 16)
1438-
.field("index", true)
1439-
.startObject("index_options")
1440-
.field("type", "bbq_hnsw")
1441-
.endObject(),
1442-
b -> b.field("type", "dense_vector")
1443-
.field("dims", dims * 16)
1444-
.field("index", true)
1445-
.startObject("index_options")
1446-
.field("type", "bbq_disk")
1447-
.endObject(),
1448-
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
1449-
);
1450+
if (IVF_FORMAT.isEnabled()) {
1451+
checker.registerUpdateCheck(
1452+
b -> b.field("type", "dense_vector")
1453+
.field("dims", dims * 16)
1454+
.field("index", true)
1455+
.startObject("index_options")
1456+
.field("type", "bbq_hnsw")
1457+
.endObject(),
1458+
b -> b.field("type", "dense_vector")
1459+
.field("dims", dims * 16)
1460+
.field("index", true)
1461+
.startObject("index_options")
1462+
.field("type", "bbq_disk")
1463+
.endObject(),
1464+
m -> assertTrue(m.toString().contains("\"type\":\"bbq_disk\""))
1465+
);
1466+
}
14501467
}
14511468

14521469
@Override

0 commit comments

Comments
 (0)