Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4776: Solrj doesn't return 'between' count in range facets 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1477637 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2013-04-30 14:04:47 +00:00
parent 13c05812fc
commit 429a056988
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -74,6 +74,9 @@ Bug Fixes
* SOLR-4752: There are some minor bugs in the Collections API parameter
validation. (Mark Miller)
* SOLR-4776: Solrj doesn't return "between" count in range facets
(Philip K. Warren via shalin)
Other Changes
----------------------

6
solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java
View File

@ -314,8 +314,9 @@ public class QueryResponse extends SolrResponseBase
Number before = (Number) values.get("before");
Number after = (Number) values.get("after");
Number between = (Number) values.get("between");
rangeFacet = new RangeFacet.Numeric(facet.getKey(), start, end, gap, before, after);
rangeFacet = new RangeFacet.Numeric(facet.getKey(), start, end, gap, before, after, between);
} else {
String gap = (String) rawGap;
Date start = (Date) values.get("start");
@ -323,8 +324,9 @@ public class QueryResponse extends SolrResponseBase
Number before = (Number) values.get("before");
Number after = (Number) values.get("after");
Number between = (Number) values.get("between");
rangeFacet = new RangeFacet.Date(facet.getKey(), start, end, gap, before, after);
rangeFacet = new RangeFacet.Date(facet.getKey(), start, end, gap, before, after, between);
}
NamedList<Integer> counts = (NamedList<Integer>) values.get("counts");

22
solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java
View File

@ -34,14 +34,16 @@ public abstract class RangeFacet<B, G> {
private final Number before;
private final Number after;
private final Number between;
protected RangeFacet(String name, B start, B end, G gap, Number before, Number after) {
protected RangeFacet(String name, B start, B end, G gap, Number before, Number after, Number between) {
this.name = name;
this.start = start;
this.end = end;
this.gap = gap;
this.before = before;
this.after = after;
this.between = between;
}
public void addCount(String value, int count) {
@ -76,18 +78,32 @@ public abstract class RangeFacet<B, G> {
return after;
}
public Number getBetween() {
return between;
}
public static class Numeric extends RangeFacet<Number, Number> {
@Deprecated
public Numeric(String name, Number start, Number end, Number gap, Number before, Number after) {
super(name, start, end, gap, before, after);
this(name, start, end, gap, before, after, null);
}
public Numeric(String name, Number start, Number end, Number gap, Number before, Number after, Number between) {
super(name, start, end, gap, before, after, between);
}
}
public static class Date extends RangeFacet<java.util.Date, String> {
@Deprecated
public Date(String name, java.util.Date start, java.util.Date end, String gap, Number before, Number after) {
super(name, start, end, gap, before, after);
this(name, start, end, gap, before, after, null);
}
public Date(String name, java.util.Date start, java.util.Date end, String gap, Number before, Number after, Number between) {
super(name, start, end, gap, before, after, between);
}
}

3
solr/solrj/src/test-files/solrj/sampleDateFacetResponse.xml
View File

@ -74,7 +74,8 @@
<date name="end">2008-02-13T15:26:37Z</date>
<int name="before">90</int>
<int name="after">1</int>
<int name="between">11</int>
</lst>
</lst>
</lst>
</response>
</response>

1
solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
View File

@ -114,6 +114,7 @@ public class QueryResponseTest extends LuceneTestCase {
assertEquals(0, manufacturedateDt.getCounts().get(2).getCount());
assertEquals(90, manufacturedateDt.getBefore());
assertEquals(1, manufacturedateDt.getAfter());
assertEquals(11, manufacturedateDt.getBetween());
}
@Test