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 yo...@apache.org on 2007/04/01 17:13:26 UTC
svn commit: r524611 - in
/lucene/solr/trunk/src/java/org/apache/solr/handler: CSVRequestHandler.java
CommitRequestHandler.java XmlUpdateRequestHandler.java
Author: yonik
Date: Sun Apr 1 08:13:25 2007
New Revision: 524611
URL: http://svn.apache.org/viewvc?view=rev&rev=524611
Log:
factor out commit param parsing: SOLR-185
Modified:
lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/CommitRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java?view=diff&rev=524611&r1=524610&r2=524611
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java Sun Apr 1 08:13:25 2007
@@ -46,7 +46,10 @@
Iterable<ContentStream> streams = req.getContentStreams();
if (streams == null) {
- throw new SolrException(400, "missing content stream");
+ if(!RequestHandlerUtils.handleCommit(req, rsp, false)) {
+ throw new SolrException( 400, "missing content stream" );
+ }
+ return;
}
for(ContentStream stream : streams) {
@@ -58,6 +61,9 @@
IOUtils.closeQuietly(reader);
}
}
+
+ // perhaps commit when we are done
+ RequestHandlerUtils.handleCommit(req, rsp, false);
}
//////////////////////// SolrInfoMBeans methods //////////////////////
@@ -68,11 +74,11 @@
@Override
public String getVersion() {
- return "$Revision:$";
- }
+ return "$Revision:$";
+ }
- @Override
- public String getSourceId() {
+ @Override
+ public String getSourceId() {
return "$Id:$";
}
@@ -94,7 +100,6 @@
static String EMPTY="keepEmpty";
static String SPLIT="split";
static String ENCAPSULATOR="encapsulator";
- static String COMMIT="commit";
static String OVERWRITE="overwrite";
private static Pattern colonSplit = Pattern.compile(":");
@@ -344,10 +349,6 @@
}
addDoc(line,vals);
- }
-
- if (params.getBool(COMMIT,false)) {
- handler.commit(new CommitUpdateCommand(false));
}
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/CommitRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/CommitRequestHandler.java?view=diff&rev=524611&r1=524610&r2=524611
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/CommitRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/CommitRequestHandler.java Sun Apr 1 08:13:25 2007
@@ -25,26 +25,21 @@
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.update.CommitUpdateCommand;
+/**
+ * This handler could be replace with the standard XmlUpdateHandler with
+ * a default parameter set to commit=true
+ *
+ * TODO? -- Delete it now, while it is not in mainstream use yet...
+ *
+ */
+@Deprecated
public class CommitRequestHandler extends RequestHandlerBase
{
@Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException
{
- SolrParams params = req.getParams();
-
- boolean optimize = params.getBool( UpdateParams.OPTIMIZE, false );
- CommitUpdateCommand cmd = new CommitUpdateCommand( optimize );
- cmd.waitFlush = params.getBool( UpdateParams.WAIT_FLUSH, cmd.waitFlush );
- cmd.waitSearcher = params.getBool( UpdateParams.WAIT_SEARCHER, cmd.waitSearcher );
-
- SolrCore.getSolrCore().getUpdateHandler().commit( cmd );
-
- if( optimize ) {
- rsp.add( "optimize", "true" );
- }
- else {
- rsp.add( "commit", "true" );
- }
+ // common parameters
+ RequestHandlerUtils.handleCommit(req, rsp, true);
}
//////////////////////// SolrInfoMBeans methods //////////////////////
@@ -56,16 +51,16 @@
@Override
public String getVersion() {
- return "$Revision:$";
+ return "$Revision$";
}
@Override
public String getSourceId() {
- return "$Id:$";
+ return "$Id$";
}
@Override
public String getSource() {
- return "$URL:$";
+ return "$URL$";
}
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java?view=diff&rev=524611&r1=524610&r2=524611
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java Sun Apr 1 08:13:25 2007
@@ -73,7 +73,10 @@
{
Iterable<ContentStream> streams = req.getContentStreams();
if( streams == null ) {
- throw new SolrException( 400, "missing content stream" );
+ if( !RequestHandlerUtils.handleCommit(req, rsp, false) ) {
+ throw new SolrException( 400, "missing content stream" );
+ }
+ return;
}
// Cycle through each stream
@@ -86,6 +89,9 @@
IOUtils.closeQuietly(reader);
}
}
+
+ // perhaps commit when we are done
+ RequestHandlerUtils.handleCommit(req, rsp, false);
}