Skip to content

Fix release tests diskbbq update #132405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2025
Merged

Fix release tests diskbbq update #132405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
582377c
Fixing release tests #131795
benwtrent Aug 4, 2025
1a1ef04
unmute
benwtrent Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
257 changes: 137 additions & 120 deletions server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,21 +342,24 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
.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")
Expand Down Expand Up @@ -467,21 +470,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
.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")
Expand Down Expand Up @@ -641,21 +646,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
.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")
Expand Down Expand Up @@ -801,21 +808,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
.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")
Expand Down Expand Up @@ -932,21 +941,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
.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")
Expand Down Expand Up @@ -1157,21 +1168,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
.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")
Expand Down Expand Up @@ -1302,21 +1315,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
.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",
Expand Down Expand Up @@ -1432,21 +1447,23 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
.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
Expand Down