lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject [10/24] lucene-solr:master: SOLR-9083: Remove deprecated <types> and <fields> from schemas
Date Tue, 10 May 2016 13:54:34 GMT
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
index ec2d73c..c918017 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
@@ -25,262 +25,293 @@ NOTE: Tests expect every field in this schema to be sortable.
 <schema name="sortable" version="1.6">
   <uniqueKey>id</uniqueKey>
 
-  <fields>
-    <field name="id" type="int" />
-    <field name="_version_" type="long" />
-
-    <field name="str" type="str" />
-    <field name="str_last" type="str_last" />
-    <field name="str_first" type="str_first" />
-    <field name="str_dv" type="str_dv" />
-    <field name="str_dv_last" type="str_dv_last" />
-    <field name="str_dv_first" type="str_dv_first" />
-
-    <field name="bin" type="bin" />
-    <field name="bin_last" type="bin_last" />
-    <field name="bin_first" type="bin_first" />
-    <field name="bin_dv" type="bin_dv" />
-    <field name="bin_dv_last" type="bin_dv_last" />
-    <field name="bin_dv_first" type="bin_dv_first" />
-
-    <field name="int" type="int" />
-    <field name="int_last" type="int_last" />
-    <field name="int_first" type="int_first" />
-    <field name="int_dv" type="int_dv" />
-    <field name="int_dv_last" type="int_dv_last" />
-    <field name="int_dv_first" type="int_dv_first" />
-
-    <field name="long" type="long" />
-    <field name="long_last" type="long_last" />
-    <field name="long_first" type="long_first" />
-    <field name="long_dv" type="long_dv" />
-    <field name="long_dv_last" type="long_dv_last" />
-    <field name="long_dv_first" type="long_dv_first" />
-
-    <field name="float" type="float" />
-    <field name="float_last" type="float_last" />
-    <field name="float_first" type="float_first" />
-    <field name="float_dv" type="float_dv" />
-    <field name="float_dv_last" type="float_dv_last" />
-    <field name="float_dv_first" type="float_dv_first" />
-
-    <field name="double" type="double" />
-    <field name="double_last" type="double_last" />
-    <field name="double_first" type="double_first" />
-    <field name="double_dv" type="double_dv" />
-    <field name="double_dv_last" type="double_dv_last" />
-    <field name="double_dv_first" type="double_dv_first" />
-
-    <field name="date" type="date" />
-    <field name="date_last" type="date_last" />
-    <field name="date_first" type="date_first" />
-    <field name="date_dv" type="date_dv" />
-    <field name="date_dv_last" type="date_dv_last" />
-    <field name="date_dv_first" type="date_dv_first" />
-
-    <field name="uuid" type="uuid" />
-    <field name="uuid_last" type="uuid_last" />
-    <field name="uuid_first" type="uuid_first" />
-    <field name="uuid_dv" type="uuid_dv" />
-    <field name="uuid_dv_last" type="uuid_dv_last" />
-    <field name="uuid_dv_first" type="uuid_dv_first" />
-
-    <field name="currency" type="currency" />
-    <field name="currency_last" type="currency_last" />
-    <field name="currency_first" type="currency_first" />
-
-    <field name="collation_en_primary" type="collation_en_primary" />
-    <field name="collation_en_primary_last" type="collation_en_primary_last" />
-    <field name="collation_en_primary_first" type="collation_en_primary_first" />
-    <field name="collation_en_primary_dv" type="collation_en_primary_dv" />
-    <field name="collation_en_primary_dv_last" type="collation_en_primary_dv_last" />
-    <field name="collation_en_primary_dv_first" type="collation_en_primary_dv_first" />
-
-    <field name="icu_collation_en_primary" type="icu_collation_en_primary" />
-    <field name="icu_collation_en_primary_last" type="icu_collation_en_primary_last" />
-    <field name="icu_collation_en_primary_first" type="icu_collation_en_primary_first"
/>
-    <field name="icu_collation_en_primary_dv" type="icu_collation_en_primary_dv" />
-    <field name="icu_collation_en_primary_dv_last" type="icu_collation_en_primary_dv_last"
/>
-    <field name="icu_collation_en_primary_dv_first" type="icu_collation_en_primary_dv_first"
/>
-
-    <field name="bool" type="bool" />
-    <field name="bool_last" type="bool_last" />
-    <field name="bool_first" type="bool_first" />
-
-    <field name="enum" type="enum" />
-    <field name="enum_last" type="enum_last" />
-    <field name="enum_first" type="enum_first" />
-    <!-- EnumField incorrectly disallows missing DocValues - see SOLR-5927 -->
-    <!-- <field name="enum_dv" type="enum_dv" />                   -->
-    <!-- <field name="enum_dv_last" type="enum_dv_last" />         -->
-    <!-- <field name="enum_dv_first" type="enum_dv_first" />       -->
-
-    <!-- ensure function sorts don't mistakenly get interpreted as field sorts
-         https://issues.apache.org/jira/browse/SOLR-5354?focusedCommentId=13835891&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13835891
-    -->
-    <dynamicField name="*" type="str" multiValued="false" />
-  </fields>
-
-  <copyField source="str" dest="str_last" />
-  <copyField source="str" dest="str_first" />
-  <copyField source="str" dest="str_dv" />
-  <copyField source="str" dest="str_dv_last" />
-  <copyField source="str" dest="str_dv_first" />
-  <copyField source="str" dest="collation_en_primary_last" />
-  <copyField source="str" dest="collation_en_primary_first" />
-  <copyField source="str" dest="collation_en_primary_dv" />
-  <copyField source="str" dest="collation_en_primary_dv_last" />
-  <copyField source="str" dest="collation_en_primary_dv_first" />
-  <copyField source="str" dest="icu_collation_en_primary_last" />
-  <copyField source="str" dest="icu_collation_en_primary_first" />
-  <copyField source="str" dest="icu_collation_en_primary_dv" />
-  <copyField source="str" dest="icu_collation_en_primary_dv_last" />
-  <copyField source="str" dest="icu_collation_en_primary_dv_first" />
-
-  <copyField source="bin" dest="bin_last" />
-  <copyField source="bin" dest="bin_first" />
-  <copyField source="bin" dest="bin_dv" />
-  <copyField source="bin" dest="bin_dv_last" />
-  <copyField source="bin" dest="bin_dv_first" />
-
-  <copyField source="int" dest="int_last" />
-  <copyField source="int" dest="int_first" />
-  <copyField source="int" dest="int_dv" />
-  <copyField source="int" dest="int_dv_last" />
-  <copyField source="int" dest="int_dv_first" />
-
-  <copyField source="long" dest="long_last" />
-  <copyField source="long" dest="long_first" />
-  <copyField source="long" dest="long_dv" />
-  <copyField source="long" dest="long_dv_last" />
-  <copyField source="long" dest="long_dv_first" />
-
-  <copyField source="float" dest="float_last" />
-  <copyField source="float" dest="float_first" />
-  <copyField source="float" dest="float_dv" />
-  <copyField source="float" dest="float_dv_last" />
-  <copyField source="float" dest="float_dv_first" />
-
-  <copyField source="double" dest="double_last" />
-  <copyField source="double" dest="double_first" />
-  <copyField source="double" dest="double_dv" />
-  <copyField source="double" dest="double_dv_last" />
-  <copyField source="double" dest="double_dv_first" />
-
-  <copyField source="date" dest="date_last" />
-  <copyField source="date" dest="date_first" />
-  <copyField source="date" dest="date_dv" />
-  <copyField source="date" dest="date_dv_last" />
-  <copyField source="date" dest="date_dv_first" />
-
-  <copyField source="uuid" dest="uuid_last" />
-  <copyField source="uuid" dest="uuid_first" />
-  <copyField source="uuid" dest="uuid_dv" />
-  <copyField source="uuid" dest="uuid_dv_last" />
-  <copyField source="uuid" dest="uuid_dv_first" />
-
-  <copyField source="currency" dest="currency_last" />
-  <copyField source="currency" dest="currency_first" />
-
-  <copyField source="bool" dest="bool_last" />
-  <copyField source="bool" dest="bool_first" />
-
-  <copyField source="enum" dest="enum_last" />
-  <copyField source="enum" dest="enum_first" />
+  <field name="id" type="int"/>
+  <field name="_version_" type="long"/>
+
+  <field name="str" type="str"/>
+  <field name="str_last" type="str_last"/>
+  <field name="str_first" type="str_first"/>
+  <field name="str_dv" type="str_dv"/>
+  <field name="str_dv_last" type="str_dv_last"/>
+  <field name="str_dv_first" type="str_dv_first"/>
+
+  <field name="bin" type="bin"/>
+  <field name="bin_last" type="bin_last"/>
+  <field name="bin_first" type="bin_first"/>
+  <field name="bin_dv" type="bin_dv"/>
+  <field name="bin_dv_last" type="bin_dv_last"/>
+  <field name="bin_dv_first" type="bin_dv_first"/>
+
+  <field name="int" type="int"/>
+  <field name="int_last" type="int_last"/>
+  <field name="int_first" type="int_first"/>
+  <field name="int_dv" type="int_dv"/>
+  <field name="int_dv_last" type="int_dv_last"/>
+  <field name="int_dv_first" type="int_dv_first"/>
+
+  <field name="long" type="long"/>
+  <field name="long_last" type="long_last"/>
+  <field name="long_first" type="long_first"/>
+  <field name="long_dv" type="long_dv"/>
+  <field name="long_dv_last" type="long_dv_last"/>
+  <field name="long_dv_first" type="long_dv_first"/>
+
+  <field name="float" type="float"/>
+  <field name="float_last" type="float_last"/>
+  <field name="float_first" type="float_first"/>
+  <field name="float_dv" type="float_dv"/>
+  <field name="float_dv_last" type="float_dv_last"/>
+  <field name="float_dv_first" type="float_dv_first"/>
+
+  <field name="double" type="double"/>
+  <field name="double_last" type="double_last"/>
+  <field name="double_first" type="double_first"/>
+  <field name="double_dv" type="double_dv"/>
+  <field name="double_dv_last" type="double_dv_last"/>
+  <field name="double_dv_first" type="double_dv_first"/>
+
+  <field name="date" type="date"/>
+  <field name="date_last" type="date_last"/>
+  <field name="date_first" type="date_first"/>
+  <field name="date_dv" type="date_dv"/>
+  <field name="date_dv_last" type="date_dv_last"/>
+  <field name="date_dv_first" type="date_dv_first"/>
+
+  <field name="uuid" type="uuid"/>
+  <field name="uuid_last" type="uuid_last"/>
+  <field name="uuid_first" type="uuid_first"/>
+  <field name="uuid_dv" type="uuid_dv"/>
+  <field name="uuid_dv_last" type="uuid_dv_last"/>
+  <field name="uuid_dv_first" type="uuid_dv_first"/>
+
+  <field name="currency" type="currency"/>
+  <field name="currency_last" type="currency_last"/>
+  <field name="currency_first" type="currency_first"/>
+
+  <field name="collation_en_primary" type="collation_en_primary"/>
+  <field name="collation_en_primary_last" type="collation_en_primary_last"/>
+  <field name="collation_en_primary_first" type="collation_en_primary_first"/>
+  <field name="collation_en_primary_dv" type="collation_en_primary_dv"/>
+  <field name="collation_en_primary_dv_last" type="collation_en_primary_dv_last"/>
+  <field name="collation_en_primary_dv_first" type="collation_en_primary_dv_first"/>
+
+  <field name="icu_collation_en_primary" type="icu_collation_en_primary"/>
+  <field name="icu_collation_en_primary_last" type="icu_collation_en_primary_last"/>
+  <field name="icu_collation_en_primary_first" type="icu_collation_en_primary_first"/>
+  <field name="icu_collation_en_primary_dv" type="icu_collation_en_primary_dv"/>
+  <field name="icu_collation_en_primary_dv_last" type="icu_collation_en_primary_dv_last"/>
+  <field name="icu_collation_en_primary_dv_first" type="icu_collation_en_primary_dv_first"/>
+
+  <field name="bool" type="bool"/>
+  <field name="bool_last" type="bool_last"/>
+  <field name="bool_first" type="bool_first"/>
+
+  <field name="enum" type="enum"/>
+  <field name="enum_last" type="enum_last"/>
+  <field name="enum_first" type="enum_first"/>
+  <!-- EnumField incorrectly disallows missing DocValues - see SOLR-5927 -->
+  <!-- <field name="enum_dv" type="enum_dv" />                   -->
+  <!-- <field name="enum_dv_last" type="enum_dv_last" />         -->
+  <!-- <field name="enum_dv_first" type="enum_dv_first" />       -->
+
+  <!-- ensure function sorts don't mistakenly get interpreted as field sorts
+       https://issues.apache.org/jira/browse/SOLR-5354?focusedCommentId=13835891&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13835891
+  -->
+  <dynamicField name="*" type="str" multiValued="false"/>
+
+  <copyField source="str" dest="str_last"/>
+  <copyField source="str" dest="str_first"/>
+  <copyField source="str" dest="str_dv"/>
+  <copyField source="str" dest="str_dv_last"/>
+  <copyField source="str" dest="str_dv_first"/>
+  <copyField source="str" dest="collation_en_primary_last"/>
+  <copyField source="str" dest="collation_en_primary_first"/>
+  <copyField source="str" dest="collation_en_primary_dv"/>
+  <copyField source="str" dest="collation_en_primary_dv_last"/>
+  <copyField source="str" dest="collation_en_primary_dv_first"/>
+  <copyField source="str" dest="icu_collation_en_primary_last"/>
+  <copyField source="str" dest="icu_collation_en_primary_first"/>
+  <copyField source="str" dest="icu_collation_en_primary_dv"/>
+  <copyField source="str" dest="icu_collation_en_primary_dv_last"/>
+  <copyField source="str" dest="icu_collation_en_primary_dv_first"/>
+
+  <copyField source="bin" dest="bin_last"/>
+  <copyField source="bin" dest="bin_first"/>
+  <copyField source="bin" dest="bin_dv"/>
+  <copyField source="bin" dest="bin_dv_last"/>
+  <copyField source="bin" dest="bin_dv_first"/>
+
+  <copyField source="int" dest="int_last"/>
+  <copyField source="int" dest="int_first"/>
+  <copyField source="int" dest="int_dv"/>
+  <copyField source="int" dest="int_dv_last"/>
+  <copyField source="int" dest="int_dv_first"/>
+
+  <copyField source="long" dest="long_last"/>
+  <copyField source="long" dest="long_first"/>
+  <copyField source="long" dest="long_dv"/>
+  <copyField source="long" dest="long_dv_last"/>
+  <copyField source="long" dest="long_dv_first"/>
+
+  <copyField source="float" dest="float_last"/>
+  <copyField source="float" dest="float_first"/>
+  <copyField source="float" dest="float_dv"/>
+  <copyField source="float" dest="float_dv_last"/>
+  <copyField source="float" dest="float_dv_first"/>
+
+  <copyField source="double" dest="double_last"/>
+  <copyField source="double" dest="double_first"/>
+  <copyField source="double" dest="double_dv"/>
+  <copyField source="double" dest="double_dv_last"/>
+  <copyField source="double" dest="double_dv_first"/>
+
+  <copyField source="date" dest="date_last"/>
+  <copyField source="date" dest="date_first"/>
+  <copyField source="date" dest="date_dv"/>
+  <copyField source="date" dest="date_dv_last"/>
+  <copyField source="date" dest="date_dv_first"/>
+
+  <copyField source="uuid" dest="uuid_last"/>
+  <copyField source="uuid" dest="uuid_first"/>
+  <copyField source="uuid" dest="uuid_dv"/>
+  <copyField source="uuid" dest="uuid_dv_last"/>
+  <copyField source="uuid" dest="uuid_dv_first"/>
+
+  <copyField source="currency" dest="currency_last"/>
+  <copyField source="currency" dest="currency_first"/>
+
+  <copyField source="bool" dest="bool_last"/>
+  <copyField source="bool" dest="bool_first"/>
+
+  <copyField source="enum" dest="enum_last"/>
+  <copyField source="enum" dest="enum_first"/>
   <!-- EnumField incorrectly disallows missing DocValues - see SOLR-5927 -->
   <!-- <copyField source="enum" dest="enum_dv" />                -->
   <!-- <copyField source="enum" dest="enum_dv_last" />           -->
   <!-- <copyField source="enum" dest="enum_dv_first" />          -->
 
