jdyer1 commented on code in PR #4050: URL: https://github.com/apache/solr/pull/4050#discussion_r2694943681
########## solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateJdkSolrClient.java: ########## @@ -0,0 +1,102 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.solr.client.solrj.impl; + +import java.io.IOException; +import java.io.InputStream; +import java.net.http.HttpResponse; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import org.apache.solr.client.solrj.request.UpdateRequest; + +/** A ConcurrentUpdate SolrClient using {@link HttpJdkSolrClient}. */ +public class ConcurrentUpdateJdkSolrClient extends ConcurrentUpdateBaseSolrClient { + + private final HttpJdkSolrClient client; + + protected ConcurrentUpdateJdkSolrClient(ConcurrentUpdateJdkSolrClient.Builder builder) { + super(builder); + this.client = (HttpJdkSolrClient) builder.getClient(); + } + + @Override + protected StreamingResponse doSendUpdateStream(Update update) { + UpdateRequest req = update.request(); + String collection = update.collection(); + CompletableFuture<HttpResponse<InputStream>> resp = + client.requestInputStreamAsync(basePath, req, collection); + + return new StreamingResponse() { + + @Override + public int awaitResponse(long timeoutMillis) throws Exception { + return resp.get(timeoutMillis, TimeUnit.MILLISECONDS).statusCode(); + } + + @Override + public InputStream getInputStream() { + try { + return resp.get().body(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return InputStream.nullInputStream(); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } + } + + @Override + public Object getUnderlyingResponse() { + return resp; + } + + @Override + public void close() throws IOException { + getInputStream().close(); + } + }; + } + + public static class Builder extends ConcurrentUpdateBaseSolrClient.Builder { + /** + * @see org.apache.solr.client.solrj.impl.ConcurrentUpdateBaseSolrClient.Builder#Builder(String, + * HttpSolrClientBase) + */ + public Builder(String baseUrl, HttpJdkSolrClient client) { + + this(baseUrl, client, false); + // The base class uses idle timeout with StreamingResponse#awaitResponse so it needs to be + // set! + this.idleTimeoutMillis = 1000; Review Comment: it actually is configurable, @janhoy. This is the constructor for the builder and users can set it to anything they want. In actuality the Jdk Client completely ignores idle timeout, and users might be less likely to set it. This 1000ms default value is a workaround for the fact that the shared code misuses this timeout value. (`ConcurrentUpdateBaseSolrClient:251`) . The original author probably didn't want to introduce yet one more timeout to configure. Before this change, it defaulted to 0, which would fail unit tests because 0ms is too short to do much of anything. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
