Skip to content
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

SOLR-3913: Optimize the commit/optimize cycle in the PostTool #2667

Merged
merged 3 commits into from
Aug 27, 2024
Merged

SOLR-3913: Optimize the commit/optimize cycle in the PostTool #2667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d96a869
Optimize the commit/optimize cycle.
epugh Aug 26, 2024
c67cec2
Merge remote-tracking branch 'upstream/main' into SOLR-3913
epugh Aug 27, 2024
a93d6d9
track changes
epugh Aug 27, 2024
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: 2 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ Optimizations
* SOLR-17408: COLSTATUS command was fetching details remotely from replicas when this information
wasn't asked for. (Mathieu Marie)

* SOLR-3913: Optimize PostTool to call just optimize when both commit and optimize requested. (Eric Pugh)

Bug Fixes
---------------------
(No changes)
Expand Down
10 changes: 5 additions & 5 deletions solr/core/src/java/org/apache/solr/cli/PostTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,11 @@ public void execute(String mode) throws SolrServerException, IOException {
return;
}

if (commit) {
commit();
}
if (optimize) {
// optimize does a commit under the covers.
optimize();
} else if (commit) {
commit();
}
displayTiming((long) timer.getTime());
}
Expand Down Expand Up @@ -461,7 +461,7 @@ boolean recursionPossible(String[] args) {
* @param args array of file names
* @param startIndexInArgs offset to start
* @param out output stream to post data to
* @param type default content-type to use when posting (may be overridden in auto mode)
* @param type default content-type to use when posting (this may be overridden in auto mode)
* @return number of files posted
*/
public int postFiles(String[] args, int startIndexInArgs, OutputStream out, String type) {
Expand Down Expand Up @@ -545,7 +545,7 @@ int postFiles(File[] files, OutputStream out, String type) {
*
* @param globFile file holding glob path
* @param out outputStream to write results to
* @param type default content-type to use when posting (may be overridden in auto mode)
* @param type default content-type to use when posting (this may be overridden in auto mode)
* @return number of files posted
*/
int handleGlob(File globFile, OutputStream out, String type) {
Expand Down
Loading