Skip to content

SOLR-18034: Add index-time nested vector expansion tests #4160

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

Open
arup-chauhan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SOLR-18034: Add index-time nested vector expansion tests #4160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions solr/core/src/test-files/solr/collection1/conf/schema-nest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,16 @@

<dynamicField name="*_s" type="string" indexed="true" stored="true"/>
<dynamicField name="*_ss" type="string" indexed="true" stored="true" multiValued="true"/>
<field name="vector_single" type="knn_vector" indexed="true" stored="true"/>
<field name="vector_multivalued" type="knn_vector" indexed="true" stored="true" multiValued="true"/>

<!-- required to test updates nested inplaceUpdates -->
<field name="inplace_updatable_int" type="int" indexed="false" stored="false"/>

<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>

<fieldType name="_nest_path_" class="solr.NestPathField" />
<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine" />

<!-- Point Fields -->
<fieldType name="int" class="solr.IntPointField"/>
Expand Down
53 changes: 53 additions & 0 deletions solr/core/src/test/org/apache/solr/update/TestNestedUpdateProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,59 @@ public void testDeeplyNestedURPFieldNameException() throws Exception {
assertThat(thrown.getMessage(), containsString(errMsg));
}

@Test
public void testMultiValuedDenseVectorExpandedToNestedChildren() throws Exception {
SolrInputDocument root =
sdoc(
"id",
"10",
"vector_multivalued",
List.of(List.of(1.0f, 2.0f, 3.0f, 4.0f), List.of(5.0f, 6.0f, 7.0f, 8.0f)));
UpdateRequestProcessor nestedUpdate =
new NestedUpdateProcessorFactory().getInstance(req(), null, null);
AddUpdateCommand cmd = new AddUpdateCommand(req());
cmd.solrDoc = root;
nestedUpdate.processAdd(cmd);
cmd.clear();

assertNull(root.getFieldValue("vector_multivalued"));
Collection<Object> generatedChildren =
root.getFieldValues(IndexSchema.NESTED_VECTORS_PSEUDO_FIELD_NAME);
assertNotNull(generatedChildren);
assertEquals(2, generatedChildren.size());

@SuppressWarnings({"rawtypes"})
List children = new ArrayList<>(generatedChildren);
SolrInputDocument firstChild = (SolrInputDocument) children.get(0);
SolrInputDocument secondChild = (SolrInputDocument) children.get(1);

assertEquals("10/vector_multivalued#0", firstChild.getFieldValue("id"));
assertEquals("10", firstChild.getFieldValue(IndexSchema.NEST_PARENT_FIELD_NAME));
assertEquals(
"/vector_multivalued#0", firstChild.getFieldValue(IndexSchema.NEST_PATH_FIELD_NAME));
assertEquals(List.of(1.0f, 2.0f, 3.0f, 4.0f), firstChild.getFieldValues("vector_multivalued"));

assertEquals("10/vector_multivalued#1", secondChild.getFieldValue("id"));
assertEquals("10", secondChild.getFieldValue(IndexSchema.NEST_PARENT_FIELD_NAME));
assertEquals(
"/vector_multivalued#1", secondChild.getFieldValue(IndexSchema.NEST_PATH_FIELD_NAME));
assertEquals(List.of(5.0f, 6.0f, 7.0f, 8.0f), secondChild.getFieldValues("vector_multivalued"));
}

@Test
public void testSingleValuedDenseVectorRemainsOnParent() throws Exception {
SolrInputDocument root = sdoc("id", "11", "vector_single", List.of(1.0f, 2.0f, 3.0f, 4.0f));
UpdateRequestProcessor nestedUpdate =
new NestedUpdateProcessorFactory().getInstance(req(), null, null);
AddUpdateCommand cmd = new AddUpdateCommand(req());
cmd.solrDoc = root;
nestedUpdate.processAdd(cmd);
cmd.clear();

assertEquals(List.of(1.0f, 2.0f, 3.0f, 4.0f), root.getFieldValues("vector_single"));
assertNull(root.getFieldValues(IndexSchema.NESTED_VECTORS_PSEUDO_FIELD_NAME));
}

private void indexSampleData(String cmd) throws Exception {
updateJ(cmd, null);
assertU(commit());
Expand Down