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 ho...@apache.org on 2010/05/30 06:23:13 UTC
svn commit: r949470 - in /lucene/solr/branches/branch-1.4: ./ CHANGES.txt
src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
src/test/org/apache/solr/client/solrj/SolrExampleTests.java
Author: hossman
Date: Sun May 30 04:23:12 2010
New Revision: 949470
URL: http://svn.apache.org/viewvc?rev=949470&view=rev
Log:
merging r883518 from solr/branches/branch-1.5-dev for SOLR-1595
Modified:
lucene/solr/branches/branch-1.4/ (props changed)
lucene/solr/branches/branch-1.4/CHANGES.txt
lucene/solr/branches/branch-1.4/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
lucene/solr/branches/branch-1.4/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 30 04:23:12 2010
@@ -1 +1 @@
-/lucene/solr/trunk:881642,881906
+/lucene/solr/trunk:881642,881906,883566
Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=949470&r1=949469&r2=949470&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Sun May 30 04:23:12 2010
@@ -55,6 +55,9 @@ Bug Fixes
* SOLR-1572: FastLRUCache correctly implemented the LRU policy only
for the first 2B accesses. (yonik)
+* SOLR-1595: StreamingUpdateSolrServer used the platform default character
+ set when streaming updates, rather than using UTF-8 as the HTTP headers
+ indicated, leading to an encoding mismatch. (hossman, yonik)
================== Release 1.4.0 ==================
Release Date: See http://lucene.apache.org/solr for the official release date.
Modified: lucene/solr/branches/branch-1.4/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java?rev=949470&r1=949469&r2=949470&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java (original)
+++ lucene/solr/branches/branch-1.4/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java Sun May 30 04:23:12 2010
@@ -90,7 +90,7 @@ public class StreamingUpdateSolrServer e
public void writeRequest(OutputStream out) throws IOException {
try {
- OutputStreamWriter writer = new OutputStreamWriter( out );
+ OutputStreamWriter writer = new OutputStreamWriter(out, "UTF-8");
writer.append( "<stream>" ); // can be anything...
UpdateRequest req = queue.poll( 250, TimeUnit.MILLISECONDS );
while( req != null ) {
Modified: lucene/solr/branches/branch-1.4/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=949470&r1=949469&r2=949470&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/solr/branches/branch-1.4/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Sun May 30 04:23:12 2010
@@ -175,7 +175,7 @@ abstract public class SolrExampleTests e
SolrInputDocument doc2 = new SolrInputDocument();
doc2.addField( "id", "id2", 1.0f );
- doc2.addField( "name", "doc2", 1.0f );
+ doc2.addField( "name", "h\u1234llo", 1.0f );
doc2.addField( "price", 20 );
Collection<SolrInputDocument> docs = new ArrayList<SolrInputDocument>();
@@ -191,7 +191,7 @@ abstract public class SolrExampleTests e
query.addSortField( "price", SolrQuery.ORDER.asc );
QueryResponse rsp = server.query( query );
- Assert.assertEquals( 2, rsp.getResults().getNumFound() );
+ assertEquals( 2, rsp.getResults().getNumFound() );
System.out.println( rsp.getResults() );
// Now do it again
@@ -199,9 +199,14 @@ abstract public class SolrExampleTests e
server.commit();
rsp = server.query( query );
- Assert.assertEquals( 2, rsp.getResults().getNumFound() );
- System.out.println( rsp.getResults() );
-
+ assertEquals( 2, rsp.getResults().getNumFound() );
+ // System.out.println( rsp.getResults() );
+
+ // query outside ascii range
+ query.setQuery("name:h\u1234llo");
+ rsp = server.query( query );
+ assertEquals( 1, rsp.getResults().getNumFound() );
+
}
/**