SOLR-9083: Remove deprecated <types> and <fields> from schemas

apache · May 10, 2016 · 5341918 · 5341918
1 parent a5d785a
commit 5341918
Show file tree

Hide file tree

Showing 149 changed files with 14,981 additions and 15,124 deletions.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -276,6 +276,9 @@ Other Changes
 * SOLR-8467: CloudSolrStream and FacetStream should take a SolrParams object rather than a 
   Map<String, String> to allow more complex Solr queries to be specified. (Erick Erickson)
 
+* SOLR-9083: Remove all <types> and <fields> from schemas. NOTE: as in the JIRA I left a few in to insure the (no cost)
+  back compat. (Erick Erickson)
+
 ==================  6.0.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

diff --git a/...ysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml b/...ysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
@@ -16,40 +16,36 @@
   -->
 
 <schema name="test" version="1.0">
-  <types>
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" multiValued="false"/>
-
-
-    <fieldType name="text_icufolding" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.ICUFoldingFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="text_icunormalizer2" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.ICUNormalizer2FilterFactory" name="nfkc_cf" mode="compose"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="text_icutransform" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.ICUTransformFilterFactory" id="Cyrillic-Latin"/>
-      </analyzer>
-    </fieldType>
-
-   </types>
-
-  <fields>
-    <field name="id" type="string" indexed="true" stored="true" required="true"/>
-    <field name="content_icufolding" type="text_icufolding" indexed="true" stored="true"/>
-    <field name="content_icunormalizer2" type="text_icunormalizer2" indexed="true" stored="true"/>
-    <field name="content_icutransform" type="text_icutransform" indexed="true" stored="true"/>
-
-  </fields>
+  <fieldType name="string" class="solr.StrField" sortMissingLast="true" multiValued="false"/>
+
+
+  <fieldType name="text_icufolding" class="solr.TextField">
+    <analyzer>
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      <filter class="solr.ICUFoldingFilterFactory"/>
+    </analyzer>
+  </fieldType>
+
+  <fieldType name="text_icunormalizer2" class="solr.TextField">
+    <analyzer>
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      <filter class="solr.ICUNormalizer2FilterFactory" name="nfkc_cf" mode="compose"/>
+    </analyzer>
+  </fieldType>
+
+  <fieldType name="text_icutransform" class="solr.TextField">
+    <analyzer>
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      <filter class="solr.ICUTransformFilterFactory" id="Cyrillic-Latin"/>
+    </analyzer>
+  </fieldType>
+
+
+  <field name="id" type="string" indexed="true" stored="true" required="true"/>
+  <field name="content_icufolding" type="text_icufolding" indexed="true" stored="true"/>
+  <field name="content_icunormalizer2" type="text_icunormalizer2" indexed="true" stored="true"/>
+  <field name="content_icutransform" type="text_icutransform" indexed="true" stored="true"/>
+
 
   <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>

diff --git a/...ysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml b/...ysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
@@ -19,33 +19,32 @@
 <!-- Test schema file for CollationField (docvalues) -->
 
 <schema name="test" version="1.0">
