You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mv...@apache.org on 2011/10/08 16:14:08 UTC
svn commit: r1180378 - in /lucene/dev/branches/branch_3x/solr: ./
solrj/src/java/org/apache/solr/client/solrj/response/
solrj/src/test-files/solrj/
solrj/src/test/org/apache/solr/client/solrj/response/
Author: mvg
Date: Sat Oct 8 14:14:08 2011
New Revision: 1180378
URL: http://svn.apache.org/viewvc?rev=1180378&view=rev
Log:
SOLR-2818: Added before/after count response parsing support for range facets in SolrJ.
Modified:
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java
lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java
lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/sampleDateFacetResponse.xml
lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1180378&r1=1180377&r2=1180378&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Sat Oct 8 14:14:08 2011
@@ -37,6 +37,9 @@ New Features
* SOLR-1979: New contrib "langid". Adds language identification capabilities as an
Update Processor, using Tika's LanguageIdentifier (janhoy, Tommaso Teofili, gsingers)
+
+* SOLR-2818: Added before/after count response parsing support for range facets in
+ SolrJ. (Bernhard Frauendienst via Martijn van Groningen)
Optimizations
----------------------
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java?rev=1180378&r1=1180377&r2=1180378&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java Sat Oct 8 14:14:08 2011
@@ -310,12 +310,20 @@ public class QueryResponse extends SolrR
Number gap = (Number) rawGap;
Number start = (Number) values.get("start");
Number end = (Number) values.get("end");
- rangeFacet = new RangeFacet.Numeric(facet.getKey(), start, end, gap);
+
+ Number before = (Number) values.get("before");
+ Number after = (Number) values.get("after");
+
+ rangeFacet = new RangeFacet.Numeric(facet.getKey(), start, end, gap, before, after);
} else {
String gap = (String) rawGap;
Date start = (Date) values.get("start");
Date end = (Date) values.get("end");
- rangeFacet = new RangeFacet.Date(facet.getKey(), start, end, gap);
+
+ Number before = (Number) values.get("before");
+ Number after = (Number) values.get("after");
+
+ rangeFacet = new RangeFacet.Date(facet.getKey(), start, end, gap, before, after);
}
NamedList<Integer> counts = (NamedList<Integer>) values.get("counts");
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java?rev=1180378&r1=1180377&r2=1180378&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java Sat Oct 8 14:14:08 2011
@@ -32,11 +32,16 @@ public abstract class RangeFacet<B, G> {
private final B end;
private final G gap;
- protected RangeFacet(String name, B start, B end, G gap) {
+ private final Number before;
+ private final Number after;
+
+ protected RangeFacet(String name, B start, B end, G gap, Number before, Number after) {
this.name = name;
this.start = start;
this.end = end;
this.gap = gap;
+ this.before = before;
+ this.after = after;
}
public void addCount(String value, int count) {
@@ -63,19 +68,26 @@ public abstract class RangeFacet<B, G> {
return gap;
}
+ public Number getBefore() {
+ return before;
+ }
+
+ public Number getAfter() {
+ return after;
+ }
public static class Numeric extends RangeFacet<Number, Number> {
- public Numeric(String name, Number start, Number end, Number gap) {
- super(name, start, end, gap);
+ public Numeric(String name, Number start, Number end, Number gap, Number before, Number after) {
+ super(name, start, end, gap, before, after);
}
}
public static class Date extends RangeFacet<java.util.Date, String> {
- public Date(String name, java.util.Date start, java.util.Date end, String gap) {
- super(name, start, end, gap);
+ 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);
}
}
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/sampleDateFacetResponse.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/sampleDateFacetResponse.xml?rev=1180378&r1=1180377&r2=1180378&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/sampleDateFacetResponse.xml (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/sampleDateFacetResponse.xml Sat Oct 8 14:14:08 2011
@@ -72,7 +72,9 @@
<str name="gap">+1YEAR</str>
<date name="start">2005-02-13T15:26:37Z</date>
<date name="end">2008-02-13T15:26:37Z</date>
+ <int name="before">90</int>
+ <int name="after">1</int>
</lst>
</lst>
</lst>
-</response>
\ No newline at end of file
+</response>
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java?rev=1180378&r1=1180377&r2=1180378&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java Sat Oct 8 14:14:08 2011
@@ -112,6 +112,8 @@ public class QueryResponseTest extends L
assertEquals(7, manufacturedateDt.getCounts().get(1).getCount());
assertEquals("2007-02-13T15:26:37Z", manufacturedateDt.getCounts().get(2).getValue());
assertEquals(0, manufacturedateDt.getCounts().get(2).getCount());
+ assertEquals(90, manufacturedateDt.getBefore());
+ assertEquals(1, manufacturedateDt.getAfter());
}
@Test