-  <types>
-
-    <fieldType name="str" class="solr.StrField" stored="true" indexed="true" />
-    <fieldType name="str_last" class="solr.StrField" stored="true" indexed="true" sortMissingLast="true"/>
-    <fieldType name="str_first" class="solr.StrField" stored="true" indexed="true" sortMissingFirst="true"/>
-    <fieldType name="str_dv" class="solr.StrField" stored="true" indexed="false" docValues="true"/>
-    <fieldType name="str_dv_last" class="solr.StrField" stored="true" indexed="false"
docValues="true" sortMissingLast="true"/>
-    <fieldType name="str_dv_first" class="solr.StrField" stored="true" indexed="false"
docValues="true" sortMissingFirst="true"/>
-
-    <!-- note: all 'binary' fields have docvalues, because this fieldType doesnt support
indexing -->
-    <fieldType name="bin" class="solr.SortableBinaryField" stored="true" indexed="true"
docValues="true"/>
-    <fieldType name="bin_last" class="solr.SortableBinaryField" stored="true" indexed="true"
docValues="true" sortMissingLast="true"/>
-    <fieldType name="bin_first" class="solr.SortableBinaryField" stored="true" indexed="true"
docValues="true" sortMissingFirst="true"/>
-    <fieldType name="bin_dv" class="solr.SortableBinaryField" stored="true" indexed="false"
docValues="true"/>
-    <fieldType name="bin_dv_last" class="solr.SortableBinaryField" stored="true" indexed="false"
docValues="true" sortMissingLast="true"/>
-    <fieldType name="bin_dv_first" class="solr.SortableBinaryField" stored="true" indexed="false"
docValues="true" sortMissingFirst="true"/>
-
-    <fieldType name="int" class="solr.TrieIntField" stored="true" indexed="true" />
-    <fieldType name="int_last" class="solr.TrieIntField" stored="true" indexed="true"
sortMissingLast="true"/>
-    <fieldType name="int_first" class="solr.TrieIntField" stored="true" indexed="true"
sortMissingFirst="true"/>
-    <fieldType name="int_dv" class="solr.TrieIntField" stored="true" indexed="false" docValues="true"/>
-    <fieldType name="int_dv_last" class="solr.TrieIntField" stored="true" indexed="false"
docValues="true" sortMissingLast="true"/>
-    <fieldType name="int_dv_first" class="solr.TrieIntField" stored="true" indexed="false"
docValues="true" sortMissingFirst="true"/>
-
-    <fieldType name="long" class="solr.TrieLongField" stored="true" indexed="true" />
-    <fieldType name="long_last" class="solr.TrieLongField" stored="true" indexed="true"
sortMissingLast="true"/>
-    <fieldType name="long_first" class="solr.TrieLongField" stored="true" indexed="true"
sortMissingFirst="true"/>
-    <fieldType name="long_dv" class="solr.TrieLongField" stored="true" indexed="false"
docValues="true"/>
-    <fieldType name="long_dv_last" class="solr.TrieLongField" stored="true" indexed="false"
docValues="true" sortMissingLast="true"/>
-    <fieldType name="long_dv_first" class="solr.TrieLongField" stored="true" indexed="false"
docValues="true" sortMissingFirst="true"/>
-
-    <fieldType name="float" class="solr.TrieFloatField" stored="true" indexed="true" />
-    <fieldType name="float_last" class="solr.TrieFloatField" stored="true" indexed="true"
sortMissingLast="true"/>
-    <fieldType name="float_first" class="solr.TrieFloatField" stored="true" indexed="true"
sortMissingFirst="true"/>
-    <fieldType name="float_dv" class="solr.TrieFloatField" stored="true" indexed="false"
docValues="true"/>
-    <fieldType name="float_dv_last" class="solr.TrieFloatField" stored="true" indexed="false"
docValues="true" sortMissingLast="true"/>
-    <fieldType name="float_dv_first" class="solr.TrieFloatField" stored="true" indexed="false"
docValues="true" sortMissingFirst="true"/>
-
-    <fieldType name="double" class="solr.TrieDoubleField" stored="true" indexed="true"
/>
-    <fieldType name="double_last" class="solr.TrieDoubleField" stored="true" indexed="true"
sortMissingLast="true"/>
-    <fieldType name="double_first" class="solr.TrieDoubleField" stored="true" indexed="true"
sortMissingFirst="true"/>
-    <fieldType name="double_dv" class="solr.TrieDoubleField" stored="true" indexed="false"
docValues="true"/>
-    <fieldType name="double_dv_last" class="solr.TrieDoubleField" stored="true" indexed="false"
docValues="true" sortMissingLast="true"/>
-    <fieldType name="double_dv_first" class="solr.TrieDoubleField" stored="true" indexed="false"
docValues="true" sortMissingFirst="true"/>
-
-    <fieldType name="date" class="solr.TrieDateField" stored="true" indexed="true" />
-    <fieldType name="date_last" class="solr.TrieDateField" stored="true" indexed="true"
sortMissingLast="true"/>
-    <fieldType name="date_first" class="solr.TrieDateField" stored="true" indexed="true"
sortMissingFirst="true"/>
-    <fieldType name="date_dv" class="solr.TrieDateField" stored="true" indexed="false"
docValues="true"/>
-    <fieldType name="date_dv_last" class="solr.TrieDateField" stored="true" indexed="false"
docValues="true" sortMissingLast="true"/>
-    <fieldType name="date_dv_first" class="solr.TrieDateField" stored="true" indexed="false"
docValues="true" sortMissingFirst="true"/>
-
-    <fieldType name="uuid" class="solr.UUIDField" stored="true" indexed="true" />
-    <fieldType name="uuid_last" class="solr.UUIDField" stored="true" indexed="true" sortMissingLast="true"/>
-    <fieldType name="uuid_first" class="solr.UUIDField" stored="true" indexed="true" sortMissingFirst="true"/>
-    <fieldType name="uuid_dv" class="solr.UUIDField" stored="true" indexed="false" docValues="true"/>
-    <fieldType name="uuid_dv_last" class="solr.UUIDField" stored="true" indexed="false"
docValues="true" sortMissingLast="true"/>
-    <fieldType name="uuid_dv_first" class="solr.UUIDField" stored="true" indexed="false"
docValues="true" sortMissingFirst="true"/>
-
-    <fieldType name="currency" class="solr.CurrencyField" stored="true" indexed="true"
foo="bar" providerClass="solr.MockExchangeRateProvider"/>
-    <fieldType name="currency_last" class="solr.CurrencyField" stored="true" indexed="true"
foo="bar" providerClass="solr.MockExchangeRateProvider" sortMissingLast="true"/>
-    <fieldType name="currency_first" class="solr.CurrencyField" stored="true" indexed="true"
foo="bar" providerClass="solr.MockExchangeRateProvider" sortMissingFirst="true"/>
-
-    <fieldType name="collation_en_primary" class="solr.CollationField" language="en" strength="primary"
stored="true" indexed="true" />
-    <fieldType name="collation_en_primary_last" class="solr.CollationField" language="en"
strength="primary" stored="true" indexed="true" sortMissingLast="true"/>
-    <fieldType name="collation_en_primary_first" class="solr.CollationField" language="en"
strength="primary" stored="true" indexed="true" sortMissingFirst="true"/>
-    <fieldType name="collation_en_primary_dv" class="solr.CollationField" language="en"
strength="primary" stored="true" indexed="false" docValues="true"/>
-    <fieldType name="collation_en_primary_dv_last" class="solr.CollationField" language="en"
strength="primary" stored="true" indexed="false" docValues="true" sortMissingLast="true"/>
-    <fieldType name="collation_en_primary_dv_first" class="solr.CollationField" language="en"
strength="primary" stored="true" indexed="false" docValues="true" sortMissingFirst="true"/>
-
-    <fieldType name="icu_collation_en_primary" class="solr.ICUCollationField" locale="en"
strength="primary" stored="true" indexed="true" />
-    <fieldType name="icu_collation_en_primary_last" class="solr.ICUCollationField" locale="en"
strength="primary" stored="true" indexed="true" sortMissingLast="true"/>
-    <fieldType name="icu_collation_en_primary_first" class="solr.ICUCollationField" locale="en"
strength="primary" stored="true" indexed="true" sortMissingFirst="true"/>
-    <fieldType name="icu_collation_en_primary_dv" class="solr.ICUCollationField" locale="en"
strength="primary" stored="true" indexed="false" docValues="true"/>
-    <fieldType name="icu_collation_en_primary_dv_last" class="solr.ICUCollationField"
locale="en" strength="primary" stored="true" indexed="false" docValues="true" sortMissingLast="true"/>
-    <fieldType name="icu_collation_en_primary_dv_first" class="solr.ICUCollationField"
locale="en" strength="primary" stored="true" indexed="false" docValues="true" sortMissingFirst="true"/>
-
-    <!-- BoolField does not support DocValues - see SOLR-5933 -->
-    <fieldType name="bool" class="solr.BoolField" stored="true" indexed="true" />
-    <fieldType name="bool_last" class="solr.BoolField" stored="true" indexed="true" sortMissingLast="true"/>
-    <fieldType name="bool_first" class="solr.BoolField" stored="true" indexed="true" sortMissingFirst="true"/>
-
-    <fieldType name="enum" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity"/>
-    <fieldType name="enum_last" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity"
sortMissingLast="true"/>
-    <fieldType name="enum_first" class="solr.EnumField" enumsConfig="enumsConfig.xml"
enumName="severity" sortMissingFirst="true"/>
-    <!-- EnumField incorrectly disallows missing DocValues - see SOLR-5927 -->
-    <!-- <fieldType name="enum_dv" class="solr.EnumField" enumsConfig="enumsConfig.xml"
enumName="severity" docValues="true"/> -->
-    <!-- <fieldType name="enum_dv_last" class="solr.EnumField" enumsConfig="enumsConfig.xml"
enumName="severity" docValues="true" sortMissingLast="true"/> -->
-    <!-- <fieldType name="enum_dv_first" class="solr.EnumField" enumsConfig="enumsConfig.xml"
enumName="severity" docValues="true" sortMissingFirst="true"/> -->
-  </types>
+
+  <fieldType name="str" class="solr.StrField" stored="true" indexed="true"/>
+  <fieldType name="str_last" class="solr.StrField" stored="true" indexed="true" sortMissingLast="true"/>
+  <fieldType name="str_first" class="solr.StrField" stored="true" indexed="true" sortMissingFirst="true"/>
+  <fieldType name="str_dv" class="solr.StrField" stored="true" indexed="false" docValues="true"/>
+  <fieldType name="str_dv_last" class="solr.StrField" stored="true" indexed="false" docValues="true"
+             sortMissingLast="true"/>
+  <fieldType name="str_dv_first" class="solr.StrField" stored="true" indexed="false" docValues="true"
+             sortMissingFirst="true"/>
+
+  <!-- note: all 'binary' fields have docvalues, because this fieldType doesnt support
indexing -->
+  <fieldType name="bin" class="solr.SortableBinaryField" stored="true" indexed="true"
docValues="true"/>
+  <fieldType name="bin_last" class="solr.SortableBinaryField" stored="true" indexed="true"
docValues="true"
+             sortMissingLast="true"/>
+  <fieldType name="bin_first" class="solr.SortableBinaryField" stored="true" indexed="true"
docValues="true"
+             sortMissingFirst="true"/>
+  <fieldType name="bin_dv" class="solr.SortableBinaryField" stored="true" indexed="false"
docValues="true"/>
+  <fieldType name="bin_dv_last" class="solr.SortableBinaryField" stored="true" indexed="false"
docValues="true"
+             sortMissingLast="true"/>
+  <fieldType name="bin_dv_first" class="solr.SortableBinaryField" stored="true" indexed="false"
docValues="true"
+             sortMissingFirst="true"/>
+
+  <fieldType name="int" class="solr.TrieIntField" stored="true" indexed="true"/>
+  <fieldType name="int_last" class="solr.TrieIntField" stored="true" indexed="true" sortMissingLast="true"/>
+  <fieldType name="int_first" class="solr.TrieIntField" stored="true" indexed="true" sortMissingFirst="true"/>
+  <fieldType name="int_dv" class="solr.TrieIntField" stored="true" indexed="false" docValues="true"/>
+  <fieldType name="int_dv_last" class="solr.TrieIntField" stored="true" indexed="false"
docValues="true"
+             sortMissingLast="true"/>
+  <fieldType name="int_dv_first" class="solr.TrieIntField" stored="true" indexed="false"
docValues="true"
+             sortMissingFirst="true"/>
+
+  <fieldType name="long" class="solr.TrieLongField" stored="true" indexed="true"/>
+  <fieldType name="long_last" class="solr.TrieLongField" stored="true" indexed="true"
sortMissingLast="true"/>
+  <fieldType name="long_first" class="solr.TrieLongField" stored="true" indexed="true"
sortMissingFirst="true"/>
+  <fieldType name="long_dv" class="solr.TrieLongField" stored="true" indexed="false" docValues="true"/>
+  <fieldType name="long_dv_last" class="solr.TrieLongField" stored="true" indexed="false"
docValues="true"
+             sortMissingLast="true"/>
+  <fieldType name="long_dv_first" class="solr.TrieLongField" stored="true" indexed="false"
docValues="true"
+             sortMissingFirst="true"/>
+
+  <fieldType name="float" class="solr.TrieFloatField" stored="true" indexed="true"/>
+  <fieldType name="float_last" class="solr.TrieFloatField" stored="true" indexed="true"
sortMissingLast="true"/>
+  <fieldType name="float_first" class="solr.TrieFloatField" stored="true" indexed="true"
sortMissingFirst="true"/>
+  <fieldType name="float_dv" class="solr.TrieFloatField" stored="true" indexed="false"
docValues="true"/>
+  <fieldType name="float_dv_last" class="solr.TrieFloatField" stored="true" indexed="false"
docValues="true"
+             sortMissingLast="true"/>
+  <fieldType name="float_dv_first" class="solr.TrieFloatField" stored="true" indexed="false"
docValues="true"
+             sortMissingFirst="true"/>
+
+  <fieldType name="double" class="solr.TrieDoubleField" stored="true" indexed="true"/>
+  <fieldType name="double_last" class="solr.TrieDoubleField" stored="true" indexed="true"
sortMissingLast="true"/>
+  <fieldType name="double_first" class="solr.TrieDoubleField" stored="true" indexed="true"
sortMissingFirst="true"/>
+  <fieldType name="double_dv" class="solr.TrieDoubleField" stored="true" indexed="false"
docValues="true"/>
+  <fieldType name="double_dv_last" class="solr.TrieDoubleField" stored="true" indexed="false"
docValues="true"
+             sortMissingLast="true"/>
+  <fieldType name="double_dv_first" class="solr.TrieDoubleField" stored="true" indexed="false"
docValues="true"
+             sortMissingFirst="true"/>
+
+  <fieldType name="date" class="solr.TrieDateField" stored="true" indexed="true"/>
+  <fieldType name="date_last" class="solr.TrieDateField" stored="true" indexed="true"
sortMissingLast="true"/>
+  <fieldType name="date_first" class="solr.TrieDateField" stored="true" indexed="true"
sortMissingFirst="true"/>
+  <fieldType name="date_dv" class="solr.TrieDateField" stored="true" indexed="false" docValues="true"/>
+  <fieldType name="date_dv_last" class="solr.TrieDateField" stored="true" indexed="false"
docValues="true"
+             sortMissingLast="true"/>
+  <fieldType name="date_dv_first" class="solr.TrieDateField" stored="true" indexed="false"
docValues="true"
+             sortMissingFirst="true"/>
+
+  <fieldType name="uuid" class="solr.UUIDField" stored="true" indexed="true"/>
+  <fieldType name="uuid_last" class="solr.UUIDField" stored="true" indexed="true" sortMissingLast="true"/>
+  <fieldType name="uuid_first" class="solr.UUIDField" stored="true" indexed="true" sortMissingFirst="true"/>
+  <fieldType name="uuid_dv" class="solr.UUIDField" stored="true" indexed="false" docValues="true"/>
+  <fieldType name="uuid_dv_last" class="solr.UUIDField" stored="true" indexed="false"
docValues="true"
+             sortMissingLast="true"/>
+  <fieldType name="uuid_dv_first" class="solr.UUIDField" stored="true" indexed="false"
docValues="true"
+             sortMissingFirst="true"/>
+
+  <fieldType name="currency" class="solr.CurrencyField" stored="true" indexed="true" foo="bar"
+             providerClass="solr.MockExchangeRateProvider"/>
+  <fieldType name="currency_last" class="solr.CurrencyField" stored="true" indexed="true"
foo="bar"
+             providerClass="solr.MockExchangeRateProvider" sortMissingLast="true"/>
+  <fieldType name="currency_first" class="solr.CurrencyField" stored="true" indexed="true"
foo="bar"
+             providerClass="solr.MockExchangeRateProvider" sortMissingFirst="true"/>
+
+  <fieldType name="collation_en_primary" class="solr.CollationField" language="en" strength="primary"
stored="true"
+             indexed="true"/>
+  <fieldType name="collation_en_primary_last" class="solr.CollationField" language="en"
strength="primary" stored="true"
+             indexed="true" sortMissingLast="true"/>
+  <fieldType name="collation_en_primary_first" class="solr.CollationField" language="en"
strength="primary"
+             stored="true" indexed="true" sortMissingFirst="true"/>
+  <fieldType name="collation_en_primary_dv" class="solr.CollationField" language="en"
strength="primary" stored="true"
+             indexed="false" docValues="true"/>
+  <fieldType name="collation_en_primary_dv_last" class="solr.CollationField" language="en"
strength="primary"
+             stored="true" indexed="false" docValues="true" sortMissingLast="true"/>
+  <fieldType name="collation_en_primary_dv_first" class="solr.CollationField" language="en"
strength="primary"
+             stored="true" indexed="false" docValues="true" sortMissingFirst="true"/>
+
+  <fieldType name="icu_collation_en_primary" class="solr.ICUCollationField" locale="en"
strength="primary" stored="true"
+             indexed="true"/>
+  <fieldType name="icu_collation_en_primary_last" class="solr.ICUCollationField" locale="en"
strength="primary"
+             stored="true" indexed="true" sortMissingLast="true"/>
+  <fieldType name="icu_collation_en_primary_first" class="solr.ICUCollationField" locale="en"
strength="primary"
+             stored="true" indexed="true" sortMissingFirst="true"/>
+  <fieldType name="icu_collation_en_primary_dv" class="solr.ICUCollationField" locale="en"
strength="primary"
+             stored="true" indexed="false" docValues="true"/>
+  <fieldType name="icu_collation_en_primary_dv_last" class="solr.ICUCollationField" locale="en"
strength="primary"
+             stored="true" indexed="false" docValues="true" sortMissingLast="true"/>
+  <fieldType name="icu_collation_en_primary_dv_first" class="solr.ICUCollationField" locale="en"
strength="primary"
+             stored="true" indexed="false" docValues="true" sortMissingFirst="true"/>
+
+  <!-- BoolField does not support DocValues - see SOLR-5933 -->
+  <fieldType name="bool" class="solr.BoolField" stored="true" indexed="true"/>
+  <fieldType name="bool_last" class="solr.BoolField" stored="true" indexed="true" sortMissingLast="true"/>
+  <fieldType name="bool_first" class="solr.BoolField" stored="true" indexed="true" sortMissingFirst="true"/>
+
+  <fieldType name="enum" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity"/>
+  <fieldType name="enum_last" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity"
+             sortMissingLast="true"/>
+  <fieldType name="enum_first" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity"
+             sortMissingFirst="true"/>
+  <!-- EnumField incorrectly disallows missing DocValues - see SOLR-5927 -->
+  <!-- <fieldType name="enum_dv" class="solr.EnumField" enumsConfig="enumsConfig.xml"
enumName="severity" docValues="true"/> -->
+  <!-- <fieldType name="enum_dv_last" class="solr.EnumField" enumsConfig="enumsConfig.xml"
enumName="severity" docValues="true" sortMissingLast="true"/> -->
+  <!-- <fieldType name="enum_dv_first" class="solr.EnumField" enumsConfig="enumsConfig.xml"
enumName="severity" docValues="true" sortMissingFirst="true"/> -->
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml b/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml
index 15837f3..254f58b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml
@@ -17,62 +17,57 @@
   -->
 
 <schema name="test" version="1.4">
