Skip to content

SOLR-18353: Remove deprecated SolrDocumentBase.getChildDocumentCount() #4785

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
serhiy-bzhezytskyy wants to merge 2 commits into
base: main
Choose a base branch
from
Open

SOLR-18353: Remove deprecated SolrDocumentBase.getChildDocumentCount() #4785

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
fff8d1a
SOLR-18353: Remove deprecated SolrDocumentBase.getChildDocumentCount()
serhiy-bzhezytskyy Aug 21, 2026
bcec5bf
SOLR-18353: drop the changelog entry
serhiy-bzhezytskyy Aug 22, 2026
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
2 changes: 1 addition & 1 deletion solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ public void writeSolrDocument(String name, SolrDocument doc, ReturnFields return
indent();
}
writeKey("_childDocuments_", true);
writeArrayOpener(doc.getChildDocumentCount());
List<SolrDocument> childDocs = doc.getChildDocuments();
writeArrayOpener(childDocs.size());
for (int i = 0; i < childDocs.size(); i++) {
writeSolrDocument(null, childDocs.get(i), null, i);
}
Expand Down
2 changes: 1 addition & 1 deletion solr/core/src/java/org/apache/solr/response/JSONWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ public void writeSolrDocument(String name, SolrDocument doc, ReturnFields return
indent();
}
writeKey("_childDocuments_", true);
writeArrayOpener(doc.getChildDocumentCount());
List<SolrDocument> childDocs = doc.getChildDocuments();
writeArrayOpener(childDocs.size());
for (int i = 0; i < childDocs.size(); i++) {
writeSolrDocument(null, childDocs.get(i), null, i);
}
Expand Down
2 changes: 1 addition & 1 deletion solr/core/src/test/org/apache/solr/search/join/TestCloudNestedDocsSort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public static void setupCluster() throws Exception {
matchingChild = chVals.iterator().next();
}
}
maxDocs += parent.getChildDocumentCount() + 1;
maxDocs += (parent.hasChildDocuments() ? parent.getChildDocuments().size() : 0) + 1;
docs.add(parent);
}
// don't add parents in increasing uniqueKey order
Expand Down
7 changes: 0 additions & 7 deletions solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,4 @@ public boolean hasChildDocuments() {
boolean isEmpty = (_childDocuments == null || _childDocuments.isEmpty());
return !isEmpty;
}

@Override
@Deprecated
public int getChildDocumentCount() {
if (_childDocuments == null) return 0;
return _childDocuments.size();
}
}
4 changes: 0 additions & 4 deletions solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,4 @@ public abstract class SolrDocumentBase<T, K> implements Map<String, T>, Serializ

/** Has <em>anonymous</em> children? */
public abstract boolean hasChildDocuments();

/** The <em>anonymous</em> child document count. */
@Deprecated
public abstract int getChildDocumentCount();
}
6 changes: 0 additions & 6 deletions solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,4 @@ public boolean hasChildDocuments() {
boolean isEmpty = (_childDocuments == null || _childDocuments.isEmpty());
return !isEmpty;
}

@Override
@Deprecated
public int getChildDocumentCount() {
return hasChildDocuments() ? _childDocuments.size() : 0;
}
}
4 changes: 2 additions & 2 deletions ...j/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryHttp2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void testQueryAndStreamResponse() throws Exception {
QueryResponse response = client.query(query);
assertEquals(1, response.getResults().size());
SolrDocument parentDoc = response.getResults().get(0);
assertEquals(1, parentDoc.getChildDocumentCount());
assertEquals(1, parentDoc.getChildDocuments().size());

// test streaming
final List<SolrDocument> docs = new ArrayList<>();
Expand All @@ -97,6 +97,6 @@ public void streamDocListInfo(long numFound, long start, Float maxScore) {}

assertEquals(1, docs.size());
parentDoc = docs.get(0);
assertEquals(1, parentDoc.getChildDocumentCount());
assertEquals(1, parentDoc.getChildDocuments().size());
}
}
4 changes: 2 additions & 2 deletions .../solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void testQueryAndStreamResponse() throws Exception {
QueryResponse response = client.query(query);
assertEquals(1, response.getResults().size());
SolrDocument parentDoc = response.getResults().get(0);
assertEquals(1, parentDoc.getChildDocumentCount());
assertEquals(1, parentDoc.getChildDocuments().size());

// test streaming
final List<SolrDocument> docs = new ArrayList<>();
Expand All @@ -96,6 +96,6 @@ public void streamDocListInfo(long numFound, long start, Float maxScore) {}

assertEquals(1, docs.size());
parentDoc = docs.get(0);
assertEquals(1, parentDoc.getChildDocumentCount());
assertEquals(1, parentDoc.getChildDocuments().size());
}
}