You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/01/04 15:53:21 UTC
svn commit: r1649347 [20/31] - in /lucene/dev/branches/lucene6005: ./
dev-tools/ dev-tools/idea/solr/contrib/dataimporthandler-extras/
dev-tools/idea/solr/contrib/extraction/
dev-tools/idea/solr/contrib/map-reduce/
dev-tools/idea/solr/contrib/velocity/...
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema.xml Sun Jan 4 14:53:12 2015
@@ -31,7 +31,7 @@
<!-- 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.
+ behavior of the fieldType.
-->
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
@@ -46,52 +46,52 @@
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
<!-- Field type demonstrating an Analyzer failure -->
- <fieldtype name="failtype1" class="solr.TextField">
+ <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>
+ </fieldType>
<!-- Demonstrating ignoreCaseChange -->
- <fieldtype name="wdf_nocase" class="solr.TextField">
+ <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" preserveOriginal="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="wdf_preserve" class="solr.TextField">
+ <fieldType name="wdf_preserve" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldtype name="highlittext" class="solr.TextField" compressThreshold="345" />
+ <fieldType name="highlittext" class="solr.TextField" compressThreshold="345" />
- <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <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" precisionStep="0"/>
- <fieldtype name="tdate" class="solr.TrieDateField" precisionStep="6"/>
- <fieldtype name="tdatedv" class="solr.TrieDateField" precisionStep="6" docValues="true" multiValued="true"/>
+ <fieldType name="date" class="solr.TrieDateField" precisionStep="0"/>
+ <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6"/>
+ <fieldType name="tdatedv" class="solr.TrieDateField" precisionStep="6" docValues="true" multiValued="true"/>
- <fieldtype name="dateRange" class="solr.DateRangeField" />
+ <fieldType name="dateRange" class="solr.DateRangeField" />
<!-- 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">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
@@ -99,14 +99,14 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldtype>
+ </fieldType>
- <fieldtype name="teststop" class="solr.TextField">
+ <fieldType name="teststop" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.LowerCaseTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
@@ -116,63 +116,63 @@
<tokenizer class="solr.LowerCaseTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <!-- fieldtypes in this section isolate tokenizers and tokenfilters for testing -->
- <fieldtype name="lowertok" class="solr.TextField">
+ <!-- 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">
+ </fieldType>
+ <fieldType name="keywordtok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/></analyzer>
- </fieldtype>
- <fieldtype name="standardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtok" class="solr.TextField">
<analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="lettertok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lettertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="whitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="whitetok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="HTMLstandardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLstandardtok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.StandardTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="HTMLwhitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLwhitetok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.MockTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardtokfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtokfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lowerfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lowerfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lowerpunctfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lowerpunctfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" expand="true"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="1" splitOnCaseChange="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="patternreplacefilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="patternreplacefilt" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
<filter class="solr.PatternReplaceFilterFactory"
@@ -182,55 +182,55 @@
<analyzer type="query">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
</analyzer>
- </fieldtype>
- <fieldtype name="patterntok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="patterntok" class="solr.TextField">
<analyzer>
<tokenizer class="solr.PatternTokenizerFactory" pattern=","/>
</analyzer>
- </fieldtype>
- <fieldtype name="porterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="porterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <!-- fieldtype name="snowballfilt" class="solr.TextField">
+ </fieldType>
+ <!-- fieldType name="snowballfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SnowballPorterFilterFactory"/>
</analyzer>
- </fieldtype -->
- <fieldtype name="engporterfilt" class="solr.TextField">
+ </fieldType -->
+ <fieldType name="engporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custengporterfilt" class="solr.TextField">
+ </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">
+ </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">
+ </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">
+ </fieldType>
+ <fieldType name="lengthfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LengthFilterFactory" min="2" max="5"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<fieldType name="charfilthtmlmap" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
@@ -239,7 +239,7 @@
</analyzer>
</fieldType>
- <fieldtype name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <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"/>
@@ -254,9 +254,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -271,9 +271,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -283,11 +283,11 @@
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- more flexible in matching skus, but more chance of a false match -->
- <fieldtype name="skutype1" class="solr.TextField">
+ <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"/>
@@ -298,10 +298,10 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="skutype2" class="solr.TextField">
+ <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"/>
@@ -312,20 +312,20 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="syn" class="solr.TextField">
+ <fieldType name="syn" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory" synonyms="old_synonyms.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
synonyms "better"
-->
- <fieldtype name="dedup" class="solr.TextField">
+ <fieldType name="dedup" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory"
@@ -333,17 +333,17 @@
<filter class="solr.PorterStemFilterFactory"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="unstored" class="solr.StrField" indexed="true" stored="false"/>
+ <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
- <fieldtype name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<fieldType name="uuid" class="solr.UUIDField" />
@@ -353,7 +353,7 @@
<fieldType name="tenD" class="solr.PointType" dimension="10" subFieldType="double"/>
<!-- Use the sub field suffix -->
<fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="_d1"/>
- <fieldtype name="geohash" class="solr.GeoHashField"/>
+ <fieldType name="geohash" class="solr.GeoHashField"/>
<fieldType name="latLon" class="solr.LatLonType" subFieldType="double"/>
@@ -575,6 +575,7 @@
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
<dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>
<dynamicField name="*_tdtdv" type="tdatedv" indexed="true" stored="true"/>
+ <dynamicField name="*_drf" type="dateRange" indexed="true" stored="true"/>
<dynamicField name="*_sI" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema11.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema11.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema11.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema11.xml Sun Jan 4 14:53:12 2015
@@ -249,7 +249,7 @@
<!-- Poly field -->
<fieldType name="xy" class="solr.PointType" dimension="2" subFieldType="double"/>
<fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="*_d"/>
- <fieldtype name="geohash" class="solr.GeoHashField"/>
+ <fieldType name="geohash" class="solr.GeoHashField"/>
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
@@ -273,14 +273,14 @@ valued. -->
<fieldType name="text_no_analyzer" stored="false" indexed="true" class="solr.TextField" />
- <fieldtype name="text_length" class="solr.TextField">
+ <fieldType name="text_length" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.LengthFilterFactory" min="2" max="32768"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- Valid attributes for fields:
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema12.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema12.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema12.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema12.xml Sun Jan 4 14:53:12 2015
@@ -31,7 +31,7 @@
<!-- 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.
+ behavior of the fieldType.
-->
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
@@ -45,43 +45,43 @@
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
<!-- Field type demonstrating an Analyzer failure -->
- <fieldtype name="failtype1" class="solr.TextField">
+ <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>
+ </fieldType>
<!-- Demonstrating ignoreCaseChange -->
- <fieldtype name="wdf_nocase" class="solr.TextField">
+ <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" preserveOriginal="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="wdf_preserve" class="solr.TextField">
+ <fieldType name="wdf_preserve" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldtype name="highlittext" class="solr.TextField"/>
+ <fieldType name="highlittext" class="solr.TextField"/>
- <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <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"/>
- <fieldtype name="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
+ <fieldType name="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true" >
<analyzer type="index">
@@ -137,65 +137,65 @@
</analyzer>
</fieldType>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldtype>
+ </fieldType>
- <fieldtype name="teststop" class="solr.TextField">
+ <fieldType name="teststop" class="solr.TextField">
<analyzer>
<tokenizer class="solr.LowerCaseTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <!-- fieldtypes in this section isolate tokenizers and tokenfilters for testing -->
- <fieldtype name="lowertok" class="solr.TextField">
+ <!-- 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">
+ </fieldType>
+ <fieldType name="keywordtok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/></analyzer>
- </fieldtype>
- <fieldtype name="standardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtok" class="solr.TextField">
<analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="lettertok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lettertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="whitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="whitetok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="HTMLstandardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLstandardtok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.StandardTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="HTMLwhitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLwhitetok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.MockTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardtokfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtokfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lowerfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lowerfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="patternreplacefilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="patternreplacefilt" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
<filter class="solr.PatternReplaceFilterFactory"
@@ -205,46 +205,46 @@
<analyzer type="query">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
</analyzer>
- </fieldtype>
- <fieldtype name="porterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="porterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="engporterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="engporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custengporterfilt" class="solr.TextField">
+ </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">
+ </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">
+ </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">
+ </fieldType>
+ <fieldType name="lengthfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LengthFilterFactory" min="2" max="5"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <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"/>
@@ -259,9 +259,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -276,9 +276,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -288,11 +288,11 @@
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- more flexible in matching skus, but more chance of a false match -->
- <fieldtype name="skutype1" class="solr.TextField">
+ <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"/>
@@ -303,10 +303,10 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="skutype2" class="solr.TextField">
+ <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"/>
@@ -317,15 +317,15 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="syn" class="solr.TextField">
+ <fieldType name="syn" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- a text field with the stop filter only on the query analyzer
-->
@@ -356,7 +356,7 @@
<!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
synonyms "better"
-->
- <fieldtype name="dedup" class="solr.TextField">
+ <fieldType name="dedup" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory"
@@ -364,17 +364,17 @@
<filter class="solr.PorterStemFilterFactory"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="unstored" class="solr.StrField" indexed="true" stored="false"/>
+ <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
- <fieldtype name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<fieldType name="uuid" class="solr.UUIDField" />
<fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" />
@@ -385,7 +385,7 @@
<!-- Poly field -->
<fieldType name="xy" class="solr.PointType" dimension="2" subFieldType="double"/>
<fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="*_d"/>
- <fieldtype name="geohash" class="solr.GeoHashField"/>
+ <fieldType name="geohash" class="solr.GeoHashField"/>
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
<!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema15.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema15.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema15.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema15.xml Sun Jan 4 14:53:12 2015
@@ -43,43 +43,43 @@
<fieldType name="currency" class="solr.CurrencyField" currencyConfig="currency.xml" multiValued="false" />
<!-- Field type demonstrating an Analyzer failure -->
- <fieldtype name="failtype1" class="solr.TextField">
+ <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>
+ </fieldType>
<!-- Demonstrating ignoreCaseChange -->
- <fieldtype name="wdf_nocase" class="solr.TextField">
+ <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" preserveOriginal="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="wdf_preserve" class="solr.TextField">
+ <fieldType name="wdf_preserve" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldtype name="highlittext" class="solr.TextField"/>
+ <fieldType name="highlittext" class="solr.TextField"/>
- <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <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"/>
- <fieldtype name="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
+ <fieldType name="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true" >
<analyzer type="index">
@@ -135,65 +135,65 @@
</analyzer>
</fieldType>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldtype>
+ </fieldType>
- <fieldtype name="teststop" class="solr.TextField">
+ <fieldType name="teststop" class="solr.TextField">
<analyzer>
<tokenizer class="solr.LowerCaseTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <!-- fieldtypes in this section isolate tokenizers and tokenfilters for testing -->
- <fieldtype name="lowertok" class="solr.TextField">
+ <!-- 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">
+ </fieldType>
+ <fieldType name="keywordtok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/></analyzer>
- </fieldtype>
- <fieldtype name="standardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtok" class="solr.TextField">
<analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="lettertok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lettertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="whitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="whitetok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="HTMLstandardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLstandardtok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.StandardTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="HTMLwhitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLwhitetok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.MockTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardtokfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtokfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lowerfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lowerfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="patternreplacefilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="patternreplacefilt" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
<filter class="solr.PatternReplaceFilterFactory"
@@ -203,52 +203,52 @@
<analyzer type="query">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
</analyzer>
- </fieldtype>
- <fieldtype name="porterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="porterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="engporterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="engporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custengporterfilt" class="solr.TextField">
+ </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">
+ </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">
+ </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">
+ </fieldType>
+ <fieldType name="lengthfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LengthFilterFactory" min="2" max="5"/>
</analyzer>
- </fieldtype>
- <fieldtype name="limitfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="limitfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="100" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <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"/>
@@ -263,9 +263,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -280,9 +280,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -292,11 +292,11 @@
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- more flexible in matching skus, but more chance of a false match -->
- <fieldtype name="skutype1" class="solr.TextField">
+ <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"/>
@@ -307,10 +307,10 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="skutype2" class="solr.TextField">
+ <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"/>
@@ -321,15 +321,15 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="syn" class="solr.TextField">
+ <fieldType name="syn" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- a text field with the stop filter only on the query analyzer
-->
@@ -360,7 +360,7 @@
<!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
synonyms "better"
-->
- <fieldtype name="dedup" class="solr.TextField">
+ <fieldType name="dedup" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory"
@@ -368,17 +368,17 @@
<filter class="solr.PorterStemFilterFactory"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="unstored" class="solr.StrField" indexed="true" stored="false"/>
+ <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
- <fieldtype name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<fieldType name="uuid" class="solr.UUIDField" />
<fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" />
@@ -389,7 +389,7 @@
<!-- Poly field -->
<fieldType name="xy" class="solr.PointType" dimension="2" subFieldType="double"/>
<fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="*_d"/>
- <fieldtype name="geohash" class="solr.GeoHashField"/>
+ <fieldType name="geohash" class="solr.GeoHashField"/>
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
<!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml Sun Jan 4 14:53:12 2015
@@ -31,7 +31,7 @@
<!-- 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.
+ behavior of the fieldType.
-->
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
@@ -45,43 +45,43 @@
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
<!-- Field type demonstrating an Analyzer failure -->
- <fieldtype name="failtype1" class="solr.TextField">
+ <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>
+ </fieldType>
<!-- Demonstrating ignoreCaseChange -->
- <fieldtype name="wdf_nocase" class="solr.TextField">
+ <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" preserveOriginal="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="wdf_preserve" class="solr.TextField">
+ <fieldType name="wdf_preserve" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldtype name="highlittext" class="solr.TextField"/>
+ <fieldType name="highlittext" class="solr.TextField"/>
- <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <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"/>
- <fieldtype name="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
+ <fieldType name="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true" >
<analyzer type="index">
@@ -137,65 +137,65 @@
</analyzer>
</fieldType>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldtype>
+ </fieldType>
- <fieldtype name="teststop" class="solr.TextField">
+ <fieldType name="teststop" class="solr.TextField">
<analyzer>
<tokenizer class="solr.LowerCaseTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <!-- fieldtypes in this section isolate tokenizers and tokenfilters for testing -->
- <fieldtype name="lowertok" class="solr.TextField">
+ <!-- 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">
+ </fieldType>
+ <fieldType name="keywordtok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/></analyzer>
- </fieldtype>
- <fieldtype name="standardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtok" class="solr.TextField">
<analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="lettertok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lettertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="whitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="whitetok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="HTMLstandardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLstandardtok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.StandardTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="HTMLwhitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLwhitetok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.MockTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardtokfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtokfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lowerfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lowerfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="patternreplacefilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="patternreplacefilt" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
<filter class="solr.PatternReplaceFilterFactory"
@@ -205,46 +205,46 @@
<analyzer type="query">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
</analyzer>
- </fieldtype>
- <fieldtype name="porterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="porterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="engporterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="engporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custengporterfilt" class="solr.TextField">
+ </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">
+ </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">
+ </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">
+ </fieldType>
+ <fieldType name="lengthfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LengthFilterFactory" min="2" max="5"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <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"/>
@@ -259,9 +259,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -276,9 +276,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -288,11 +288,11 @@
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- more flexible in matching skus, but more chance of a false match -->
- <fieldtype name="skutype1" class="solr.TextField">
+ <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"/>
@@ -303,10 +303,10 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="skutype2" class="solr.TextField">
+ <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"/>
@@ -317,15 +317,15 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="syn" class="solr.TextField">
+ <fieldType name="syn" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- a text field with the stop filter only on the query analyzer
-->
@@ -372,7 +372,7 @@
<!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
synonyms "better"
-->
- <fieldtype name="dedup" class="solr.TextField">
+ <fieldType name="dedup" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory"
@@ -380,17 +380,17 @@
<filter class="solr.PorterStemFilterFactory"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="unstored" class="solr.StrField" indexed="true" stored="false"/>
+ <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
- <fieldtype name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<fieldType name="uuid" class="solr.UUIDField" />
<fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" />
@@ -401,7 +401,7 @@
<!-- Poly field -->
<fieldType name="xy" class="solr.PointType" dimension="2" subFieldType="double"/>
<fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="*_d"/>
- <fieldtype name="geohash" class="solr.GeoHashField"/>
+ <fieldType name="geohash" class="solr.GeoHashField"/>
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
<!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml Sun Jan 4 14:53:12 2015
@@ -26,6 +26,5 @@
<maxIndexingThreads>123</maxIndexingThreads>
<infoStream>true</infoStream>
<mergePolicy class="org.apache.solr.util.RandomMergePolicy" />
- <checkIntegrityAtMerge>true</checkIntegrityAtMerge>
</indexConfig>
</config>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml Sun Jan 4 14:53:12 2015
@@ -67,6 +67,23 @@
</lst>
</requestHandler>
+ <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell">
+ <lst name="defaults">
+ <str name="df">text</str>
+ </lst>
+ </initParams>
+
+ <requestHandler name="/elevate" class="DumpRequestHandler" startup="lazy">
+ <lst name="defaults">
+ <str name="echoParams">explicit</str>
+ </lst>
+ <arr name="last-components">
+ <str>elevator</str>
+ </arr>
+ </requestHandler>
+
+
+
</config>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml Sun Jan 4 14:53:12 2015
@@ -40,7 +40,7 @@
<str name="sourceLocation">phrasesuggest.txt</str>
</lst>
- <!-- specify a fieldtype using keywordtokenizer + lowercase + cleanup -->
+ <!-- specify a fieldType using keywordtokenizer + lowercase + cleanup -->
<str name="queryAnalyzerFieldType">phrase_suggest</str>
</searchComponent>
@@ -61,7 +61,7 @@
<str name="sourceLocation">jasuggest.txt</str>
</lst>
- <!-- specify a fieldtype using keywordtokenizer + lowercase + cleanup -->
+ <!-- specify a fieldType using keywordtokenizer + lowercase + cleanup -->
<str name="queryAnalyzerFieldType">phrase_suggest</str>
</searchComponent>
@@ -79,7 +79,7 @@
<str name="sourceLocation">analyzingInfixSuggest.txt</str>
</lst>
- <!-- specify a fieldtype using keywordtokenizer + lowercase + cleanup -->
+ <!-- specify a fieldType using keywordtokenizer + lowercase + cleanup -->
<str name="queryAnalyzerFieldType">phrase_suggest</str>
</searchComponent>
@@ -182,7 +182,7 @@
<str name="sourceLocation">fuzzysuggest.txt</str>
</lst>
- <!-- specify a fieldtype using keywordtokenizer + lowercase + cleanup -->
+ <!-- specify a fieldType using keywordtokenizer + lowercase + cleanup -->
<str name="queryAnalyzerFieldType">phrase_suggest</str>
</searchComponent>
@@ -204,7 +204,7 @@
<str name="sourceLocation">fuzzysuggest.txt</str>
</lst>
- <!-- specify a fieldtype using keywordtokenizer + lowercase + cleanup -->
+ <!-- specify a fieldType using keywordtokenizer + lowercase + cleanup -->
<str name="queryAnalyzerFieldType">phrase_suggest</str>
</searchComponent>
@@ -226,7 +226,7 @@
<str name="sourceLocation">fuzzysuggest.txt</str>
</lst>
- <!-- specify a fieldtype using keywordtokenizer + lowercase + cleanup -->
+ <!-- specify a fieldType using keywordtokenizer + lowercase + cleanup -->
<str name="queryAnalyzerFieldType">phrase_suggest</str>
</searchComponent>
@@ -248,7 +248,7 @@
<str name="sourceLocation">fuzzysuggest.txt</str>
</lst>
- <!-- specify a fieldtype using keywordtokenizer + lowercase + cleanup -->
+ <!-- specify a fieldType using keywordtokenizer + lowercase + cleanup -->
<str name="queryAnalyzerFieldType">phrase_suggest</str>
</searchComponent>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml Sun Jan 4 14:53:12 2015
@@ -512,4 +512,25 @@
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
+ <updateRequestProcessorChain name="ignore-commit-from-client-403">
+ <processor class="solr.IgnoreCommitOptimizeUpdateProcessorFactory"/>
+ <processor class="solr.RunUpdateProcessorFactory" />
+ </updateRequestProcessorChain>
+
+ <updateRequestProcessorChain name="ignore-commit-from-client-200">
+ <processor class="solr.IgnoreCommitOptimizeUpdateProcessorFactory">
+ <int name="statusCode">200</int>
+ <str name="responseMessage">Thou shall not issue a commit!</str>
+ </processor>
+ <processor class="solr.RunUpdateProcessorFactory" />
+ </updateRequestProcessorChain>
+
+ <updateRequestProcessorChain name="ignore-optimize-only-from-client-403">
+ <processor class="solr.IgnoreCommitOptimizeUpdateProcessorFactory">
+ <str name="responseMessage">Thou shall not issue an optimize, but commits are OK!</str>
+ <bool name="ignoreOptimizeOnly">true</bool>
+ </processor>
+ <processor class="solr.RunUpdateProcessorFactory" />
+ </updateRequestProcessorChain>
+
</config>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml Sun Jan 4 14:53:12 2015
@@ -52,6 +52,8 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+ <statsCache class="${solr.statsCache:}"/>
+
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<updateHandler class="solr.DirectUpdateHandler2">
@@ -585,7 +587,7 @@
<restManager>
<!--
IMPORTANT: Due to the Lucene SecurityManager, tests can only write to their runtime directory or below.
- But its easier to just keep everything in memory for testing so no remnants are left behind.
+ But it's easier to just keep everything in memory for testing so no remnants are left behind.
-->
<str name="storageIO">org.apache.solr.rest.ManagedResourceStorage$InMemoryStorageIO</str>
</restManager>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/crazy-path-to-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/crazy-path-to-schema.xml?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/crazy-path-to-schema.xml (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/crazy-path-to-schema.xml Sun Jan 4 14:53:12 2015
@@ -23,8 +23,8 @@
<schema name="test" version="1.0">
<types>
- <fieldtype name="int" class="solr.TrieIntField" precisionStep="0"/>
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0"/>
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
@@ -32,7 +32,7 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
</types>
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java Sun Jan 4 14:53:12 2015
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;
import org.apache.solr.client.solrj.request.QueryRequest;
@@ -137,7 +137,7 @@ public class AnalysisAfterCoreReloadTest
}
}
- protected SolrServer getSolrCore() {
+ protected SolrClient getSolrCore() {
return new EmbeddedSolrServer(h.getCore());
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java Sun Jan 4 14:53:12 2015
@@ -625,7 +625,7 @@ public class BasicFunctionalityTest exte
,"*[count(//doc)=2]"
,"//arr[@name='multiDefault']"
);
- assertQ("1 doc should have it's explicit multiDefault",
+ assertQ("1 doc should have its explicit multiDefault",
req("multiDefault:a")
,"*[count(//doc)=1]"
);
@@ -634,7 +634,7 @@ public class BasicFunctionalityTest exte
req("intDefault:42")
,"*[count(//doc)=2]"
);
- assertQ("1 doc should have it's explicit intDefault",
+ assertQ("1 doc should have its explicit intDefault",
req("intDefault:[3 TO 5]")
,"*[count(//doc)=1]"
);
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java Sun Jan 4 14:53:12 2015
@@ -78,7 +78,7 @@ public class SolrInfoMBeanTest extends S
}
catch( InstantiationException ex ) {
// expected...
- //System.out.println( "unable to initalize: "+clazz );
+ //System.out.println( "unable to initialize: "+clazz );
}
}
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java Sun Jan 4 14:53:12 2015
@@ -18,7 +18,7 @@ package org.apache.solr;
*/
import org.apache.lucene.util.LuceneTestCase.Slow;
-import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.params.CommonParams;
@@ -243,7 +243,7 @@ public class TestDistributedGrouping ext
setDistributedParams(params);
int which = r.nextInt(clients.size());
- SolrServer client = clients.get(which);
+ SolrClient client = clients.get(which);
QueryResponse rsp = client.query(params);
NamedList nl = (NamedList<?>) rsp.getResponse().get("grouped");
nl = (NamedList<?>) nl.getVal(0);
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestDistributedSearch.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestDistributedSearch.java Sun Jan 4 14:53:12 2015
@@ -17,7 +17,6 @@
package org.apache.solr;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -25,10 +24,10 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.lucene.util.LuceneTestCase.Slow;
-import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.response.FacetField;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.RangeFacet;
@@ -316,6 +315,11 @@ public class TestDistributedSearch exten
query("q","*:*", "fl",i1, "fl", "id","sort",i1 + " desc");
query("q","*:*", "fl", "id", "fl",nint, "fl",tint,"sort",i1 + " desc");
query("q","*:*", "fl",nint, "fl", "id", "fl",tint,"sort",i1 + " desc");
+ handle.put("did", SKIPVAL);
+ query("q","*:*", "fl","did:[docid]","sort",i1 + " desc");
+ handle.remove("did");
+ query("q","*:*", "fl","log(" + tlong + "),abs(" + tlong + "),score","sort",i1 + " desc");
+ query("q","*:*", "fl","n_*","sort",i1 + " desc");
// basic spellcheck testing
query("q", "toyata", "fl", "id,lowerfilt", "spellcheck", true, "spellcheck.q", "toyata", "qt", "spellCheckCompRH_Direct", "shards.qt", "spellCheckCompRH_Direct");
@@ -471,7 +475,7 @@ public class TestDistributedSearch exten
for(int numDownServers = 0; numDownServers < jettys.size()-1; numDownServers++)
{
List<JettySolrRunner> upJettys = new ArrayList<>(jettys);
- List<SolrServer> upClients = new ArrayList<>(clients);
+ List<SolrClient> upClients = new ArrayList<>(clients);
List<JettySolrRunner> downJettys = new ArrayList<>();
List<String> upShards = new ArrayList<>(Arrays.asList(shardsArr));
for(int i=0; i<numDownServers; i++)
@@ -554,7 +558,7 @@ public class TestDistributedSearch exten
"stats.field", tdate_a,
"stats.field", tdate_b,
"stats.calcdistinct", "true");
- } catch (HttpSolrServer.RemoteSolrException e) {
+ } catch (HttpSolrClient.RemoteSolrException e) {
if (e.getMessage().startsWith("java.lang.NullPointerException")) {
fail("NullPointerException with stats request on empty index");
} else {
@@ -590,7 +594,7 @@ public class TestDistributedSearch exten
}
protected void queryPartialResults(final List<String> upShards,
- final List<SolrServer> upClients,
+ final List<SolrClient> upClients,
Object... q) throws Exception {
final ModifiableSolrParams params = new ModifiableSolrParams();
@@ -622,7 +626,7 @@ public class TestDistributedSearch exten
public void run() {
for (int j = 0; j < stress; j++) {
int which = r.nextInt(upClients.size());
- SolrServer client = upClients.get(which);
+ SolrClient client = upClients.get(which);
try {
QueryResponse rsp = client.query(new ModifiableSolrParams(params));
if (verifyStress) {
@@ -643,10 +647,10 @@ public class TestDistributedSearch exten
}
}
- protected QueryResponse queryRandomUpServer(ModifiableSolrParams params, List<SolrServer> upClients) throws SolrServerException {
+ protected QueryResponse queryRandomUpServer(ModifiableSolrParams params, List<SolrClient> upClients) throws SolrServerException {
// query a random "up" server
int which = r.nextInt(upClients.size());
- SolrServer client = upClients.get(which);
+ SolrClient client = upClients.get(which);
QueryResponse rsp = client.query(params);
return rsp;
}
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java Sun Jan 4 14:53:12 2015
@@ -74,7 +74,7 @@ public class TestSolrCoreProperties exte
public void testSimple() throws Exception {
SolrParams params = params("q", "*:*",
"echoParams", "all");
- QueryResponse res = getSolrServer().query(params);
+ QueryResponse res = getSolrClient().query(params);
assertEquals(0, res.getResults().getNumFound());
NamedList echoedParams = (NamedList) res.getHeader().get("params");
Modified: lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestTolerantSearch.java?rev=1649347&r1=1649346&r2=1649347&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestTolerantSearch.java (original)
+++ lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/TestTolerantSearch.java Sun Jan 4 14:53:12 2015
@@ -6,9 +6,9 @@ import java.io.OutputStream;
import org.apache.commons.io.FileUtils;
import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrException;
@@ -40,8 +40,8 @@ import org.junit.BeforeClass;
public class TestTolerantSearch extends SolrJettyTestBase {
- private static SolrServer collection1;
- private static SolrServer collection2;
+ private static SolrClient collection1;
+ private static SolrClient collection2;
private static String shard1;
private static String shard2;
private static File solrHome;
@@ -60,8 +60,8 @@ public class TestTolerantSearch extends
solrHome = createSolrHome();
createJetty(solrHome.getAbsolutePath(), null, null);
String url = jetty.getBaseUrl().toString();
- collection1 = new HttpSolrServer(url);
- collection2 = new HttpSolrServer(url + "/collection2");
+ collection1 = new HttpSolrClient(url);
+ collection2 = new HttpSolrClient(url + "/collection2");
String urlCollection1 = jetty.getBaseUrl().toString() + "/" + "collection1";
String urlCollection2 = jetty.getBaseUrl().toString() + "/" + "collection2";