Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

added gzip encoding to solr2sor http interface, client side (server

Browse Source 
already works)
This commit is contained in:
Michael Peter Christen 2012-08-20 16:53:21 +02:00
parent a049761e0c
commit 67d235fae9
1 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
source/net/yacy/cora/services/federated/solr/RemoteSolrConnector.java
View File

@ -31,10 +31,19 @@ import java.net.InetAddress;
import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.document.MultiProtocolURI;
import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.Domains;
import org.apache.commons.httpclient.HttpException;
import org.apache.http.Header;
import org.apache.http.HeaderElement;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
import org.apache.http.HttpResponse;
import org.apache.http.HttpResponseInterceptor;
import org.apache.http.auth.AuthScope; import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.AuthCache; import org.apache.http.client.AuthCache;
import org.apache.http.client.entity.GzipDecompressingEntity;
import org.apache.http.client.protocol.ClientContext; import org.apache.http.client.protocol.ClientContext;
import org.apache.http.impl.auth.BasicScheme; import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.client.BasicAuthCache; import org.apache.http.impl.client.BasicAuthCache;
@ -47,6 +56,7 @@ import org.apache.solr.client.solrj.impl.HttpSolrServer;
public class RemoteSolrConnector extends SolrServerConnector implements SolrConnector { public class RemoteSolrConnector extends SolrServerConnector implements SolrConnector {
private final String solrurl, host, solrpath, solraccount, solrpw; private final String solrurl, host, solrpath, solraccount, solrpw;
private DefaultHttpClient client;
private final int port; private final int port;
/** /**
@ -77,7 +87,7 @@ public class RemoteSolrConnector extends SolrServerConnector implements SolrConn
} }
HttpSolrServer s; HttpSolrServer s;
if (this.solraccount.length() > 0) { if (this.solraccount.length() > 0) {
final DefaultHttpClient client = new DefaultHttpClient() { this.client = new DefaultHttpClient() {
@Override @Override
protected HttpContext createHttpContext() { protected HttpContext createHttpContext() {
HttpContext context = super.createHttpContext(); HttpContext context = super.createHttpContext();
@ -89,10 +99,35 @@ public class RemoteSolrConnector extends SolrServerConnector implements SolrConn
return context; return context;
} }
}; };
this.client.addRequestInterceptor(new HttpRequestInterceptor() {
@Override
public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
if (!request.containsHeader("Accept-Encoding")) request.addHeader("Accept-Encoding", "gzip");
}
});
this.client.addResponseInterceptor(new HttpResponseInterceptor() {
@Override
public void process(final HttpResponse response, final HttpContext context) throws HttpException, IOException {
HttpEntity entity = response.getEntity();
if (entity != null) {
Header ceheader = entity.getContentEncoding();
if (ceheader != null) {
HeaderElement[] codecs = ceheader.getElements();
for (HeaderElement codec : codecs) {
if (codec.getName().equalsIgnoreCase("gzip")) {
response.setEntity(new GzipDecompressingEntity(response.getEntity()));
return;
}
}
}
}
}
});
BasicCredentialsProvider credsProvider = new BasicCredentialsProvider(); BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
credsProvider.setCredentials(new AuthScope(this.host, AuthScope.ANY_PORT), new UsernamePasswordCredentials(this.solraccount, this.solrpw)); credsProvider.setCredentials(new AuthScope(this.host, AuthScope.ANY_PORT), new UsernamePasswordCredentials(this.solraccount, this.solrpw));
client.setCredentialsProvider(credsProvider); this.client.setCredentialsProvider(credsProvider);
s = new HttpSolrServer("http://" + this.host + ":" + this.port + this.solrpath, client); s = new HttpSolrServer("http://" + this.host + ":" + this.port + this.solrpath, this.client);
} else { } else {
s = new HttpSolrServer(this.solrurl); s = new HttpSolrServer(this.solrurl);
} }
@ -103,6 +138,16 @@ public class RemoteSolrConnector extends SolrServerConnector implements SolrConn
super.init(s); super.init(s);
} }
public void terminate() {
this.client.getConnectionManager().shutdown();
}
@Override
public synchronized void close() {
super.close();
this.terminate();
}
public String getAdminInterface() { public String getAdminInterface() {
final InetAddress localhostExternAddress = Domains.myPublicLocalIP(); final InetAddress localhostExternAddress = Domains.myPublicLocalIP();
final String localhostExtern = localhostExternAddress == null ? "127.0.0.1" : localhostExternAddress.getHostAddress(); final String localhostExtern = localhostExternAddress == null ? "127.0.0.1" : localhostExternAddress.getHostAddress();