-  <types>
 
-    <fieldType name="tint" class="solr.TrieIntField" precisionStep="8"/>
-    <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8"/>
-    <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8"/>
-    <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8"/>
-    <fieldType name="tdoubleDV" class="solr.TrieDoubleField" precisionStep="8" docValues="true"/>
+  <fieldType name="tint" class="solr.TrieIntField" precisionStep="8"/>
+  <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8"/>
+  <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8"/>
+  <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8"/>
+  <fieldType name="tdoubleDV" class="solr.TrieDoubleField" precisionStep="8" docValues="true"/>
 
-    <fieldType name="boolean" class="solr.BoolField"/>
+  <fieldType name="boolean" class="solr.BoolField"/>
 
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
+  <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
 
-    <fieldType name="srpt_geohash"   class="solr.SpatialRecursivePrefixTreeFieldType"
-               prefixTree="geohash" distanceUnits="degrees"
-        />
-    <fieldType name="srpt_quad"   class="solr.SpatialRecursivePrefixTreeFieldType"
-              prefixTree="quad" distanceUnits="degrees"
-        />
-    <fieldType name="srpt_packedquad"   class="solr.SpatialRecursivePrefixTreeFieldType"
-              prefixTree="packedQuad" distanceUnits="degrees"
-        />
-    <fieldType name="srpt_100km"   class="solr.SpatialRecursivePrefixTreeFieldType"
-              maxDistErr="100" distanceUnits="kilometers"
-        />
-    <fieldType name="stqpt_geohash"   class="solr.SpatialTermQueryPrefixTreeFieldType"
-              prefixTree="geohash" distanceUnits="degrees" />
+  <fieldType name="srpt_geohash" class="solr.SpatialRecursivePrefixTreeFieldType"
+             prefixTree="geohash" distanceUnits="degrees"
+  />
+  <fieldType name="srpt_quad" class="solr.SpatialRecursivePrefixTreeFieldType"
+             prefixTree="quad" distanceUnits="degrees"
+  />
+  <fieldType name="srpt_packedquad" class="solr.SpatialRecursivePrefixTreeFieldType"
+             prefixTree="packedQuad" distanceUnits="degrees"
+  />
+  <fieldType name="srpt_100km" class="solr.SpatialRecursivePrefixTreeFieldType"
+             maxDistErr="100" distanceUnits="kilometers"
+  />
+  <fieldType name="stqpt_geohash" class="solr.SpatialTermQueryPrefixTreeFieldType"
+             prefixTree="geohash" distanceUnits="degrees"/>
 
