lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [36/52] [abbrv] lucene-solr:jira/solr-9858: Revert "Merge remote-tracking branch 'origin/master'"
Date Wed, 15 Feb 2017 19:00:40 GMT
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml b/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
index e4747d8..c6491eb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
@@ -109,7 +109,7 @@
   <!-- If you remove this field, you must _also_ disable the update log in solrconfig.xml
      or Solr won't start. _version_ and update log are required for SolrCloud
   -->
-  <field name="_version_" type="${solr.tests.longClass:plong}" indexed="false" stored="false"
docValues="true"/>
+  <field name="_version_" type="long" indexed="false" stored="false" docValues="true"/>
 
   <!-- points to the root document of a block of nested documents. Required for nested
      document support, may be removed otherwise
@@ -130,9 +130,9 @@
   <field name="includes" type="text_general" indexed="true" stored="true" termVectors="true"
termPositions="true"
          termOffsets="true"/>
 
-  <field name="weight" type="${solr.tests.floatClass:pfloat}" indexed="true" stored="true"/>
-  <field name="price" type="${solr.tests.floatClass:pfloat}" indexed="true" stored="true"/>
-  <field name="popularity" type="${solr.tests.intClass:pint}" indexed="true" stored="true"/>
+  <field name="weight" type="float" indexed="true" stored="true"/>
+  <field name="price" type="float" indexed="true" stored="true"/>
+  <field name="popularity" type="int" indexed="true" stored="true"/>
   <field name="inStock" type="boolean" indexed="true" stored="true"/>
 
   <field name="store" type="location" indexed="true" stored="true"/>
@@ -200,27 +200,27 @@
       a "*" only at the start or the end.  -->
 
   <!-- docvalues and stored are exclusive -->
-  <dynamicField name="*_i" type="${solr.tests.intClass:pint}" indexed="true" stored="true"/>
-  <dynamicField name="*_is" type="${solr.tests.intClass:pint}" indexed="true" stored="true"
multiValued="true"/>
+  <dynamicField name="*_i" type="int" indexed="true" stored="true"/>
+  <dynamicField name="*_is" type="int" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_id" type="${solr.tests.intClass:pint}" indexed="true" stored="false"
docValues="true"/>
-  <dynamicField name="*_ids" type="${solr.tests.intClass:pint}" indexed="true" stored="false"
multiValued="true" docValues="true"/>
+  <dynamicField name="*_ids" type="int" indexed="true" stored="false" multiValued="true"
docValues="true"/>
   <dynamicField name="*_s" type="string" indexed="true" stored="true"/>
   <dynamicField name="*_s1" type="string" indexed="true" stored="true"/>
   <dynamicField name="*_ss" type="string" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_sd" type="string" indexed="true" stored="false" docValues="true"/>
   <dynamicField name="*_sds" type="string" indexed="true" stored="false" multiValued="true"
