You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/07/13 19:30:49 UTC
[2/2] lucene-solr:branch_7x: SOLR-11043: Precommit fix and trivial
change to test
SOLR-11043: Precommit fix and trivial change to test
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3abdff12
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3abdff12
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3abdff12
Branch: refs/heads/branch_7x
Commit: 3abdff12cc05d04a8c8ab6676a39a4f2bb593654
Parents: 6095d11
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu Jul 13 12:29:33 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu Jul 13 12:30:08 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +-
.../src/test/org/apache/solr/request/SimpleFacetsTest.java | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3abdff12/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index dc6c57a..5df0c6d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -320,7 +320,7 @@ Bug Fixes
* SOLR-11045: The new replica created by MoveReplica will have to have same name and coreName as the
old one in case of HDFS (Cao Manh Dat)
-* SOLR-11043: Fix facet.range.method=dv and interval facets on negative single-valued float fields.
+* SOLR-11043: Fix facet.range.method=dv and interval facets on single-valued float fields with negative values.
(Tomás Fernández Löbbe, Steve Rowe)
Optimizations
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3abdff12/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
index 86c57ff..b338bbf 100644
--- a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
+++ b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.request;
+import com.fasterxml.jackson.core.JsonParser.NumberType;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
@@ -185,7 +186,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
public void testDvMethodNegativeFloatRangeFacet() throws Exception {
String field = "negative_num_f1_dv";
- assertTrue(h.getCore().getLatestSchema().getField(field).hasDocValues());
+ assertTrue("Unexpected schema configuration", h.getCore().getLatestSchema().getField(field).hasDocValues());
+ assertEquals("Unexpected schema configuration", NumberType.FLOAT, h.getCore().getLatestSchema().getField(field).getType().getNumberType());
+ assertFalse("Unexpected schema configuration", h.getCore().getLatestSchema().getField(field).getType().isMultiValued());
final String[] commonParams = {
"q", "*:*", "facet", "true", "facet.range.start", "-2", "facet.range.end", "0", "facet.range.gap", "2"
@@ -197,10 +200,10 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertU(commit());
assertQ(req(commonParams, "facet.range", field, "facet.range.method", "filter"),
- String.format(countAssertion, field)
+ String.format(Locale.ROOT, countAssertion, field)
);
assertQ(req(commonParams, "facet.range", field, "facet.range.method", "dv"),
- String.format(countAssertion, field)
+ String.format(Locale.ROOT, countAssertion, field)
);
}