You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2008/10/21 13:21:27 UTC
svn commit: r706577 - in /lucene/solr/trunk: ./
src/java/org/apache/solr/common/params/
src/java/org/apache/solr/common/util/ src/java/org/apache/solr/request/
Author: shalin
Date: Tue Oct 21 04:21:26 2008
New Revision: 706577
URL: http://svn.apache.org/viewvc?rev=706577&view=rev
Log:
SOLR-746 -- Added "omitHeader" request parameter to omit the header from the response
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/common/params/CommonParams.java
lucene/solr/trunk/src/java/org/apache/solr/common/util/NamedList.java
lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=706577&r1=706576&r2=706577&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Tue Oct 21 04:21:26 2008
@@ -67,6 +67,9 @@
as well as configuration replication and exposes detailed statistics and progress information
on the Admin page. Works on all platforms. (Noble Paul, yonik, Akshay Ukey, shalin)
+10. SOLR-746: Added "omitHeader" request parameter to omit the header from the response.
+ (Noble Paul via shalin)
+
Optimizations
----------------------
1. SOLR-374: Use IndexReader.reopen to save resources by re-using parts of the
Modified: lucene/solr/trunk/src/java/org/apache/solr/common/params/CommonParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/common/params/CommonParams.java?rev=706577&r1=706576&r2=706577&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/params/CommonParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/params/CommonParams.java Tue Oct 21 04:21:26 2008
@@ -89,7 +89,10 @@
/** include the parameters in the header **/
public static final String HEADER_ECHO_PARAMS = "echoParams";
-
+
+ /** include header in the response */
+ public static final String OMIT_HEADER = "omitHeader";
+
/** valid values for: <code>echoParams</code> */
public enum EchoParamStyle {
EXPLICIT,
Modified: lucene/solr/trunk/src/java/org/apache/solr/common/util/NamedList.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/common/util/NamedList.java?rev=706577&r1=706576&r2=706577&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/util/NamedList.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/util/NamedList.java Tue Oct 21 04:21:26 2008
@@ -287,4 +287,10 @@
};
return iter;
}
+
+ public T remove(String name) {
+ int idx = indexOf(name, 0);
+ if(idx != -1) return remove(idx);
+ return null;
+ }
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java?rev=706577&r1=706576&r2=706577&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java Tue Oct 21 04:21:26 2008
@@ -21,6 +21,7 @@
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.NamedListCodec;
import org.apache.solr.schema.IndexSchema;
@@ -40,6 +41,8 @@
public class BinaryResponseWriter implements BinaryQueryResponseWriter {
public void write(OutputStream out, SolrQueryRequest req, SolrQueryResponse response) throws IOException {
Resolver resolver = new Resolver(req, response.getReturnFields());
+ Boolean omitHeader = req.getParams().getBool(CommonParams.OMIT_HEADER);
+ if(omitHeader != null && omitHeader) response.getValues().remove("responseHeader");
NamedListCodec codec = new NamedListCodec(resolver);
codec.marshal(response.getValues(), out);
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java?rev=706577&r1=706576&r2=706577&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java Tue Oct 21 04:21:26 2008
@@ -21,6 +21,7 @@
import org.apache.lucene.document.Fieldable;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.schema.SchemaField;
@@ -85,6 +86,8 @@
if(wrapperFunction!=null) {
writer.write(wrapperFunction + "(");
}
+ Boolean omitHeader = req.getParams().getBool(CommonParams.OMIT_HEADER);
+ if(omitHeader != null && omitHeader) rsp.getValues().remove("responseHeader");
writeNamedList(null, rsp.getValues());
if(wrapperFunction!=null) {
writer.write(')');
@@ -836,4 +839,4 @@
writeDouble(name, Double.toString(val));
}
}
-}
\ No newline at end of file
+}
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java?rev=706577&r1=706576&r2=706577&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java Tue Oct 21 04:21:26 2008
@@ -99,6 +99,8 @@
// dump response values
NamedList lst = rsp.getValues();
+ Boolean omitHeader = req.getParams().getBool(CommonParams.OMIT_HEADER);
+ if(omitHeader != null && omitHeader) lst.remove("responseHeader");
int sz = lst.size();
int start=0;