You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/10/15 21:41:08 UTC
svn commit: r1023082 - in /lucene/dev/trunk:
lucene/src/java/org/apache/lucene/util/PagedBytes.java
solr/src/test/org/apache/solr/request/SimpleFacetsTest.java
Author: yonik
Date: Fri Oct 15 19:41:08 2010
New Revision: 1023082
URL: http://svn.apache.org/viewvc?rev=1023082&view=rev
Log:
SOLR-2142: fix PagedBytes for copying zero-len BytesRef
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/PagedBytes.java
lucene/dev/trunk/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/PagedBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/PagedBytes.java?rev=1023082&r1=1023081&r2=1023082&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/PagedBytes.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/PagedBytes.java Fri Oct 15 19:41:08 2010
@@ -228,7 +228,7 @@ public final class PagedBytes {
* This only supports bytes.length <= blockSize */
public void copy(BytesRef bytes, BytesRef out) throws IOException {
int left = blockSize - upto;
- if (bytes.length > left) {
+ if (bytes.length > left || currentBlock==null) {
if (currentBlock != null) {
blocks.add(currentBlock);
blockEnd.add(upto);
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java?rev=1023082&r1=1023081&r2=1023082&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java Fri Oct 15 19:41:08 2010
@@ -94,7 +94,8 @@ public class SimpleFacetsTest extends So
add_doc("id", "47",
"range_facet_f", "28.62",
"trait_s", "Pig",
- "text", "line up and fly directly at the enemy death cannons, clogging them with wreckage!");
+ "text", "line up and fly directly at the enemy death cannons, clogging them with wreckage!",
+ "zerolen_s","");
}
@Test
@@ -300,6 +301,16 @@ public class SimpleFacetsTest extends So
,"//int[2][@name='Obnoxious'][.='1']"
,"//int[3][@name='Tool'][.='2']"
);
+
+
+ assertQ(req("q", "id:[42 TO 47]"
+ ,"facet", "true"
+ ,"facet.method","fc"
+ ,"fq", "id:[42 TO 45]"
+ ,"facet.field", "zerolen_s"
+ )
+ ,"*[count(//lst[@name='zerolen_s']/int)=1]"
+ );
}
public static void indexDateFacets() {