You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/04/09 21:48:16 UTC
svn commit: r1586106 [2/4] - in /lucene/dev/trunk/solr: ./
contrib/clustering/src/test-files/clustering/solr/collection1/conf/
contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/
contrib/dataimporthandler/src/test-files/dih...
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java Wed Apr 9 19:48:14 2014
@@ -35,7 +35,7 @@ import org.apache.solr.request.SolrReque
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.schema.DateField;
+import org.apache.solr.schema.TrieDateField;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
@@ -402,7 +402,7 @@ public final class DocExpirationUpdatePr
try {
DeleteUpdateCommand del = new DeleteUpdateCommand(req);
del.setQuery("{!cache=false}" + expireField + ":[* TO " +
- DateField.formatExternal(SolrRequestInfo.getRequestInfo().getNOW())
+ TrieDateField.formatExternal(SolrRequestInfo.getRequestInfo().getNOW())
+ "]");
proc.processDelete(del);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java Wed Apr 9 19:48:14 2014
@@ -91,7 +91,7 @@ import org.apache.solr.util.plugin.SolrC
* <str name="fieldRegex">.*SKIP.*</str>
* </lst>
* <lst name="exclude">
- * <str name="typeClass">solr.DateField</str>
+ * <str name="typeClass">solr.TrieDateField</str>
* </lst>
* </processor></pre>
*
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java Wed Apr 9 19:48:14 2014
@@ -50,7 +50,7 @@ import java.util.Map;
* <p>
* The default selection behavior is to mutate both those fields that don't match
* a schema field, as well as those fields that match a schema field with a field
- * type that uses class solr.DateField or a sub-class, including solr.TrieDateField.
+ * type that uses class solr.TrieDateField.
* </p>
* <p>
* If all values are parseable as dates (or are already Date), then the field will
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java Wed Apr 9 19:48:14 2014
@@ -39,8 +39,7 @@ import java.util.Locale;
* <p>
* The default selection behavior is to mutate both those fields that don't match
* a schema field, as well as those fields that match a schema field with a field
- * type that uses class solr.DoubleField, solr.TrieDoubleField, or
- * solr.SortableDoubleField.
+ * type that uses class solr.TrieDoubleField.
* </p>
* <p>
* If all values are parseable as double (or are already Double), then the field
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java Wed Apr 9 19:48:14 2014
@@ -39,8 +39,7 @@ import java.util.Locale;
* <p>
* The default selection behavior is to mutate both those fields that don't match
* a schema field, as well as those fields that match a schema field with a field
- * type that uses class solr.FloatField, solr.TrieFloatField, or
- * solr.SortableFloatField.
+ * type that uses class solr.TrieFloatField.
* </p>
* <p>
* If all values are parseable as float (or are already Float), then the field
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java Wed Apr 9 19:48:14 2014
@@ -36,8 +36,7 @@ import java.util.Locale;
* <p>
* The default selection behavior is to mutate both those fields that don't match
* a schema field, as well as those fields that match a schema field with a field
- * type that uses class solr.IntField, solr.TrieIntField, or
- * solr.SortableIntField.
+ * type that uses class solr.TrieIntField.
* </p>
* <p>
* If all values are parseable as int (or are already Integer), then the field
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java Wed Apr 9 19:48:14 2014
@@ -36,8 +36,7 @@ import java.util.Locale;
* <p>
* The default selection behavior is to mutate both those fields that don't match
* a schema field, as well as those fields that match a schema field with a field
- * type that uses class solr.LongField, solr.TrieLongField, or
- * solr.SortableLongField.
+ * type that uses class solr.TrieLongField.
* </p>
* <p>
* If all values are parseable as long (or are already Long), then the field
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml Wed Apr 9 19:48:14 2014
@@ -23,7 +23,7 @@
<schema name="test" version="1.5">
<types>
<fieldtype name="long" class="solr.TrieLongField" stored="true" indexed="true" />
- <fieldtype name="sint" class="solr.SortableIntField" />
+ <fieldtype name="int" class="solr.TrieIntField" precisionStep="0"/>
<fieldtype name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
@@ -34,7 +34,7 @@
<fields>
- <field name="id" type="sint" indexed="true" stored="true" multiValued="false"/>
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false"/>
<field name="text" type="text" indexed="true" stored="true"/>
<field name="_version_" type="long" />
</fields>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml Wed Apr 9 19:48:14 2014
@@ -23,8 +23,8 @@
<fieldType name="string" class="solr.StrField"/>
<!-- BEGIN BAD STUFF -->
- <fieldType name="ftAgain" class="solr.IntField"/>
- <fieldType name="ftAgain" class="solr.IntField"/>
+ <fieldType name="ftAgain" class="solr.TrieIntField"/>
+ <fieldType name="ftAgain" class="solr.TrieIntField"/>
<!-- END BAD STUFF -->
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml Wed Apr 9 19:48:14 2014
@@ -34,59 +34,45 @@
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.
+ <!--
+ Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="integer" class="solr.IntField"/>
- <fieldType name="long" class="solr.LongField"/>
- <fieldtype name="float" class="solr.FloatField"/>
- <fieldType name="double" class="solr.DoubleField"/>
-
- <!-- numeric field types that manipulate the value into
- a string value that isn't human readable in it's internal form,
- but sorts correctly and supports range queries.
-
- If sortMissingLast="true" then a sort on this field will cause documents
- without the field to come after documents with the field,
- regardless of the requested sort order.
- If sortMissingFirst="true" then a sort on this field will cause documents
- without the field to come before documents with the field,
- regardless of the requested sort order.
- If sortMissingLast="false" and sortMissingFirst="false" (the default),
- then default lucene sorting will be used which places docs without the field
- first in an ascending sort and last in a descending sort.
+ <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 NumericRangeQuery 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="sint" class="solr.SortableIntField" sortMissingLast="true"/>
- <fieldtype name="slong" class="solr.SortableLongField" sortMissingLast="true"/>
- <fieldtype name="sfloat" class="solr.SortableFloatField" sortMissingLast="true"/>
- <fieldtype name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true"/>
- <fieldtype name="binary" class="solr.BinaryField"/>
-
- <!-- bcd versions of sortable numeric type may provide smaller
- storage space and support very large numbers.
- -->
- <fieldtype name="bcdint" class="solr.BCDIntField" sortMissingLast="true"/>
- <fieldtype name="bcdlong" class="solr.BCDLongField" sortMissingLast="true"/>
- <fieldtype name="bcdstr" class="solr.BCDStrField" sortMissingLast="true"/>
-
+ <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="binary" class="solr.BinaryField"/>
<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.DateField" sortMissingLast="true"/>
+ <fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true"/>
</types>
<fields>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="data" type="binary" stored="true"/>
</fields>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml Wed Apr 9 19:48:14 2014
@@ -34,41 +34,28 @@
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.
+ <!--
+ Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="integer" class="solr.IntField"/>
- <fieldType name="long" class="solr.LongField"/>
- <fieldtype name="float" class="solr.FloatField"/>
- <fieldType name="double" class="solr.DoubleField"/>
-
- <!-- numeric field types that manipulate the value into
- a string value that isn't human readable in it's internal form,
- but sorts correctly and supports range queries.
-
- If sortMissingLast="true" then a sort on this field will cause documents
- without the field to come after documents with the field,
- regardless of the requested sort order.
- If sortMissingFirst="true" then a sort on this field will cause documents
- without the field to come before documents with the field,
- regardless of the requested sort order.
- If sortMissingLast="false" and sortMissingFirst="false" (the default),
- then default lucene sorting will be used which places docs without the field
- first in an ascending sort and last in a descending sort.
+ <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 NumericRangeQuery 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="sint" class="solr.SortableIntField" sortMissingLast="true"/>
- <fieldtype name="slong" class="solr.SortableLongField" sortMissingLast="true"/>
- <fieldtype name="sfloat" class="solr.SortableFloatField" sortMissingLast="true"/>
- <fieldtype name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true"/>
-
- <!-- bcd versions of sortable numeric type may provide smaller
- storage space and support very large numbers.
- -->
- <fieldtype name="bcdint" class="solr.BCDIntField" sortMissingLast="true"/>
- <fieldtype name="bcdlong" class="solr.BCDLongField" sortMissingLast="true"/>
- <fieldtype name="bcdstr" class="solr.BCDStrField" sortMissingLast="true"/>
+ <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">
@@ -98,7 +85,7 @@
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="solr.DateField" sortMissingLast="true"/>
+ <fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
text analyzers specified as a tokenizer and a list
@@ -308,7 +295,7 @@
<fields>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="false"/>
+ <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"/>
@@ -331,8 +318,8 @@
<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="integer" indexed="false" stored="true"/>
- <field name="iind" type="integer" indexed="true" stored="false"/>
+ <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"/>
@@ -383,7 +370,7 @@
<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="sint" indexed="true" stored="true" default="42" multiValued="false"/>
+ <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"
@@ -405,16 +392,15 @@
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="sint" indexed="true" stored="true"/>
+ <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="slong" indexed="true" stored="true"/>
+ <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="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_d" type="sdouble" 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="*_bcd" type="bcdstr" indexed="true" stored="true"/>
<dynamicField name="*_sI" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
@@ -428,7 +414,7 @@
<!-- for testing to ensure that longer patterns are matched first -->
<dynamicField name="*aa" type="string" indexed="true" stored="true"/>
- <dynamicField name="*aaa" type="integer" indexed="false" 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"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml Wed Apr 9 19:48:14 2014
@@ -34,15 +34,29 @@
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.
+ <!--
+ Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="integer" class="solr.IntField"/>
- <fieldType name="long" class="solr.LongField"/>
- <fieldtype name="float" class="solr.FloatField"/>
- <fieldType name="double" class="solr.DoubleField"/>
+ <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 NumericRangeQuery 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"/>
@@ -54,8 +68,8 @@
</types>
<fields>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="true"/>
- <field name="intfield" type="integer" 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"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml Wed Apr 9 19:48:14 2014
@@ -35,8 +35,8 @@
<fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="sint_ml" class="solr.SortableIntField" sortMissingLast="true"/>
- <fieldtype name="sint_mf" class="solr.SortableIntField" 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"/>
@@ -51,8 +51,8 @@
<field name="signatureField" type="string_ml" indexed="true" stored="false"/>
<dynamicField name="*_ti1" type="tint" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_si_ml" type="sint_ml" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_si_mf" type="sint_mf" 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"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml Wed Apr 9 19:48:14 2014
@@ -24,7 +24,7 @@
<schema name="test" version="1.0">
<types>
<fieldType name="string" class="solr.StrField"/>
- <fieldtype name="sint" class="solr.SortableIntField" />
+ <fieldtype name="int" class="solr.TrieIntField" precisionStep="0"/>
<fieldtype name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
@@ -35,7 +35,7 @@
<fields>
- <field name="id" type="sint" multiValued="false" indexed="true" stored="true" required="false"/>
+ <field name="id" type="int" multiValued="false" indexed="true" stored="true" required="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml Wed Apr 9 19:48:14 2014
@@ -28,7 +28,7 @@
<schema name="test" version="1.2">
<types>
- <fieldType name="integer" class="solr.IntField"/>
+ <fieldType name="integer" class="solr.TrieIntField" precisionStep="0"/>
<fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml Wed Apr 9 19:48:14 2014
@@ -28,7 +28,7 @@
<schema name="test" version="1.2">
<types>
- <fieldType name="integer" class="solr.IntField"/>
+ <fieldType name="integer" class="solr.TrieIntField" precisionStep="0"/>
<fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml Wed Apr 9 19:48:14 2014
@@ -34,41 +34,28 @@
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.
+ <!--
+ Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldtype name="integer" class="solr.IntField"/>
- <fieldtype name="long" class="solr.LongField"/>
- <fieldtype name="float" class="solr.FloatField"/>
- <fieldtype name="double" class="solr.DoubleField"/>
-
- <!-- numeric field types that manipulate the value into
- a string value that isn't human readable in it's internal form,
- but sorts correctly and supports range queries.
-
- If sortMissingLast="true" then a sort on this field will cause documents
- without the field to come after documents with the field,
- regardless of the requested sort order.
- If sortMissingFirst="true" then a sort on this field will cause documents
- without the field to come before documents with the field,
- regardless of the requested sort order.
- If sortMissingLast="false" and sortMissingFirst="false" (the default),
- then default lucene sorting will be used which places docs without the field
- first in an ascending sort and last in a descending sort.
+ <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 NumericRangeQuery 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="sint" class="solr.SortableIntField" sortMissingLast="true"/>
- <fieldtype name="slong" class="solr.SortableLongField" sortMissingLast="true"/>
- <fieldtype name="sfloat" class="solr.SortableFloatField" sortMissingLast="true"/>
- <fieldtype name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true"/>
-
- <!-- bcd versions of sortable numeric type may provide smaller
- storage space and support very large numbers.
- -->
- <fieldtype name="bcdint" class="solr.BCDIntField" sortMissingLast="true"/>
- <fieldtype name="bcdlong" class="solr.BCDLongField" sortMissingLast="true"/>
- <fieldtype name="bcdstr" class="solr.BCDStrField" sortMissingLast="true"/>
+ <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">
@@ -89,7 +76,7 @@
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="solr.DateField" sortMissingLast="true"/>
+ <fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
text analyzers specified as a tokenizer and a list
@@ -299,7 +286,7 @@
<fields>
- <field name="id" type="integer" multiValued="false" indexed="true" stored="true"/> <!-- the uniqueKey is required by default -->
+ <field name="id" type="int" multiValued="false" indexed="true" stored="true"/> <!-- the uniqueKey is required by default -->
<field name="name" type="nametext" indexed="true" stored="true" required="true"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="subject" type="text" indexed="true" stored="true" required="true" default="Stuff"/>
@@ -322,8 +309,8 @@
<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="integer" indexed="false" stored="true"/>
- <field name="iind" type="integer" indexed="true" stored="false"/>
+ <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"/>
@@ -373,7 +360,7 @@
<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="sint" indexed="true" stored="true" default="42" multiValued="false"/>
+ <field name="intDefault" type="int" indexed="true" stored="true" default="42" multiValued="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false" />
@@ -386,16 +373,15 @@
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="sint" indexed="true" stored="true"/>
+ <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="slong" indexed="true" stored="true"/>
+ <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="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_d" type="sdouble" 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="*_bcd" type="bcdstr" indexed="true" stored="true"/>
<dynamicField name="*_sI" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
@@ -406,7 +392,7 @@
<!-- for testing to ensure that longer patterns are matched first -->
<dynamicField name="*aa" type="string" indexed="true" stored="true"/>
- <dynamicField name="*aaa" type="integer" indexed="false" stored="true"/>
+ <dynamicField name="*aaa" type="int" indexed="false" stored="true"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml Wed Apr 9 19:48:14 2014
@@ -31,11 +31,6 @@
1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)
-->
<types>
- <fieldType name="pint" class="solr.IntField"/>
- <fieldType name="plong" class="solr.LongField"/>
- <fieldtype name="pfloat" class="solr.FloatField"/>
- <fieldType name="pdouble" class="solr.DoubleField"/>
-
<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"/>
@@ -46,25 +41,6 @@
<fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
- <!-- numeric field types that manipulate the value into
- a string value that isn't human readable in it's internal form,
- but sorts correctly and supports range queries.
-
- If sortMissingLast="true" then a sort on this field will cause documents
- without the field to come after documents with the field,
- regardless of the requested sort order.
- If sortMissingFirst="true" then a sort on this field will cause documents
- without the field to come before documents with the field,
- regardless of the requested sort order.
- If sortMissingLast="false" and sortMissingFirst="false" (the default),
- then default lucene sorting will be used which places docs without the field
- first in an ascending sort and last in a descending sort.
- -->
- <fieldtype name="sint" class="solr.SortableIntField" sortMissingLast="true" />
- <fieldtype name="slong" class="solr.SortableLongField" sortMissingLast="true"/>
- <fieldtype name="sfloat" class="solr.SortableFloatField" sortMissingLast="true"/>
- <fieldtype name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true"/>
-
<!-- Field type demonstrating an Analyzer failure -->
<fieldtype name="failtype1" class="solr.TextField">
<analyzer type="index">
@@ -103,7 +79,6 @@
-->
<fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true"/>
<fieldtype name="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
- <fieldtype name="pdate" class="solr.DateField" sortMissingLast="true"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true" >
<analyzer type="index">
@@ -573,12 +548,6 @@
<dynamicField name="*_coordinate" type="tdouble" indexed="true" stored="false"/>
-
- <dynamicField name="*_si" type="sint" indexed="true" stored="true"/>
- <dynamicField name="*_sl" type="slong" indexed="true" stored="true"/>
- <dynamicField name="*_sf" type="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_sd" type="sdouble" 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"/>
@@ -612,13 +581,6 @@
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
- <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
- <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
- <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
- <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
- <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
-
-
<dynamicField name="ignored_*" type="ignored" multiValued="true"/>
<dynamicField name="attr_*" type="text" indexed="true" stored="true" multiValued="true"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml Wed Apr 9 19:48:14 2014
@@ -26,7 +26,7 @@
<fieldtype name="long" class="solr.TrieLongField" />
- <fieldtype name="integer" class="solr.IntField" />
+ <fieldType name="integer" class="solr.TrieIntField" precisionStep="0"/>
<fieldtype name="string" class="solr.StrField" />
<fieldtype name="text" class="solr.TextField">
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml Wed Apr 9 19:48:14 2014
@@ -115,50 +115,6 @@ NOTE: Tests expect every field in this s
<!-- <field name="enum_dv_last" type="enum_dv_last" /> -->
<!-- <field name="enum_dv_first" type="enum_dv_first" /> -->
- <field name="bcd_int" type="bcd_int" />
- <field name="bcd_int_last" type="bcd_int_last" />
- <field name="bcd_int_first" type="bcd_int_first" />
-
- <field name="bcd_long" type="bcd_long" />
- <field name="bcd_long_last" type="bcd_long_last" />
- <field name="bcd_long_first" type="bcd_long_first" />
-
- <field name="bcd_str" type="bcd_str" />
- <field name="bcd_str_last" type="bcd_str_last" />
- <field name="bcd_str_first" type="bcd_str_first" />
-
- <!-- IntField doesn't support sortMissingFirst or sortMissingLast variants -->
- <field name="legacy_int" type="legacy_int" />
-
- <field name="legacy_sortable_int" type="legacy_sortable_int" />
- <field name="legacy_sortable_int_last" type="legacy_sortable_int_last" />
- <field name="legacy_sortable_int_first" type="legacy_sortable_int_first" />
-
- <!-- LongField doesn't support sortMissingFirst or sortMissingLast variants -->
- <field name="legacy_long" type="legacy_long" />
-
- <field name="legacy_sortable_long" type="legacy_sortable_long" />
- <field name="legacy_sortable_long_last" type="legacy_sortable_long_last" />
- <field name="legacy_sortable_long_first" type="legacy_sortable_long_first" />
-
- <!-- FloatField doesn't support sortMissingFirst or sortMissingLast variants -->
- <field name="legacy_float" type="legacy_float" />
-
- <field name="legacy_sortable_float" type="legacy_sortable_float" />
- <field name="legacy_sortable_float_last" type="legacy_sortable_float_last" />
- <field name="legacy_sortable_float_first" type="legacy_sortable_float_first" />
-
- <!-- DoubleField doesn't support sortMissingFirst or sortMissingLast variants -->
- <field name="legacy_double" type="legacy_double" />
-
- <field name="legacy_sortable_double" type="legacy_sortable_double" />
- <field name="legacy_sortable_double_last" type="legacy_sortable_double_last" />
- <field name="legacy_sortable_double_first" type="legacy_sortable_double_first" />
-
- <field name="legacy_date" type="legacy_date" />
- <field name="legacy_date_last" type="legacy_date_last" />
- <field name="legacy_date_first" type="legacy_date_first" />
-
<!-- ensure function sorts don't mistakenly get interpreted as field sorts
https://issues.apache.org/jira/browse/SOLR-5354?focusedCommentId=13835891&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13835891
-->
@@ -192,57 +148,30 @@ NOTE: Tests expect every field in this s
<copyField source="int" dest="int_dv" />
<copyField source="int" dest="int_dv_last" />
<copyField source="int" dest="int_dv_first" />
- <copyField source="int" dest="bcd_int" />
- <copyField source="int" dest="bcd_int_last" />
- <copyField source="int" dest="bcd_int_first" />
- <copyField source="int" dest="bcd_str" />
- <copyField source="int" dest="bcd_str_last" />
- <copyField source="int" dest="bcd_str_first" />
- <copyField source="int" dest="legacy_int" />
- <copyField source="int" dest="legacy_sortable_int" />
- <copyField source="int" dest="legacy_sortable_int_last" />
- <copyField source="int" dest="legacy_sortable_int_first" />
<copyField source="long" dest="long_last" />
<copyField source="long" dest="long_first" />
<copyField source="long" dest="long_dv" />
<copyField source="long" dest="long_dv_last" />
<copyField source="long" dest="long_dv_first" />
- <copyField source="long" dest="bcd_long" />
- <copyField source="long" dest="bcd_long_last" />
- <copyField source="long" dest="bcd_long_first" />
- <copyField source="long" dest="legacy_long" />
- <copyField source="long" dest="legacy_sortable_long" />
- <copyField source="long" dest="legacy_sortable_long_last" />
- <copyField source="long" dest="legacy_sortable_long_first" />
<copyField source="float" dest="float_last" />
<copyField source="float" dest="float_first" />
<copyField source="float" dest="float_dv" />
<copyField source="float" dest="float_dv_last" />
<copyField source="float" dest="float_dv_first" />
- <copyField source="float" dest="legacy_float" />
- <copyField source="float" dest="legacy_sortable_float" />
- <copyField source="float" dest="legacy_sortable_float_last" />
- <copyField source="float" dest="legacy_sortable_float_first" />
<copyField source="double" dest="double_last" />
<copyField source="double" dest="double_first" />
<copyField source="double" dest="double_dv" />
<copyField source="double" dest="double_dv_last" />
<copyField source="double" dest="double_dv_first" />
- <copyField source="double" dest="legacy_double" />
- <copyField source="double" dest="legacy_sortable_double" />
- <copyField source="double" dest="legacy_sortable_double_last" />
- <copyField source="double" dest="legacy_sortable_double_first" />
<copyField source="date" dest="date_last" />
<copyField source="date" dest="date_first" />
<copyField source="date" dest="date_dv" />
<copyField source="date" dest="date_dv_last" />
<copyField source="date" dest="date_dv_first" />
- <copyField source="date" dest="legacy_date_last" />
- <copyField source="date" dest="legacy_date_first" />
<copyField source="uuid" dest="uuid_last" />
<copyField source="uuid" dest="uuid_first" />
@@ -351,50 +280,6 @@ NOTE: Tests expect every field in this s
<!-- <fieldType name="enum_dv" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity" docValues="true"/> -->
<!-- <fieldType name="enum_dv_last" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity" docValues="true" sortMissingLast="true"/> -->
<!-- <fieldType name="enum_dv_first" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity" docValues="true" sortMissingFirst="true"/> -->
-
- <fieldtype name="bcd_int" class="solr.BCDIntField" stored="true" indexed="true" />
- <fieldtype name="bcd_int_last" class="solr.BCDIntField" stored="true" indexed="true" sortMissingLast="true"/>
- <fieldtype name="bcd_int_first" class="solr.BCDIntField" stored="true" indexed="true" sortMissingFirst="true"/>
-
- <fieldtype name="bcd_long" class="solr.BCDLongField" stored="true" indexed="true" />
- <fieldtype name="bcd_long_last" class="solr.BCDLongField" stored="true" indexed="true" sortMissingLast="true"/>
- <fieldtype name="bcd_long_first" class="solr.BCDLongField" stored="true" indexed="true" sortMissingFirst="true"/>
-
- <fieldtype name="bcd_str" class="solr.BCDStrField" stored="true" indexed="true" />
- <fieldtype name="bcd_str_last" class="solr.BCDStrField" stored="true" indexed="true" sortMissingLast="true"/>
- <fieldtype name="bcd_str_first" class="solr.BCDStrField" stored="true" indexed="true" sortMissingFirst="true"/>
-
- <!-- IntField doesn't support sortMissingFirst or sortMissingLast variants -->
- <fieldtype name="legacy_int" class="solr.IntField" stored="true" indexed="true" />
-
- <fieldtype name="legacy_sortable_int" class="solr.SortableIntField" stored="true" indexed="true" />
- <fieldtype name="legacy_sortable_int_last" class="solr.SortableIntField" stored="true" indexed="true" sortMissingLast="true"/>
- <fieldtype name="legacy_sortable_int_first" class="solr.SortableIntField" stored="true" indexed="true" sortMissingFirst="true"/>
-
- <!-- LongField doesn't support sortMissingFirst or sortMissingLast variants -->
- <fieldtype name="legacy_long" class="solr.LongField" stored="true" indexed="true" />
-
- <fieldtype name="legacy_sortable_long" class="solr.SortableLongField" stored="true" indexed="true" />
- <fieldtype name="legacy_sortable_long_last" class="solr.SortableLongField" stored="true" indexed="true" sortMissingLast="true"/>
- <fieldtype name="legacy_sortable_long_first" class="solr.SortableLongField" stored="true" indexed="true" sortMissingFirst="true"/>
-
- <!-- FloatField doesn't support sortMissingFirst or sortMissingLast variants -->
- <fieldtype name="legacy_float" class="solr.FloatField" stored="true" indexed="true" />
-
- <fieldtype name="legacy_sortable_float" class="solr.SortableFloatField" stored="true" indexed="true" />
- <fieldtype name="legacy_sortable_float_last" class="solr.SortableFloatField" stored="true" indexed="true" sortMissingLast="true"/>
- <fieldtype name="legacy_sortable_float_first" class="solr.SortableFloatField" stored="true" indexed="true" sortMissingFirst="true"/>
-
- <!-- DoubleField doesn't support sortMissingFirst or sortMissingLast variants -->
- <fieldtype name="legacy_double" class="solr.DoubleField" stored="true" indexed="true" />
-
- <fieldtype name="legacy_sortable_double" class="solr.SortableDoubleField" stored="true" indexed="true" />
- <fieldtype name="legacy_sortable_double_last" class="solr.SortableDoubleField" stored="true" indexed="true" sortMissingLast="true"/>
- <fieldtype name="legacy_sortable_double_first" class="solr.SortableDoubleField" stored="true" indexed="true" sortMissingFirst="true"/>
-
- <fieldtype name="legacy_date" class="solr.DateField" stored="true" indexed="true" />
- <fieldtype name="legacy_date_last" class="solr.DateField" stored="true" indexed="true" sortMissingLast="true"/>
- <fieldtype name="legacy_date_first" class="solr.DateField" stored="true" indexed="true" sortMissingFirst="true"/>
</types>
</schema>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml Wed Apr 9 19:48:14 2014
@@ -26,7 +26,7 @@
<types>
- <fieldtype name="integer" class="solr.IntField" />
+ <fieldtype name="integer" class="solr.TrieIntField" precisionStep="0"/>
<fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<fieldtype name="stop-one" class="solr.TextField">
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml Wed Apr 9 19:48:14 2014
@@ -69,24 +69,10 @@
field first in an ascending sort and last in a descending sort.
-->
-
- <!-- numeric field types that store and index the text
- value verbatim (and hence don't support range queries, since the
- lexicographic ordering isn't equal to the numeric ordering) -->
- <fieldType name="integer" class="solr.IntField" omitNorms="true"/>
- <fieldType name="long" class="solr.LongField" omitNorms="true"/>
- <fieldType name="float" class="solr.FloatField" omitNorms="true"/>
- <fieldType name="double" class="solr.DoubleField" omitNorms="true"/>
-
-
- <!-- Numeric field types that manipulate the value into
- a string value that isn't human-readable in its internal form,
- but with a lexicographic ordering the same as the numeric ordering,
- so that range queries work correctly. -->
- <fieldType name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/>
+ <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="tint" class="solr.TrieIntField" omitNorms="true" positionIncrementGap="0" indexed="true" stored="false" />
<fieldType name="tfloat" class="solr.TrieFloatField" omitNorms="true" positionIncrementGap="0" indexed="true" stored="false" />
@@ -116,9 +102,9 @@
... 6 months and 3 days in the future from the start of
the current day
- Consult the DateField javadocs for more information.
+ Consult the TrieDateField javadocs for more information.
-->
- <fieldType name="date" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
<!-- The "RandomSortField" is not used to store or search any
@@ -269,7 +255,7 @@
-->
<!-- for testing, a type that does a transform to see if it's correctly done everywhere -->
- <field name="id" type="sfloat" indexed="true" stored="true" required="true" />
+ <field name="id" type="tfloat" indexed="true" stored="true" required="true" />
<field name="text" type="text" indexed="true" stored="false" />
<field name="signatureField" type="string" indexed="true" stored="false"/>
@@ -294,15 +280,10 @@
<dynamicField name="*_s" type="string" indexed="true" stored="true"/>
<dynamicField name="*_ss" type="string" indexed="true" stored="true" multiValued="true"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
- <dynamicField name="*_i" type="sint" indexed="true" stored="true"/>
- <dynamicField name="*_l" type="slong" indexed="true" stored="true"/>
- <dynamicField name="*_f" type="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_d" type="sdouble" indexed="true" stored="true"/>
-
- <dynamicField name="*_pi" type="integer" indexed="true" stored="true"/>
- <dynamicField name="*_pl" type="long" indexed="true" stored="true"/>
- <dynamicField name="*_pf" type="float" indexed="true" stored="true"/>
- <dynamicField name="*_pd" type="double" indexed="true" stored="true"/>
+ <dynamicField name="*_i" type="tint" indexed="true" stored="true"/>
+ <dynamicField name="*_l" type="tlong" indexed="true" stored="true"/>
+ <dynamicField name="*_f" type="tfloat" indexed="true" stored="true"/>
+ <dynamicField name="*_d" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_t" type="text" indexed="true" stored="true"/>
<dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema.xml Wed Apr 9 19:48:14 2014
@@ -34,16 +34,6 @@
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="pint" class="solr.IntField"/>
- <fieldType name="plong" class="solr.LongField"/>
- <fieldtype name="pfloat" class="solr.FloatField"/>
- <fieldType name="pdouble" class="solr.DoubleField"/>
-
<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"/>
@@ -55,32 +45,6 @@
<fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <!-- numeric field types that manipulate the value into
- a string value that isn't human readable in it's internal form,
- but sorts correctly and supports range queries.
-
- If sortMissingLast="true" then a sort on this field will cause documents
- without the field to come after documents with the field,
- regardless of the requested sort order.
- If sortMissingFirst="true" then a sort on this field will cause documents
- without the field to come before documents with the field,
- regardless of the requested sort order.
- If sortMissingLast="false" and sortMissingFirst="false" (the default),
- then default lucene sorting will be used which places docs without the field
- first in an ascending sort and last in a descending sort.
- -->
- <fieldtype name="sint" class="solr.SortableIntField" sortMissingLast="true"/>
- <fieldtype name="slong" class="solr.SortableLongField" sortMissingLast="true"/>
- <fieldtype name="sfloat" class="solr.SortableFloatField" sortMissingLast="true"/>
- <fieldtype name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true"/>
-
- <!-- bcd versions of sortable numeric type may provide smaller
- storage space and support very large numbers.
- -->
- <fieldtype name="bcdint" class="solr.BCDIntField" sortMissingLast="true"/>
- <fieldtype name="bcdlong" class="solr.BCDLongField" sortMissingLast="true"/>
- <fieldtype name="bcdstr" class="solr.BCDStrField" sortMissingLast="true"/>
-
<!-- Field type demonstrating an Analyzer failure -->
<fieldtype name="failtype1" class="solr.TextField">
<analyzer type="index">
@@ -119,7 +83,6 @@
-->
<fieldtype name="date" class="solr.TrieDateField" precisionStep="0"/>
<fieldtype name="tdate" class="solr.TrieDateField" precisionStep="6"/>
- <fieldtype name="pdate" class="solr.DateField" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
@@ -501,24 +464,6 @@
<field name="test_posofftv" type="text" termVectors="true"
termPositions="true" termOffsets="true"/>
- <!-- test valid combinations of indexed settings,
- see also BadIndexSchemaTest -->
- <!-- indexed=false should not prevent omit___=true -->
- <field name="pint_i_norm" type="pint" omitNorms="true"
- indexed="false" />
- <field name="pint_i_tf" type="pint" omitTermFreqAndPositions="true"
- indexed="false" />
- <field name="pint_i_pos" type="pint" omitPositions="true"
- indexed="false" />
- <field name="pint_i_all" type="pint"
- indexed="false"
- omitNorms="true"
- omitTermFreqAndPositions="true"
- omitPositions="true" />
- <!-- omitTermFreqAndPositions=false and omitPositions=true are ok -->
- <field name="pint_tf_pos" type="pint" indexed="true"
- omitTermFreqAndPositions="false" omitPositions="true" />
-
<!-- test highlit field settings -->
<field name="test_hlt" type="highlittext" indexed="true"/>
<field name="test_hlt_off" type="highlittext" indexed="true"/>
@@ -594,7 +539,7 @@
both match, the first appearing in the schema will be used.
-->
<dynamicField name="*_i" type="int" indexed="true" stored="true"/>
- <dynamicField name="*_i1" type="int" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_i1" type="int" indexed="true" stored="true" multiValued="false" sortMissingLast="true"/>
<dynamicField name="*_s" type="string" indexed="true" stored="true"/>
<dynamicField name="*_s1" type="string" indexed="true" stored="true" multiValued="false"/>
@@ -609,7 +554,6 @@
<dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>
<dynamicField name="*_dt" type="date" indexed="true" stored="true"/>
<dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_bcd" type="bcdstr" indexed="true" stored="true"/>
<!-- some trie-coded dynamic fields for faster range queries -->
@@ -625,20 +569,6 @@
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
<dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_si" type="sint" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_sl" type="slong" indexed="true" stored="true"/>
- <dynamicField name="*_sf" type="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_sf1" type="sfloat" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_sd" type="sdouble" indexed="true" stored="true"/>
- <dynamicField name="*_sd1" type="sdouble" indexed="true" stored="true" multiValued="false"/>
-
- <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
- <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
- <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
- <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
- <dynamicField name="*_pdt" type="pdate" 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"/>
@@ -657,7 +587,7 @@
<!-- for testing to ensure that longer patterns are matched first -->
<dynamicField name="*aa" type="string" indexed="true" stored="true"/>
- <dynamicField name="*aaa" type="pint" indexed="false" 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"/>
@@ -691,15 +621,8 @@
<copyField source="*_t" dest="text"/>
- <copyField source="id" dest="range_facet_si"/>
<copyField source="id" dest="range_facet_l"/>
- <copyField source="id" dest="range_facet_sl"/>
- <copyField source="range_facet_f" dest="range_facet_sf"/>
<copyField source="range_facet_f" dest="range_facet_d"/>
- <copyField source="range_facet_f" dest="range_facet_sd"/>
-
- <copyField source="bday" dest="bday_pdt"/>
- <copyField source="a_tdt" dest="a_pdt"/>
<!-- dynamic destination -->
<copyField source="*_dynamic" dest="dynamic_*"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema11.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema11.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema11.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema11.xml Wed Apr 9 19:48:14 2014
@@ -67,26 +67,16 @@
- If sortMissingLast="false" and sortMissingFirst="false" (the default),
then default lucene sorting will be used which places docs without the
field first in an ascending sort and last in a descending sort.
- -->
+ -->
- <!-- numeric field types that store and index the text
- value verbatim (and hence don't support range queries, since the
- lexicographic ordering isn't equal to the numeric ordering) -->
- <fieldType name="integer" class="solr.IntField" omitNorms="true"/>
- <fieldType name="long" class="solr.LongField" omitNorms="true"/>
- <fieldType name="float" class="solr.FloatField" omitNorms="true"/>
- <fieldType name="double" class="solr.DoubleField" omitNorms="true"/>
-
-
- <!-- Numeric field types that manipulate the value into
- a string value that isn't human-readable in its internal form,
- but with a lexicographic ordering the same as the numeric ordering,
- so that range queries work correctly. -->
- <fieldType name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/>
+ <!--
+ 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"/>
<!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
@@ -107,9 +97,9 @@
... 6 months and 3 days in the future from the start of
the current day
- Consult the DateField javadocs for more information.
+ Consult the TrieDateField javadocs for more information.
-->
- <fieldType name="date" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
<!-- The "RandomSortField" is not used to store or search any
@@ -268,7 +258,6 @@ valued. -->
<fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
<!-- These should pass right through and insure that we can declare external field types -->
- <fieldType name="pfloat" class="solr.FloatField" omitNorms="true"/>
<fieldType name="eff_float" keyField="id" defVal="0"
stored="false" indexed="true"
class="solr.ExternalFileField" valType="float"/>
@@ -277,10 +266,6 @@ valued. -->
stored="false" indexed="true"
class="solr.ExternalFileField" valType="tfloat"/>
- <fieldType name="eff_pfloat" keyField="id" defVal="0"
- stored="false" indexed="true"
- class="solr.ExternalFileField" valType="pfloat"/>
-
<!-- Be sure that the valType can be optional Since valType has done nothing up until now, this is preferred -->
<fieldType name="eff_none" keyField="id" defVal="0"
stored="false" indexed="true"
@@ -314,7 +299,7 @@ valued. -->
-->
<!-- for testing, a type that does a transform to see if it's correctly done everywhere -->
- <field name="id" type="sfloat" indexed="true" stored="true" required="true" />
+ <field name="id" type="float" indexed="true" stored="true" required="true" />
<field name="text" type="text" indexed="true" stored="false" />
<!-- Test a point field for distances -->
@@ -344,17 +329,11 @@ valued. -->
<dynamicField name="*_s" type="string" indexed="true" stored="true"/>
<dynamicField name="*_ss" type="string" indexed="true" stored="true" multiValued="true"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
- <dynamicField name="*_ii" type="integer" indexed="true" stored="true" multiValued="true"/>
- <dynamicField name="*_i" type="sint" indexed="true" stored="true"/>
- <dynamicField name="*_is" type="sint" indexed="true" stored="true" multiValued="true"/>
- <dynamicField name="*_l" type="slong" indexed="true" stored="true"/>
- <dynamicField name="*_f" type="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_d" type="sdouble" indexed="true" stored="true"/>
-
- <dynamicField name="*_pi" type="integer" indexed="true" stored="true"/>
- <dynamicField name="*_pl" type="long" indexed="true" stored="true"/>
- <dynamicField name="*_pf" type="float" indexed="true" stored="true"/>
- <dynamicField name="*_pd" type="double" indexed="true" stored="true"/>
+ <dynamicField name="*_i" type="int" indexed="true" stored="true"/>
+ <dynamicField name="*_ii" type="int" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_l" type="long" indexed="true" stored="true"/>
+ <dynamicField name="*_f" type="float" indexed="true" stored="true"/>
+ <dynamicField name="*_d" type="double" indexed="true" stored="true"/>
<dynamicField name="*_ti" type="tint" indexed="true" stored="true"/>
<dynamicField name="*_tl" type="tlong" indexed="true" stored="true"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema12.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema12.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema12.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema12.xml Wed Apr 9 19:48:14 2014
@@ -34,16 +34,6 @@
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="pint" class="solr.IntField"/>
- <fieldType name="plong" class="solr.LongField"/>
- <fieldtype name="pfloat" class="solr.FloatField"/>
- <fieldType name="pdouble" class="solr.DoubleField"/>
-
<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"/>
@@ -54,25 +44,6 @@
<fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <!-- numeric field types that manipulate the value into
- a string value that isn't human readable in it's internal form,
- but sorts correctly and supports range queries.
-
- If sortMissingLast="true" then a sort on this field will cause documents
- without the field to come after documents with the field,
- regardless of the requested sort order.
- If sortMissingFirst="true" then a sort on this field will cause documents
- without the field to come before documents with the field,
- regardless of the requested sort order.
- If sortMissingLast="false" and sortMissingFirst="false" (the default),
- then default lucene sorting will be used which places docs without the field
- first in an ascending sort and last in a descending sort.
- -->
- <fieldtype name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="true" />
- <fieldtype name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/>
- <fieldtype name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/>
- <fieldtype name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/>
-
<!-- Field type demonstrating an Analyzer failure -->
<fieldtype name="failtype1" class="solr.TextField">
<analyzer type="index">
@@ -111,7 +82,6 @@
-->
<fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true"/>
<fieldtype name="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
- <fieldtype name="pdate" class="solr.DateField" sortMissingLast="true"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true" >
<analyzer type="index">
@@ -540,12 +510,6 @@
<dynamicField name="*_coordinate" type="tdouble" indexed="true" stored="false"/>
-
- <dynamicField name="*_si" type="sint" indexed="true" stored="true"/>
- <dynamicField name="*_sl" type="slong" indexed="true" stored="true"/>
- <dynamicField name="*_sf" type="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_sd" type="sdouble" 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"/>
@@ -579,13 +543,6 @@
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
- <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
- <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
- <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
- <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
- <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
-
-
<dynamicField name="ignored_*" type="ignored" multiValued="true"/>
<dynamicField name="attr_*" type="text" indexed="true" stored="true" multiValued="true"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema15.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema15.xml?rev=1586106&r1=1586105&r2=1586106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema15.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema15.xml Wed Apr 9 19:48:14 2014
@@ -31,11 +31,6 @@
1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)
-->
<types>
- <fieldType name="pint" class="solr.IntField"/>
- <fieldType name="plong" class="solr.LongField"/>
- <fieldtype name="pfloat" class="solr.FloatField"/>
- <fieldType name="pdouble" class="solr.DoubleField"/>
-
<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"/>
@@ -47,25 +42,6 @@
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="currency" class="solr.CurrencyField" currencyConfig="currency.xml" multiValued="false" />
- <!-- numeric field types that manipulate the value into
- a string value that isn't human readable in it's internal form,
- but sorts correctly and supports range queries.
-
- If sortMissingLast="true" then a sort on this field will cause documents
- without the field to come after documents with the field,
- regardless of the requested sort order.
- If sortMissingFirst="true" then a sort on this field will cause documents
- without the field to come before documents with the field,
- regardless of the requested sort order.
- If sortMissingLast="false" and sortMissingFirst="false" (the default),
- then default lucene sorting will be used which places docs without the field
- first in an ascending sort and last in a descending sort.
- -->
- <fieldtype name="sint" class="solr.SortableIntField" sortMissingLast="true" />
- <fieldtype name="slong" class="solr.SortableLongField" sortMissingLast="true"/>
- <fieldtype name="sfloat" class="solr.SortableFloatField" sortMissingLast="true"/>
- <fieldtype name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true"/>
-
<!-- Field type demonstrating an Analyzer failure -->
<fieldtype name="failtype1" class="solr.TextField">
<analyzer type="index">
@@ -104,7 +80,6 @@
-->
<fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true"/>
<fieldtype name="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
- <fieldtype name="pdate" class="solr.DateField" sortMissingLast="true"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true" >
<analyzer type="index">
@@ -535,12 +510,6 @@
<dynamicField name="*_coordinate" type="tdouble" indexed="true" stored="false"/>
-
- <dynamicField name="*_si" type="sint" indexed="true" stored="true"/>
- <dynamicField name="*_sl" type="slong" indexed="true" stored="true"/>
- <dynamicField name="*_sf" type="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_sd" type="sdouble" 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"/>
@@ -575,13 +544,6 @@
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
- <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
- <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
- <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
- <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
- <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
-
-
<dynamicField name="ignored_*" type="ignored" multiValued="true"/>
<dynamicField name="attr_*" type="text" indexed="true" stored="true" multiValued="true"/>