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 2013/10/16 22:45:49 UTC
svn commit: r1532900 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java
core/src/test/org/apache/solr/TestRandomFaceting.java
test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
Author: yonik
Date: Wed Oct 16 20:45:48 2013
New Revision: 1532900
URL: http://svn.apache.org/r1532900
Log:
SOLR-5330: make copy of term bytes before calling next
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1532900&r1=1532899&r2=1532900&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Oct 16 20:45:48 2013
@@ -189,6 +189,10 @@ Bug Fixes
* SOLR-5349: CloudSolrServer - ZK timeout arguments passed to ZkStateReader are flipped.
(Ricardo Merizalde via shalin)
+* SOLR-5330: facet.method=fcs on single values fields could sometimes result
+ in incorrect facet labels. (Michael Froh, yonik)
+
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java?rev=1532900&r1=1532899&r2=1532900&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java Wed Oct 16 20:45:48 2013
@@ -174,10 +174,10 @@ class PerSegmentSingleValuedFaceting {
while (queue.size() > 0) {
SegFacet seg = queue.top();
- // make a shallow copy
- val.bytes = seg.tempBR.bytes;
- val.offset = seg.tempBR.offset;
- val.length = seg.tempBR.length;
+ // we will normally end up advancing the term enum for this segment
+ // while still using "val", so we need to make a copy since the BytesRef
+ // may be shared across calls.
+ val.copyBytes(seg.tempBR);
int count = 0;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java?rev=1532900&r1=1532899&r2=1532900&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestRandomFaceting.java Wed Oct 16 20:45:48 2013
@@ -59,8 +59,11 @@ public class TestRandomFaceting extends
types.add(new FldType("small_f",ONE_ONE, new FVal(-4,5)));
types.add(new FldType("small_d",ONE_ONE, new FVal(-4,5)));
types.add(new FldType("foo_i",ZERO_ONE, new IRange(-2,indexSize)));
- types.add(new FldType("small_s",ZERO_ONE, new SVal('a',(char)('c'+indexSize/3),1,1)));
- types.add(new FldType("small2_s",ZERO_ONE, new SVal('a',(char)('c'+indexSize/3),1,1)));
+ types.add(new FldType("rare_s1",new IValsPercent(95,0,5,1), new SVal('a','b',1,5)));
+ types.add(new FldType("str_s1",ZERO_ONE, new SVal('a','z',1,2)));
+ types.add(new FldType("long_s1",ZERO_ONE, new SVal('a','b',1,5)));
+ types.add(new FldType("small_s1",ZERO_ONE, new SVal('a',(char)('c'+indexSize/3),1,1)));
+ types.add(new FldType("small2_s1",ZERO_ONE, new SVal('a',(char)('c'+indexSize/3),1,1)));
types.add(new FldType("small2_ss",ZERO_TWO, new SVal('a',(char)('c'+indexSize/3),1,1)));
types.add(new FldType("small3_ss",new IRange(0,25), new SVal('A','z',1,1)));
types.add(new FldType("small_i",ZERO_ONE, new IRange(-2,5+indexSize/3)));
@@ -70,7 +73,7 @@ public class TestRandomFaceting extends
types.add(new FldType("missing_i",new IRange(0,0), new IRange(0,100)));
types.add(new FldType("missing_is",new IRange(0,0), new IRange(0,100)));
- types.add(new FldType("missing_s",new IRange(0,0), new SVal('a','b',1,1)));
+ types.add(new FldType("missing_s1",new IRange(0,0), new SVal('a','b',1,1)));
types.add(new FldType("missing_ss",new IRange(0,0), new SVal('a','b',1,1)));
// TODO: doubles, multi-floats, ints with precisionStep>0, booleans
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1532900&r1=1532899&r2=1532900&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Wed Oct 16 20:45:48 2013
@@ -1162,6 +1162,32 @@ public abstract class SolrTestCaseJ4 ext
}
}
+ public static class IValsPercent extends IVals {
+ final int[] percentAndValue;
+ public IValsPercent(int... percentAndValue) {
+ this.percentAndValue = percentAndValue;
+ }
+
+ @Override
+ public int getInt() {
+ int r = between(0,99);
+ int cumulative = 0;
+ for (int i=0; i<percentAndValue.length; i+=2) {
+ cumulative += percentAndValue[i];
+ if (r < cumulative) {
+ return percentAndValue[i+1];
+ }
+ }
+
+ return percentAndValue[percentAndValue.length-1];
+ }
+
+ @Override
+ public Comparable get() {
+ return getInt();
+ }
+ }
+
public static class FVal extends Vals {
final float min;
final float max;
@@ -1280,14 +1306,14 @@ public abstract class SolrTestCaseJ4 ext
protected class FldType {
public String fname;
- public IRange numValues;
+ public IVals numValues;
public Vals vals;
public FldType(String fname, Vals vals) {
this(fname, ZERO_ONE, vals);
}
- public FldType(String fname, IRange numValues, Vals vals) {
+ public FldType(String fname, IVals numValues, Vals vals) {
this.fname = fname;
this.numValues = numValues;
this.vals = vals;