You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2017/06/23 00:04:57 UTC

[1/2] lucene-solr:master: SOLR-9989: Enable generic testing for other facet methods

Repository: lucene-solr
Updated Branches:
  refs/heads/master 01b7e3156 -> 4e033a0f4


SOLR-9989: Enable generic testing for other facet methods


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6aec01e4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6aec01e4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6aec01e4

Branch: refs/heads/master
Commit: 6aec01e426402937d05ca92442acb54e2cde9b79
Parents: 8d92e08
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Jun 23 07:02:29 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Jun 23 07:02:29 2017 +0700

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/search/facet/FacetRange.java    | 2 +-
 .../core/src/test/org/apache/solr/search/facet/TestJsonFacets.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6aec01e4/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java
index 5bd8899..b99b4b8 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java
@@ -572,7 +572,7 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
       super(f);
       this.now = now;
       if (! (field.getType() instanceof TrieDateField) && !(field.getType().isPointField()) ) {
-        throw new IllegalArgumentException("SchemaField must use field type extending TrieDateField or DateRangeField");
+        throw new IllegalArgumentException("SchemaField must use field type extending TrieDateField, DateRangeField or PointField");
       }
     }
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6aec01e4/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
index fbffd5c..8d6b4df 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
@@ -89,7 +89,6 @@ public class TestJsonFacets extends SolrTestCaseHS {
   public static Iterable<Object[]> parameters() {
     // wrap each enum val in an Object[] and return as Iterable
     return () -> Arrays.stream(FacetField.FacetMethod.values())
-        .filter(m -> m == FacetField.FacetMethod.ENUM)
         .map(it -> new Object[]{it}).iterator();
   }
 


[2/2] lucene-solr:master: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

Posted by da...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4e033a0f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4e033a0f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4e033a0f

Branch: refs/heads/master
Commit: 4e033a0f4e1fc90a900a00506957fd6db384a4f3
Parents: 6aec01e 01b7e31
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Jun 23 07:04:17 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Jun 23 07:04:17 2017 +0700

----------------------------------------------------------------------
 .../org/apache/solr/handler/component/TermsComponentTest.java   | 2 +-
 .../org/apache/solr/search/facet/TestJsonFacetRefinement.java   | 5 +++--
 .../test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------