docValues="true"/>
-  <dynamicField name="*_l" type="${solr.tests.longClass:plong}" indexed="true" stored="true"/>
-  <dynamicField name="*_ls" type="${solr.tests.longClass:plong}" indexed="true" stored="true"
multiValued="true"/>
-  <dynamicField name="*_ld" type="${solr.tests.longClass:plong}" indexed="true" stored="false"
docValues="true"/>
-  <dynamicField name="*_lds" type="${solr.tests.longClass:plong}" indexed="true" stored="false"
multiValued="true" docValues="true"/>
-  <dynamicField name="*_f" type="${solr.tests.floatClass:pfloat}" indexed="true" stored="true"/>
-  <dynamicField name="*_fs" type="${solr.tests.floatClass:pfloat}" indexed="true" stored="true"
multiValued="true"/>
+  <dynamicField name="*_l" type="long" indexed="true" stored="true"/>
+  <dynamicField name="*_ls" type="long" indexed="true" stored="true" multiValued="true"/>
+  <dynamicField name="*_ld" type="long" indexed="true" stored="false" docValues="true"/>
+  <dynamicField name="*_lds" type="long" indexed="true" stored="false" multiValued="true"
docValues="true"/>
+  <dynamicField name="*_f" type="float" indexed="true" stored="true"/>
+  <dynamicField name="*_fs" type="float" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_fd" type="${solr.tests.floatClass:pfloat}" indexed="true" stored="false"
docValues="true"/>
-  <dynamicField name="*_fds" type="${solr.tests.floatClass:pfloat}" indexed="true" stored="false"
multiValued="true" docValues="true"/>
-  <dynamicField name="*_d" type="${solr.tests.doubleClass:pdouble}" indexed="true" stored="true"/>
-  <dynamicField name="*_ds" type="${solr.tests.doubleClass:pdouble}" indexed="true" stored="true"
multiValued="true"/>
+  <dynamicField name="*_fds" type="float" indexed="true" stored="false" multiValued="true"
docValues="true"/>
+  <dynamicField name="*_d" type="double" indexed="true" stored="true"/>
+  <dynamicField name="*_ds" type="double" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_dd" type="${solr.tests.doubleClass:pdouble}" indexed="true" stored="false"
docValues="true"/>
-  <dynamicField name="*_dds" type="${solr.tests.doubleClass:pdouble}" indexed="true" stored="false"
multiValued="true" docValues="true"/>
+  <dynamicField name="*_dds" type="double" indexed="true" stored="false" multiValued="true"
docValues="true"/>
   <dynamicField name="*_dt" type="date" indexed="true" stored="true"/>
   <dynamicField name="*_dts" type="date" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_dtd" type="date" indexed="true" stored="false" docValues="true"/>
@@ -228,15 +228,15 @@
 
   <!-- docvalues and stored (S suffix) -->
   <dynamicField name="*_idS" type="${solr.tests.intClass:pint}" indexed="true" stored="true"
docValues="true"/>
-  <dynamicField name="*_idsS" type="${solr.tests.intClass:pint}" indexed="true" stored="true"
multiValued="true" docValues="true"/>
+  <dynamicField name="*_idsS" type="int" indexed="true" stored="true" multiValued="true"
docValues="true"/>
   <dynamicField name="*_sdS" type="string" indexed="true" stored="true" docValues="true"/>
   <dynamicField name="*_sdsS" type="string" indexed="true" stored="true" multiValued="true"
docValues="true"/>
   <dynamicField name="*_ldS" type="${solr.tests.longClass:plong}" indexed="true" stored="true"
docValues="true"/>
-  <dynamicField name="*_ldsS" type="${solr.tests.longClass:plong}" indexed="true" stored="true"
multiValued="true" docValues="true"/>
+  <dynamicField name="*_ldsS" type="long" indexed="true" stored="true" multiValued="true"
docValues="true"/>
   <dynamicField name="*_fdS" type="${solr.tests.floatClass:pfloat}" indexed="true" stored="true"
docValues="true"/>
-  <dynamicField name="*_fdsS" type="${solr.tests.floatClass:pfloat}" indexed="true" stored="true"
multiValued="true" docValues="true"/>
+  <dynamicField name="*_fdsS" type="float" indexed="true" stored="true" multiValued="true"
docValues="true"/>
   <dynamicField name="*_ddS" type="${solr.tests.doubleClass:pdouble}" indexed="true" stored="true"
docValues="true"/>
-  <dynamicField name="*_ddsS" type="${solr.tests.doubleClass:pdouble}" indexed="true"
stored="true" multiValued="true" docValues="true"/>
+  <dynamicField name="*_ddsS" type="double" indexed="true" stored="true" multiValued="true"
docValues="true"/>
   <dynamicField name="*_dtdS" type="date" indexed="true" stored="true" docValues="true"/>
   <dynamicField name="*_dtdsS" type="date" indexed="true" stored="true" multiValued="true"
docValues="true"/>
 
@@ -396,10 +396,10 @@
   <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
   
   <!-- Point Fields -->
-  <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
-  <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
-  <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
-  <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
+  <fieldType name="pint" class="solr.IntPointField"/>
+  <fieldType name="plong" class="solr.LongPointField"/>
+  <fieldType name="pdouble" class="solr.DoublePointField"/>
+  <fieldType name="pfloat" class="solr.FloatPointField"/>
   
 
   <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
