Apache Solr open-source search software
SOLR-12963: Default uninvertible=false in schema version 1.7 (#2601)
Houston Putmanb0ab58ef8753
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 5676087acec..883ee4cd5d5 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -156,6 +156,13 @@ ImprovementsStatuses are now removed 5 minutes after the read of a completed/failed status. Helps collectionasync backup/restore and other operations scale to 100+ shards. (Pierre Salagnac, David Smiley)+* SOLR-10808, SOLR-12963: The Solr schema version has been increased to 1.7.+ Starting in schema version 1.7, all fields/fieldTypes that support docValues will have them enabled by default.+ This behavior can be reverted by setting the 'docValues' parameter for a field or a field type to false, the default for schema versions 1.6 and below.+ Also in schema version 1.7, all fields/fieldTypes will be unable to be uninverted by default.+ This behavior can be reverted by setting the 'uninvertible' parameter for a field or a field type to true, the default for schema versions 1.6 and below.+ (Houston Putman, hossman)+* SOLR-10808 : The Solr schema version has been increased to 1.7. Since schema version 1.7, all fields/fieldTypes thatsupport docValues will have them enabled by default. This behavior can be reverted by setting'docValues' parameter for a field or a field type to false, the default for schema versions 1.6 and below. (Houston Putman)diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.javaindex 9eae31f1a02..9431691b1de 100644--- a/solr/core/src/java/org/apache/solr/schema/FieldType.java+++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java@@ -190,7 +190,7 @@ public abstract class FieldType extends FieldProperties {if (schemaVersion >= 1.6f) properties |= USE_DOCVALUES_AS_STORED;if (schemaVersion >= 1.7f && doesTypeSupportDocValues()) properties |= DOC_VALUES;- properties |= UNINVERTIBLE;+ if (schemaVersion < 1.7f) properties |= UNINVERTIBLE;this.args = Collections.unmodifiableMap(args);Map<String, String> initArgs = new HashMap<>(args);diff --git a/solr/core/src/java/org/apache/solr/schema/SortableTextField.java b/solr/core/src/java/org/apache/solr/schema/SortableTextField.javaindex b61d668f333..4811a1dfa59 100644--- a/solr/core/src/java/org/apache/solr/schema/SortableTextField.java+++ b/solr/core/src/java/org/apache/solr/schema/SortableTextField.java@@ -227,7 +227,7 @@ public class SortableTextField extends TextField {return new SortedSetFieldSource(field.getName(), selectorType);}- /** {@inheritDoc} this field type is not uninvertable, this method always returns null */+ /** {@inheritDoc} this field type is not uninvertible, this method always returns null */@Overridepublic Type getUninversionType(SchemaField sf) {return null;diff --git a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.javaindex 78a3576420d..174095a2ea4 100644--- a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java+++ b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java@@ -228,7 +228,7 @@ public class UninvertingReader extends FilterLeafReader {ArrayList<FieldInfo> newFieldInfos = new ArrayList<>(in.getFieldInfos().size());for (FieldInfo fi : in.getFieldInfos()) {DocValuesType type = fi.getDocValuesType();- // fields which currently don't have docValues, but are uninvertable (indexed or points data+ // fields which currently don't have docValues, but are uninvertible (indexed or points data// present)if (type == DocValuesType.NONE&& (fi.getIndexOptions() != IndexOptions.NONEdiff --git a/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml b/solr/core/src/test-files/solr/collection1/conf/schema-collate.xmlindex c9587d75f7d..4a4dbf42a01 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml@@ -39,12 +39,12 @@<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/><field name="text" type="text" indexed="true" stored="false"/>- <field name="sort_ar" type="sort_ar_t" indexed="true" stored="false" multiValued="false" docValues="false"/>- <field name="sort_de" type="sort_de_t" indexed="true" stored="false" multiValued="false" docValues="false"/>- <field name="sort_tr_canon" type="sort_tr_canon_t" indexed="true" stored="false" multiValued="false" docValues="false"/>- <field name="sort_zh_full" type="sort_zh_full_t" indexed="true" stored="false" multiValued="false" docValues="false"/>- <field name="sort_da" type="sort_da_t" indexed="true" stored="false" multiValued="false" docValues="false"/>- <field name="sort_custom" type="sort_custom_t" indexed="true" stored="false" multiValued="false" docValues="false"/>+ <field name="sort_ar" type="sort_ar_t" indexed="true" stored="false" multiValued="false" docValues="false" uninvertible="true"/>+ <field name="sort_de" type="sort_de_t" indexed="true" stored="false" multiValued="false" docValues="false" uninvertible="true"/>+ <field name="sort_tr_canon" type="sort_tr_canon_t" indexed="true" stored="false" multiValued="false" docValues="false" uninvertible="true"/>+ <field name="sort_zh_full" type="sort_zh_full_t" indexed="true" stored="false" multiValued="false" docValues="false" uninvertible="true"/>+ <field name="sort_da" type="sort_da_t" indexed="true" stored="false" multiValued="false" docValues="false" uninvertible="true"/>+ <field name="sort_custom" type="sort_custom_t" indexed="true" stored="false" multiValued="false" docValues="false" uninvertible="true"/><uniqueKey>id</uniqueKey>diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xmlindex db038b62787..1b36f23d497 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml@@ -17,8 +17,8 @@--><schema name="test-custom-field-sort" version="1.7">- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><fieldType name="string" class="solr.StrField" sortMissingLast="true"/><fieldType name="text" class="solr.TextField"><analyzer>diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xmlindex 84d628f7da5..90caa68a3c8 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml@@ -17,30 +17,30 @@--><schema name="test-distributed-missing-sort" version="1.7">- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0"/>- <fieldType name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="6"/>+ <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" uninvertible="true"/>+ <fieldType name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="6" uninvertible="true"/><fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>- <fieldType name="int_ml" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="true"/>- <fieldType name="int_mf" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingFirst="true"/>+ <fieldType name="int_ml" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="true" uninvertible="true"/>+ <fieldType name="int_mf" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingFirst="true" uninvertible="true"/><fieldType name="long_ml" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"- sortMissingLast="true"/>+ sortMissingLast="true" uninvertible="true"/><fieldType name="long_mf" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"- sortMissingFirst="true"/>+ sortMissingFirst="true" uninvertible="true"/><fieldType name="string_ml" class="solr.StrField" sortMissingLast="true"/><fieldType name="string_mf" class="solr.StrField" sortMissingFirst="true"/>@@ -70,12 +70,12 @@<dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/><dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>- <dynamicField name="*_b" type="boolean" indexed="true" stored="true" docValues="false"/>+ <dynamicField name="*_b" type="boolean" indexed="true" stored="true" docValues="false" uninvertible="true"/>- <dynamicField name="*_s1_ml" type="string_ml" indexed="true" stored="true" multiValued="false" docValues="false"/>- <dynamicField name="*_s1_mf" type="string_mf" indexed="true" stored="true" multiValued="false" docValues="false"/>+ <dynamicField name="*_s1_ml" type="string_ml" indexed="true" stored="true" multiValued="false" docValues="false" uninvertible="true"/>+ <dynamicField name="*_s1_mf" type="string_mf" indexed="true" stored="true" multiValued="false" docValues="false" uninvertible="true"/>- <dynamicField name="*_mfacet" type="string_ml" indexed="true" stored="false" multiValued="true" docValues="false"/>+ <dynamicField name="*_mfacet" type="string_ml" indexed="true" stored="false" multiValued="true" docValues="false" uninvertible="true"/><dynamicField name="*_sS" type="string_ml" indexed="false" stored="true" docValues="false"/><!-- int varient of id, adding this here simplifies some indexing and test assertions -->diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xmlindex ddb42f36e8f..74f377c6640 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml@@ -38,14 +38,14 @@These are provided more for backward compatability, allowing oneto create a schema that matches an existing lucene index.-->- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><!-- format for date is 1995-12-31T23:59:59.999Z and only the fractionalseconds part (.999) is optional.-->- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><fieldType name="boolean" class="solr.BoolField"/><fieldType name="string" class="solr.StrField"/>diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xmlindex 8db18dc2996..67e6789f610 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml@@ -17,11 +17,11 @@--><schema name="test" version="1.7">- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><fieldType name="string" class="solr.StrField" sortMissingLast="true"/><fieldType name="pint" class="solr.IntPointField"/>@@ -30,41 +30,41 @@<fieldType name="pfloat" class="solr.FloatPointField"/><fieldType name="pdate" class="solr.DatePointField"/>- <field name="id" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="true"/>+ <field name="id" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="true" uninvertible="true"/><field name="id_dv" type="string" indexed="false" stored="false" multiValued="false"required="true"/>- <dynamicField name="*_i" type="int" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}"/>+ <dynamicField name="*_i" type="int" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" uninvertible="true"/><dynamicField name="*_i_dv" type="int" indexed="false" stored="false" docValues="true"/><dynamicField name="*_i_p" type="pint" indexed="true" stored="false"/>- <dynamicField name="*_is" type="int" indexed="true" stored="true" docValues="${solr.tests.numeric.dv}" multiValued="true"/>+ <dynamicField name="*_is" type="int" indexed="true" stored="true" docValues="${solr.tests.numeric.dv}" multiValued="true" uninvertible="true"/><dynamicField name="*_is_dv" type="int" indexed="false" stored="false" multiValued="true" docValues="true"/><dynamicField name="*_is_p" type="pint" indexed="true" stored="false" multiValued="true"/>- <dynamicField name="*_s" type="string" indexed="true" stored="false" docValues="false"/>+ <dynamicField name="*_s" type="string" indexed="true" stored="false" docValues="false" uninvertible="true"/><dynamicField name="*_s_dv" type="string" indexed="false" stored="false" docValues="true"/>- <dynamicField name="*_ss" type="string" indexed="true" stored="false" docValues="false" multiValued="true"/>+ <dynamicField name="*_ss" type="string" indexed="true" stored="false" docValues="false" multiValued="true" uninvertible="true"/><dynamicField name="*_ss_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="true"/>- <dynamicField name="*_f" type="float" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}"/>+ <dynamicField name="*_f" type="float" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" uninvertible="true"/><dynamicField name="*_f_dv" type="float" indexed="true" stored="false" docValues="true"/><dynamicField name="*_f_p" type="pfloat" indexed="true" stored="false"/>- <dynamicField name="*_fs" type="float" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" multiValued="true"/>+ <dynamicField name="*_fs" type="float" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" multiValued="true" uninvertible="true"/><dynamicField name="*_fs_dv" type="float" indexed="true" stored="false" docValues="true" multiValued="true"/><dynamicField name="*_fs_p" type="pfloat" indexed="true" stored="false" multiValued="true"/>- <dynamicField name="*_l" type="long" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}"/>+ <dynamicField name="*_l" type="long" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" uninvertible="true"/><dynamicField name="*_l_dv" type="long" indexed="true" stored="false" docValues="true"/><dynamicField name="*_l_p" type="plong" indexed="true" stored="false"/>- <dynamicField name="*_ls" type="long" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" multiValued="true"/>+ <dynamicField name="*_ls" type="long" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" multiValued="true" uninvertible="true"/><dynamicField name="*_ls_dv" type="long" indexed="true" stored="false" docValues="true" multiValued="true"/><dynamicField name="*_ls_p" type="plong" indexed="true" stored="false" multiValued="true"/>- <dynamicField name="*_d" type="double" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}"/>+ <dynamicField name="*_d" type="double" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" uninvertible="true"/><dynamicField name="*_d_dv" type="double" indexed="true" stored="false" docValues="true"/><dynamicField name="*_d_p" type="pdouble" indexed="true" stored="false"/>- <dynamicField name="*_ds" type="double" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" multiValued="true"/>+ <dynamicField name="*_ds" type="double" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" multiValued="true" uninvertible="true"/><dynamicField name="*_ds_dv" type="double" indexed="true" stored="false" docValues="true" multiValued="true"/><dynamicField name="*_ds_p" type="pdouble" indexed="true" stored="false" multiValued="true"/>- <dynamicField name="*_dt" type="date" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}"/>+ <dynamicField name="*_dt" type="date" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" uninvertible="true"/><dynamicField name="*_dt_dv" type="date" indexed="true" stored="false" docValues="true"/><dynamicField name="*_dt_p" type="pdate" indexed="true" stored="false"/>- <dynamicField name="*_dts" type="date" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" multiValued="true"/>+ <dynamicField name="*_dts" type="date" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}" multiValued="true" uninvertible="true"/><dynamicField name="*_dts_dv" type="date" indexed="true" stored="false" docValues="true" multiValued="true"/><dynamicField name="*_dts_p" type="pdate" indexed="true" stored="false" multiValued="true"/>diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xmlindex 646956e43a6..0fccb86224f 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml@@ -28,7 +28,7 @@1.4: default auto-phrase (QueryParser feature) to off1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.--><fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/><fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>@@ -65,33 +65,33 @@</analyzer></fieldType>- <field name="id" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="true"/>+ <field name="id" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="true" uninvertible="true"/><field name="id_dv" type="string" indexed="false" stored="false" multiValued="false"required="true"/>- <dynamicField name="*_i" type="int" indexed="true" stored="false" docValues="false"/>+ <dynamicField name="*_i" type="int" indexed="true" stored="false" docValues="false" uninvertible="true"/><dynamicField name="*_i_dv" type="int" indexed="true" stored="true" docValues="true"/>- <dynamicField name="*_is" type="int" indexed="true" stored="false" docValues="false" multiValued="true"/>+ <dynamicField name="*_is" type="int" indexed="true" stored="false" docValues="false" multiValued="true" uninvertible="true"/><dynamicField name="*_is_dv" type="int" indexed="true" stored="true" docValues="true" multiValued="true"/>- <dynamicField name="*_s" type="string" indexed="true" stored="false" docValues="false"/>+ <dynamicField name="*_s" type="string" indexed="true" stored="false" docValues="false" uninvertible="true"/><dynamicField name="*_s_dv" type="string" indexed="true" stored="true" docValues="true"/>- <dynamicField name="*_ss" type="string" indexed="true" stored="false" docValues="false" multiValued="true"/>+ <dynamicField name="*_ss" type="string" indexed="true" stored="false" docValues="false" multiValued="true" uninvertible="true"/><dynamicField name="*_ss_dv" type="string" indexed="true" stored="true" docValues="true" multiValued="true"/>- <dynamicField name="*_f" type="float" indexed="true" stored="false" docValues="false"/>+ <dynamicField name="*_f" type="float" indexed="true" stored="false" docValues="false" uninvertible="true"/><dynamicField name="*_f_dv" type="float" indexed="true" stored="true" docValues="true"/>- <dynamicField name="*_fs_dv" type="float" indexed="true" stored="true" docValues="true" multiValued="true"/>- <dynamicField name="*_l" type="long" indexed="true" stored="false" docValues="false"/>+ <dynamicField name="*_fs_dv" type="float" indexed="true" stored="true" docValues="true" multiValued="true" uninvertible="true"/>+ <dynamicField name="*_l" type="long" indexed="true" stored="false" docValues="false" uninvertible="true"/><dynamicField name="*_l_dv" type="long" indexed="true" stored="false" docValues="true"/>- <dynamicField name="*_ls_dv" type="long" indexed="true" stored="false" docValues="true" multiValued="true"/>- <dynamicField name="*_d" type="double" indexed="true" stored="false" docValues="false"/>+ <dynamicField name="*_ls_dv" type="long" indexed="true" stored="false" docValues="true" multiValued="true" uninvertible="true"/>+ <dynamicField name="*_d" type="double" indexed="true" stored="false" docValues="false" uninvertible="true"/><dynamicField name="*_d_dv" type="double" indexed="true" stored="false" docValues="true"/><dynamicField name="*_ds_dv" type="double" indexed="true" stored="false" docValues="true" multiValued="true"/>- <dynamicField name="*_dt" type="date" indexed="true" stored="false" docValues="false"/>+ <dynamicField name="*_dt" type="date" indexed="true" stored="false" docValues="false" uninvertible="true"/><dynamicField name="*_dt_dv" type="date" indexed="true" stored="false" docValues="true"/><dynamicField name="*_dts_dv" type="date" indexed="true" stored="false" docValues="true" multiValued="true"/><dynamicField name="*_t" type="text" indexed="true" stored="true"/>- <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>+ <field name="_version_" type="long" indexed="true" stored="true" multiValued="false" uninvertible="true"/><uniqueKey>id</uniqueKey>diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml b/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xmlindex a98b16a6b84..a88da298762 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml@@ -17,7 +17,7 @@--><schema name="id-and-version-fields-only" version="1.7">- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/><fieldType name="string" class="solr.StrField" sortMissingLast="true"/><field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/><field name="_version_" type="long" indexed="true" stored="true"/>diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml b/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xmlindex 92989ce2b64..f6cfe7f8b94 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml@@ -19,8 +19,8 @@<schema name="test-multi-word-synonyms" version="1.7"><fieldType name="string" class="solr.StrField" sortMissingLast="true"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><field name="signatureField" type="string" indexed="true" stored="false"/><field name="boost_d" type="double" indexed="true" stored="false" />diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml b/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xmlindex 78b13270b80..3a487dfea02 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml@@ -29,37 +29,37 @@<fieldType name="string" class="solr.StrField" sortMissingLast="true"/><fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="false" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="false" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="false" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="false" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="false" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="int_last" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="float_last" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="long_last" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="date_last" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="double_last" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingLast="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="int_first" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingFirst="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="float_first" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingFirst="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="long_first" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingFirst="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="date_first" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingFirst="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><fieldType name="double_first" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" sortMissingFirst="true" omitNorms="true"- positionIncrementGap="0"/>+ positionIncrementGap="0" uninvertible="true"/><field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-pseudo-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-pseudo-fields.xmlindex 19bedf66555..a5d87f03c86 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-pseudo-fields.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-pseudo-fields.xml@@ -37,8 +37,8 @@<uniqueKey>id</uniqueKey><fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" docValues="false"/>- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><fieldType name="string" class="solr.StrField" sortMissingLast="true" /><fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers" />diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xmlindex 2f5e04790fd..517182771bd 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml@@ -30,17 +30,17 @@1.4: default auto-phrase (QueryParser feature) to off1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.-->- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0" uninvertible="true"/><!-- Field type demonstrating an Analyzer failure --><fieldType name="failtype1" class="solr.TextField">@@ -97,8 +97,8 @@<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractionalseconds part (.999) is optional.-->- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" sortMissingLast="true"/>- <fieldType name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" sortMissingLast="true" precisionStep="6"/>+ <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" sortMissingLast="true" uninvertible="true"/>+ <fieldType name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" sortMissingLast="true" precisionStep="6" uninvertible="true"/><fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true"><analyzer type="index">diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sorting-text.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sorting-text.xmlindex cc814ab58ca..fdc675e2d07 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-sorting-text.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sorting-text.xml@@ -46,7 +46,7 @@<field name="whitespace_plain_txt" type="whitespace_plain_txt" /><field name="whitespace_plain_str" type="str" /><field name="keyword_s_dv" type="str" indexed="false" stored="true" />- <field name="keyword_s" type="str" indexed="true" docValues="false" stored="true" />+ <field name="keyword_s" type="str" indexed="true" docValues="false" stored="true" uninvertible="true" /><!-- . -->diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml b/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xmlindex bfee166fb0d..7ec98bde0f7 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml@@ -18,12 +18,12 @@<schema name="test" version="1.7">- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" uninvertible="true"/><!-- tdouble class can't be randomized, because BBoxField requires TrieDoubleField. See SOLR-11111. -->- <fieldType name="tdouble" class="solr.TrieDoubleField" docValues="${solr.tests.numeric.dv}" precisionStep="8"/>+ <fieldType name="tdouble" class="solr.TrieDoubleField" docValues="${solr.tests.numeric.dv}" precisionStep="8" uninvertible="true"/><fieldType name="tdoubleDV" class="${solr.tests.DoubleFieldType}" precisionStep="8"/>diff --git a/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml b/solr/core/src/test-files/solr/collection1/conf/schema_latest.xmlindex 100abb67981..7d1e09faf28 100644--- a/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml+++ b/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml@@ -33,7 +33,7 @@1.5: omitNorms defaults to true for primitive field types(int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.--><!-- Valid attributes for fields:@@ -95,10 +95,10 @@<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false"/><field name="sku" type="text_en_splitting_tight" indexed="true" stored="true" omitNorms="true"/>- <field name="name" type="text_general" indexed="true" stored="true"/>+ <field name="name" type="text_general" indexed="true" stored="true" uninvertible="true"/><field name="manu" type="text_general" indexed="true" stored="true" omitNorms="true"/>- <field name="cat" type="string" indexed="true" stored="true" multiValued="true"/>- <field name="features" type="text_general" indexed="true" stored="true" multiValued="true"/>+ <field name="cat" type="string" indexed="true" stored="true" multiValued="true" uninvertible="true"/>+ <field name="features" type="text_general" indexed="true" stored="true" multiValued="true" uninvertible="true"/><field name="includes" type="text_general" indexed="true" stored="true" termVectors="true" termPositions="true"termOffsets="true"/>@@ -237,7 +237,7 @@<dynamicField name="*_bdS" type="boolean" indexed="true" docValues="true" stored="true"/><dynamicField name="*_bdsS" type="boolean" indexed="true" docValues="true" stored="true" multiValued="true"/>- <dynamicField name="*_t" type="text_general" indexed="true" stored="true"/>+ <dynamicField name="*_t" type="text_general" indexed="true" stored="true" uninvertible="true"/><dynamicField name="*_txt" type="text_general" indexed="true" stored="true" multiValued="true"/><dynamicField name="*_en" type="text_en" indexed="true" stored="true" multiValued="true"/>@@ -366,11 +366,11 @@These fields support doc values, but they require the field to besingle-valued and either be required or have a default value.-->- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/><!--Numeric field types that index each value at various levels of precisiondiff --git a/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xmlindex 40241c3bda5..58e6405959a 100644--- a/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml+++ b/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml@@ -30,17 +30,17 @@1.4: default auto-phrase (QueryParser feature) to off1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.-->- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" positionIncrementGap="0" uninvertible="true"/><!-- Field type demonstrating an Analyzer failure --><fieldType name="failtype1" class="solr.TextField">@@ -96,8 +96,8 @@<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractionalseconds part (.999) is optional.-->- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" sortMissingLast="true"/>- <fieldType name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" sortMissingLast="true" precisionStep="6"/>+ <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" sortMissingLast="true" uninvertible="true"/>+ <fieldType name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" sortMissingLast="true" precisionStep="6" uninvertible="true"/><fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true"><analyzer type="index">diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xmlindex 2714a21b5de..d457870208a 100644--- a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml+++ b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml@@ -17,12 +17,12 @@--><schema name="minimal" version="1.7"><fieldType name="string" class="solr.StrField"/>- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><!-- for versioning --><field name="_version_" type="long" indexed="true" stored="true"/><field name="_root_" type="string" indexed="true" stored="true" multiValued="false" required="false"/>- <field name="id" type="string" indexed="true" stored="true" docValues="false"/>+ <field name="id" type="string" indexed="true" stored="true" docValues="false" uninvertible="true"/><fieldType name="sortabletext" class="solr.SortableTextField" positionIncrementGap="100" multiValued="true"><analyzer type="index">diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xmlindex b539459ad5e..fc23706512e 100644--- a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml+++ b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml@@ -17,8 +17,8 @@--><schema name="minimal" version="1.7"><fieldType name="string" class="solr.StrField"/>- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><dynamicField name="*" type="string" indexed="true" stored="true"/><!-- for versioning --><field name="_version_" type="long" indexed="true" stored="true"/>diff --git a/solr/core/src/test-files/solr/configsets/dedup/conf/schema.xml b/solr/core/src/test-files/solr/configsets/dedup/conf/schema.xmlindex fadaa72eac9..2da9becb844 100644--- a/solr/core/src/test-files/solr/configsets/dedup/conf/schema.xml+++ b/solr/core/src/test-files/solr/configsets/dedup/conf/schema.xml@@ -18,7 +18,7 @@<schema name="dedup" version="1.7"><fieldType name="string" class="solr.StrField"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><!-- for versioning --><field name="_version_" type="long" indexed="true" stored="true"/>diff --git a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/schema.xml b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/schema.xmlindex 1875c733f96..0d788eb038a 100644--- a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/schema.xml+++ b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/schema.xml@@ -30,7 +30,7 @@1.4: default auto-phrase (QueryParser feature) to off1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.--><!-- Collection meant to hold whitespace delimited text -->diff --git a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/schema.xml b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/schema.xmlindex 98fc0a8c5c9..37692c15943 100644--- a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/schema.xml+++ b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/schema.xml@@ -30,7 +30,7 @@1.4: default auto-phrase (QueryParser feature) to off1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.--><!-- Collection meant to hold whitespace delimited text -->diff --git a/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml b/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xmlindex 62d52896700..8a4eb25bba9 100644--- a/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml+++ b/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml@@ -30,7 +30,7 @@1.4: default auto-phrase (QueryParser feature) to off1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.--><fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/><fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>diff --git a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/schema.xml b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/schema.xmlindex 4ade7650b81..e9090724541 100644--- a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/schema.xml+++ b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/schema.xml@@ -16,11 +16,11 @@limitations under the License.--><schema name="minimal" version="1.7">- <fieldType name="string" class="solr.StrField" docValues="false"/>+ <fieldType name="string" class="solr.StrField" docValues="false" uninvertible="true"/><fieldType name="string_dv" class="solr.StrField"/><fieldType name="string_dvs" class="solr.StrField" multiValued="true"/>- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><dynamicField name="*" type="string" indexed="true" stored="true"/><dynamicField name="*_dv" type="string_dv" indexed="true" stored="true"/><dynamicField name="*_dvs" type="string_dvs" indexed="true" stored="true"/>diff --git a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.javaindex 90a7685d83e..f059acb8a6c 100644--- a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java+++ b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerAPI.java@@ -839,6 +839,7 @@ public class TestSchemaDesignerAPI extends SolrCloudTestCase implements SchemaDeSimpleOrderedMap<Object> idFieldMapUpdated = idFieldMap.clone();idFieldMapUpdated.setVal(idFieldMapUpdated.indexOf("docValues", 0), Boolean.FALSE);idFieldMapUpdated.setVal(idFieldMapUpdated.indexOf("useDocValuesAsStored", 0), Boolean.FALSE);+ idFieldMapUpdated.setVal(idFieldMapUpdated.indexOf("uninvertible", 0), Boolean.TRUE);idFieldMapUpdated.setVal(idFieldMapUpdated.indexOf("omitTermFreqAndPositions", 0), Boolean.FALSE);@@ -892,14 +893,23 @@ public class TestSchemaDesignerAPI extends SolrCloudTestCase implements SchemaDeassertEquals(Arrays.asList(Map.of(- "omitTermFreqAndPositions", true, "useDocValuesAsStored", true, "docValues", true),+ "omitTermFreqAndPositions",+ true,+ "useDocValuesAsStored",+ true,+ "docValues",+ true,+ "uninvertible",+ false),Map.of("omitTermFreqAndPositions",false,"useDocValuesAsStored",false,"docValues",- false)),+ false,+ "uninvertible",+ true)),mapDiff.get("id"));assertNotNull(fieldsDiff.get("added"));Map<String, Object> fieldsAdded = (Map<String, Object>) fieldsDiff.get("added");diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.javaindex f019e73aef2..5eb97247a39 100644--- a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java@@ -30,7 +30,7 @@ public class TestFieldResource extends SolrRestletTestBase {"/response/lst[@name='field']/str[@name='type'] = 'text'","/response/lst[@name='field']/bool[@name='indexed'] = 'true'","/response/lst[@name='field']/bool[@name='stored'] = 'true'",- "/response/lst[@name='field']/bool[@name='uninvertible'] = 'true'",+ "/response/lst[@name='field']/bool[@name='uninvertible'] = 'false'","/response/lst[@name='field']/bool[@name='docValues'] = 'false'","/response/lst[@name='field']/bool[@name='termVectors'] = 'true'","/response/lst[@name='field']/bool[@name='termPositions'] = 'true'",@@ -64,7 +64,7 @@ public class TestFieldResource extends SolrRestletTestBase {"/field/type=='text'","/field/indexed==true","/field/stored==true",- "/field/uninvertible==true",+ "/field/uninvertible==false","/field/docValues==false","/field/termVectors==true","/field/termPositions==true",diff --git a/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java b/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.javaindex 0ddbc7a28a6..41d64fb3cb6 100644--- a/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java+++ b/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java@@ -76,9 +76,11 @@ public class SchemaVersionSpecificBehaviorTest extends SolrTestCaseJ4 {((v < 1.7F || f.contains("text")) ? false : true),field.hasDocValues());- // uninvertable defaults to true (for now)- assertTrue(- f + " field's type has wrong uninvertable for ver=" + ver, field.isUninvertible());+ // 1.7: uninvertible defaults to false+ assertEquals(+ f + " field's type has wrong uninvertible for ver=" + ver,+ (v < 1.7F ? true : false),+ field.isUninvertible());}// regardless of version, explicit multiValued values on field or typediff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xmlindex 07779ce8a93..56c756f75b5 100644--- a/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml+++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml@@ -22,8 +22,8 @@<field name="finalScore" type="string" indexed="true" stored="true" multiValued="false"/><field name="finalScoreFloat" type="float" indexed="true" stored="true" multiValued="false"/><field name="field" type="text_general" indexed="true" stored="false" multiValued="false"/>- <field name="title" type="text_general" indexed="true" stored="false"/>- <field name="description" type="text_general" indexed="true" stored="false"/>+ <field name="title" type="text_general" indexed="true" stored="false" uninvertible="true"/>+ <field name="description" type="text_general" indexed="true" stored="false" uninvertible="true"/><field name="keywords" type="text_general" indexed="true" stored="true" multiValued="true"/><field name="popularity" type="int" indexed="true" stored="true" /><field name="dvIntPopularity" type="int" indexed="false" docValues="true" stored="false" multiValued="false"/>@@ -73,11 +73,11 @@<types><fieldType name="string" class="solr.StrField" sortMissingLast="true" /><fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/><fieldtype name="binary" class="solr.BinaryField"/><fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">diff --git a/solr/modules/sql/src/test-files/solr/configsets/sql/conf/schema.xml b/solr/modules/sql/src/test-files/solr/configsets/sql/conf/schema.xmlindex 7c7131ba66b..2311e766632 100644--- a/solr/modules/sql/src/test-files/solr/configsets/sql/conf/schema.xml+++ b/solr/modules/sql/src/test-files/solr/configsets/sql/conf/schema.xml@@ -43,7 +43,7 @@1.4: default auto-phrase (QueryParser feature) to off1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.--><fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" positionIncrementGap="0"/><fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" positionIncrementGap="0"/>diff --git a/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml b/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xmlindex 76a6f64af34..2c78c1667f0 100644--- a/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml+++ b/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml@@ -55,7 +55,7 @@1.5: omitNorms defaults to true for primitive field types(int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.--><!-- Valid attributes for fields:@@ -114,7 +114,7 @@<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" /><!-- docValues are enabled by default for long type so we don't need to index the version field --><field name="_version_" type="plong" indexed="false" stored="false"/>- <field name="_root_" type="string" indexed="true" stored="false" docValues="false" />+ <field name="_root_" type="string" indexed="true" stored="false" docValues="false" uninvertible="true" /><field name="_text_" type="text_general" indexed="true" stored="false" multiValued="true"/><!-- This can be enabled, in case the client does not know what fields may be searched. It isn't enabled by default@@ -272,7 +272,7 @@(empty by default), and down cases. At query time only, italso applies synonyms.-->- <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100" multiValued="true">+ <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100" multiValued="true" uninvertible="true"><analyzer type="index"><tokenizer class="solr.StandardTokenizerFactory"/><filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />diff --git a/solr/server/solr/configsets/_default/conf/managed-schema.xml b/solr/server/solr/configsets/_default/conf/managed-schema.xmlindex 5250e837ff5..8d7b974bec0 100644--- a/solr/server/solr/configsets/_default/conf/managed-schema.xml+++ b/solr/server/solr/configsets/_default/conf/managed-schema.xml@@ -55,7 +55,7 @@1.5: omitNorms defaults to true for primitive field types(int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.--><!-- Valid attributes for fields:diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema.xmlindex 05cd8c431e6..cb521ecf914 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema.xml+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema.xml@@ -62,7 +62,7 @@1.5: omitNorms defaults to true for primitive field types(int, float, boolean, string...)1.6: useDocValuesAsStored defaults to true.- 1.7: docValues defaults to true.+ 1.7: docValues defaults to true, uninvertible defaults to false.-->@@ -134,11 +134,11 @@<field name="pre" type="preanalyzed" indexed="true" stored="true"/><field name="sku" type="text_en_splitting_tight" indexed="true" stored="true" omitNorms="true"/>- <field name="name" type="text_general" indexed="true" stored="true"/>+ <field name="name" type="text_general" indexed="true" stored="true" uninvertible="true"/><field name="manu" type="text_gen_sort" indexed="true" stored="true" omitNorms="true" multiValued="false" useDocValuesAsStored="true"/><field name="cat" type="string" indexed="true" stored="true" multiValued="true"/>- <field name="features" type="text_general" indexed="true" stored="true" multiValued="true"/>- <field name="includes" type="text_general" indexed="true" stored="true" termVectors="true" termPositions="true" termOffsets="true" />+ <field name="features" type="text_general" indexed="true" stored="true" multiValued="true" uninvertible="true"/>+ <field name="includes" type="text_general" indexed="true" stored="true" termVectors="true" termPositions="true" termOffsets="true" uninvertible="true" /><field name="weight" type="pfloat" indexed="true" stored="true"/><field name="price" type="pfloat" indexed="true" stored="true"/>diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adocindex 6122e7476d2..f085682b6cb 100644--- a/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adoc+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/field-type-definitions-and-properties.adoc@@ -198,10 +198,10 @@ The table below includes the default value for most `FieldType` implementations|Property |Description |Implicit Default|`indexed` |If `true`, the value of the field can be used in queries to retrieve matching documents. |`true`|`stored` |If `true`, the actual value of the field can be retrieved by queries. |`true`-|`docValues` |If `true`, the value of the field will be put in a column-oriented xref:docvalues.adoc[] structure. |`false`+|`docValues` |If `true`, the value of the field will be put in a column-oriented xref:docvalues.adoc[] structure. |`true`|`sortMissingFirst`, `sortMissingLast` |Control the placement of documents when a sort field is not present. |`false`|`multiValued` |If `true`, indicates that a single document might contain multiple values for this field type. |`false`-|`uninvertible` |If `true`, indicates that an `indexed="true" docValues="false"` field can be "un-inverted" at query time to build up large in memory data structure to serve in place of xref:docvalues.adoc[]. *Defaults to `true` for historical reasons, but users are strongly encouraged to set this to `false` for stability and use `docValues="true"` as needed.* |`true`+|`uninvertible` |If `true`, indicates that an `indexed="true" docValues="false"` field can be "un-inverted" at query time to build up large in memory data structure to serve in place of xref:docvalues.adoc[]. |`false`|`omitNorms` |If `true`, omits the norms associated with this field (this disables length normalization for the field, and saves some memory). *Defaults to true for all primitive (non-analyzed) field types, such as int, float, data, bool, and string.* Only full-text fields or fields that need an index-time boost need norms. |*|`omitTermFreqAndPositions` |If `true`, omits term frequency, positions, and payloads from postings for this field. This can be a performance boost for fields that don't require that information. It also reduces the storage space required for the index. Queries that rely on position that are issued on a field with this option will silently fail to find documents. *This property defaults to true for all field types that are not text fields.* |*|`omitPositions` |Similar to `omitTermFreqAndPositions` but preserves term frequency information. |*diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adocindex 6f9123bded5..ee1cae69deb 100644--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc@@ -72,6 +72,7 @@ Due to changes in Lucene 9, that isn't possible any more.The default schemaVersion is now 1.7.With the new schema version, all fields and fieldTypes that support docValues (StrField, *PointField, BoolField, etc.)will have docValues enabled by default.+Also, fields will be unable to be uninverted by default. (`uninvertible=false`)In order to upgrade from schemaVersion 1.6 to 1.7, a re-index of all data will generally be required.**This re-index cannot be in-place**.@@ -82,6 +83,8 @@ However, if any of the following is true, a re-index is not required:* All applicable fields already have docValues enabled in the original schema* The schema is updated to explicitly default `docValues="false"` for all fields and fieldTypes that did not have an explicit `docValues` default provided.+The `uninvertible=false` default has no impact on the index, so is unrelated to re-indexing concerns.+== Solr 9.6=== Dependency upgradesLucene is upgraded to 9.10.0 and a variety of library dependencies have been upgraded. See https://solr.apache.org/docs/9_6_0/changes/Changes.html for specific upgraded libraries.diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/schema.xml b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/schema.xmlindex 74b073ae8b6..35099afce8e 100644--- a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/schema.xml+++ b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/schema.xml@@ -29,13 +29,13 @@<fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/><fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><fieldType name="random" class="solr.RandomSortField" indexed="true" />@@ -45,8 +45,8 @@<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractionalseconds part (.999) is optional.-->- <fieldtype name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0"/>- <fieldtype name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="6"/>+ <fieldtype name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" uninvertible="true"/>+ <fieldtype name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="6" uninvertible="true"/><field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xmlindex 5784fd0ffe4..5a202baa2b8 100644--- a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml+++ b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml@@ -43,12 +43,12 @@<fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/><fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/><fieldType name="long" class="${solr.tests.LongFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><fieldType name="random" class="solr.RandomSortField" indexed="true" />diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xmlindex 691ada4ba64..e0d04c62517 100644--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml@@ -27,7 +27,7 @@<schema name="test" version="1.7">- <fieldType name="integer" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0"/>+ <fieldType name="integer" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" uninvertible="true"/><fieldType name="string" class="solr.StrField" sortMissingLast="true"/><field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xmlindex 08dd32abf9d..f557a80e64d 100644--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xml+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xml@@ -45,12 +45,12 @@<fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true"positionIncrementGap="0"/><fieldType name="long" class="${solr.tests.LongFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><!-- numeric field types that manipulate the value intoa string value that isn't human readable in it's internal form,diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xmlindex 0836a7f74a6..c17096fc576 100644--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml@@ -33,15 +33,15 @@behavior of the fieldType.-->- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>-- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>++ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><!-- Field type demonstrating an Analyzer failure --><fieldType name="failtype1" class="solr.TextField">diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/schema.xmlindex 544edf8ae04..be212b86919 100644--- a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/schema.xml+++ b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/schema.xml@@ -29,13 +29,13 @@<fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/><fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><fieldType name="random" class="solr.RandomSortField" indexed="true" />diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xmlindex 4aad5690101..f12c5e09038 100644--- a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml+++ b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml@@ -42,7 +42,7 @@<filter class="solr.RemoveDuplicatesTokenFilterFactory"/></analyzer></fieldType>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/><!-- general --><field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/schema.xmlindex 5784fd0ffe4..5a202baa2b8 100644--- a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml+++ b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml@@ -43,12 +43,12 @@<fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/><fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/><fieldType name="long" class="${solr.tests.LongFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><fieldType name="random" class="solr.RandomSortField" indexed="true" />diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/tracking-updates/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/tracking-updates/conf/schema.xmlindex b539459ad5e..fc23706512e 100644--- a/solr/solrj/src/test-files/solrj/solr/configsets/tracking-updates/conf/schema.xml+++ b/solr/solrj/src/test-files/solrj/solr/configsets/tracking-updates/conf/schema.xml@@ -17,8 +17,8 @@--><schema name="minimal" version="1.7"><fieldType name="string" class="solr.StrField"/>- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><dynamicField name="*" type="string" indexed="true" stored="true"/><!-- for versioning --><field name="_version_" type="long" indexed="true" stored="true"/>diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xmlindex 8b3a3933996..8dddc57a24e 100644--- a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml@@ -19,7 +19,7 @@<schema name="example core zero" version="1.7"><fieldtype name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/><!-- general --><field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/><field name="type" type="string" indexed="true" stored="true" multiValued="false" />diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xmlindex fd1cac0374f..079a2683edb 100644--- a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml@@ -19,7 +19,7 @@<schema name="example core one" version="1.7"><fieldtype name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0" uninvertible="true"/><!-- general --><field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>diff --git a/solr/test-framework/src/test-files/solr/collection1/conf/schema.xml b/solr/test-framework/src/test-files/solr/collection1/conf/schema.xmlindex f18a9b7490f..e65df97ed61 100644--- a/solr/test-framework/src/test-files/solr/collection1/conf/schema.xml+++ b/solr/test-framework/src/test-files/solr/collection1/conf/schema.xml@@ -33,16 +33,16 @@behavior of the fieldType.-->- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/>+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0" uninvertible="true"/><!-- Point Fields --><fieldType name="pint" class="solr.IntPointField"/>@@ -112,8 +112,8 @@<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractionalseconds part (.999) is optional.-->- <fieldType name="date" class="${solr.tests.DateFieldType}" precisionStep="0" docValues="${solr.tests.numeric.dv}"/>- <fieldType name="tdate" class="${solr.tests.DateFieldType}" precisionStep="6" docValues="${solr.tests.numeric.dv}"/>+ <fieldType name="date" class="${solr.tests.DateFieldType}" precisionStep="0" docValues="${solr.tests.numeric.dv}" uninvertible="true"/>+ <fieldType name="tdate" class="${solr.tests.DateFieldType}" precisionStep="6" docValues="${solr.tests.numeric.dv}" uninvertible="true"/><fieldType name="tdatedv" class="${solr.tests.DateFieldType}" precisionStep="6"/><fieldType name="dateRange" class="solr.DateRangeField"/>@@ -545,13 +545,13 @@</fieldType>- <field name="id" type="string" indexed="true" stored="${solr.tests.id.stored:true}" multiValued="false" required="false" docValues="${solr.tests.id.docValues:false}"/>+ <field name="id" type="string" indexed="true" stored="${solr.tests.id.stored:true}" multiValued="false" required="false" docValues="${solr.tests.id.docValues:false}" uninvertible="true"/><field name="_root_" type="string" indexed="true" stored="false"/><field name="_nest_path_" type="_nest_path_" /><fieldType name="_nest_path_" class="solr.NestPathField"/><field name="signatureField" type="string" indexed="true" stored="false"/><field name="uuid" type="uuid" stored="true"/>- <field name="name" type="nametext" indexed="true" stored="true"/>+ <field name="name" type="nametext" indexed="true" stored="true" uninvertible="true"/><field name="text" type="text" indexed="true" stored="false"/><field name="subject" type="text" indexed="true" stored="true"/><field name="title" type="nametext" indexed="true" stored="true"/>@@ -791,7 +791,7 @@<dynamicField name="*_mfacet" type="string" indexed="true" stored="false" multiValued="true"/><!-- Type used to index the components for the "point" FieldType -->- <dynamicField name="*_coordinate" type="double" indexed="true" stored="false" omitNorms="true" docValues="false"/>+ <dynamicField name="*_coordinate" type="double" indexed="true" stored="false" omitNorms="true" docValues="false" uninvertible="true"/><dynamicField name="*_path" type="path" indexed="true" stored="true" omitNorms="true" multiValued="true"/><dynamicField name="*_ancestor" type="ancestor_path" indexed="true" stored="true" omitNorms="true"