You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/08/13 11:56:33 UTC
svn commit: r1372346 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
Author: siren
Date: Mon Aug 13 09:56:33 2012
New Revision: 1372346
URL: http://svn.apache.org/viewvc?rev=1372346&view=rev
Log:
SOLR-3649: fix bug in JavabinLoader that caused deleteById(List<String> ids) to not work in SolrJ
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1372346&r1=1372345&r2=1372346&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Aug 13 09:56:33 2012
@@ -51,6 +51,9 @@ Bug Fixes
* SOLR-3725: Fixed package-local-src-tgz target to not bring in unnecessary jars
and binary contents. (Michael Dodsworth via rmuir)
+* SOLR-3649: Fixed bug in JavabinLoader that caused deleteById(List<String> ids)
+ to not work in SolrJ (siren)
+
================== 4.0.0-BETA ===================
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java?rev=1372346&r1=1372345&r2=1372346&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java Mon Aug 13 09:56:33 2012
@@ -122,8 +122,8 @@ public class JavabinLoader extends Conte
for (String s : update.getDeleteById()) {
delcmd.id = s;
processor.processDelete(delcmd);
+ delcmd.clear();
}
- delcmd.id = null;
}
if(update.getDeleteQuery() != null) {
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1372346&r1=1372345&r2=1372346&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Mon Aug 13 09:56:33 2012
@@ -711,16 +711,11 @@ abstract public class SolrExampleTests e
assertNumFound( "*:*", 3 ); // make sure it got in
// should be able to handle multiple delete commands in a single go
- StringWriter xml = new StringWriter();
- xml.append( "<delete>" );
+ List<String> ids = new ArrayList<String>();
for( SolrInputDocument d : doc ) {
- xml.append( "<id>" );
- XML.escapeCharData( (String)d.getField( "id" ).getFirstValue(), xml );
- xml.append( "</id>" );
+ ids.add(d.getFieldValue("id").toString());
}
- xml.append( "</delete>" );
- DirectXmlRequest up = new DirectXmlRequest( "/update", xml.toString() );
- server.request( up );
+ server.deleteById(ids);
server.commit();
assertNumFound( "*:*", 0 ); // make sure it got out
}