You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/21 08:40:44 UTC
[1/3] lucene-solr:jira/http2: Cleanup Http2SolrClient
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 7308f0bb3 -> d0972b73c
Cleanup Http2SolrClient
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3a38ace7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3a38ace7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3a38ace7
Branch: refs/heads/jira/http2
Commit: 3a38ace7377934aead3140107e570f52b9de9df8
Parents: 7308f0b
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Sep 21 10:48:06 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Sep 21 10:48:06 2018 +0700
----------------------------------------------------------------------
.../solr/client/solrj/impl/Http2SolrClient.java | 48 +++-----------------
1 file changed, 6 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3a38ace7/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index dc6a41c..13c0205 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -268,9 +268,9 @@ public class Http2SolrClient extends SolrClient {
}
}
- public Http2ClientResponse request(SolrRequest solrRequest, String collection, OnComplete onComplete)
+ public void request(SolrRequest solrRequest, String collection, OnComplete onComplete)
throws SolrServerException, IOException {
- return request(solrRequest, collection, onComplete, false);
+ request(solrRequest, collection, onComplete, false);
}
private boolean isV2ApiRequest(final SolrRequest request) {
@@ -608,36 +608,14 @@ public class Http2SolrClient extends SolrClient {
@Override
public NamedList<Object> request(SolrRequest request, String collection) throws SolrServerException, IOException {
- return request(request, collection, null).response;
+ return request(request, collection, null, false).response;
}
public void setRequestWriter(RequestWriter requestWriter) {
this.requestWriter = requestWriter;
}
- // sample new async method
- public void add(String collection, SolrInputDocument doc, int commitWithinMs, OnComplete<UpdateResponse> onComplete)
- throws SolrServerException, IOException {
-
- UpdateRequest req = new UpdateRequest();
- req.add(doc);
- req.setCommitWithin(commitWithinMs);
- request(req, collection, onComplete);
- }
-
- public String get(String url) throws InterruptedException, ExecutionException, TimeoutException {
- ContentResponse response = httpClient.GET(url);
- return response.getContentAsString();
- }
-
- // sample new async method
- public void query(String collection, SolrParams params, OnComplete<QueryResponse> onComplete)
- throws SolrServerException, IOException {
- QueryRequest queryRequest = new QueryRequest(params);
- request(queryRequest, collection, onComplete);
- }
-
- public InputStream queryAndStreamResponse(String collection, SolrParams params)
+ private InputStream queryAndStreamResponse(String collection, SolrParams params)
throws SolrServerException, IOException {
QueryRequest queryRequest = new QueryRequest(params);
Http2ClientResponse resp = request(queryRequest, collection, null, true);
@@ -645,22 +623,8 @@ public class Http2SolrClient extends SolrClient {
return resp.stream;
}
- public void commit(String collection, boolean softCommit, boolean waitSearcher, OnComplete<UpdateResponse> onComplete)
- throws SolrServerException, IOException {
- UpdateRequest req = new UpdateRequest();
- ModifiableSolrParams params = new ModifiableSolrParams();
-
- params.set(UpdateParams.COMMIT, "true");
- params.set(UpdateParams.SOFT_COMMIT, String.valueOf(softCommit));
-
- params.set(UpdateParams.WAIT_SEARCHER, String.valueOf(waitSearcher));
- req.setParams(params);
-
- request(req, collection, onComplete);
- }
-
- public interface OnComplete<T> {
- void onSuccess(T result);
+ public interface OnComplete {
+ void onSuccess(NamedList result);
void onFailure(Throwable e);
}
[2/3] lucene-solr:jira/http2: Fix compile error caused by last commit
Posted by da...@apache.org.
Fix compile error caused by last commit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eacd7e62
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eacd7e62
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eacd7e62
Branch: refs/heads/jira/http2
Commit: eacd7e62011279d5accd42395beafc76b0d93b7b
Parents: 3a38ace
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Sep 21 10:55:19 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Sep 21 10:55:19 2018 +0700
----------------------------------------------------------------------
.../org/apache/solr/update/SolrCmdDistributor.java | 2 +-
.../apache/solr/update/MockingHttp2SolrClient.java | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eacd7e62/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index 8369fcc..c8ad92f 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -168,7 +168,7 @@ public class SolrCmdDistributor {
pendingTasksPhaser.arriveAndDeregister();
} else {
//TODO write add cmds in single outputstream
- client.request(req.uReq, null, new Http2SolrClient.OnComplete<NamedList>() {
+ client.request(req.uReq, null, new Http2SolrClient.OnComplete() {
@Override
public void onSuccess(NamedList result) {
req.trackRequestResult(result, true);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eacd7e62/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
index 2b8d8a2..6f701be 100644
--- a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
+++ b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java
@@ -118,19 +118,23 @@ public class MockingHttp2SolrClient extends Http2SolrClient {
return super.request(request, collection);
}
- public Http2ClientResponse request(SolrRequest request, String collection, OnComplete onComplete)
+ public void request(SolrRequest request, String collection, OnComplete onComplete)
throws SolrServerException, IOException {
if (request instanceof UpdateRequest) {
UpdateRequest ur = (UpdateRequest) request;
// won't throw exception if request is DBQ
- if (ur.getDeleteQuery() != null && !ur.getDeleteQuery().isEmpty())
- return super.request(request, collection, onComplete);
+ if (ur.getDeleteQuery() != null && !ur.getDeleteQuery().isEmpty()) {
+ super.request(request, collection, onComplete);
+ return;
+ }
}
if (exp != null) {
if (oneExpPerReq) {
- if (reqGotException.contains(request))
- return super.request(request, collection, onComplete);
+ if (reqGotException.contains(request)) {
+ super.request(request, collection, onComplete);
+ return;
+ }
else
reqGotException.add(request);
}
@@ -149,6 +153,6 @@ public class MockingHttp2SolrClient extends Http2SolrClient {
}
}
- return super.request(request, collection, onComplete);
+ super.request(request, collection, onComplete);
}
}
[3/3] lucene-solr:jira/http2: Remove unused imports for
Http2SolrClient
Posted by da...@apache.org.
Remove unused imports for Http2SolrClient
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d0972b73
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d0972b73
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d0972b73
Branch: refs/heads/jira/http2
Commit: d0972b73cde9c0f189d995a143334d94b07f9337
Parents: eacd7e6
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Sep 21 15:40:36 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Sep 21 15:40:36 2018 +0700
----------------------------------------------------------------------
.../java/org/apache/solr/client/solrj/impl/Http2SolrClient.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d0972b73/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 13c0205..320ea27 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -48,16 +48,11 @@ import org.apache.solr.client.solrj.V2RequestSupport;
import org.apache.solr.client.solrj.embedded.SSLConfig;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.RequestWriter;
-import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.request.V2Request;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.client.solrj.response.UpdateResponse;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.params.UpdateParams;
import org.apache.solr.common.util.Base64;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.NamedList;