Tidy up java code in o.a.s.filestore package - #4657
Open
epugh wants to merge 2 commits into
Open
Conversation
epugh
changed the title
epugh
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors parts of org.apache.solr.filestore to align better with Java style expectations and to remove code that appears unused, primarily in DistribFileStore.
Changes:
- Removed unused/disconnected code paths and variables in
DistribFileStore(including an unused in-memory map and related code). - Simplified
CryptoKeysvariable initialization in validation paths (removing redundant= null). - Cleaned up some minor formatting/comment issues while adjusting the file distribution logic.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
solr/core/src/java/org/apache/solr/filestore/FileStoreUtils.java |
Minor cleanup in signature validation setup (CryptoKeys initialization). |
solr/core/src/java/org/apache/solr/filestore/DistribFileStore.java |
Removes dead/unused code and refactors parts of distribution/fetch logic; some leftover logic needs follow-up. |
solr/core/src/java/org/apache/solr/filestore/ClusterFileStore.java |
Minor cleanup in signature validation setup (CryptoKeys initialization). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
402
to
406
| .submit( | ||
| () -> { | ||
| try { | ||
| Thread.sleep(10 * 1000); | ||
| } finally { | ||
| tmpFiles.remove(info.path); | ||
| } | ||
| Thread.sleep(10 * 1000); | ||
| return null; | ||
| }); |
| if (i == FETCHFROM_SRC) { | ||
| // This is just an optimization | ||
| // at this point a bunch of nodes are already downloading from me | ||
| // at this point a bunch of nodes are already downloading from me. |
Comment on lines
110
to
112
| this.path = path; | ||
| } | ||
|
|
epugh
changed the title
psalagnac
approved these changes
Jul 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Reviewing code in the org.apache.solr.filestore package for potential improvements.
Solution
Mostly driven by what IntelliJ is suggesting are weaknesses. Specifically, found what looks like dead code in the DistribFileStore.
Tests
Same tests. And Claude review.