Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-03-07 00:39:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

SOLR-6787 refactored a method out

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1646418 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2014-12-18 09:40:46 +00:00
parent 84e6519950
commit 9ac8383fb7
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
solr/core/src/java/org/apache/solr/handler/BlobHandler.java
View File

@ -101,12 +101,11 @@ public class BlobHandler extends RequestHandlerBase implements PluginInfoInitia
TopDocs duplicate = req.getSearcher().search(new TermQuery(new Term("id", md5)), 1); TopDocs duplicate = req.getSearcher().search(new TermQuery(new Term("id", md5)), 1);
if(duplicate.totalHits >0){ if(duplicate.totalHits >0){
rsp.add("error", "duplicate entry"); rsp.add("error", "duplicate entry");
SolrParams solrParams = new MapSolrParams((Map) ZkNodeProps.makeMap( req.forward(null,
new MapSolrParams((Map) makeMap(
"q", "id:" + md5, "q", "id:" + md5,
"fl", "id,size,version,timestamp,blobName")); "fl", "id,size,version,timestamp,blobName")),
try(LocalSolrQueryRequest r = new LocalSolrQueryRequest(req.getCore(), solrParams)) { rsp);
req.getCore().getRequestHandler(null).handleRequest(r, rsp);
}
return; return;
} }
@ -178,13 +177,12 @@ public class BlobHandler extends RequestHandlerBase implements PluginInfoInitia
if (blobName != null) q = "blobName" + ":" + blobName; if (blobName != null) q = "blobName" + ":" + blobName;
if (version > -1) q += " AND version:" + version; if (version > -1) q += " AND version:" + version;
SolrParams args = new MapSolrParams((Map) ZkNodeProps.makeMap( req.forward(null,
"q", q, new MapSolrParams((Map) makeMap(
"fl", "id,size,version,timestamp,blobName", "q", q,
"sort", "version desc")); "fl", "id,size,version,timestamp,blobName",
try (LocalSolrQueryRequest r = new LocalSolrQueryRequest(req.getCore(), args)){ "sort", "version desc"))
req.getCore().getRequestHandler(null).handleRequest(r, rsp); ,rsp);
}
} }
} }
} }

8
solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java
View File

@ -17,6 +17,7 @@
package org.apache.solr.request; package org.apache.solr.request;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.IndexSchema;
import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.params.SolrParams;
@ -82,6 +83,13 @@ public interface SolrQueryRequest {
* Suitable for logging. * Suitable for logging.
*/ */
public String getParamString(); public String getParamString();
/** Forward the request to another handler. DO a return after this call if
* no other operations need to be performed
* @param handler the name of the handler
* @param params The new set of parameter
*/
public void forward(String handler, SolrParams params, SolrQueryResponse rsp);
} }

9
solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java
View File

@ -17,6 +17,7 @@
package org.apache.solr.request; package org.apache.solr.request;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.RefCounted; import org.apache.solr.util.RefCounted;
import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.IndexSchema;
@ -151,4 +152,12 @@ public abstract class SolrQueryRequestBase implements SolrQueryRequest, Closeabl
return this.getClass().getSimpleName() + '{' + params + '}'; return this.getClass().getSimpleName() + '{' + params + '}';
} }
@Override
public void forward(String handler ,SolrParams params, SolrQueryResponse rsp){
try(LocalSolrQueryRequest r = new LocalSolrQueryRequest(getCore(), params)) {
getCore().getRequestHandler(handler).handleRequest(r, rsp);
}
}
} }