You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2016/05/10 13:54:40 UTC
[16/24] lucene-solr:master: SOLR-9083: Remove deprecated and
from schemas
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
index f24570a..47ddeb2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
@@ -26,437 +26,450 @@
-->
<schema name="test" version="1.0">
- <types>
- <!-- field type definitions... note that the "name" attribute is
- just a label to be used by field definitions. The "class"
- attribute and any other attributes determine the real type and
- behavior of the fieldType.
- -->
+ <!-- field type definitions... note that the "name" attribute is
+ just a label to be used by field definitions. The "class"
+ attribute and any other attributes determine the real type and
+ behavior of the fieldType.
+ -->
+
+ <!--
+ Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
+ -->
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+
+ <!--
+ Numeric field types that index each value at various levels of precision
+ to accelerate range queries when the number of values between the range
+ endpoints is large. See the javadoc for LegacyNumericRangeQuery for internal
+ implementation details.
+
+ Smaller precisionStep values (specified in bits) will lead to more tokens
+ indexed per value, slightly larger index size, and faster range queries.
+ A precisionStep of 0 disables indexing at different precision levels.
+ -->
+ <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+
+ <!-- Field type demonstrating an Analyzer failure -->
+ <fieldType name="failtype1" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0"
+ catenateNumbers="0" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldType>
+
+ <!-- Demonstrating ignoreCaseChange -->
+ <fieldType name="wdf_nocase" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0"
+ catenateNumbers="0" catenateAll="0" splitOnCaseChange="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldType>
+
+
+ <!-- HighlitText optimizes storage for (long) columns which will be highlit -->
+ <fieldType name="highlittext" class="solr.TextField" compressThreshold="345"/>
- <!--
- Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
+
+ <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
+ seconds part (.999) is optional.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
-
- <!--
- Numeric field types that index each value at various levels of precision
- to accelerate range queries when the number of values between the range
- endpoints is large. See the javadoc for LegacyNumericRangeQuery for internal
- implementation details.
-
- Smaller precisionStep values (specified in bits) will lead to more tokens
- indexed per value, slightly larger index size, and faster range queries.
- A precisionStep of 0 disables indexing at different precision levels.
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
+
+ <!-- solr.TextField allows the specification of custom
+ text analyzers specified as a tokenizer and a list
+ of token filters.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
-
- <!-- Field type demonstrating an Analyzer failure -->
- <fieldType name="failtype1" class="solr.TextField">
- <analyzer type="index">
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
- </fieldType>
-
- <!-- Demonstrating ignoreCaseChange -->
- <fieldType name="wdf_nocase" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
- </fieldType>
-
-
- <!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldType name="highlittext" class="solr.TextField" compressThreshold="345" />
-
- <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
-
- <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
- seconds part (.999) is optional.
- -->
- <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
-
- <!-- solr.TextField allows the specification of custom
- text analyzers specified as a tokenizer and a list
- of token filters.
- -->
- <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="nametext" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldType>
-
- <fieldType name="teststop" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.LowerCaseTokenizerFactory"/>
- <filter class="solr.StandardFilterFactory"/>
- <filter class="solr.StopFilterFactory" words="stopwords.txt"/>
- </analyzer>
- </fieldType>
-
- <!-- fieldTypes in this section isolate tokenizers and tokenfilters for testing -->
- <fieldType name="lowertok" class="solr.TextField">
- <analyzer><tokenizer class="solr.LowerCaseTokenizerFactory"/></analyzer>
- </fieldType>
- <fieldType name="keywordtok" class="solr.TextField">
- <analyzer><tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/></analyzer>
- </fieldType>
- <fieldType name="standardtok" class="solr.TextField">
- <analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
- </fieldType>
- <fieldType name="lettertok" class="solr.TextField">
- <analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
- </fieldType>
- <fieldType name="whitetok" class="solr.TextField">
- <analyzer><tokenizer class="solr.MockTokenizerFactory"/></analyzer>
- </fieldType>
- <fieldType name="HTMLstandardtok" class="solr.TextField">
- <analyzer>
+ <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="nametext" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
+ </fieldType>
+
+ <fieldType name="teststop" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.LowerCaseTokenizerFactory"/>
+ <filter class="solr.StandardFilterFactory"/>
+ <filter class="solr.StopFilterFactory" words="stopwords.txt"/>
+ </analyzer>
+ </fieldType>
+
+ <!-- fieldTypes in this section isolate tokenizers and tokenfilters for testing -->
+ <fieldType name="lowertok" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.LowerCaseTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="keywordtok" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="standardtok" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="lettertok" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.LetterTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="whitetok" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="HTMLstandardtok" class="solr.TextField">
+ <analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.StandardTokenizerFactory"/>
- </analyzer>
- </fieldType>
- <fieldType name="HTMLwhitetok" class="solr.TextField">
- <analyzer>
+ </analyzer>
+ </fieldType>
+ <fieldType name="HTMLwhitetok" class="solr.TextField">
+ <analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.MockTokenizerFactory"/>
- </analyzer>
- </fieldType>
- <fieldType name="standardtokfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.StandardTokenizerFactory"/>
- <filter class="solr.StandardFilterFactory"/>
- </analyzer>
- </fieldType>
- <fieldType name="standardfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.StandardFilterFactory"/>
- </analyzer>
- </fieldType>
- <fieldType name="lowerfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
- </fieldType>
- <fieldType name="patternreplacefilt" class="solr.TextField">
- <analyzer type="index">
- <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
- <filter class="solr.PatternReplaceFilterFactory"
- pattern="([^a-zA-Z])" replacement="_" replace="all"
- />
- </analyzer>
- <analyzer type="query">
- <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
- </analyzer>
- </fieldType>
- <fieldType name="porterfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.PorterStemFilterFactory"/>
- </analyzer>
- </fieldType>
- <!-- fieldType name="snowballfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.SnowballPorterFilterFactory"/>
- </analyzer>
- </fieldType -->
- <fieldType name="engporterfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.PorterStemFilterFactory"/>
- </analyzer>
- </fieldType>
- <fieldType name="custengporterfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
- <filter class="solr.PorterStemFilterFactory"/>
- </analyzer>
- </fieldType>
- <fieldType name="stopfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.StopFilterFactory" ignoreCase="true"/>
- </analyzer>
- </fieldType>
- <fieldType name="custstopfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.StopFilterFactory" words="stopwords.txt"/>
- </analyzer>
- </fieldType>
- <fieldType name="lengthfilt" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.LengthFilterFactory" min="2" max="5"/>
- </analyzer>
- </fieldType>
-
- <fieldType name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
- <analyzer type="index">
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.StopFilterFactory"/>
- <filter class="solr.PorterStemFilterFactory"/>
- </analyzer>
- <analyzer type="query">
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.StopFilterFactory"/>
- <filter class="solr.PorterStemFilterFactory"/>
- </analyzer>
- </fieldType>
-
- <!-- more flexible in matching skus, but more chance of a false match -->
- <fieldType name="skutype1" class="solr.TextField">
- <analyzer type="index">
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
- <analyzer type="query">
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
- </fieldType>
-
- <!-- less flexible in matching skus, but less chance of a false match -->
- <fieldType name="skutype2" class="solr.TextField">
- <analyzer type="index">
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
- <analyzer type="query">
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
- </fieldType>
-
- <!-- less flexible in matching skus, but less chance of a false match -->
- <fieldType name="syn" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt"/>
- </analyzer>
- </fieldType>
-
- <!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
- synonyms "better"
- -->
- <fieldType name="dedup" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.SynonymFilterFactory"
- synonyms="synonyms.txt" expand="true" />
- <filter class="solr.PorterStemFilterFactory"/>
- <filter class="solr.RemoveDuplicatesTokenFilterFactory" />
- </analyzer>
- </fieldType>
-
- <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="standardtokfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.StandardFilterFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="standardfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.StandardFilterFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="lowerfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="patternreplacefilt" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
+ <filter class="solr.PatternReplaceFilterFactory"
+ pattern="([^a-zA-Z])" replacement="_" replace="all"
+ />
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="porterfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldType>
+ <!-- fieldType name="snowballfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.SnowballPorterFilterFactory"/>
+ </analyzer>
+ </fieldType -->
+ <fieldType name="engporterfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="custengporterfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="stopfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.StopFilterFactory" ignoreCase="true"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="custstopfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.StopFilterFactory" words="stopwords.txt"/>
+ </analyzer>
+ </fieldType>
+ <fieldType name="lengthfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LengthFilterFactory" min="2" max="5"/>
+ </analyzer>
+ </fieldType>
+
+ <fieldType name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"
+ catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.StopFilterFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0"
+ catenateNumbers="0" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.StopFilterFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldType>
+
+ <!-- more flexible in matching skus, but more chance of a false match -->
+ <fieldType name="skutype1" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"
+ catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1"
+ catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldType>
+
+ <!-- less flexible in matching skus, but less chance of a false match -->
+ <fieldType name="skutype2" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1"
+ catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1"
+ catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldType>
+
+ <!-- less flexible in matching skus, but less chance of a false match -->
+ <fieldType name="syn" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt"/>
+ </analyzer>
+ </fieldType>
+
+ <!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
+ synonyms "better"
+ -->
+ <fieldType name="dedup" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.SynonymFilterFactory"
+ synonyms="synonyms.txt" expand="true"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+ </analyzer>
+ </fieldType>
+
+ <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
<fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
- <analyzer>
- <tokenizer class="solr.MockTokenizerFactory"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- </analyzer>
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
</fieldType>
- </types>
-
-
- <fields>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
- <field name="name" type="nametext" indexed="true" stored="true"/>
- <field name="text" type="text" indexed="true" stored="false"/>
- <field name="subject" type="text" indexed="true" stored="true"/>
- <field name="title" type="nametext" indexed="true" stored="true"/>
- <field name="weight" type="float" indexed="true" stored="true"/>
- <field name="bday" type="date" indexed="true" stored="true"/>
-
- <field name="title_stemmed" type="text" indexed="true" stored="false"/>
- <field name="title_lettertok" type="lettertok" indexed="true" stored="false"/>
-
- <field name="syn" type="syn" indexed="true" stored="true"/>
-
- <!-- to test property inheritance and overriding -->
- <field name="shouldbeunstored" type="unstored" />
- <field name="shouldbestored" type="unstored" stored="true"/>
- <field name="shouldbeunindexed" type="unstored" indexed="false" stored="true"/>
-
-
- <!-- test different combinations of indexed and stored -->
- <field name="bind" type="boolean" indexed="true" stored="false"/>
- <field name="bsto" type="boolean" indexed="false" stored="true"/>
- <field name="bindsto" type="boolean" indexed="true" stored="true"/>
- <field name="isto" type="int" indexed="false" stored="true"/>
- <field name="iind" type="int" indexed="true" stored="false"/>
- <field name="ssto" type="string" indexed="false" stored="true"/>
- <field name="sind" type="string" indexed="true" stored="false"/>
- <field name="sindsto" type="string" indexed="true" stored="true"/>
-
- <!-- test combinations of term vector settings -->
- <field name="test_basictv" type="text" termVectors="true"/>
- <field name="test_notv" type="text" termVectors="false"/>
- <field name="test_postv" type="text" termVectors="true" termPositions="true"/>
- <field name="test_offtv" type="text" termVectors="true" termOffsets="true"/>
- <field name="test_posofftv" type="text" termVectors="true"
- termPositions="true" termOffsets="true"/>
-
- <!-- test highlit field settings -->
- <field name="test_hlt" type="highlittext" indexed="true"/>
- <field name="test_hlt_off" type="highlittext" indexed="true"/>
-
- <!-- fields to test individual tokenizers and tokenfilters -->
- <field name="teststop" type="teststop" indexed="true" stored="true"/>
- <field name="lowertok" type="lowertok" indexed="true" stored="true"/>
- <field name="keywordtok" type="keywordtok" indexed="true" stored="true"/>
- <field name="standardtok" type="standardtok" indexed="true" stored="true"/>
- <field name="HTMLstandardtok" type="HTMLstandardtok" indexed="true" stored="true"/>
- <field name="lettertok" type="lettertok" indexed="true" stored="true"/>
- <field name="whitetok" type="whitetok" indexed="true" stored="true"/>
- <field name="HTMLwhitetok" type="HTMLwhitetok" indexed="true" stored="true"/>
- <field name="standardtokfilt" type="standardtokfilt" indexed="true" stored="true"/>
- <field name="standardfilt" type="standardfilt" indexed="true" stored="true"/>
- <field name="lowerfilt" type="lowerfilt" indexed="true" stored="true"/>
- <field name="patternreplacefilt" type="patternreplacefilt" indexed="true" stored="true"/>
- <field name="porterfilt" type="porterfilt" indexed="true" stored="true"/>
- <field name="engporterfilt" type="engporterfilt" indexed="true" stored="true"/>
- <field name="custengporterfilt" type="custengporterfilt" indexed="true" stored="true"/>
- <field name="stopfilt" type="stopfilt" indexed="true" stored="true"/>
- <field name="custstopfilt" type="custstopfilt" indexed="true" stored="true"/>
- <field name="lengthfilt" type="lengthfilt" indexed="true" stored="true"/>
- <field name="dedup" type="dedup" indexed="true" stored="true"/>
- <field name="wdf_nocase" type="wdf_nocase" indexed="true" stored="true"/>
-
- <field name="numberpartfail" type="failtype1" indexed="true" stored="true"/>
-
- <field name="nullfirst" type="string" indexed="true" stored="true" sortMissingFirst="true"/>
-
- <field name="subword" type="subword" indexed="true" stored="true"/>
- <field name="sku1" type="skutype1" indexed="true" stored="true"/>
- <field name="sku2" type="skutype2" indexed="true" stored="true"/>
-
- <field name="textgap" type="textgap" indexed="true" stored="true"/>
-
- <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
- <field name="multiDefault" type="string" indexed="true" stored="true" default="muLti-Default" multiValued="true"/>
- <field name="intDefault" type="int" indexed="true" stored="true" default="42" multiValued="false"/>
-
- <!-- test maxChars copyField attribute -->
- <field name="text_fr" type="text" indexed="true" stored="true"
- termVectors="true" termPositions="true" termOffsets="true"/>
- <field name="text_en" type="text" indexed="true" stored="true"
- termVectors="true" termPositions="true" termOffsets="true"/>
- <field name="highlight" type="text" indexed="true" stored="true"
- termVectors="true" termPositions="true" termOffsets="true"/>
- <field name="signatureField" type="string" indexed="true" stored="false"/>
-
- <field name="_version_" type="long" indexed="true" stored="true" multiValued="false" />
-
-
- <!-- Dynamic field definitions. If a field name is not found, dynamicFields
- will be used if the name matches any of the patterns.
- RESTRICTION: the glob-like pattern in the name attribute must have
- a "*" only at the start or the end.
- EXAMPLE: name="*_i" will match any field ending in _i (like myid_i, z_i)
- Longer patterns will be matched first. if equal size patterns
- both match, the first appearing in the schema will be used.
- -->
- <dynamicField name="*_i" type="int" indexed="true" stored="true"/>
- <dynamicField name="*_s" type="string" indexed="true" stored="true"/>
- <dynamicField name="*_s1" type="string" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_l" type="long" indexed="true" stored="true"/>
- <dynamicField name="*_t" type="text" indexed="true" stored="true"/>
- <dynamicField name="*_b" type="boolean" 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="*_sI" type="string" indexed="true" stored="false"/>
- <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
- <dynamicField name="t_*" type="text" indexed="true" stored="true"/>
- <dynamicField name="tv_*" type="text" indexed="true" stored="true"
- termVectors="true" termPositions="true" termOffsets="true"/>
-
- <!-- special fields for dynamic copyField test -->
- <dynamicField name="dynamic_*" type="string" indexed="true" stored="true"/>
- <dynamicField name="*_dynamic" type="string" indexed="true" stored="true"/>
-
- <!-- for testing to ensure that longer patterns are matched first -->
- <dynamicField name="*aa" type="string" indexed="true" stored="true"/>
- <dynamicField name="*aaa" type="int" indexed="false" stored="true"/>
-
- <!-- ignored becuase not stored or indexed -->
- <dynamicField name="*_ignored" type="text" indexed="false" stored="false"/>
-
- <!-- test maxSize copyField attribute -->
- <dynamicField name="text_*" type="text" indexed="true" stored="true"
- termVectors="true" termPositions="true" termOffsets="true"/>
-
- </fields>
-
- <defaultSearchField>text</defaultSearchField>
- <uniqueKey>id</uniqueKey>
+
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="name" type="nametext" indexed="true" stored="true"/>
+ <field name="text" type="text" indexed="true" stored="false"/>
+ <field name="subject" type="text" indexed="true" stored="true"/>
+ <field name="title" type="nametext" indexed="true" stored="true"/>
+ <field name="weight" type="float" indexed="true" stored="true"/>
+ <field name="bday" type="date" indexed="true" stored="true"/>
+
+ <field name="title_stemmed" type="text" indexed="true" stored="false"/>
+ <field name="title_lettertok" type="lettertok" indexed="true" stored="false"/>
+
+ <field name="syn" type="syn" indexed="true" stored="true"/>
+
+ <!-- to test property inheritance and overriding -->
+ <field name="shouldbeunstored" type="unstored"/>
+ <field name="shouldbestored" type="unstored" stored="true"/>
+ <field name="shouldbeunindexed" type="unstored" indexed="false" stored="true"/>
+
+
+ <!-- test different combinations of indexed and stored -->
+ <field name="bind" type="boolean" indexed="true" stored="false"/>
+ <field name="bsto" type="boolean" indexed="false" stored="true"/>
+ <field name="bindsto" type="boolean" indexed="true" stored="true"/>
+ <field name="isto" type="int" indexed="false" stored="true"/>
+ <field name="iind" type="int" indexed="true" stored="false"/>
+ <field name="ssto" type="string" indexed="false" stored="true"/>
+ <field name="sind" type="string" indexed="true" stored="false"/>
+ <field name="sindsto" type="string" indexed="true" stored="true"/>
+
+ <!-- test combinations of term vector settings -->
+ <field name="test_basictv" type="text" termVectors="true"/>
+ <field name="test_notv" type="text" termVectors="false"/>
+ <field name="test_postv" type="text" termVectors="true" termPositions="true"/>
+ <field name="test_offtv" type="text" termVectors="true" termOffsets="true"/>
+ <field name="test_posofftv" type="text" termVectors="true"
+ termPositions="true" termOffsets="true"/>
+
+ <!-- test highlit field settings -->
+ <field name="test_hlt" type="highlittext" indexed="true"/>
+ <field name="test_hlt_off" type="highlittext" indexed="true"/>
+
+ <!-- fields to test individual tokenizers and tokenfilters -->
+ <field name="teststop" type="teststop" indexed="true" stored="true"/>
+ <field name="lowertok" type="lowertok" indexed="true" stored="true"/>
+ <field name="keywordtok" type="keywordtok" indexed="true" stored="true"/>
+ <field name="standardtok" type="standardtok" indexed="true" stored="true"/>
+ <field name="HTMLstandardtok" type="HTMLstandardtok" indexed="true" stored="true"/>
+ <field name="lettertok" type="lettertok" indexed="true" stored="true"/>
+ <field name="whitetok" type="whitetok" indexed="true" stored="true"/>
+ <field name="HTMLwhitetok" type="HTMLwhitetok" indexed="true" stored="true"/>
+ <field name="standardtokfilt" type="standardtokfilt" indexed="true" stored="true"/>
+ <field name="standardfilt" type="standardfilt" indexed="true" stored="true"/>
+ <field name="lowerfilt" type="lowerfilt" indexed="true" stored="true"/>
+ <field name="patternreplacefilt" type="patternreplacefilt" indexed="true" stored="true"/>
+ <field name="porterfilt" type="porterfilt" indexed="true" stored="true"/>
+ <field name="engporterfilt" type="engporterfilt" indexed="true" stored="true"/>
+ <field name="custengporterfilt" type="custengporterfilt" indexed="true" stored="true"/>
+ <field name="stopfilt" type="stopfilt" indexed="true" stored="true"/>
+ <field name="custstopfilt" type="custstopfilt" indexed="true" stored="true"/>
+ <field name="lengthfilt" type="lengthfilt" indexed="true" stored="true"/>
+ <field name="dedup" type="dedup" indexed="true" stored="true"/>
+ <field name="wdf_nocase" type="wdf_nocase" indexed="true" stored="true"/>
+
+ <field name="numberpartfail" type="failtype1" indexed="true" stored="true"/>
+
+ <field name="nullfirst" type="string" indexed="true" stored="true" sortMissingFirst="true"/>
+
+ <field name="subword" type="subword" indexed="true" stored="true"/>
+ <field name="sku1" type="skutype1" indexed="true" stored="true"/>
+ <field name="sku2" type="skutype2" indexed="true" stored="true"/>
+
+ <field name="textgap" type="textgap" indexed="true" stored="true"/>
+
+ <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
+ <field name="multiDefault" type="string" indexed="true" stored="true" default="muLti-Default" multiValued="true"/>
+ <field name="intDefault" type="int" indexed="true" stored="true" default="42" multiValued="false"/>
+
+ <!-- test maxChars copyField attribute -->
+ <field name="text_fr" type="text" indexed="true" stored="true"
+ termVectors="true" termPositions="true" termOffsets="true"/>
+ <field name="text_en" type="text" indexed="true" stored="true"
+ termVectors="true" termPositions="true" termOffsets="true"/>
+ <field name="highlight" type="text" indexed="true" stored="true"
+ termVectors="true" termPositions="true" termOffsets="true"/>
+ <field name="signatureField" type="string" indexed="true" stored="false"/>
+
+ <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+
+
+ <!-- Dynamic field definitions. If a field name is not found, dynamicFields
+ will be used if the name matches any of the patterns.
+ RESTRICTION: the glob-like pattern in the name attribute must have
+ a "*" only at the start or the end.
+ EXAMPLE: name="*_i" will match any field ending in _i (like myid_i, z_i)
+ Longer patterns will be matched first. if equal size patterns
+ both match, the first appearing in the schema will be used.
+ -->
+ <dynamicField name="*_i" type="int" indexed="true" stored="true"/>
+ <dynamicField name="*_s" type="string" indexed="true" stored="true"/>
+ <dynamicField name="*_s1" type="string" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_l" type="long" indexed="true" stored="true"/>
+ <dynamicField name="*_t" type="text" indexed="true" stored="true"/>
+ <dynamicField name="*_b" type="boolean" 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="*_sI" type="string" indexed="true" stored="false"/>
+ <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
+ <dynamicField name="t_*" type="text" indexed="true" stored="true"/>
+ <dynamicField name="tv_*" type="text" indexed="true" stored="true"
+ termVectors="true" termPositions="true" termOffsets="true"/>
+
+ <!-- special fields for dynamic copyField test -->
+ <dynamicField name="dynamic_*" type="string" indexed="true" stored="true"/>
+ <dynamicField name="*_dynamic" type="string" indexed="true" stored="true"/>
+
+ <!-- for testing to ensure that longer patterns are matched first -->
+ <dynamicField name="*aa" type="string" indexed="true" stored="true"/>
+ <dynamicField name="*aaa" type="int" indexed="false" stored="true"/>
+
+ <!-- ignored becuase not stored or indexed -->
+ <dynamicField name="*_ignored" type="text" indexed="false" stored="false"/>
+
+ <!-- test maxSize copyField attribute -->
+ <dynamicField name="text_*" type="text" indexed="true" stored="true"
+ termVectors="true" termPositions="true" termOffsets="true"/>
+
+
+ <defaultSearchField>text</defaultSearchField>
+ <uniqueKey>id</uniqueKey>
<!-- copyField commands copy one field to another at the time a document
is added to the index. It's used either to index the same field different
ways, or to add multiple fields to the same field for easier/faster searching.
-->
- <copyField source="title" dest="title_stemmed"/>
- <copyField source="title" dest="title_lettertok"/>
-
- <copyField source="title" dest="text"/>
- <copyField source="subject" dest="text"/>
-
- <copyField source="*_t" dest="text"/>
-
- <!-- dynamic destination -->
- <copyField source="*_dynamic" dest="dynamic_*"/>
-
- <!-- test maxSize copyField attribute -->
- <copyField source="text_fr" dest="highlight" maxChars="25" />
- <copyField source="text_en" dest="highlight" maxChars="25" />
- <copyField source="text_*" dest="highlight" maxChars="25" />
-
- <!-- test source glob matching multiple explicit fields: sku1 and sku2 -->
- <copyField source="sku*" dest="text"/>
- <copyField source="sku*" dest="*_s"/>
- <copyField source="sku*" dest="*_dest_sub_s"/>
- <copyField source="sku*" dest="dest_sub_no_ast_s"/>
-
- <!-- test source glob that doesn't match any explicit or dynamic field -->
- <copyField source="testing123_*" dest="text"/>
-
- <copyField source="*" dest="catchall_t"/>
+ <copyField source="title" dest="title_stemmed"/>
+ <copyField source="title" dest="title_lettertok"/>
+
+ <copyField source="title" dest="text"/>
+ <copyField source="subject" dest="text"/>
+
+ <copyField source="*_t" dest="text"/>
+
+ <!-- dynamic destination -->
+ <copyField source="*_dynamic" dest="dynamic_*"/>
+
+ <!-- test maxSize copyField attribute -->
+ <copyField source="text_fr" dest="highlight" maxChars="25"/>
+ <copyField source="text_en" dest="highlight" maxChars="25"/>
+ <copyField source="text_*" dest="highlight" maxChars="25"/>
+
+ <!-- test source glob matching multiple explicit fields: sku1 and sku2 -->
+ <copyField source="sku*" dest="text"/>
+ <copyField source="sku*" dest="*_s"/>
+ <copyField source="sku*" dest="*_dest_sub_s"/>
+ <copyField source="sku*" dest="dest_sub_no_ast_s"/>
+
+ <!-- test source glob that doesn't match any explicit or dynamic field -->
+ <copyField source="testing123_*" dest="text"/>
+
+ <copyField source="*" dest="catchall_t"/>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
index a0551d3..cdf5dee 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
@@ -17,29 +17,25 @@
-->
<schema name="test-custom-field-sort" version="1.6">
- <types>
- <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="string" class="solr.StrField" sortMissingLast="true"/>
- <fieldType name="text" class="solr.TextField">
- <analyzer>
- <tokenizer class="solr.StandardTokenizerFactory"/>
- </analyzer>
- </fieldType>
- <fieldType class="org.apache.solr.schema.SortableBinaryField" name="sortable_binary"/>
- </types>
- <fields>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
- <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
- <field name="signatureField" type="string" indexed="true" stored="false"/>
- <field name="text" type="text" indexed="true" stored="false"/>
- <field name="payload" type="sortable_binary" indexed="false"
- stored="true" multiValued="false" docValues="true" required="true"/>
- <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
+ <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="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="text" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
+ <fieldType class="org.apache.solr.schema.SortableBinaryField" name="sortable_binary"/>
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+ <field name="signatureField" type="string" indexed="true" stored="false"/>
+ <field name="text" type="text" indexed="true" stored="false"/>
+ <field name="payload" type="sortable_binary" indexed="false"
+ stored="true" multiValued="false" docValues="true" required="true"/>
+ <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
- <!-- catchall wildcard to help ensure we aren't breaking function sorting -->
- <dynamicField name="*" type="string" indexed="true" stored="true"/>
- </fields>
+ <!-- catchall wildcard to help ensure we aren't breaking function sorting -->
+ <dynamicField name="*" type="string" indexed="true" stored="true"/>
<defaultSearchField>text</defaultSearchField>
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
index 790bc2c..4d0cbfd 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
@@ -26,58 +26,54 @@
-->
<schema name="test" version="1.2">
- <types>
- <!-- field type definitions... note that the "name" attribute is
- just a label to be used by field definitions. The "class"
- attribute and any other attributes determine the real type and
- behavior of the fieldType.
- -->
-
- <!--
- Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
- -->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
-
- <!--
- Numeric field types that index each value at various levels of precision
- to accelerate range queries when the number of values between the range
- endpoints is large. See the javadoc for LegacyNumericRangeQuery for internal
- implementation details.
-
- Smaller precisionStep values (specified in bits) will lead to more tokens
- indexed per value, slightly larger index size, and faster range queries.
- A precisionStep of 0 disables indexing at different precision levels.
+ <!-- field type definitions... note that the "name" attribute is
+ just a label to be used by field definitions. The "class"
+ attribute and any other attributes determine the real type and
+ behavior of the fieldType.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="customfield" class="org.apache.solr.schema.MyCrazyCustomField" multiValued="true" positionIncrementGap="100">
+ <!--
+ Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
+ -->
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+
+ <!--
+ Numeric field types that index each value at various levels of precision
+ to accelerate range queries when the number of values between the range
+ endpoints is large. See the javadoc for LegacyNumericRangeQuery for internal
+ implementation details.
+
+ Smaller precisionStep values (specified in bits) will lead to more tokens
+ indexed per value, slightly larger index size, and faster range queries.
+ A precisionStep of 0 disables indexing at different precision levels.
+ -->
+ <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+
+ <fieldType name="customfield" class="org.apache.solr.schema.MyCrazyCustomField" multiValued="true"
+ positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
</analyzer>
- </fieldType>
-
- <fieldType name="customtrieintfield" class="org.apache.solr.schema.TrieIntPrefixActsAsRangeQueryFieldType"/>
+ </fieldType>
- </types>
+ <fieldType name="customtrieintfield" class="org.apache.solr.schema.TrieIntPrefixActsAsRangeQueryFieldType"/>
- <fields>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
- <field name="intfield" type="int" indexed="true" stored="true"/>
- <field name="swap_foo_bar_in_prefix_query" type="customfield" indexed="true" stored="true" multiValued="true"/>
- <field name="int_prefix_as_range" type="customtrieintfield" indexed="true" stored="true"/>
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="intfield" type="int" indexed="true" stored="true"/>
+ <field name="swap_foo_bar_in_prefix_query" type="customfield" indexed="true" stored="true" multiValued="true"/>
+ <field name="int_prefix_as_range" type="customtrieintfield" indexed="true" stored="true"/>
- <field name="_version_" type="long" indexed="true" stored="true" multiValued="false" />
+ <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
- </fields>
- <uniqueKey>id</uniqueKey>
+ <uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
index d334fee..038ce51 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
@@ -19,34 +19,29 @@
<!-- Test schema file for DFISimilarityFactory -->
<schema name="dfi" version="1.5">
- <types>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-
- <!-- default parameters -->
- <fieldType name="text" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
- <similarity class="solr.DFISimilarityFactory">
- <str name="independenceMeasure">ChiSquared</str>
- </similarity>
- </fieldType>
-
- <!-- with discountOverlaps parameter -->
- <fieldType name="text_params" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
- <similarity class="solr.DFISimilarityFactory">
- <str name="independenceMeasure">ChiSquared</str>
- <bool name="discountOverlaps">false</bool>
- </similarity>
- </fieldType>
-
-
- </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="text_params" type="text_params" indexed="true" stored="false"/>
- </fields>
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+
+ <!-- default parameters -->
+ <fieldType name="text" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+ <similarity class="solr.DFISimilarityFactory">
+ <str name="independenceMeasure">ChiSquared</str>
+ </similarity>
+ </fieldType>
+
+ <!-- with discountOverlaps parameter -->
+ <fieldType name="text_params" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+ <similarity class="solr.DFISimilarityFactory">
+ <str name="independenceMeasure">ChiSquared</str>
+ <bool name="discountOverlaps">false</bool>
+ </similarity>
+ </fieldType>
+
+
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="text" type="text" indexed="true" stored="false"/>
+ <field name="text_params" type="text_params" indexed="true" stored="false"/>
<defaultSearchField>text</defaultSearchField>
<uniqueKey>id</uniqueKey>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
index b9bb006..f99a776 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
@@ -19,51 +19,47 @@
<!-- Test schema file for DFRSimilarityFactory -->
<schema name="test" version="1.0">
- <types>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-
- <!-- default parameters -->
- <fieldType name="text" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
- <similarity class="solr.DFRSimilarityFactory">
- <str name="basicModel">I(F)</str>
- <str name="afterEffect">B</str>
- <str name="normalization">H2</str>
- </similarity>
- </fieldType>
-
- <!-- with parameters -->
- <fieldType name="text_params" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
- <similarity class="solr.DFRSimilarityFactory">
- <str name="basicModel">I(F)</str>
- <str name="afterEffect">B</str>
- <str name="normalization">H3</str>
- <float name="mu">900</float>
- </similarity>
- </fieldType>
-
- <!-- with parameter C -->
- <fieldType name="text_paramc" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
- <similarity class="solr.DFRSimilarityFactory">
- <str name="basicModel">P</str>
- <str name="afterEffect">L</str>
- <str name="normalization">H2</str>
- <float name="c">7</float>
- </similarity>
- </fieldType>
-
- </types>
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <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="text_params" type="text_params" indexed="true" stored="false"/>
- <field name="text_paramc" type="text_paramc" indexed="true" stored="false"/>
- </fields>
+ <!-- default parameters -->
+ <fieldType name="text" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+ <similarity class="solr.DFRSimilarityFactory">
+ <str name="basicModel">I(F)</str>
+ <str name="afterEffect">B</str>
+ <str name="normalization">H2</str>
+ </similarity>
+ </fieldType>
+
+ <!-- with parameters -->
+ <fieldType name="text_params" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+ <similarity class="solr.DFRSimilarityFactory">
+ <str name="basicModel">I(F)</str>
+ <str name="afterEffect">B</str>
+ <str name="normalization">H3</str>
+ <float name="mu">900</float>
+ </similarity>
+ </fieldType>
+
+ <!-- with parameter C -->
+ <fieldType name="text_paramc" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+ <similarity class="solr.DFRSimilarityFactory">
+ <str name="basicModel">P</str>
+ <str name="afterEffect">L</str>
+ <str name="normalization">H2</str>
+ <float name="c">7</float>
+ </similarity>
+ </fieldType>
+
+
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="text" type="text" indexed="true" stored="false"/>
+ <field name="text_params" type="text_params" indexed="true" stored="false"/>
+ <field name="text_paramc" type="text_paramc" indexed="true" stored="false"/>
<defaultSearchField>text</defaultSearchField>
<uniqueKey>id</uniqueKey>
-
+
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
index 9b1d3d6..79d200d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
@@ -17,66 +17,63 @@
-->
<schema name="test" version="1.6">
- <types>
- <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" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- </types>
+ <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" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fields>
- <field name="id" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="true"/>
- <field name="id_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="false" required="true"/>
- <dynamicField name="*_i" type="int" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_i_dv" type="int" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_is" type="int" indexed="true" stored="false" docValues="false" multiValued="true"/>
- <dynamicField name="*_is_dv" type="int" indexed="false" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_s" type="string" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_s_dv" type="string" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_ss" type="string" indexed="true" stored="false" docValues="false" multiValued="true"/>
- <dynamicField name="*_ss_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_f" type="float" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_f_dv" type="float" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_fs_dv" type="float" indexed="true" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_l" type="long" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_l_dv" type="long" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_ls_dv" type="long" indexed="true" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_d" type="double" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_d_dv" type="double" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_ds_dv" type="double" indexed="true" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_dt" type="date" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_dt_dv" type="date" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_dts_dv" type="date" indexed="true" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
-
- <dynamicField name="*_ti1" type="int" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_tl" type="long" indexed="true" stored="true"/>
- <dynamicField name="*_tl1" type="long" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_tf" type="float" indexed="true" stored="true"/>
- <dynamicField name="*_tf1" type="float" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_td" type="double" indexed="true" stored="true"/>
- <dynamicField name="*_td1" type="double" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_tds" type="double" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_tdt" type="date" indexed="true" stored="true"/>
- <dynamicField name="*_tdt1" type="date" indexed="true" stored="true" multiValued="false"/>
-
- <dynamicField name="*_i1" type="int" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_l1" type="long" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_f1" type="float" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
- </fields>
+ <field name="id" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="true"/>
+ <field name="id_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="false"
+ required="true"/>
+ <dynamicField name="*_i" type="int" indexed="true" stored="false" docValues="false"/>
+ <dynamicField name="*_i_dv" type="int" indexed="false" stored="false" docValues="true"/>
+ <dynamicField name="*_is" type="int" indexed="true" stored="false" docValues="false" multiValued="true"/>
+ <dynamicField name="*_is_dv" type="int" indexed="false" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_s" type="string" indexed="true" stored="false" docValues="false"/>
+ <dynamicField name="*_s_dv" type="string" indexed="false" stored="false" docValues="true"/>
+ <dynamicField name="*_ss" type="string" indexed="true" stored="false" docValues="false" multiValued="true"/>
+ <dynamicField name="*_ss_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_f" type="float" indexed="true" stored="false" docValues="false"/>
+ <dynamicField name="*_f_dv" type="float" indexed="true" stored="false" docValues="true"/>
+ <dynamicField name="*_fs_dv" type="float" indexed="true" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_l" type="long" indexed="true" stored="false" docValues="false"/>
+ <dynamicField name="*_l_dv" type="long" indexed="true" stored="false" docValues="true"/>
+ <dynamicField name="*_ls_dv" type="long" indexed="true" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_d" type="double" indexed="true" stored="false" docValues="false"/>
+ <dynamicField name="*_d_dv" type="double" indexed="true" stored="false" docValues="true"/>
+ <dynamicField name="*_ds_dv" type="double" indexed="true" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_dt" type="date" indexed="true" stored="false" docValues="false"/>
+ <dynamicField name="*_dt_dv" type="date" indexed="true" stored="false" docValues="true"/>
+ <dynamicField name="*_dts_dv" type="date" indexed="true" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
+
+ <dynamicField name="*_ti1" type="int" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tl" type="long" indexed="true" stored="true"/>
+ <dynamicField name="*_tl1" type="long" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tf" type="float" indexed="true" stored="true"/>
+ <dynamicField name="*_tf1" type="float" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_td" type="double" indexed="true" stored="true"/>
+ <dynamicField name="*_td1" type="double" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tds" type="double" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tdt" type="date" indexed="true" stored="true"/>
+ <dynamicField name="*_tdt1" type="date" indexed="true" stored="true" multiValued="false"/>
+
+ <dynamicField name="*_i1" type="int" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_l1" type="long" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_f1" type="float" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
<defaultSearchField>id</defaultSearchField>
<uniqueKey>id</uniqueKey>
-
- <copyField source="*_i" dest="*_i_dv" />
- <copyField source="*_f" dest="*_f_dv" />
- <copyField source="*_is" dest="*_is_dv" />
- <copyField source="*_s" dest="*_s_dv" />
- <copyField source="*_ss" dest="*_ss_dv" />
- <copyField source="id" dest="id_dv" />
+
+ <copyField source="*_i" dest="*_i_dv"/>
+ <copyField source="*_f" dest="*_f_dv"/>
+ <copyField source="*_is" dest="*_is_dv"/>
+ <copyField source="*_s" dest="*_s_dv"/>
+ <copyField source="*_ss" dest="*_ss_dv"/>
+ <copyField source="id" dest="id_dv"/>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/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 4fe84d2..822d2be 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,67 +17,66 @@
-->
<schema name="test-distributed-missing-sort" version="1.6">
- <types>
- <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.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tint" class="solr.TrieIntField" 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.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="solr.TrieLongField" 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.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="solr.TrieFloatField" 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.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="solr.TrieDoubleField" 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.TrieDateField" precisionStep="0"/>
+ <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6"/>
- <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <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.TrieIntField" precisionStep="0" sortMissingLast="true"/>
+ <fieldType name="int_mf" class="solr.TrieIntField" precisionStep="0" sortMissingFirst="true"/>
- <fieldType name="long_ml" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0" sortMissingLast="true"/>
- <fieldType name="long_mf" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0" sortMissingFirst="true"/>
+ <fieldType name="long_ml" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"
+ sortMissingLast="true"/>
+ <fieldType name="long_mf" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"
+ sortMissingFirst="true"/>
- <fieldType name="string_ml" class="solr.StrField" sortMissingLast="true"/>
- <fieldType name="string_mf" class="solr.StrField" sortMissingFirst="true"/>
- </types>
+ <fieldType name="string_ml" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="string_mf" class="solr.StrField" sortMissingFirst="true"/>
- <fields>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
- <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
- <field name="signatureField" type="string_ml" indexed="true" stored="false"/>
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+ <field name="signatureField" type="string_ml" indexed="true" stored="false"/>
- <dynamicField name="*_ti1" type="tint" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_i1_ml" type="int_ml" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_i1_mf" type="int_mf" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_ti1" type="tint" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_i1_ml" type="int_ml" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_i1_mf" type="int_mf" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_l1_ml" type="long_ml" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_l1_mf" type="long_mf" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_l1_ml" type="long_ml" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_l1_mf" type="long_mf" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_l1" type="long" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_tl1" type="tlong" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_l1" type="long" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tl1" type="tlong" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_f" type="float" indexed="true" stored="true"/>
- <dynamicField name="*_f1" type="float" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_tf1" type="tfloat" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_f" type="float" indexed="true" stored="true"/>
+ <dynamicField name="*_f1" type="float" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tf1" type="tfloat" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_d" type="double" indexed="true" stored="true"/>
- <dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_td1" type="tdouble" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_d" type="double" indexed="true" stored="true"/>
+ <dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_td1" type="tdouble" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
+ <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
- <dynamicField name="*_s1_ml" type="string_ml" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_s1_mf" type="string_mf" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_s1_ml" type="string_ml" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_s1_mf" type="string_mf" indexed="true" stored="true" multiValued="false"/>
+
+ <dynamicField name="*_mfacet" type="string_ml" indexed="true" stored="false" multiValued="true"/>
+ <dynamicField name="*_sS" type="string_ml" indexed="false" stored="true"/>
- <dynamicField name="*_mfacet" type="string_ml" indexed="true" stored="false" multiValued="true" />
- <dynamicField name="*_sS" type="string_ml" indexed="false" stored="true"/>
- </fields>
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5341918a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
index 680ac04..59fe99a 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
@@ -26,59 +26,50 @@
-->
<schema name="schema-docValues" version="1.6">
- <types>
-
- <!-- field type definitions... note that the "name" attribute is
- just a label to be used by field definitions. The "class"
- attribute and any other attributes determine the real type and
- behavior of the fieldType.
- -->
-
- <!-- numeric field types that store and index the text
- value verbatim (and hence don't sort correctly or support range queries.)
- These are provided more for backward compatability, allowing one
- to create a schema that matches an existing lucene index.
- -->
- <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"/>
- <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
- seconds part (.999) is optional.
- -->
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-
- <fieldType name="boolean" class="solr.BoolField" />
- <fieldType name="string" class="solr.StrField" />
-
- <fieldType name="uuid" class="solr.UUIDField" />
-
- </types>
+ <!-- field type definitions... note that the "name" attribute is
+ just a label to be used by field definitions. The "class"
+ attribute and any other attributes determine the real type and
+ behavior of the fieldType.
+ -->
- <fields>
+ <!-- numeric field types that store and index the text
+ value verbatim (and hence don't sort correctly or support range queries.)
+ These are provided more for backward compatability, allowing one
+ to create a schema that matches an existing lucene index.
+ -->
+ <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"/>
+ <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
+ seconds part (.999) is optional.
+ -->
+ <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <field name="id" type="int" required="true" />
+ <fieldType name="boolean" class="solr.BoolField"/>
+ <fieldType name="string" class="solr.StrField"/>
- <field name="floatdv" type="float" indexed="false" stored="false" docValues="true" default="1" />
- <field name="intdv" type="int" indexed="false" stored="false" docValues="true" default="2" />
- <field name="doubledv" type="double" indexed="false" stored="false" docValues="true" default="3" />
- <field name="longdv" type="long" indexed="false" stored="false" docValues="true" default="4" />
- <field name="datedv" type="date" indexed="false" stored="false" docValues="true" default="1995-12-31T23:59:59.999Z" />
+ <fieldType name="uuid" class="solr.UUIDField"/>
- <field name="stringdv" type="string" indexed="false" stored="false" docValues="true" default="solr" />
- <field name="floatdvs" type="float" indexed="false" stored="false" docValues="true" default="1" />
- <field name="intdvs" type="int" indexed="false" stored="false" docValues="true" default="2" />
- <field name="doubledvs" type="double" indexed="false" stored="false" docValues="true" default="3" />
- <field name="longdvs" type="long" indexed="false" stored="false" docValues="true" default="4" />
- <field name="datedvs" type="date" indexed="false" stored="false" docValues="true" default="1995-12-31T23:59:59.999Z" />
- <field name="stringdvs" type="string" indexed="false" stored="false" docValues="true" default="solr" />
+ <field name="id" type="int" required="true"/>
+ <field name="floatdv" type="float" indexed="false" stored="false" docValues="true" default="1"/>
+ <field name="intdv" type="int" indexed="false" stored="false" docValues="true" default="2"/>
+ <field name="doubledv" type="double" indexed="false" stored="false" docValues="true" default="3"/>
+ <field name="longdv" type="long" indexed="false" stored="false" docValues="true" default="4"/>
+ <field name="datedv" type="date" indexed="false" stored="false" docValues="true" default="1995-12-31T23:59:59.999Z"/>
+ <field name="stringdv" type="string" indexed="false" stored="false" docValues="true" default="solr"/>
+ <field name="floatdvs" type="float" indexed="false" stored="false" docValues="true" default="1"/>
+ <field name="intdvs" type="int" indexed="false" stored="false" docValues="true" default="2"/>
+ <field name="doubledvs" type="double" indexed="false" stored="false" docValues="true" default="3"/>
+ <field name="longdvs" type="long" indexed="false" stored="false" docValues="true" default="4"/>
+ <field name="datedvs" type="date" indexed="false" stored="false" docValues="true" default="1995-12-31T23:59:59.999Z"/>
+ <field name="stringdvs" type="string" indexed="false" stored="false" docValues="true" default="solr"/>
- </fields>
<uniqueKey>id</uniqueKey>