lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [25/58] [abbrv] lucene-solr:jira/solr-10879: SOLR-10970: Randomize PointFields in all tests using schema-*sort* files
Date Mon, 03 Jul 2017 11:58:05 GMT
SOLR-10970: Randomize PointFields in all tests using schema-*sort* files


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

Branch: refs/heads/jira/solr-10879
Commit: 89abc989075f3b213ffd84139b0798ced02a32cc
Parents: 82a44be
Author: Chris Hostetter <hossman@apache.org>
Authored: Wed Jun 28 14:52:40 2017 -0700
Committer: Chris Hostetter <hossman@apache.org>
Committed: Wed Jun 28 14:52:40 2017 -0700

----------------------------------------------------------------------
 solr/CHANGES.txt                                |  1 +
 .../conf/schema-distributed-missing-sort.xml    | 28 ++++++++++----------
 .../conf/schema-field-sort-values.xml           |  4 +--
 .../collection1/conf/schema-sortingresponse.xml | 22 +++++++--------
 4 files changed, 28 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89abc989/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index be23b3a..bbda1a3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -357,6 +357,7 @@ Other Changes
 * SOLR-10807: Randomize Points based numeric field types in (more) test schemas
   - SOLR-10946: Randomize the usage of Points based numerics in solrj test schemas (hossman)
   - SOLR-10947: Randomize the usage of Points based numerics in contrib test schemas (hossman)
+  - SOLR-10970: Randomize PointFields in all tests using schema-*sort* files (hossman)
 
 * SOLR-6807: Changed requestDispatcher's handleSelect to default to false, thus ignoring
"qt".
   Simplified configs to not refer to handleSelect or "qt".  Switch all tests that assumed
true to assume false

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89abc989/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
index 13daf46..2187449 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
@@ -17,29 +17,29 @@
 -->
 
 <schema name="test-distributed-missing-sort" version="1.6">
-  <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-  <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true"
positionIncrementGap="0"/>
+  <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+  <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
 
-  <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
-  <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true"
positionIncrementGap="0"/>
+  <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+  <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
 
-  <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
-  <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true"
positionIncrementGap="0"/>
+  <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+  <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
 
-  <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
-  <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true"
positionIncrementGap="0"/>
+  <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+  <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
 
-  <fieldType name="date" class="solr.TrieDateField" precisionStep="0"/>
-  <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6"/>
+  <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0"/>
+  <fieldType name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="6"/>
 
   <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
 
-  <fieldType name="int_ml" class="solr.TrieIntField" precisionStep="0" sortMissingLast="true"/>
-  <fieldType name="int_mf" class="solr.TrieIntField" precisionStep="0" sortMissingFirst="true"/>
+  <fieldType name="int_ml" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" sortMissingLast="true"/>
+  <fieldType name="int_mf" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" sortMissingFirst="true"/>
 
-  <fieldType name="long_ml" class="solr.TrieLongField" precisionStep="0" omitNorms="true"
positionIncrementGap="0"
+  <fieldType name="long_ml" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"
              sortMissingLast="true"/>
-  <fieldType name="long_mf" class="solr.TrieLongField" precisionStep="0" omitNorms="true"
positionIncrementGap="0"
+  <fieldType name="long_mf" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"
              sortMissingFirst="true"/>
 
   <fieldType name="string_ml" class="solr.StrField" sortMissingLast="true"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89abc989/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
index 94485f6..3a9cd3b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
@@ -17,8 +17,8 @@
 -->
 
 <schema name="test-custom-comparator" version="1.6">
-  <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-  <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
+  <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+  <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
   <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
   <fieldType name="text" class="solr.TextField">
     <analyzer>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89abc989/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
index 680a5d3..c45f178 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
@@ -25,7 +25,7 @@
   <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
        seconds part (.999) is optional.
     -->
-  <fieldType name="date" class="${solr.tests.DateFieldType}" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
+  <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
   
   <!-- Point Fields -->
   <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
@@ -41,18 +41,18 @@
   <fieldType name="uuid" class="solr.UUIDField"/>
 
   <field name="id" type="string" required="true" indexed="true"/>
-  <field name="floatdv_m" type="${solr.tests.floatClass:pfloat}" indexed="false" stored="false"
docValues="true" multiValued="true"/>
-  <field name="intdv_m" type="${solr.tests.intClass:pint}" indexed="false" stored="false"
docValues="true" multiValued="true"/>
-  <field name="doubledv_m" type="${solr.tests.doubleClass:pdouble}" indexed="false" stored="false"
docValues="true" multiValued="true"/>
-  <field name="longdv_m" type="${solr.tests.longClass:plong}" indexed="false" stored="false"
docValues="true" multiValued="true"/>
-  <field name="datedv_m" type="${solr.tests.dateClass:pdate}" indexed="false" stored="false"
docValues="true" multiValued="true"/>
+  <field name="floatdv_m" type="float" indexed="false" stored="false" docValues="true"
multiValued="true"/>
+  <field name="intdv_m" type="int" indexed="false" stored="false" docValues="true" multiValued="true"/>
+  <field name="doubledv_m" type="double" indexed="false" stored="false" docValues="true"
multiValued="true"/>
+  <field name="longdv_m" type="long" indexed="false" stored="false" docValues="true" multiValued="true"/>
+  <field name="datedv_m" type="date" indexed="false" stored="false" docValues="true" multiValued="true"/>
   <field name="stringdv_m" type="string" indexed="false" stored="false" docValues="true"
multiValued="true"/>
 
-  <field name="floatdv" type="${solr.tests.floatClass:pfloat}" indexed="false" stored="false"
docValues="true"/>
-  <field name="intdv" type="${solr.tests.intClass:pint}" indexed="false" stored="false"
docValues="true"/>
-  <field name="doubledv" type="${solr.tests.doubleClass:pdouble}" indexed="false" stored="false"
docValues="true"/>
-  <field name="longdv" type="${solr.tests.longClass:plong}" indexed="false" stored="false"
docValues="true"/>
-  <field name="datedv" type="${solr.tests.dateClass:pdate}" indexed="false" stored="false"
docValues="true"/>
+  <field name="floatdv" type="float" indexed="false" stored="false" docValues="true"/>
+  <field name="intdv" type="int" indexed="false" stored="false" docValues="true"/>
+  <field name="doubledv" type="double" indexed="false" stored="false" docValues="true"/>
+  <field name="longdv" type="long" indexed="false" stored="false" docValues="true"/>
+  <field name="datedv" type="date" indexed="false" stored="false" docValues="true"/>
   <field name="stringdv" type="string" indexed="false" stored="false" docValues="true"/>
 
    <!-- Point fields explicitly -->


Mime
View raw message