You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@solr.apache.org by "puneeetsharma (via GitHub)" <gi...@apache.org> on 2025/07/23 11:27:38 UTC
[PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
puneeetsharma opened a new pull request, #3436:
URL: https://github.com/apache/solr/pull/3436
https://issues.apache.org/jira/browse/SOLR-17721
<!--
_(If you are a project committer then you may remove some/all of the following template.)_
Before creating a pull request, please file an issue in the ASF Jira system for Solr:
* https://issues.apache.org/jira/projects/SOLR
For something minor (i.e. that wouldn't be worth putting in release notes), you can skip JIRA.
To create a Jira issue, you will need to create an account there first.
The title of the PR should reference the Jira issue number in the form:
* SOLR-####: <short description of problem or changes>
SOLR must be fully capitalized. A short description helps people scanning pull requests for items they can work on.
Properly referencing the issue in the title ensures that Jira is correctly updated with code review comments and commits. -->
# Description
This issue is very intermittent and depending on a number of factors.Fixed a NullPointerException in Solr's atomic update functionality when performing add-distinct operations on fields that exist in the document but have null values. The error "Cannot invoke 'java.util.Collection.size()' because 'original' is null" was occurring in the doAddDistinct method of AtomicUpdateDocumentMerger when getValues() returned null for fields with null values.
# Solution
Added a null check in the doAddDistinct method to handle the case where existingField.getValues() returns null. When a field exists in the document but has a null value, getValues() returns null, but the code was trying to call size() on this null collection. The fix initializes an empty ArrayList when getValues() returns null, ensuring the atomic update operation can proceed without throwing a NullPointerException.
Code Changes:
Modified solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java in the doAddDistinct method
Added null check: if (original == null) { original = new ArrayList<>(); }
# Tests
Added a test case testAddDistinctToNullField() in solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java that reproduces the exact scenario where:
A field exists in the document (existingField != null)
The field has a null value (getValues() returns null)
An add-distinct atomic update operation is performed on that field
The test verifies that the operation completes successfully without throwing a NullPointerException and that the new value is correctly added to the field. The test suite was run to ensure no existing functionality was broken, with all 28 tests passing (1 skipped).
# Checklist
Please review the following and check all that apply:
- [x] I have reviewed the guidelines for [How to Contribute](https://github.com/apache/solr/blob/main/CONTRIBUTING.md) and my code conforms to the standards described there to the best of my ability.
- [x] I have created a Jira issue and added the issue ID to my pull request title.
- [x] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended, not available for branches on forks living under an organisation)
- [x] I have developed this patch against the `main` branch.
- [x] I have run `./gradlew check`.
- [x] I have added tests for my changes.
- [ ] I have added documentation for the [Reference Guide](https://github.com/apache/solr/tree/main/solr/solr-ref-guide)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "epugh (via GitHub)" <gi...@apache.org>.
epugh commented on code in PR #3436:
URL: https://github.com/apache/solr/pull/3436#discussion_r2240496815
##########
solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java:
##########
@@ -545,8 +545,11 @@ protected void doAddDistinct(SolrInputDocument toDoc, SolrInputField sif, Object
final String name = sif.getName();
SolrInputField existingField = toDoc.get(name);
- Collection<Object> original =
- existingField != null ? existingField.getValues() : new ArrayList<>();
+ Collection<Object> original = existingField != null ? existingField.getValues() : null;
Review Comment:
thank yo8u for breaking this down for me...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "puneeetsharma (via GitHub)" <gi...@apache.org>.
puneeetsharma commented on PR #3436:
URL: https://github.com/apache/solr/pull/3436#issuecomment-3132326731
Thanks @epugh you can reference me with puneetSharma in the commit message.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "epugh (via GitHub)" <gi...@apache.org>.
epugh commented on PR #3436:
URL: https://github.com/apache/solr/pull/3436#issuecomment-3133905393
Thanks! I back ported it to branch 9x as well. Keep the fixes coming!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "puneeetsharma (via GitHub)" <gi...@apache.org>.
puneeetsharma commented on PR #3436:
URL: https://github.com/apache/solr/pull/3436#issuecomment-3114517565
> Is "doc.setField("cat", null); // Set field to null" a normal thing to do?
I have seen people do it because, during document building, fields with null values are skipped entirely and not added to the Lucene document and does't cause any index size bloating. But getValues() returning null and causing the atomic update failures.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "epugh (via GitHub)" <gi...@apache.org>.
epugh commented on PR #3436:
URL: https://github.com/apache/solr/pull/3436#issuecomment-3133244219
@puneeetsharma I realized I had a pending code comment from my review that I never submitted (I guess thats what I get for using my phone~)... Can you answer the question, and then I'll add CHANGES and move it along...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "epugh (via GitHub)" <gi...@apache.org>.
epugh commented on PR #3436:
URL: https://github.com/apache/solr/pull/3436#issuecomment-3131999265
If David doesn't get to it I will.. how would you liked to be referenced I. The commit message?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "puneeetsharma (via GitHub)" <gi...@apache.org>.
puneeetsharma commented on code in PR #3436:
URL: https://github.com/apache/solr/pull/3436#discussion_r2240410507
##########
solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java:
##########
@@ -545,8 +545,11 @@ protected void doAddDistinct(SolrInputDocument toDoc, SolrInputField sif, Object
final String name = sif.getName();
SolrInputField existingField = toDoc.get(name);
- Collection<Object> original =
- existingField != null ? existingField.getValues() : new ArrayList<>();
+ Collection<Object> original = existingField != null ? existingField.getValues() : null;
Review Comment:
Previously, if existingField was null, we were assigning original to a new ArrayList<>, which was fine. However, if existingField.getValues() returned null, then original would also be assigned null, leading to a NullPointerException when calling original.size().
In the new code, whether existingField is null or existingField.getValues() returns null, original is initially set to null. We then explicitly check for null and assign it to a new ArrayList<> if needed. This ensures that original is never null when calling size(), thus avoiding the NPE.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "epugh (via GitHub)" <gi...@apache.org>.
epugh commented on PR #3436:
URL: https://github.com/apache/solr/pull/3436#issuecomment-3109213581
Is "doc.setField("cat", null); // Set field to null" a normal thing to do?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "epugh (via GitHub)" <gi...@apache.org>.
epugh commented on code in PR #3436:
URL: https://github.com/apache/solr/pull/3436#discussion_r2226171681
##########
solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java:
##########
@@ -545,8 +545,11 @@ protected void doAddDistinct(SolrInputDocument toDoc, SolrInputField sif, Object
final String name = sif.getName();
SolrInputField existingField = toDoc.get(name);
- Collection<Object> original =
- existingField != null ? existingField.getValues() : new ArrayList<>();
+ Collection<Object> original = existingField != null ? existingField.getValues() : null;
Review Comment:
how is this differnet than what was previous?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "puneeetsharma (via GitHub)" <gi...@apache.org>.
puneeetsharma commented on PR #3436:
URL: https://github.com/apache/solr/pull/3436#issuecomment-3130768577
Thanks for the approval, @dsmiley. Could you please help merge this PR?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-17721 - null pointer fix in the doAddDistinct method [solr]
Posted by "epugh (via GitHub)" <gi...@apache.org>.
epugh merged PR #3436:
URL: https://github.com/apache/solr/pull/3436
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org