-    <fieldType name="stqpt_u"  class="solr.SpatialTermQueryPrefixTreeFieldType"
-        geo="false" distCalculator="cartesian^2" worldBounds="ENVELOPE(0, 1000, 1000, 0)"
distanceUnits="degrees"/>
+  <fieldType name="stqpt_u" class="solr.SpatialTermQueryPrefixTreeFieldType"
+             geo="false" distCalculator="cartesian^2" worldBounds="ENVELOPE(0, 1000, 1000,
0)" distanceUnits="degrees"/>
 
-    <fieldType name="pointvector" class="solr.SpatialPointVectorFieldType"
-               numberType="tdouble" distanceUnits="degrees"/>
+  <fieldType name="pointvector" class="solr.SpatialPointVectorFieldType"
+             numberType="tdouble" distanceUnits="degrees"/>
 
-    <fieldType name="srptgeom" class="solr.RptWithGeometrySpatialField" />
+  <fieldType name="srptgeom" class="solr.RptWithGeometrySpatialField"/>
 
-    <fieldType name="bbox" class="solr.BBoxField"
-               numberType="tdoubleDV" distanceUnits="degrees" storeSubFields="false"/>
-  </types>
+  <fieldType name="bbox" class="solr.BBoxField"
+             numberType="tdoubleDV" distanceUnits="degrees" storeSubFields="false"/>
 
 
-  <fields>
+  <field name="id" type="string" required="true"/>
 