index a38bc04..bb1cbcf 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
@@ -35,8 +35,6 @@
       <arr name="typeClass">
         <str>solr.TrieIntField</str>
         <str>solr.TrieLongField</str>
-        <str>solr.IntPointField</str>
-        <str>solr.LongPointField</str>
       </arr>
     </processor>
     <processor class="solr.MinFieldValueUpdateProcessorFactory">

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
index fc48847..24ab689 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
@@ -76,8 +76,8 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase
{
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   String t1="a_t";
-  String i1 = pickRandom("a_i1", "a_i_p", "a_i_ni_p");
-  String nint = pickRandom("n_i", "n_is_p", "n_is_ni_p");
+  String i1="a_i1";
+  String nint = "n_i";
   String tint = "n_ti";
   String tlong = "other_tl1";
   String tdate_a = "a_n_tdt";
@@ -187,8 +187,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase
{
     // these queries should be exactly ordered and scores should exactly match
     query("q","*:*", "sort",i1+" desc");
     query("q","*:*", "sort","{!func}testfunc(add("+i1+",5))"+" desc");
-    query("q",i1 + "[* TO *]", "sort",i1+" asc");
-    query("q","*:*", "sort",i1+" asc, id desc");
+    query("q","*:*", "sort",i1+" asc");
     query("q","*:*", "sort",i1+" desc", "fl","*,score");
     query("q","*:*", "sort","n_tl1 asc", "fl","*,score"); 
     query("q","*:*", "sort","n_tl1 desc");
@@ -423,7 +422,6 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase
{
     
     query("q","*:*", "sort",i1+" desc", "stats", "true", "stats.field", "stats_dt");
     query("q","*:*", "sort",i1+" desc", "stats", "true", "stats.field", i1);
-    query("q","*:*", "sort",i1+" desc", "stats", "true", "stats.field", nint);
 
     handle.put("stddev", FUZZY);
     handle.put("sumOfSquares", FUZZY);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
index 2910e0c..dc6c627 100644
--- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
@@ -50,7 +50,6 @@ import org.noggit.ObjectBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SolrTestCaseJ4.SuppressPointFields(bugUrl="https://issues.apache.org/jira/browse/SOLR-9992")
 public class TestGroupingSearch extends SolrTestCaseJ4 {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
index 0a9cb2b..dc0f5c2 100644
--- a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
+++ b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java
@@ -74,12 +74,6 @@ public class TestRandomDVFaceting extends SolrTestCaseJ4 {
     types.add(new FldType("small2_i",ZERO_ONE, new IRange(0,5+indexSize/3)));
     types.add(new FldType("small2_is",ZERO_TWO, new IRange(0,5+indexSize/3)));
     types.add(new FldType("small3_is",new IRange(0,25), new IRange(0,100)));
-    
-    types.add(new FldType("foo_fs", new IRange(0,25), new FVal(0,indexSize)));
-    types.add(new FldType("foo_f", ZERO_ONE, new FVal(0,indexSize)));
-    types.add(new FldType("foo_ds", new IRange(0,25), new FVal(0,indexSize)));
-    types.add(new FldType("foo_d", ZERO_ONE, new FVal(0,indexSize)));
-    types.add(new FldType("foo_ls", new IRange(0,25), new IRange(0,indexSize)));
 
     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)));
@@ -162,9 +156,10 @@ public class TestRandomDVFaceting extends SolrTestCaseJ4 {
       Random rand = random();
       boolean validate = validateResponses;
       ModifiableSolrParams params = params("facet","true", "wt","json", "indent","true",
"omitHeader","true");
-      params.add("q","*:*");  // TODO: select subsets
+      params.add("q","*:*", "rows","0");  // TODO: select subsets
       params.add("rows","0");
 
+
       SchemaField sf = req.getSchema().getField(ftype.fname);
       boolean multiValued = sf.getType().multiValuedFieldCache();
       boolean indexed = sf.indexed();
@@ -178,16 +173,12 @@ public class TestRandomDVFaceting extends SolrTestCaseJ4 {
         params.add("facet.offset", Integer.toString(offset));
       }
 
+      int limit = 100;
       if (rand.nextInt(100) < 20) {
-        if(rarely()) {
-          params.add("facet.limit", "-1");
-        } else {
-          int limit = 100;
-          if (rand.nextBoolean()) {
-            limit = rand.nextInt(100) < 10 ? rand.nextInt(indexSize/2+1) : rand.nextInt(indexSize*2);
-          }
-          params.add("facet.limit", Integer.toString(limit));
+        if (rand.nextBoolean()) {
+          limit = rand.nextInt(100) < 10 ? rand.nextInt(indexSize/2+1) : rand.nextInt(indexSize*2);
         }
+        params.add("facet.limit", Integer.toString(limit));
       }
 
       // the following two situations cannot work for unindexed single-valued numerics:
@@ -243,10 +234,7 @@ public class TestRandomDVFaceting extends SolrTestCaseJ4 {
         responses.add(strResponse);
       }
       // If there is a PointField option for this test, also test it
-      // Don't check points if facet.mincount=0
-      if (h.getCore().getLatestSchema().getFieldOrNull(facet_field + "_p") != null
-          && params.get("facet.mincount") != null
-          && params.getInt("facet.mincount").intValue() > 0) {
+      if (h.getCore().getLatestSchema().getFieldOrNull(facet_field + "_p") != null) {
         params.set("facet.field", "{!key="+facet_field+"}"+facet_field+"_p");
         String strResponse = h.query(req(params));
         responses.add(strResponse);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
index 2720350..3fe12ed 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Random;
 
-import org.apache.solr.SolrTestCaseJ4.SuppressPointFields;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -32,8 +31,7 @@ import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ShardParams;
 import org.apache.solr.common.util.SimpleOrderedMap;
 import org.apache.solr.response.SolrQueryResponse;
-// This test uses grouping requests, which doesn't work yet with PointFields
-@SuppressPointFields(bugUrl="https://issues.apache.org/jira/browse/SOLR-9992")
+
 class SegmentTerminateEarlyTestState {
 
   final String keyField = "id";

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java
index de632c9..5e6283a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.lucene.util.TestUtil;
-import org.apache.solr.SolrTestCaseJ4.SuppressPointFields;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.schema.SchemaRequest.Field;
@@ -42,7 +41,6 @@ import org.junit.rules.TestName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressPointFields(bugUrl="https://issues.apache.org/jira/browse/SOLR-9992")
 public class TestSegmentSorting extends SolrCloudTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
index 1798ae5..c0e88fc 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
@@ -84,8 +84,7 @@ public class StatsComponentTest extends AbstractSolrTestCase {
             "stats_i","stats_l","stats_f","stats_d",
             "stats_ti","stats_tl","stats_tf","stats_td",
             "stats_ti_dv","stats_tl_dv","stats_tf_dv","stats_td_dv", 
-            "stats_ti_ni_dv","stats_tl_ni_dv","stats_tf_ni_dv","stats_td_ni_dv",
-            "stats_i_ni_p","stats_l_ni_p","stats_f_ni_p","stats_d_ni_p",
+            "stats_ti_ni_dv","stats_tl_ni_dv","stats_tf_ni_dv","stats_td_ni_dv"
     }) {
 
       // all of our checks should work with all of these params
@@ -112,9 +111,7 @@ public class StatsComponentTest extends AbstractSolrTestCase {
     for (String f : new String[] {"stats_ii",
             "stats_tis","stats_tfs","stats_tls","stats_tds",  // trie fields
             "stats_tis_dv","stats_tfs_dv","stats_tls_dv","stats_tds_dv",  // Doc Values
-            "stats_tis_ni_dv","stats_tfs_ni_dv","stats_tls_ni_dv","stats_tds_ni_dv",  //
Doc Values Not indexed
-            "stats_is_p", "stats_fs_p", "stats_ls_p", "stats_ds_p", // Point Fields
-            "stats_is_ni_p","stats_fs_ni_p","stats_ls_ni_p" // Point Doc Values Not indexed
+            "stats_tis_ni_dv","stats_tfs_ni_dv","stats_tls_ni_dv","stats_tds_ni_dv"  // Doc
Values Not indexed
                                   }) {
 
       doTestMVFieldStatisticsResult(f);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
index 177881a..0974524 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
@@ -27,8 +27,6 @@ import java.util.regex.Pattern;
  *
  *
  **/
-// TermsComponent not currently supported for PointFields
-@SolrTestCaseJ4.SuppressPointFields
 public class TermsComponentTest extends SolrTestCaseJ4 {
 
   @BeforeClass

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java b/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java
index fa23494..ea7c001 100644
--- a/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java
+++ b/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java
@@ -17,9 +17,6 @@
 
 package org.apache.solr.request;
 
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import org.apache.solr.request.SimpleFacets.FacetMethod;
 import org.apache.solr.schema.BoolField;
 import org.apache.solr.schema.IntPointField;
@@ -28,6 +25,8 @@ import org.apache.solr.schema.StrField;
 import org.apache.solr.schema.TrieIntField;
 import org.junit.Test;
 
+import static junit.framework.Assert.assertEquals;
+
 public class TestFacetMethods {
 
   // TODO - make these public in FieldProperties?
@@ -215,12 +214,6 @@ public class TestFacetMethods {
     assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, FacetMethod.ENUM,
0));
     assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, FacetMethod.FC,
0));
     assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, FacetMethod.FCS,
0));
-    field = new SchemaField("fooMV", new IntPointField(), 0x00000200, "0"); //MultiValued
-    assertTrue(field.multiValued());
-    assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, null,
0));
-    assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, FacetMethod.ENUM,
0));
-    assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, FacetMethod.FC,
0));
-    assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, FacetMethod.FCS,
0));
   }
 
 }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/325cbf00/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