-  <types>
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-
-    <!-- basic text field -->
-    <fieldType name="text" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="sort_ar_t"       class="solr.ICUCollationField" locale="ar"/>
-    <fieldType name="sort_de_t"       class="solr.ICUCollationField" locale="de" strength="primary"/>
-    <fieldType name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary"   decomposition="canonical"/>
-    <fieldType name="sort_da_t"       class="solr.ICUCollationField" locale="da" strength="primary"/>
-    <fieldType name="sort_custom_t"   class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
-  </types>
-
-  <fields>
-    <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
-    <field name="text" type="text" indexed="true" stored="false"/>
-    <field name="sort_ar"       type="sort_ar_t"       indexed="false" stored="false" multiValued="false" docValues="true"/>
-    <field name="sort_de"       type="sort_de_t"       indexed="false" stored="false" multiValued="false" docValues="true"/>
-    <field name="sort_tr_canon" type="sort_tr_canon_t" indexed="false" stored="false" multiValued="true" docValues="true"/>
-    <field name="sort_da"       type="sort_da_t"       indexed="false" stored="false" multiValued="false" docValues="true"/>
-    <field name="sort_custom"   type="sort_custom_t"   indexed="false" stored="false" multiValued="true" docValues="true"/>
-  </fields>
+
+  <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+
+  <!-- basic text field -->
+  <fieldType name="text" class="solr.TextField">
+    <analyzer>
+      <tokenizer class="solr.StandardTokenizerFactory"/>
+      <filter class="solr.LowerCaseFilterFactory"/>
+    </analyzer>
+  </fieldType>
+
+  <fieldType name="sort_ar_t" class="solr.ICUCollationField" locale="ar"/>
+  <fieldType name="sort_de_t" class="solr.ICUCollationField" locale="de" strength="primary"/>
+  <fieldType name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary"
+             decomposition="canonical"/>
+  <fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
+  <fieldType name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
+
+  <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+  <field name="text" type="text" indexed="true" stored="false"/>
+  <field name="sort_ar" type="sort_ar_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
+  <field name="sort_de" type="sort_de_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
+  <field name="sort_tr_canon" type="sort_tr_canon_t" indexed="false" stored="false" multiValued="true"
+         docValues="true"/>
+  <field name="sort_da" type="sort_da_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
+  <field name="sort_custom" type="sort_custom_t" indexed="false" stored="false" multiValued="true" docValues="true"/>
 
   <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>

diff --git a/...nalysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml b/...nalysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
@@ -19,33 +19,32 @@
 <!-- Test schema file for CollationField -->
 
 <schema name="test" version="1.0">
-  <types>
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-
-    <!-- basic text field -->
-    <fieldType name="text" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="sort_ar_t"       class="solr.ICUCollationField" locale="ar"/>
-    <fieldType name="sort_de_t"       class="solr.ICUCollationField" locale="de" strength="primary"/>
-    <fieldType name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary"   decomposition="canonical"/>
-    <fieldType name="sort_da_t"       class="solr.ICUCollationField" locale="da" strength="primary"/>
-    <fieldType name="sort_custom_t"   class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
-  </types>
-
-  <fields>
-    <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
-    <field name="text" type="text" indexed="true" stored="false"/>
-    <field name="sort_ar"       type="sort_ar_t"       indexed="true" stored="false" multiValued="false"/>
-    <field name="sort_de"       type="sort_de_t"       indexed="true" stored="false" multiValued="false"/>
-    <field name="sort_tr_canon" type="sort_tr_canon_t" indexed="true" stored="false" multiValued="false"/>
-    <field name="sort_da"       type="sort_da_t"       indexed="true" stored="false" multiValued="false"/>
-    <field name="sort_custom"   type="sort_custom_t"   indexed="true" stored="false" multiValued="false"/>
-  </fields>
+
+  <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+
+  <!-- basic text field -->
+  <fieldType name="text" class="solr.TextField">
+    <analyzer>
+      <tokenizer class="solr.StandardTokenizerFactory"/>
+      <filter class="solr.LowerCaseFilterFactory"/>
+    </analyzer>
+  </fieldType>
+
+  <fieldType name="sort_ar_t" class="solr.ICUCollationField" locale="ar"/>
+  <fieldType name="sort_de_t" class="solr.ICUCollationField" locale="de" strength="primary"/>
+  <fieldType name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary"
+             decomposition="canonical"/>
+  <fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
+  <fieldType name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
+
+  <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+  <field name="text" type="text" indexed="true" stored="false"/>
+  <field name="sort_ar" type="sort_ar_t" indexed="true" stored="false" multiValued="false"/>
+  <field name="sort_de" type="sort_de_t" indexed="true" stored="false" multiValued="false"/>
+  <field name="sort_tr_canon" type="sort_tr_canon_t" indexed="true" stored="false" multiValued="false"/>
+  <field name="sort_da" type="sort_da_t" indexed="true" stored="false" multiValued="false"/>
+  <field name="sort_custom" type="sort_custom_t" indexed="true" stored="false" multiValued="false"/>
+
 
   <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>