-    <field name="id" type="string" required="true"/>
+  <field name="srpt_geohash" type="srpt_geohash" multiValued="true"/>
+  <field name="srpt_quad" type="srpt_quad" multiValued="true"/>
+  <field name="srpt_packedquad" type="srpt_packedquad" multiValued="true"/>
+  <field name="stqpt_geohash" type="stqpt_geohash" multiValued="true"/>
+  <field name="pointvector" type="pointvector"/>
+  <field name="srptgeom" type="srptgeom"/>
+  <field name="bbox" type="bbox"/>
 
-    <field name="srpt_geohash" type="srpt_geohash" multiValued="true" />
-    <field name="srpt_quad" type="srpt_quad" multiValued="true" />
-    <field name="srpt_packedquad" type="srpt_packedquad" multiValued="true" />
-    <field name="stqpt_geohash" type="stqpt_geohash" multiValued="true" />
-    <field name="pointvector" type="pointvector" />
-    <field name="srptgeom" type="srptgeom" />
-    <field name="bbox" type="bbox" />
+  <dynamicField name="bboxD_*" type="bbox" indexed="true"/>
+  <dynamicField name="str_*" type="string" indexed="true" stored="true"/>
 
-    <dynamicField name="bboxD_*" type="bbox" indexed="true" />
-    <dynamicField name="str_*" type="string" indexed="true" stored="true"/>
-
-  </fields>
 
   <uniqueKey>id</uniqueKey>
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml b/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
index e145e14..11e7dba 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
@@ -33,18 +33,17 @@
        1.0: multiValued attribute did not exist, all fields are multiValued by nature
        1.1: multiValued attribute introduced, false by default -->
 