index f0c5f43..5a4510f 100644
--- a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
+++ b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
@@ -105,11 +105,10 @@ public class TestIntervalFaceting extends SolrTestCaseJ4 {
     assertU(adoc("id", "10"));
     assertU(commit());
     int i = 11;
-    while (getNumberOfReaders() < 2 && i < 20) {
+    while (getNumberOfReaders() < 2 && i < 10) {
       //try to get more than one segment
       assertU(adoc("id", String.valueOf(i), "test_i_dv", String.valueOf(i)));
       assertU(commit());
-      i++;
     }
     if (getNumberOfReaders() < 2) {
       // It is OK if for some seeds we fall into this case (for example, TieredMergePolicy
with
@@ -245,11 +244,9 @@ public class TestIntervalFaceting extends SolrTestCaseJ4 {
     // All field values will be a number between 0 and cardinality
     int cardinality = 100000;
     // Fields to use for interval faceting
-    String[] fields = new String[]{
-        "test_s_dv", "test_i_dv", "test_l_dv", "test_f_dv", "test_d_dv",
+    String[] fields = new String[]{"test_s_dv", "test_i_dv", "test_l_dv", "test_f_dv", "test_d_dv",
         "test_ss_dv", "test_is_dv", "test_fs_dv", "test_ls_dv", "test_ds_dv", "test_s", "test_i",

-        "test_l", "test_f", "test_d", "test_ss", "test_is", "test_fs", "test_ls", "test_ds",
-        "test_i_p", "test_is_p", "test_l_p", "test_ls_p", "test_f_p", "test_fs_p", "test_d_p",
"test_ds_p"};
+        "test_l", "test_f", "test_d", "test_ss", "test_is", "test_fs", "test_ls", "test_ds"};
     for (int i = 0; i < atLeast(500); i++) {
       if (random().nextInt(50) == 0) {
         //have some empty docs
@@ -746,11 +743,10 @@ public class TestIntervalFaceting extends SolrTestCaseJ4 {
     assertU(commit());
     
     int i = 12;
-    while (getNumberOfReaders() < 2 && i < 20) {
+    while (getNumberOfReaders() < 2 && i < 10) {
       //try to get more than one segment
       assertU(adoc("id", String.valueOf(i), "test_s_dv", String.valueOf(i)));
       assertU(commit());
-      i++;
     }
     if (getNumberOfReaders() < 2) {
       // It is OK if for some seeds we fall into this case (for example, TieredMergePolicy
with


Mime
View raw message