You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/07/19 01:10:49 UTC

lucene-solr:master: SOLR-11120: Remove trie fieldTypes from schema-points.xml

Repository: lucene-solr
Updated Branches:
  refs/heads/master 49ff81756 -> bddbef0ce


SOLR-11120: Remove trie fieldTypes from schema-points.xml


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

Branch: refs/heads/master
Commit: bddbef0ce98419233b80a5c433bf763a9a4d6e1b
Parents: 49ff817
Author: Chris Hostetter <ho...@apache.org>
Authored: Tue Jul 18 18:10:44 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Tue Jul 18 18:10:44 2017 -0700

----------------------------------------------------------------------
 solr/CHANGES.txt                                        |  1 +
 .../test-files/solr/collection1/conf/schema-point.xml   | 12 +-----------
 .../test/org/apache/solr/schema/TestPointFields.java    |  1 -
 3 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bddbef0c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 28c5777..45f3830 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -520,6 +520,7 @@ Other Changes
   - SOLR-11114: Randomize PointFields in schema-customfield.xml and TestOverriddenPrefixQueryForCustomFieldType (hossman)
   - SOLR-11074: Randomize PointFields in cloud-dynamic configset and all related tests (Anshum Gupta)
   - SOLR-11121: Randomize PointFields in schema-trie.xml and TestTrie (hossman)
+  - SOLR-11120: Remove trie fieldTypes from schema-points.xml (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/bddbef0c/solr/core/src/test-files/solr/collection1/conf/schema-point.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-point.xml b/solr/core/src/test-files/solr/collection1/conf/schema-point.xml
index c024cb6..c933d13 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-point.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-point.xml
@@ -27,26 +27,16 @@
     <fieldType name="pfloat" class="solr.FloatPointField" useDocValuesAsStored="false"/>
     <fieldType name="pdate" class="solr.DatePointField" useDocValuesAsStored="false"/>
     
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
  </types>
 
  <fields>
    <field name="id" type="string"/>
    <field name="text" type="string"/>
-   <field name="_version_" type="long" indexed="true" stored="true" multiValued="false" />
+   <field name="_version_" type="plong" indexed="true" stored="true" multiValued="false" />
    <field name="signatureField" type="string" indexed="true" stored="false"/>
 
    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true"/>
    <dynamicField name="*_sS" type="string"  indexed="false" stored="true"/>
-   <dynamicField name="*_i"  type="int"    indexed="true"  stored="true"/>
-   <dynamicField name="*_l"  type="long"   indexed="true"  stored="true"/>
-   <dynamicField name="*_f"  type="float"  indexed="true"  stored="true"/>
-   <dynamicField name="*_d"  type="double" indexed="true"  stored="true"/>
-   <dynamicField name="*_dt"  type="date" indexed="true"  stored="true"/>
    
    <dynamicField name="*_p_i"  type="pint"    indexed="true"  stored="true"/>
    <dynamicField name="*_p_i_dv"  type="pint"    indexed="true"  stored="true" docValues="true"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bddbef0c/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
index 7aad542..04d704d 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -505,7 +505,6 @@ public class TestPointFields extends SolrTestCaseJ4 {
 
   @Test
   public void testDoublePointFieldExactQuery() throws Exception {
-    doTestFloatPointFieldExactQuery("number_d", true);
     doTestFloatPointFieldExactQuery("number_p_d", true);
     doTestFloatPointFieldExactQuery("number_p_d_mv", true);
     doTestFloatPointFieldExactQuery("number_p_d_dv", true);