-  <types>
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
+  <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
 
-    <fieldType name="text" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory"/>
-        <filter class="solr.PorterStemFilterFactory"/>
-      </analyzer>
-    </fieldType>
+  <fieldType name="text" class="solr.TextField">
+    <analyzer>
+      <tokenizer class="solr.StandardTokenizerFactory"/>
+      <filter class="solr.StandardFilterFactory"/>
+      <filter class="solr.LowerCaseFilterFactory"/>
+      <filter class="solr.StopFilterFactory"/>
+      <filter class="solr.PorterStemFilterFactory"/>
+    </analyzer>
+  </fieldType>
 
   <fieldType name="spellText" class="solr.TextField" positionIncrementGap="100">
     <analyzer type="index">
@@ -61,27 +60,22 @@
       <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
     </analyzer>
   </fieldType>
-  
- </types>
-
 
- <fields>
-   <field name="id" type="string" indexed="true" stored="true"/>
-   <field name="spell" type="spellText" indexed="true" stored="true" />
-   <field name="suggest" type="spellText" indexed="true" stored="true" />
-   <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
- </fields>
+  <field name="id" type="string" indexed="true" stored="true"/>
+  <field name="spell" type="spellText" indexed="true" stored="true"/>
+  <field name="suggest" type="spellText" indexed="true" stored="true"/>
+  <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
 
- <copyField source="text" dest="spell"/>
- <copyField source="text" dest="suggest"/>
+  <copyField source="text" dest="spell"/>
+  <copyField source="text" dest="suggest"/>
 
- <!-- field to use to determine and enforce document uniqueness. -->
- <uniqueKey>id</uniqueKey>
+  <!-- field to use to determine and enforce document uniqueness. -->
+  <uniqueKey>id</uniqueKey>
 
- <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <defaultSearchField>text</defaultSearchField>
+  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
+  <defaultSearchField>text</defaultSearchField>
 
- <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
+  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
+  <solrQueryParser defaultOperator="OR"/>
 
 </schema>


Mime
View raw message