diff --git a/...-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml b/...-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
@@ -19,43 +19,43 @@
 <!-- Test schema file for CollationField options -->
 
 <schema name="test" version="1.0">
-  <types>
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
 
-    <!-- basic text field -->
-    <fieldType name="text" class="solr.TextField">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- ignores punctuation and whitespace -->
-    <fieldType name="sort_ignore_punctuation_t" class="solr.ICUCollationField" 
-               locale="en" strength="primary" alternate="shifted"/>
-    <!-- ignores only whitespace -->
-    <fieldType name="sort_ignore_space_t" class="solr.ICUCollationField" 
-               locale="en" strength="primary" alternate="shifted" variableTop=" "/>
-    <!-- ignores only accents, but not case -->
-    <fieldType name="sort_ignore_accents_t" class="solr.ICUCollationField"
-               locale="en" strength="primary" caseLevel="true"/>
-    <!-- sorts numerics in numeric order -->
-    <fieldType name="sort_numerics_t" class="solr.ICUCollationField" 
-               locale="en" numeric="true"/>
-    <!-- sorts uppercase before lowercase -->
-    <fieldType name="sort_uppercase_first_t" class="solr.ICUCollationField" 
-               locale="en" strength="tertiary" caseFirst="upper"/>
-  </types>
+  <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+
+  <!-- basic text field -->
+  <fieldType name="text" class="solr.TextField">
+    <analyzer>
+      <tokenizer class="solr.StandardTokenizerFactory"/>
+      <filter class="solr.LowerCaseFilterFactory"/>
+    </analyzer>
+  </fieldType>
+
+  <!-- ignores punctuation and whitespace -->
+  <fieldType name="sort_ignore_punctuation_t" class="solr.ICUCollationField"
+             locale="en" strength="primary" alternate="shifted"/>
+  <!-- ignores only whitespace -->
+  <fieldType name="sort_ignore_space_t" class="solr.ICUCollationField"
+             locale="en" strength="primary" alternate="shifted" variableTop=" "/>
+  <!-- ignores only accents, but not case -->
+  <fieldType name="sort_ignore_accents_t" class="solr.ICUCollationField"
+             locale="en" strength="primary" caseLevel="true"/>
+  <!-- sorts numerics in numeric order -->
+  <fieldType name="sort_numerics_t" class="solr.ICUCollationField"
+             locale="en" numeric="true"/>
+  <!-- sorts uppercase before lowercase -->
+  <fieldType name="sort_uppercase_first_t" class="solr.ICUCollationField"
+             locale="en" strength="tertiary" caseFirst="upper"/>
+
+
+  <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+  <field name="text" type="text" indexed="true" stored="false"/>
+  <field name="sort_ignore_punctuation" type="sort_ignore_punctuation_t" indexed="true" stored="false"
+         multiValued="false"/>
+  <field name="sort_ignore_space" type="sort_ignore_space_t" indexed="true" stored="false" multiValued="false"/>
+  <field name="sort_ignore_accents" type="sort_ignore_accents_t" indexed="true" stored="false" multiValued="false"/>
+  <field name="sort_numerics" type="sort_numerics_t" indexed="true" stored="false" multiValued="false"/>
+  <field name="sort_uppercase_first" type="sort_uppercase_first_t" indexed="true" stored="false" multiValued="false"/>
 
-  <fields>
-    <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
-    <field name="text" type="text" indexed="true" stored="false"/>
-    <field name="sort_ignore_punctuation" type="sort_ignore_punctuation_t" indexed="true" stored="false" multiValued="false"/>
-    <field name="sort_ignore_space"       type="sort_ignore_space_t"       indexed="true" stored="false" multiValued="false"/>
-    <field name="sort_ignore_accents"     type="sort_ignore_accents_t"     indexed="true" stored="false" multiValued="false"/>
-    <field name="sort_numerics"           type="sort_numerics_t"           indexed="true" stored="false" multiValued="false"/>
-    <field name="sort_uppercase_first"    type="sort_uppercase_first_t"    indexed="true" stored="false" multiValued="false"/>
-  </fields>
 
   <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>