Skip to content

SOLR-18243: Refactor solrj-streaming to reuse shared CloudHttp2SolrClient engine #4510

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
chatzipavlidis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SOLR-18243: Refactor solrj-streaming to reuse shared CloudHttp2SolrClient engine #4510

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
18 changes: 17 additions & 1 deletion solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.solr.common.AlreadyClosedException;
import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.URLUtil;
import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;

/** The SolrClientCache caches SolrClients, so they can be reused by different TupleStreams. */
public class SolrClientCache implements Closeable {
Expand Down Expand Up @@ -136,7 +137,22 @@ public synchronized SolrClient getHttpSolrClient(String baseUrl) {
ensureOpen();
Objects.requireNonNull(baseUrl, "Url cannot be null!");
return httpSolrClients.computeIfAbsent(
baseUrl, url -> newHttpSolrClientBuilder(url, httpSolrClient).build());
baseUrl,
url -> {
// Find an existing Cloud Client connection
HttpSolrClient sharedEngine = this.httpSolrClient;

@epugh epugh Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe called it sharedClient?

@chatzipavlidis chatzipavlidis Jun 9, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Affirmative 😊


if (sharedEngine == null && !cloudSolClients.isEmpty()) {

@epugh epugh Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was cloudSolClients spelled wrong?

@chatzipavlidis chatzipavlidis Jun 9, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apparently? Should i refactor it?

// Get first available active Cloud client connection
CloudSolrClient firstCloudClient = cloudSolClients.values().iterator().next();
if (firstCloudClient instanceof CloudHttp2SolrClient) {
sharedEngine = ((CloudHttp2SolrClient) firstCloudClient).getHttpClient();
}
}

// Build the client using the shared engine if found one
return newHttpSolrClientBuilder(url, sharedEngine).build();
});
}

@SuppressWarnings({"unchecked", "rawtypes"})
Expand Down
Loading