You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2024/07/26 21:28:44 UTC
(solr) branch branch_9x updated: SOLR-10808: SchemaVersion 1.7 - DocValues default to true (#2017)
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 6c21ccff491 SOLR-10808: SchemaVersion 1.7 - DocValues default to true (#2017)
6c21ccff491 is described below
commit 6c21ccff491bb65aa753b3257e0f81ab1e70adbf
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri Jul 26 16:26:19 2024 -0400
SOLR-10808: SchemaVersion 1.7 - DocValues default to true (#2017)
Most test schemas have been changed to use 1.7
(cherry picked from commit 050723371136729870c6bf4f989ca38a56d0e87d)
---
solr/CHANGES.txt | 4 +
.../configs/cloud-minimal/conf/schema.xml | 4 +-
.../src/resources/configs/minimal/conf/schema.xml | 2 +-
.../java/org/apache/solr/schema/BinaryField.java | 5 ++
.../org/apache/solr/schema/CollationField.java | 5 ++
.../org/apache/solr/schema/DenseVectorField.java | 5 ++
.../src/java/org/apache/solr/schema/FieldType.java | 15 +++-
.../solr/schema/LatLonPointSpatialField.java | 5 ++
.../src/java/org/apache/solr/schema/PointType.java | 5 ++
.../org/apache/solr/schema/PrimitiveFieldType.java | 5 ++
.../org/apache/solr/schema/SortableTextField.java | 5 ++
.../java/org/apache/solr/update/VersionInfo.java | 6 +-
solr/core/src/resources/SystemCollectionSchema.xml | 8 +-
.../solr/analysisconfs/analysis-err-schema.xml | 2 +-
.../collection1/conf/atomic-update-json-test.xml | 2 +-
.../conf/bad-schema-analyzer-by-name.xml | 2 +-
.../conf/bad-schema-analyzer-class-and-name-cf.xml | 2 +-
.../conf/bad-schema-analyzer-class-and-name-tf.xml | 2 +-
.../bad-schema-analyzer-class-and-name-tok.xml | 2 +-
.../conf/bad-schema-analyzer-class-and-nested.xml | 2 +-
.../conf/bad-schema-bogus-analysis-parameters.xml | 2 +-
.../conf/bad-schema-bogus-field-parameters.xml | 2 +-
.../bad-schema-codec-global-vs-ft-mismatch.xml | 2 +-
.../bad-schema-currency-dynamic-multivalued.xml | 2 +-
.../conf/bad-schema-currency-ft-amount-suffix.xml | 2 +-
.../bad-schema-currency-ft-bogus-code-in-xml.xml | 2 +-
.../bad-schema-currency-ft-bogus-default-code.xml | 2 +-
.../conf/bad-schema-currency-ft-code-suffix.xml | 2 +-
.../conf/bad-schema-currency-ft-multivalued.xml | 2 +-
.../conf/bad-schema-currency-ft-oer-norates.xml | 2 +-
.../conf/bad-schema-currency-multivalued.xml | 2 +-
...chema-currencyfieldtype-bogus-amount-suffix.xml | 4 +-
...-schema-currencyfieldtype-bogus-code-suffix.xml | 4 +-
...chema-currencyfieldtype-dynamic-multivalued.xml | 4 +-
...hema-currencyfieldtype-ft-bogus-code-in-xml.xml | 4 +-
...ema-currencyfieldtype-ft-bogus-default-code.xml | 4 +-
...bad-schema-currencyfieldtype-ft-multivalued.xml | 4 +-
...bad-schema-currencyfieldtype-ft-oer-norates.xml | 4 +-
...ema-currencyfieldtype-missing-amount-suffix.xml | 2 +-
...chema-currencyfieldtype-missing-code-suffix.xml | 4 +-
.../bad-schema-currencyfieldtype-multivalued.xml | 4 +-
...ad-schema-currencyfieldtype-wrong-amount-ft.xml | 4 +-
.../bad-schema-currencyfieldtype-wrong-code-ft.xml | 4 +-
.../bad-schema-daterangefield-instance-options.xml | 4 +-
.../bad-schema-daterangefield-type-options.xml | 4 +-
.../conf/bad-schema-default-operator.xml | 2 +-
.../conf/bad-schema-defaultsearchfield.xml | 2 +-
.../conf/bad-schema-densevector-dimension-null.xml | 2 +-
.../conf/bad-schema-densevector-dimension.xml | 2 +-
.../conf/bad-schema-densevector-docvalues.xml | 2 +-
.../conf/bad-schema-densevector-multivalued.xml | 2 +-
.../conf/bad-schema-densevector-similarity.xml | 2 +-
.../conf/bad-schema-dup-dynamicField.xml | 2 +-
.../solr/collection1/conf/bad-schema-dup-field.xml | 2 +-
.../collection1/conf/bad-schema-dup-fieldType.xml | 2 +-
.../conf/bad-schema-dynamicfield-default-val.xml | 2 +-
.../conf/bad-schema-dynamicfield-required.xml | 2 +-
.../solr/collection1/conf/bad-schema-eff.xml | 4 +-
.../solr/collection1/conf/bad-schema-enums.xml | 2 +-
...ed-asterisk-copyfield-dest-should-fail-test.xml | 2 +-
...-asterisk-copyfield-source-should-fail-test.xml | 2 +-
...le-asterisk-copyfield-dest-should-fail-test.xml | 2 +-
...-asterisk-copyfield-source-should-fail-test.xml | 2 +-
...ld-source-matching-nothing-should-fail-test.xml | 2 +-
.../conf/bad-schema-nontext-analyzer.xml | 2 +-
.../conf/bad-schema-not-indexed-but-norms.xml | 2 +-
.../conf/bad-schema-not-indexed-but-pos.xml | 2 +-
.../conf/bad-schema-not-indexed-but-tf.xml | 2 +-
.../bad-schema-not-indexed-but-uninvertible.xml | 2 +-
.../conf/bad-schema-omit-tf-but-not-pos.xml | 2 +-
.../conf/bad-schema-sim-default-does-not-exist.xml | 2 +-
.../bad-schema-sim-default-has-no-explicit-sim.xml | 2 +-
.../conf/bad-schema-sim-global-vs-ft-mismatch.xml | 2 +-
.../conf/bad-schema-sweetspot-both-tf.xml | 2 +-
.../conf/bad-schema-sweetspot-partial-baseline.xml | 2 +-
.../bad-schema-sweetspot-partial-hyperbolic.xml | 2 +-
.../conf/bad-schema-sweetspot-partial-norms.xml | 2 +-
...bad-schema-uniquekey-diff-type-dynamic-root.xml | 2 +-
.../conf/bad-schema-uniquekey-diff-type-root.xml | 2 +-
.../bad-schema-uniquekey-is-copyfield-dest.xml | 2 +-
.../conf/bad-schema-uniquekey-multivalued.xml | 2 +-
.../conf/bad-schema-uniquekey-uses-default.xml | 2 +-
.../conf/bad-schema-uniquekey-uses-points.xml | 2 +-
.../conf/bad-schema-unsupported-docValues.xml | 2 +-
.../conf/schema-HighlighterMaxOffsetTest.xml | 2 +-
.../collection1/conf/schema-SimpleTextCodec.xml | 4 +-
.../schema-add-schema-fields-update-processor.xml | 24 +++---
.../collection1/conf/schema-analyzer-by-name.xml | 2 +-
.../solr/collection1/conf/schema-behavior.xml | 17 +++-
.../solr/collection1/conf/schema-binaryfield.xml | 4 +-
.../solr/collection1/conf/schema-bm25.xml | 2 +-
.../collection1/conf/schema-booleansimilarity.xml | 2 +-
.../solr/collection1/conf/schema-charfilters.xml | 2 +-
...hema-class-name-shortening-on-serialization.xml | 2 +-
.../collection1/conf/schema-classification.xml | 4 +-
.../solr/collection1/conf/schema-collate-dv.xml | 14 ++--
.../solr/collection1/conf/schema-collate.xml | 14 ++--
.../collection1/conf/schema-copyfield-test.xml | 2 +-
.../solr/collection1/conf/schema-custom-field.xml | 4 +-
.../solr/collection1/conf/schema-customfield.xml | 2 +-
.../schema-densevector-codec-hyperparameter.xml | 2 +-
.../schema-densevector-high-dimensionality.xml | 2 +-
.../conf/schema-densevector-similarity-null.xml | 2 +-
.../solr/collection1/conf/schema-deprecations.xml | 4 +-
.../solr/collection1/conf/schema-dfi.xml | 2 +-
.../solr/collection1/conf/schema-dfr.xml | 2 +-
.../conf/schema-distrib-interval-faceting.xml | 28 +++----
.../conf/schema-distributed-missing-sort.xml | 12 +--
.../solr/collection1/conf/schema-docValues.xml | 2 +-
.../collection1/conf/schema-docValuesFaceting.xml | 26 +++---
.../solr/collection1/conf/schema-docValuesJoin.xml | 5 +-
.../collection1/conf/schema-docValuesMissing.xml | 96 +++++++++++-----------
.../collection1/conf/schema-docValuesMulti.xml | 26 +++---
.../solr/collection1/conf/schema-eff.xml | 2 +-
.../solr/collection1/conf/schema-enums.xml | 2 +-
.../collection1/conf/schema-field-sort-values.xml | 2 +-
.../solr/collection1/conf/schema-folding.xml | 2 +-
.../solr/collection1/conf/schema-hash.xml | 8 +-
.../test-files/solr/collection1/conf/schema-ib.xml | 2 +-
.../conf/schema-id-and-version-fields-only.xml | 2 +-
.../conf/schema-inplace-required-field.xml | 4 +-
.../collection1/conf/schema-inplace-updates.xml | 14 ++--
.../solr/collection1/conf/schema-lmdirichlet.xml | 2 +-
.../collection1/conf/schema-lmjelinekmercer.xml | 2 +-
.../collection1/conf/schema-luceneMatchVersion.xml | 2 +-
.../solr/collection1/conf/schema-minhash.xml | 8 +-
.../conf/schema-minimal-atomic-stress.xml | 14 ++--
.../conf/schema-minimal-with-another-uniqkey.xml | 2 +-
.../collection1/conf/schema-multiword-synonyms.xml | 2 +-
.../solr/collection1/conf/schema-nest.xml | 20 ++---
.../conf/schema-non-stored-docvalues.xml | 58 ++++++-------
.../conf/schema-not-required-unique-key.xml | 2 +-
.../conf/schema-null-charfilters-analyzer.xml | 2 +-
.../solr/collection1/conf/schema-numeric.xml | 2 +-
...chema-one-field-no-dynamic-field-unique-key.xml | 2 +-
.../conf/schema-one-field-no-dynamic-field.xml | 2 +-
.../conf/schema-phrases-identification.xml | 2 +-
.../solr/collection1/conf/schema-phrasesuggest.xml | 2 +-
.../collection1/conf/schema-postingshighlight.xml | 2 +-
.../solr/collection1/conf/schema-preanalyzed.xml | 2 +-
.../collection1/conf/schema-protected-term.xml | 8 +-
.../solr/collection1/conf/schema-pseudo-fields.xml | 6 +-
.../solr/collection1/conf/schema-rank-fields.xml | 2 +-
.../solr/collection1/conf/schema-replication1.xml | 2 +-
.../solr/collection1/conf/schema-replication2.xml | 2 +-
.../conf/schema-rest-lucene-match-version.xml | 2 +-
.../solr/collection1/conf/schema-rest.xml | 29 +++----
.../solr/collection1/conf/schema-reversed.xml | 2 +-
.../solr/collection1/conf/schema-root.xml | 2 +-
.../conf/schema-sim-default-override.xml | 2 +-
.../solr/collection1/conf/schema-sim.xml | 2 +-
.../collection1/conf/schema-simpleqpplugin.xml | 2 +-
.../solr/collection1/conf/schema-sorting-text.xml | 20 ++---
.../collection1/conf/schema-sortingresponse.xml | 16 ++--
.../solr/collection1/conf/schema-spatial.xml | 24 +++---
.../solr/collection1/conf/schema-spellchecker.xml | 4 +-
.../solr/collection1/conf/schema-sql.xml | 62 +++++++-------
.../solr/collection1/conf/schema-sweetspot.xml | 2 +-
.../collection1/conf/schema-synonym-tokenizer.xml | 2 +-
.../solr/collection1/conf/schema-tagger.xml | 4 +-
.../solr/collection1/conf/schema-tfidf.xml | 2 +-
.../solr/collection1/conf/schema-tiny.xml | 2 +-
.../collection1/conf/schema-tokenizer-test.xml | 2 +-
.../test-files/solr/collection1/conf/schema.xml | 12 +--
.../solr/collection1/conf/schema_codec.xml | 8 +-
.../solr/collection1/conf/schema_latest.xml | 23 +++---
.../solr/collection1/conf/schemasurround.xml | 4 +-
.../configsets/_default/conf/managed-schema.xml | 6 +-
.../solr/configsets/backcompat/conf/schema.xml | 2 +-
.../configsets/bad-mergepolicy/conf/schema.xml | 2 +-
.../solr/configsets/cache-control/conf/schema.xml | 2 +-
.../solr/configsets/ccjoin/conf/schema.xml | 8 +-
.../cloud-aggregate-node-metrics/conf/schema.xml | 2 +-
.../solr/configsets/cloud-dynamic/conf/schema.xml | 27 +++---
.../solr/configsets/cloud-hdfs/conf/schema.xml | 2 +-
.../conf/managed-schema.xml | 2 +-
.../conf/managed-schema.xml | 2 +-
.../cloud-managed-upgrade/conf/schema.xml | 2 +-
.../cloud-managed/conf/managed-schema.xml | 4 +-
.../cloud-minimal-field-limiting/conf/schema.xml | 2 +-
.../cloud-minimal-inplace-updates/conf/schema.xml | 2 +-
.../cloud-minimal-userproperties/conf/schema.xml | 2 +-
.../solr/configsets/cloud-minimal/conf/schema.xml | 2 +-
.../conf/schema.xml | 2 +-
.../solr/configsets/cloud-subdirs/conf/schema.xml | 2 +-
.../conf-using-mypkg-version-1/conf/schema.xml | 2 +-
.../solr/configsets/conf2/conf/schema.xml | 2 +-
.../solr/configsets/conf3/conf/schema.xml | 2 +-
.../solr/configsets/configset-2/conf/schema.xml | 2 +-
.../solr/configsets/dedup/conf/schema.xml | 4 +-
.../collectionA/conf/schema.xml | 15 ++--
.../collectionB/conf/schema.xml | 15 ++--
.../solr/configsets/doc-expiry/conf/schema.xml | 7 +-
.../configsets/exitable-directory/conf/schema.xml | 8 +-
.../solr/configsets/minimal/conf/schema.xml | 2 +-
.../solr/configsets/schema-package/conf/schema.xml | 2 +-
.../upload/legacy-managed-schema/managed-schema | 2 +-
.../configsets/upload/regular/managed-schema.xml | 2 +-
.../upload/with-lib-directive/managed-schema.xml | 2 +-
.../with-script-processor/managed-schema.xml | 2 +-
.../src/test-files/solr/crazy-path-to-schema.xml | 2 +-
.../solr/rest/schema/TestSchemaResource.java | 6 +-
.../rest/schema/TestSchemaVersionResource.java | 2 +-
.../schema/SchemaVersionSpecificBehaviorTest.java | 46 ++++++++++-
.../org/apache/solr/schema/ICUCollationField.java | 5 ++
.../solr/collection1/conf/schema-folding-extra.xml | 2 +-
.../solr/collection1/conf/schema-icucollate-dv.xml | 12 +--
.../solr/collection1/conf/schema-icucollate.xml | 2 +-
.../collection1/conf/schema-icucollateoptions.xml | 2 +-
.../collection1/conf/schema-opennlp-extract.xml | 2 +-
.../clustering/solr/collection1/conf/schema.xml | 2 +-
.../gcs-repository/src/test-files/conf/schema.xml | 2 +-
.../solr/configsets/cloud-minimal/conf/schema.xml | 2 +-
.../langid/solr/collection1/conf/schema.xml | 2 +-
.../test-files/solr/collection1/conf/schema.xml | 8 +-
.../test-files/solr/collection1/conf/schema.xml | 2 +-
.../s3-repository/src/test-files/conf/schema.xml | 2 +-
.../scripting/solr/collection1/conf/schema.xml | 2 +-
.../test-files/solr/configsets/sql/conf/schema.xml | 67 +++++++--------
.../test/analysis_extras_config/conf/schema.xml | 4 +-
.../solr/collection1/conf/managed-schema.xml | 33 ++++----
.../configsets/_default/conf/managed-schema.xml | 38 +++++----
.../conf/managed-schema.xml | 40 ++++-----
.../modules/indexing-guide/pages/docvalues.adoc | 15 +++-
.../modules/indexing-guide/pages/enum-fields.adoc | 4 +-
.../indexing-guide/pages/language-analysis.adoc | 4 +-
.../pages/partial-document-updates.adoc | 8 ++
.../modules/indexing-guide/pages/schema-api.adoc | 2 +-
.../modules/query-guide/pages/spatial-search.adoc | 4 +-
.../pages/major-changes-in-solr-9.adoc | 15 ++++
.../solrj/solr/configsets/ml/conf/schema.xml | 8 +-
.../solr/configsets/streaming/conf/schema.xml | 16 ++--
.../solr/collection1/conf/schema-replication1.xml | 2 +-
.../solrj/solr/collection1/conf/schema-sql.xml | 10 +--
.../solrj/solr/collection1/conf/schema.xml | 2 +-
.../configsets/configset-1/conf/schema-minimal.xml | 2 +-
.../solr/configsets/configset-2/conf/schema.xml | 2 +-
.../solrj/solr/configsets/ml/conf/schema.xml | 10 +--
.../solrj/solr/configsets/shared/conf/schema.xml | 2 +-
.../solrj/solr/configsets/spatial/conf/schema.xml | 6 +-
.../solr/configsets/streaming/conf/schema.xml | 16 ++--
.../configsets/tracking-updates/conf/schema.xml | 2 +-
.../test-files/solrj/solr/crazy-path-to-schema.xml | 2 +-
.../solrj/solr/multicore/core0/conf/schema.xml | 2 +-
.../solrj/solr/multicore/core1/conf/schema.xml | 2 +-
.../solr/client/solrj/request/SchemaTest.java | 4 +-
.../apache/solr/schema/SortableBinaryField.java | 5 ++
.../test-files/solr/collection1/conf/schema.xml | 68 +++++++--------
.../solr/configsets/minimal/conf/schema.xml | 2 +-
249 files changed, 888 insertions(+), 722 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8d5dff4b3e5..2c7bc588dce 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -60,6 +60,10 @@ Improvements
Statuses are now removed 5 minutes after the read of a completed/failed status. Helps collection
async backup/restore and other operations scale to 100+ shards. (Pierre Salagnac, David Smiley)
+* SOLR-10808 : The Solr schema version has been increased to 1.7. Since schema version 1.7, all fields/fieldTypes that
+ support 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)
+
Optimizations
---------------------
* SOLR-17257: Both Minimize Cores and the Affinity replica placement strategies would over-gather
diff --git a/solr/benchmark/src/resources/configs/cloud-minimal/conf/schema.xml b/solr/benchmark/src/resources/configs/cloud-minimal/conf/schema.xml
index cbdf1bac1f2..e517aea5930 100644
--- a/solr/benchmark/src/resources/configs/cloud-minimal/conf/schema.xml
+++ b/solr/benchmark/src/resources/configs/cloud-minimal/conf/schema.xml
@@ -15,9 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldType name="string" class="solr.StrField" docValues="true"/>
+ <fieldType name="string" class="solr.StrField"/>
<fieldType name="int" class="org.apache.solr.schema.IntPointField" docValues="false" omitNorms="true"
positionIncrementGap="0"/>
<fieldType name="long" class="org.apache.solr.schema.LongPointField" docValues="false" omitNorms="true"
diff --git a/solr/benchmark/src/resources/configs/minimal/conf/schema.xml b/solr/benchmark/src/resources/configs/minimal/conf/schema.xml
index 287d4fe0149..51d407dfc1d 100644
--- a/solr/benchmark/src/resources/configs/minimal/conf/schema.xml
+++ b/solr/benchmark/src/resources/configs/minimal/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<dynamicField name="*" type="string" indexed="true" stored="true"/>
</schema>
diff --git a/solr/core/src/java/org/apache/solr/schema/BinaryField.java b/solr/core/src/java/org/apache/solr/schema/BinaryField.java
index 94bc94fd86f..37bfc653236 100644
--- a/solr/core/src/java/org/apache/solr/schema/BinaryField.java
+++ b/solr/core/src/java/org/apache/solr/schema/BinaryField.java
@@ -152,6 +152,11 @@ public class BinaryField extends FieldType {
protected void checkSupportsDocValues() { // we support DocValues
}
+ @Override
+ protected boolean doesTypeSupportDocValues() {
+ return true;
+ }
+
@Override
public Object toNativeType(Object val) {
if (val instanceof byte[]) {
diff --git a/solr/core/src/java/org/apache/solr/schema/CollationField.java b/solr/core/src/java/org/apache/solr/schema/CollationField.java
index 25ad27f00fb..739bae5f211 100644
--- a/solr/core/src/java/org/apache/solr/schema/CollationField.java
+++ b/solr/core/src/java/org/apache/solr/schema/CollationField.java
@@ -245,6 +245,11 @@ public class CollationField extends FieldType {
protected void checkSupportsDocValues() { // we support DocValues
}
+ @Override
+ protected boolean doesTypeSupportDocValues() {
+ return true;
+ }
+
@Override
public List<IndexableField> createFields(SchemaField field, Object value) {
if (field.hasDocValues()) {
diff --git a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
index 5d5994ad10c..d83462235b0 100644
--- a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
+++ b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java
@@ -178,6 +178,11 @@ public class DenseVectorField extends FloatPointField {
return vectorEncoding;
}
+ @Override
+ protected boolean doesTypeSupportDocValues() {
+ return false;
+ }
+
@Override
public void checkSchemaField(final SchemaField field) throws SolrException {
super.checkSchemaField(field);
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.java
index 38a55185254..2e2ef48ea25 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java
@@ -178,7 +178,8 @@ public abstract class FieldType extends FieldProperties {
* which is called by this method.
*/
protected void setArgs(IndexSchema schema, Map<String, String> args) {
- // default to STORED, INDEXED, OMIT_TF_POSITIONS and MULTIVALUED depending on schema version
+ // default to STORED, INDEXED, OMIT_TF_POSITIONS,MULTIVALUED, USE_DOCVALUES_AS_STORED
+ // and DOC_VALUES depending on schema version
properties = (STORED | INDEXED);
float schemaVersion = schema.getVersion();
if (schemaVersion < 1.1f) properties |= MULTIVALUED;
@@ -187,6 +188,7 @@ public abstract class FieldType extends FieldProperties {
args.remove("compressThreshold");
}
if (schemaVersion >= 1.6f) properties |= USE_DOCVALUES_AS_STORED;
+ if (schemaVersion >= 1.7f && doesTypeSupportDocValues()) properties |= DOC_VALUES;
properties |= UNINVERTIBLE;
@@ -1125,6 +1127,17 @@ public abstract class FieldType extends FieldProperties {
ErrorCode.SERVER_ERROR, "Field type " + this + " does not support doc values");
}
+ /** Returns whether this field type supports docValues. By default none do. */
+ protected boolean doesTypeSupportDocValues() {
+ try {
+ // TODO: In Solr 10.0 change this such that checkSupportsDocValues() calls this method instead
+ checkSupportsDocValues();
+ return true;
+ } catch (Exception ignored) {
+ return false;
+ }
+ }
+
public static final String TYPE = "type";
public static final String TYPE_NAME = "name";
public static final String CLASS_NAME = "class";
diff --git a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
index 11e2d730b2f..b237b79ad37 100644
--- a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
+++ b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
@@ -69,6 +69,11 @@ public class LatLonPointSpatialField
protected void checkSupportsDocValues() { // we support DocValues
}
+ @Override
+ protected boolean doesTypeSupportDocValues() {
+ return true;
+ }
+
@Override
public void inform(IndexSchema schema) {
this.schema = schema;
diff --git a/solr/core/src/java/org/apache/solr/schema/PointType.java b/solr/core/src/java/org/apache/solr/schema/PointType.java
index 3d68af9449c..2f80fc24722 100644
--- a/solr/core/src/java/org/apache/solr/schema/PointType.java
+++ b/solr/core/src/java/org/apache/solr/schema/PointType.java
@@ -172,6 +172,11 @@ public class PointType extends CoordinateFieldType implements SpatialQueryable {
}
}
+ @Override
+ protected boolean doesTypeSupportDocValues() {
+ return true;
+ }
+
/**
* Calculates the range and creates a RangeQuery (bounding box) wrapped in a BooleanQuery (unless
* the dimension is 1, one range for every dimension, AND'd together by a Boolean
diff --git a/solr/core/src/java/org/apache/solr/schema/PrimitiveFieldType.java b/solr/core/src/java/org/apache/solr/schema/PrimitiveFieldType.java
index 1143260d708..2ce3203ae71 100644
--- a/solr/core/src/java/org/apache/solr/schema/PrimitiveFieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/PrimitiveFieldType.java
@@ -38,6 +38,11 @@ public abstract class PrimitiveFieldType extends FieldType {
protected void checkSupportsDocValues() { // primitive types support DocValues
}
+ @Override
+ protected boolean doesTypeSupportDocValues() {
+ return true;
+ }
+
@Override
public MultiValueSelector getDefaultMultiValueSelectorForSort(
SchemaField field, boolean reverse) {
diff --git a/solr/core/src/java/org/apache/solr/schema/SortableTextField.java b/solr/core/src/java/org/apache/solr/schema/SortableTextField.java
index f5b3a8c970a..b61d668f333 100644
--- a/solr/core/src/java/org/apache/solr/schema/SortableTextField.java
+++ b/solr/core/src/java/org/apache/solr/schema/SortableTextField.java
@@ -150,6 +150,11 @@ public class SortableTextField extends TextField {
// No-Op
}
+ @Override
+ protected boolean doesTypeSupportDocValues() {
+ return true;
+ }
+
@Override
public SortField getSortField(SchemaField field, boolean reverse) {
if (!field.hasDocValues()) {
diff --git a/solr/core/src/java/org/apache/solr/update/VersionInfo.java b/solr/core/src/java/org/apache/solr/update/VersionInfo.java
index d805ccab702..09a39397197 100644
--- a/solr/core/src/java/org/apache/solr/update/VersionInfo.java
+++ b/solr/core/src/java/org/apache/solr/update/VersionInfo.java
@@ -66,17 +66,17 @@ public class VersionInfo {
if (!sf.indexed() && !sf.hasDocValues()) {
throw new SolrException(
SolrException.ErrorCode.SERVER_ERROR,
- errPrefix + " (" + VERSION_FIELD + " not searchable");
+ errPrefix + " (" + VERSION_FIELD + " not searchable)");
}
if (!sf.stored() && !sf.hasDocValues()) {
throw new SolrException(
SolrException.ErrorCode.SERVER_ERROR,
- errPrefix + " (" + VERSION_FIELD + " not retrievable");
+ errPrefix + " (" + VERSION_FIELD + " not retrievable)");
}
if (sf.multiValued()) {
throw new SolrException(
SolrException.ErrorCode.SERVER_ERROR,
- errPrefix + " (" + VERSION_FIELD + " is multiValued");
+ errPrefix + " (" + VERSION_FIELD + " is multiValued)");
}
return sf;
diff --git a/solr/core/src/resources/SystemCollectionSchema.xml b/solr/core/src/resources/SystemCollectionSchema.xml
index 81f393f4f58..a21aee2d012 100644
--- a/solr/core/src/resources/SystemCollectionSchema.xml
+++ b/solr/core/src/resources/SystemCollectionSchema.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" ?>
-<schema name="_system collection or core" version="1.1">
+<schema name="_system collection or core" version="1.7">
<fieldtype name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="long" class="solr.LongPointField" docValues="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.DoublePointField" docValues="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="solr.LongPointField" positionIncrementGap="0"/>
+ <fieldType name="double" class="solr.DoublePointField" positionIncrementGap="0"/>
<fieldType name="bytes" class="solr.BinaryField"/>
- <fieldType name="date" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="date" class="solr.DatePointField"/>
<fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
diff --git a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
index 8b9aa0eeaea..3be62af129d 100644
--- a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
+++ b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
@@ -20,7 +20,7 @@
text field that blows up in analysis, and an ID field for diagnosis.
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" stored="true" indexed="true"/>
<fieldType name="string" class="solr.StrField" />
<fieldType name="text" class="solr.TextField">
diff --git a/solr/core/src/test-files/solr/collection1/conf/atomic-update-json-test.xml b/solr/core/src/test-files/solr/collection1/conf/atomic-update-json-test.xml
index 820c13e5f93..2434820b9be 100644
--- a/solr/core/src/test-files/solr/collection1/conf/atomic-update-json-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/atomic-update-json-test.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="id-version-and-multivalued-name-field" version="1.1">
+<schema name="id-version-and-multivalued-name-field" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
<field name="id" type="string" indexed="true" stored="true"/>
<field name="_version_" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-by-name.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-by-name.xml
index ec3e2ce3198..4b5f5e5f385 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-by-name.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-by-name.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<!--
Resolve analysis factories by name. See: SOLR-13593
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-cf.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-cf.xml
index 4c0252a02f2..80ea4bae04d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-cf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-cf.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<!--
Resolve analysis factories by name. See: SOLR-13593
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-tf.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-tf.xml
index d60aa06b14d..65904b18335 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-tf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-tf.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<!--
Resolve analysis factories by name. See: SOLR-13593
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-tok.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-tok.xml
index 3f89f7202b6..5f02e257721 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-tok.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-name-tok.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<!--
Resolve analysis factories by name. See: SOLR-13593
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
index 8321405c120..42ec46c2c6e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-analyzer-class-and-nested" version="1.0">
+<schema name="bad-schema-analyzer-class-and-nested" version="1.7">
<fieldType name="bad_type" class="solr.TextField">
<!-- BEGIN BAD STUFF -->
<analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer">
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml
index 82ce742967c..85515414ef3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-bogus-analysis-parameters" version="1.6">
+<schema name="bad-schema-bogus-analysis-parameters" version="1.7">
<fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory" bogusArg="bogusValue"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml
index e9272865b53..4d2a60ff77d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-bogus-field-parameters" version="1.6">
+<schema name="bad-schema-bogus-field-parameters" version="1.7">
<fieldType name="binary" class="solr.BinaryField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
index 5c8e4e330f0..590e24421d9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-codec-global-vs-ft-mismatch" version="1.0">
+<schema name="bad-schema-codec-global-vs-ft-mismatch" version="1.7">
<!-- BAD: postingsFormat here but no codec that allows it -->
<fieldType name="direct1" class="solr.TextField" postingsFormat="Direct">
<analyzer>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
index 9956c391fc3..7291b7be759 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-currency-ft-multivalued" version="1.4">
+<schema name="bad-schema-currency-ft-multivalued" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="currency" class="solr.CurrencyField" currencyConfig="currency.xml" multiValued="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-amount-suffix.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-amount-suffix.xml
index bafdb37d722..c06403e889b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-amount-suffix.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-amount-suffix.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-currency-ft-amount-suffix" version="1.4">
+<schema name="bad-schema-currency-ft-amount-suffix" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="plong" class="solr.LongPointField" multiValued="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
index 879daa2aae9..02b25f8c04c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-currency-ft-bogus-code-in-xml" version="1.4">
+<schema name="bad-schema-currency-ft-bogus-code-in-xml" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<!-- BEGIN BAD STUFF: bad-currency.xml has bogus code-->
<fieldType name="currency"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
index 4c47f6b50ed..78d6c1fedd2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-currency-ft-bogus-default-code" version="1.4">
+<schema name="bad-schema-currency-ft-bogus-default-code" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<!-- BEGIN BAD STUFF: default -->
<fieldType name="currency"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-code-suffix.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-code-suffix.xml
index 06973f46fa8..7ff00b55ec9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-code-suffix.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-code-suffix.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-currency-ft-code-suffix" version="1.4">
+<schema name="bad-schema-currency-ft-code-suffix" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<!-- BEGIN BAD STUFF: codeStrSuffix not allowed -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
index ccd014b6714..aaa4a258829 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-currency-ft-multivalued" version="1.4">
+<schema name="bad-schema-currency-ft-multivalued" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<!-- BEGIN BAD STUFF: multiValued -->
<fieldType name="currency" class="solr.CurrencyField" currencyConfig="currency.xml" multiValued="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
index a1d664cd027..5b50a155e3b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-currency-ft-oer-norates" version="1.4">
+<schema name="bad-schema-currency-ft-oer-norates" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<!-- BEGIN BAD STUFF: no rates-->
<fieldType name="currency"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
index 984445669ff..c6d120585ac 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-currency-multivalued" version="1.4">
+<schema name="bad-schema-currency-multivalued" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="currency" class="solr.CurrencyField" currencyConfig="currency.xml"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-bogus-amount-suffix.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-bogus-amount-suffix.xml
index 37b6d200f16..a64adca7f92 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-bogus-amount-suffix.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-bogus-amount-suffix.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-bogus-amount-suffix" version="1.6">
+<schema name="bad-schema-currencyfieldtype-bogus-amount-suffix" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: bogus amount field suffix -->
<fieldType name="currency" class="solr.CurrencyFieldType" currencyConfig="currency.xml" multiValued="false"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-bogus-code-suffix.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-bogus-code-suffix.xml
index 717245533fd..2f35726f297 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-bogus-code-suffix.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-bogus-code-suffix.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-bogus-code-suffix" version="1.6">
+<schema name="bad-schema-currencyfieldtype-bogus-code-suffix" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: bogus code field suffix -->
<fieldType name="currency" class="solr.CurrencyFieldType" currencyConfig="currency.xml" multiValued="false"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-dynamic-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-dynamic-multivalued.xml
index 2fba82a6aec..d31cd01265e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-dynamic-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-dynamic-multivalued.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-dynamic-multivalued" version="1.6">
+<schema name="bad-schema-currencyfieldtype-dynamic-multivalued" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<fieldType name="currency" class="solr.CurrencyFieldType" currencyConfig="currency.xml" multiValued="false"
amountLongSuffix="_l" codeStrSuffix="_s"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-bogus-code-in-xml.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-bogus-code-in-xml.xml
index 3b5c69535ac..c60a201801c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-bogus-code-in-xml.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-bogus-code-in-xml.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-ft-bogus-code-in-xml" version="1.6">
+<schema name="bad-schema-currencyfieldtype-ft-bogus-code-in-xml" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: bad-currency.xml has bogus code-->
<fieldType name="currency"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-bogus-default-code.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-bogus-default-code.xml
index 27483729127..81940c2c930 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-bogus-default-code.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-bogus-default-code.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-ft-bogus-default-code" version="1.6">
+<schema name="bad-schema-currencyfieldtype-ft-bogus-default-code" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: defaultCurrency -->
<fieldType name="currency"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-multivalued.xml
index 6afcea452e6..d1d65a21883 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-multivalued.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-ft-multivalued" version="1.6">
+<schema name="bad-schema-currencyfieldtype-ft-multivalued" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: multiValued -->
<fieldType name="currency" class="solr.CurrencyFieldType" currencyConfig="currency.xml" multiValued="true"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-oer-norates.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-oer-norates.xml
index 8d8533d75ed..fa13c3f6318 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-oer-norates.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-ft-oer-norates.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-ft-oer-norates" version="1.6">
+<schema name="bad-schema-currencyfieldtype-ft-oer-norates" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: no rates -->
<fieldType name="currency"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-missing-amount-suffix.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-missing-amount-suffix.xml
index 77a531d5b32..62d1d82c910 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-missing-amount-suffix.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-missing-amount-suffix.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-missing-amount-suffix" version="1.6">
+<schema name="bad-schema-currencyfieldtype-missing-amount-suffix" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<!-- BEGIN BAD STUFF: missing amountLongSuffix -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-missing-code-suffix.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-missing-code-suffix.xml
index 89c70801055..143d6a7e1e1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-missing-code-suffix.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-missing-code-suffix.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-missing-code-suffix" version="1.6">
+<schema name="bad-schema-currencyfieldtype-missing-code-suffix" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: missing codeStrSuffix -->
<fieldType name="currency" class="solr.CurrencyFieldType" currencyConfig="currency.xml" multiValued="false"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-multivalued.xml
index 9e95458331d..6bbe8f61a98 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-multivalued.xml
@@ -16,11 +16,11 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-multivalued" version="1.6">
+<schema name="bad-schema-currencyfieldtype-multivalued" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="currency" class="solr.CurrencyFieldType" currencyConfig="currency.xml"
amountLongSuffix="_l" codeStrSuffix="_s"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-wrong-amount-ft.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-wrong-amount-ft.xml
index 51881901279..e4021fb627b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-wrong-amount-ft.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-wrong-amount-ft.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-wrong-amount-ft" version="1.6">
+<schema name="bad-schema-currencyfieldtype-wrong-amount-ft" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: code dynamic field type is wrong -->
<fieldType name="currency" class="solr.CurrencyFieldType" currencyConfig="currency.xml" multiValued="false"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-wrong-code-ft.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-wrong-code-ft.xml
index c3eadc1e019..05ed88e7777 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-wrong-code-ft.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currencyfieldtype-wrong-code-ft.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-wrong-code-ft" version="1.6">
+<schema name="bad-schema-currencyfieldtype-wrong-code-ft" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: code dynamic field type is wrong -->
<fieldType name="currency" class="solr.CurrencyFieldType" currencyConfig="currency.xml" multiValued="false"
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-instance-options.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-instance-options.xml
index 3b040c20e1f..78b1b00b6d8 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-instance-options.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-instance-options.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-bogus-amount-suffix" version="1.6">
+<schema name="bad-schema-currencyfieldtype-bogus-amount-suffix" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: bogus amount field suffix -->
<fieldType name="daterange" class="solr.DateRangeField" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-type-options.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-type-options.xml
index 9489cf13aa5..ef17f76816f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-type-options.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-daterangefield-type-options.xml
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<schema name="bad-schema-currencyfieldtype-bogus-amount-suffix" version="1.6">
+<schema name="bad-schema-currencyfieldtype-bogus-amount-suffix" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<!-- BEGIN BAD STUFF: bogus amount field suffix -->
<fieldType name="daterange" class="solr.DateRangeField" omitNorms="false" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-default-operator.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-default-operator.xml
index 3de607c42b3..b4dae4fb52f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-default-operator.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-default-operator.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-default-operator" version="1.6">
+<schema name="bad-schema-default-operator" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-defaultsearchfield.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-defaultsearchfield.xml
index 9567e30dd48..73a0a0bb7b7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-defaultsearchfield.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-defaultsearchfield.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-defaultsearchfield" version="1.6">
+<schema name="bad-schema-defaultsearchfield" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-dimension-null.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-dimension-null.xml
index 69e80724bc2..2bd0a83092a 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-dimension-null.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-dimension-null.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DenseVectorField -->
-<schema name="bad-schema-densevector-dimension-null" version="1.0">
+<schema name="bad-schema-densevector-dimension-null" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="knn_vector" class="solr.DenseVectorField" similarityFunction="euclidean"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-dimension.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-dimension.xml
index 5a2b4a1f8e0..34c04621934 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-dimension.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-dimension.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DenseVectorField -->
-<schema name="bad-schema-densevector-dimension" version="1.0">
+<schema name="bad-schema-densevector-dimension" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4.6" similarityFunction="euclidean"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-docvalues.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-docvalues.xml
index 9e434a5e473..3eac17d427a 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-docvalues.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-docvalues.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DenseVectorField -->
-<schema name="bad-schema-densevector-docvalues" version="1.0">
+<schema name="bad-schema-densevector-docvalues" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="euclidean" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-multivalued.xml
index 915b124892c..c702d6e72d1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-multivalued.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DenseVectorField -->
-<schema name="bad-schema-densevector-multivalued" version="1.0">
+<schema name="bad-schema-densevector-multivalued" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="euclidean" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-similarity.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-similarity.xml
index 6bd87e45073..ec36a7c89e5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-similarity.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-densevector-similarity.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DenseVectorField -->
-<schema name="bad-schema-densevector-similarity" version="1.0">
+<schema name="bad-schema-densevector-similarity" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="not_existent"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
index 48990d628b3..c1650a6d417 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-dup-dynamicField" version="1.0">
+<schema name="bad-schema-dup-dynamicField" version="1.7">
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
index aee203e6a6e..f9da7034120 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-dup-field" version="1.0">
+<schema name="bad-schema-dup-field" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<fieldType name="text" class="solr.TextField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
index ac48c515ae2..1e808935f23 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-dup-fieldType" version="1.0">
+<schema name="bad-schema-dup-fieldType" version="1.7">
<fieldType name="text" class="solr.TextField"/>
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
index a4a7444f333..8fe60b8d7c1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-dynamicfield-default-val" version="1.4">
+<schema name="bad-schema-dynamicfield-default-val" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
index 359fa1b2079..506c6d03e3f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-dynamicfield-required" version="1.4">
+<schema name="bad-schema-dynamicfield-required" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-eff.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-eff.xml
index da662819f77..21f390ae894 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-eff.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-eff.xml
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<schema name="example" version="1.6">
+<schema name="example" version="1.7">
<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false"/>
@@ -34,7 +34,7 @@
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<fieldType name="pint" class="solr.IntPointField"/>
- <field name="keyfield" type="pint" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <field name="keyfield" type="pint" indexed="true" stored="true" multiValued="false"/>
<!-- Our external file field type -->
<!-- Begin bad stuff: keyfield is points-based -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-enums.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-enums.xml
index 675f45efab5..af6893408ef 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-enums.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-enums.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="bad-schema-enums" version="1.6">
+<schema name="bad-schema-enums" version="1.7">
<field name="id" type="string" indexed="true" stored="true" required="true"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
index 8b680721d00..185bc1c8261 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<field name="text" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
index 9f9ed989f65..218954745e0 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<field name="text" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
index 582f2d58356..af43e51134e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<field name="text" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
index ee892445d60..251c5ea1582 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<field name="text" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
index d01ed87b141..b840c6761d2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<field name="id" type="string" indexed="true" stored="true" required="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
index a8b6642d6bc..4fef256a771 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-nontext-analyzer" version="1.0">
+<schema name="bad-schema-nontext-analyzer" version="1.7">
<!-- BEGIN BAD STUFF -->
<fieldType name="bad_type" class="solr.StrField">
<analyzer>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
index 4b39ba4e21e..d67d109b54f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-not-indexed-but-norms" version="1.0">
+<schema name="bad-schema-not-indexed-but-norms" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
index 476a0b0a2c4..9d80848f272 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-not-indexed-but-pos" version="1.0">
+<schema name="bad-schema-not-indexed-but-pos" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
index 3c56a57bb0d..f87243d7859 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-not-indexed-but-tf" version="1.0">
+<schema name="bad-schema-not-indexed-but-tf" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-uninvertible.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-uninvertible.xml
index 8f814dfe19e..2342f6e59c7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-uninvertible.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-uninvertible.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-not-indexed-but-uninvertible" version="1.6">
+<schema name="bad-schema-not-indexed-but-uninvertible" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
index 827879e25df..8c5ac4a4071 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-omit-tf-but-not-pos" version="1.0">
+<schema name="bad-schema-omit-tf-but-not-pos" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml
index eeb0242541f..90abd7e70d8 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-sim-global-vs-ft-mismatch" version="1.0">
+<schema name="bad-schema-sim-global-vs-ft-mismatch" version="1.7">
<similarity class="solr.SchemaSimilarityFactory" >
<!-- BROKEN: the named fieldType does not exist -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml
index fef7f1f296b..0396fcc7cd0 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-sim-global-vs-ft-mismatch" version="1.0">
+<schema name="bad-schema-sim-global-vs-ft-mismatch" version="1.7">
<similarity class="solr.SchemaSimilarityFactory" >
<!-- BROKEN: the named fieldType does not have an explicit sim defined, circular default -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
index c8406ea33bd..888576c7a49 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-sim-global-vs-ft-mismatch" version="1.0">
+<schema name="bad-schema-sim-global-vs-ft-mismatch" version="1.7">
<similarity class="solr.BM25SimilarityFactory"/> <!-- global sim -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
index 64a41baa7a5..a992c4dae80 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-sweetspot-both-tf" version="1.0">
+<schema name="bad-schema-sweetspot-both-tf" version="1.7">
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
index 6605a51b5f8..2b721a840a0 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-sweetspot-partial-baseline" version="1.0">
+<schema name="bad-schema-sweetspot-partial-baseline" version="1.7">
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
index e1ced325247..12cd2804698 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-sweetspot-partial-hyperbolic" version="1.0">
+<schema name="bad-schema-sweetspot-partial-hyperbolic" version="1.7">
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
index eae48aa43ca..be0f5cf9f43 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-sweetspot-partial-norms" version="1.0">
+<schema name="bad-schema-sweetspot-partial-norms" version="1.7">
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-diff-type-dynamic-root.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-diff-type-dynamic-root.xml
index 4f06bd1270c..110994dcfdf 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-diff-type-dynamic-root.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-diff-type-dynamic-root.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-uniquekey-diff-type-dynamic-root" version="1.4">
+<schema name="bad-schema-uniquekey-diff-type-dynamic-root" version="1.7">
<!-- NOTE: these fieldTypes are defined with same class, and same props, but schema should
still error because the type *names* used not identical.
this is risky, because it means the types could diverge over time, and we wnat to
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-diff-type-root.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-diff-type-root.xml
index 377762d0443..2187a3ff8c6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-diff-type-root.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-diff-type-root.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-uniquekey-diff-type-root" version="1.4">
+<schema name="bad-schema-uniquekey-diff-type-root" version="1.7">
<!-- NOTE: these fieldTypes are defined with same class, and same props, but schema should
still error because the type *names* used not identical.
this is risky, because it means the types could diverge over time, and we wnat to
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
index 19db42d5554..ff433dc50e5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-uniquekey-is-copyfield-dest" version="1.4">
+<schema name="bad-schema-uniquekey-is-copyfield-dest" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
index a1c384f8e0f..a193fa8f9bb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-uniquekey-multivalued" version="1.4">
+<schema name="bad-schema-uniquekey-multivalued" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<!-- BEGIN BAD STUFF: multiValued inherited from field type -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
index 2c7583abf81..ede13af9cbf 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-uniquekey-uses-default" version="1.4">
+<schema name="bad-schema-uniquekey-uses-default" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<!-- BEGIN BAD STUFF -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-points.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-points.xml
index ac4fd9c4a2d..ff05ab530fc 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-points.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-points.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-uniquekey-uses-points" version="1.4">
+<schema name="bad-schema-uniquekey-uses-points" version="1.7">
<fieldType name="bad" class="solr.IntPointField"/>
<!-- BEGIN BAD STUFF -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml
index 903531cb3d6..33d4a733f40 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-docValues-unsupported" version="1.6">
+<schema name="bad-schema-docValues-unsupported" version="1.7">
<fieldType name="random" class="solr.RandomSortField" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
index 6ea70f30e15..8c2829421b9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
@@ -21,7 +21,7 @@
Test for HighlighterMaxOffsetTest which requires the use of ReversedWildcardFilterFactory
-->
-<schema name="example" version="1.6">
+<schema name="example" version="1.7">
<field name="id" type="string" indexed="true" stored="true" required="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-SimpleTextCodec.xml b/solr/core/src/test-files/solr/collection1/conf/schema-SimpleTextCodec.xml
index 528de731e3f..6d004040ba9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-SimpleTextCodec.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-SimpleTextCodec.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="SimpleTextCodec" version="1.6">
+<schema name="SimpleTextCodec" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<fieldType name="text_general" class="solr.TextField" positionIncrementGap="100">
@@ -25,7 +25,7 @@
</analyzer>
</fieldType>
- <field name="id" type="string" indexed="true" stored="true" docValues="true" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" required="true"/>
<field name="text" type="text_general" indexed="true" stored="true"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml b/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
index 654628738d8..4abe31eb02d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="add-schema-fields-update-processor" version="1.6">
+<schema name="add-schema-fields-update-processor" version="1.7">
<fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
<fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
@@ -33,22 +33,22 @@
</analyzer>
</fieldType>
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
- <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
- <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
- <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
- <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
- <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
- <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="pfloat" class="solr.FloatPointField"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
+ <fieldType name="pints" class="solr.IntPointField" multiValued="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" multiValued="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" multiValued="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" multiValued="true"/>
+ <fieldType name="pdate" class="solr.DatePointField"/>
+ <fieldType name="pdates" class="solr.DatePointField" multiValued="true"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="_version_" type="long" indexed="true" stored="true"/>
<field name="_root_" type="string" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_str" type="string" stored="false" multiValued="true" docValues="true" useDocValuesAsStored="false"/>
+ <dynamicField name="*_str" type="string" stored="false" multiValued="true" useDocValuesAsStored="false"/>
<dynamicField name="*_t" type="text" indexed="true" stored="true"/>
<dynamicField name="*_ti" type="tint" indexed="true" stored="true"/>
<dynamicField name="*_tl" type="tlong" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-analyzer-by-name.xml b/solr/core/src/test-files/solr/collection1/conf/schema-analyzer-by-name.xml
index b5704253a00..0ac416b4ce7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-analyzer-by-name.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-analyzer-by-name.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<!--
Resolve analysis factories by name. See: SOLR-13593
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml b/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
index 663de185faa..c459fcba42c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
@@ -26,7 +26,7 @@
<fieldType name="text" class="solr.TextField"/>
<fieldType name="bool" class="solr.BoolField"/>
<fieldType name="str" class="solr.StrField"/>
- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}"/>
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}"/>
<!-- explicit props on type -->
<fieldType name="multi_f" class="solr.StrField" multiValued="false"/>
@@ -52,6 +52,9 @@
<fieldType name="str_uninvert_f" class="solr.StrField" uninvertible="false"/>
<fieldType name="str_uninvert_t" class="solr.StrField" uninvertible="true"/>
+
+ <fieldType name="str_dv_f" class="solr.StrField" docValues="false"/>
+ <fieldType name="str_dv_t" class="solr.StrField" docValues="true"/>
<!-- all behavior is default -->
@@ -106,6 +109,11 @@
<dynamicField name="*_dyn_ft_uninvert_t" type="str_uninvert_t"/>
<dynamicField name="*_dyn_ft_uninvert_f" type="str_uninvert_f"/>
+ <field name="ft_dv_t" type="str_dv_t"/>
+ <field name="ft_dv_f" type="str_dv_f"/>
+ <dynamicField name="*_dyn_ft_dv_t" type="str_dv_t"/>
+ <dynamicField name="*_dyn_ft_dv_f" type="str_dv_f"/>
+
<!-- explicit props on field -->
<field name="multi_f" type="str" multiValued="false"/>
<field name="multi_t" type="str" multiValued="true"/>
@@ -136,10 +144,15 @@
<field name="intdvas_f" type="int" useDocValuesAsStored="false"/>
<dynamicField name="*_dyn_intdvas_t" type="int" useDocValuesAsStored="true"/>
<dynamicField name="*_dyn_intdvas_f" type="int" useDocValuesAsStored="false"/>
-
+
<field name="uninvert_t" type="str" uninvertible="true"/>
<field name="uninvert_f" type="str" uninvertible="false"/>
<dynamicField name="*_dyn_uninvert_t" type="str" uninvertible="true"/>
<dynamicField name="*_dyn_uninvert_f" type="str" uninvertible="false"/>
+ <field name="dv_t" type="str" docValues="true"/>
+ <field name="dv_f" type="str" docValues="false"/>
+ <dynamicField name="*_dyn_dv_t" type="str" docValues="true"/>
+ <dynamicField name="*_dyn_dv_f" type="str" docValues="false"/>
+
</schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml b/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
index faee854ca97..7d5b3f09051 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.2">
+<schema name="test" version="1.7">
<fieldType name="binary" class="solr.BinaryField"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
@@ -33,7 +33,7 @@
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="data" type="binary" stored="true"/>
- <field name="data_dv" type="binary" stored="false" docValues="true" />
+ <field name="data_dv" type="binary" stored="false" />
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml b/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
index a9c2a6a1ecb..4e55c54815f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for BM25SimilarityFactory -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-booleansimilarity.xml b/solr/core/src/test-files/solr/collection1/conf/schema-booleansimilarity.xml
index 3f7a2c18b27..75e3010d8eb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-booleansimilarity.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-booleansimilarity.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for BooleanSimilarityFactory -->
-<schema name="booleansimilarity" version="1.0">
+<schema name="booleansimilarity" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="text" class="solr.TextField">
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml b/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
index 1adb7aaf7e8..130acd27c6f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- charfilter only at query-time -->
<fieldType name="text" class="solr.TextField">
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml b/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
index 55f12136a66..cd0aad67b63 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="test-class-name-shortening-on-serialization" version="1.6">
+<schema name="test-class-name-shortening-on-serialization" version="1.7">
<fieldType name="fullClassNames" class="org.apache.solr.schema.TextField">
<analyzer>
<charFilter class="org.apache.solr.analysis.MockCharFilterFactory" remainder="0"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-classification.xml b/solr/core/src/test-files/solr/collection1/conf/schema-classification.xml
index 89c27a6766a..2fdfcde02a8 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-classification.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-classification.xml
@@ -18,8 +18,8 @@
<!--
Test Schema for a simple Classification Test
-->
-<schema name="classification" version="1.1">
- <fieldType name="string" class="solr.StrField"/>
+<schema name="classification" version="1.7">
+ <fieldType name="string" class="solr.StrField" docValues="false"/>
<fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.StandardTokenizerFactory"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml b/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
index 0a2953d590c..d388af92a19 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for CollationField -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
@@ -39,13 +39,13 @@
<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="false" stored="false" multiValued="false" docValues="true"/>
- <field name="sort_de" type="sort_de_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
+ <field name="sort_ar" type="sort_ar_t" indexed="false" stored="false" multiValued="false"/>
+ <field name="sort_de" type="sort_de_t" indexed="false" stored="false" multiValued="false"/>
<field name="sort_tr_canon" type="sort_tr_canon_t" indexed="false" stored="false" multiValued="true"
- docValues="true"/>
- <field name="sort_zh_full" type="sort_zh_full_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
- <field name="sort_da" type="sort_da_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
- <field name="sort_custom" type="sort_custom_t" indexed="false" stored="false" multiValued="true" docValues="true"/>
+ />
+ <field name="sort_zh_full" type="sort_zh_full_t" indexed="false" stored="false" multiValued="false"/>
+ <field name="sort_da" type="sort_da_t" indexed="false" stored="false" multiValued="false"/>
+ <field name="sort_custom" type="sort_custom_t" indexed="false" stored="false" multiValued="true"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml b/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
index bfe65b157e1..c9587d75f7d 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
@@ -18,7 +18,7 @@
<!-- Test schema file for CollationField -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
@@ -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"/>
- <field name="sort_de" type="sort_de_t" indexed="true" stored="false" multiValued="false"/>
- <field name="sort_tr_canon" type="sort_tr_canon_t" indexed="true" stored="false" multiValued="false"/>
- <field name="sort_zh_full" type="sort_zh_full_t" indexed="true" stored="false" multiValued="false"/>
- <field name="sort_da" type="sort_da_t" indexed="true" stored="false" multiValued="false"/>
- <field name="sort_custom" type="sort_custom_t" indexed="true" stored="false" multiValued="false"/>
+ <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"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
index 20dc97adb19..703b4d93b7c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
@@ -62,7 +62,7 @@
<!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldType name="highlittext" class="solr.TextField" compressThreshold="345"/>
+ <fieldType name="highlittext" class="solr.TextField"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
index c8e89a127a0..db038b62787 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test-custom-field-sort" version="1.6">
+<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="string" class="solr.StrField" sortMissingLast="true"/>
@@ -31,7 +31,7 @@
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="payload" type="sortable_binary" indexed="false"
- stored="true" multiValued="false" docValues="true" required="true"/>
+ stored="true" multiValued="false" required="true"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
<!-- int varient of id, adding this here simplifies some indexing to do numeric sorting -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
index 44cea6351b7..2b1f719c6dc 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.2">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-densevector-codec-hyperparameter.xml b/solr/core/src/test-files/solr/collection1/conf/schema-densevector-codec-hyperparameter.xml
index 74034c93d17..2f35ebfc5e6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-densevector-codec-hyperparameter.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-densevector-codec-hyperparameter.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DenseVectorField -->
-<schema name="schema-densevector-codec-hyperparameter" version="1.0">
+<schema name="schema-densevector-codec-hyperparameter" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="knn_vector_default" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine"/>
<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine" knnAlgorithm="hnsw" hnswMaxConnections="10" hnswBeamWidth="40"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-densevector-high-dimensionality.xml b/solr/core/src/test-files/solr/collection1/conf/schema-densevector-high-dimensionality.xml
index aff9f94f20e..3d98b6631e2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-densevector-high-dimensionality.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-densevector-high-dimensionality.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DenseVectorField -->
-<schema name="schema-densevector" version="1.0">
+<schema name="schema-densevector" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="2048" similarityFunction="cosine" />
<fieldType name="plong" class="solr.LongPointField" useDocValuesAsStored="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-densevector-similarity-null.xml b/solr/core/src/test-files/solr/collection1/conf/schema-densevector-similarity-null.xml
index 44850ddd2bb..6c88efd01d0 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-densevector-similarity-null.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-densevector-similarity-null.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DenseVectorField -->
-<schema name="schema-densevector-similarity-null" version="1.0">
+<schema name="schema-densevector-similarity-null" version="1.7">
<fieldType name="string" class="solr.StrField" multiValued="true"/>
<fieldType name="knn_vector" class="solr.DenseVectorField" vectorDimension="4"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-deprecations.xml b/solr/core/src/test-files/solr/collection1/conf/schema-deprecations.xml
index 95747544220..bf726cbf72b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-deprecations.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-deprecations.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<schema name="schema-deprecations" version="1.6">
+<schema name="schema-deprecations" version="1.7">
<types>
<fieldType name="lowertok" class="solr.TextField">
@@ -29,7 +29,7 @@
<fields>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
- <field name="_version_" type="long" indexed="false" stored="false" docValues="true"/>
+ <field name="_version_" type="long" indexed="false" stored="false"/>
<field name="lowertext" type="lowertok" indexed="true"/>
</fields>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
index 184f142ac52..662e320121d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DFISimilarityFactory -->
-<schema name="dfi" version="1.5">
+<schema name="dfi" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
index 78c3b7ff958..2e1f4147f2b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for DFRSimilarityFactory -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
index 7be9b80300e..ec3499365fe 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<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"/>
@@ -26,28 +26,28 @@
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
<field name="id" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="true"/>
- <field name="id_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="false"
+ <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_dv" type="int" indexed="false" stored="false" docValues="true"/>
+ <dynamicField name="*_i_dv" type="int" indexed="false" stored="false"/>
<dynamicField name="*_is" type="int" indexed="true" stored="false" docValues="false" multiValued="true"/>
- <dynamicField name="*_is_dv" type="int" indexed="false" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_is_dv" type="int" indexed="false" stored="false" multiValued="true"/>
<dynamicField name="*_s" type="string" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_s_dv" type="string" indexed="false" stored="false" docValues="true"/>
+ <dynamicField name="*_s_dv" type="string" indexed="false" stored="false"/>
<dynamicField name="*_ss" type="string" indexed="true" stored="false" docValues="false" multiValued="true"/>
- <dynamicField name="*_ss_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_ss_dv" type="string" indexed="false" stored="false" multiValued="true"/>
<dynamicField name="*_f" type="float" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_f_dv" type="float" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_fs_dv" type="float" indexed="true" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_f_dv" type="float" indexed="true" stored="false"/>
+ <dynamicField name="*_fs_dv" type="float" indexed="true" stored="false" multiValued="true"/>
<dynamicField name="*_l" type="long" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_l_dv" type="long" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_ls_dv" type="long" indexed="true" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_l_dv" type="long" indexed="true" stored="false"/>
+ <dynamicField name="*_ls_dv" type="long" indexed="true" stored="false" multiValued="true"/>
<dynamicField name="*_d" type="double" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_d_dv" type="double" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_ds_dv" type="double" indexed="true" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_d_dv" type="double" indexed="true" stored="false"/>
+ <dynamicField name="*_ds_dv" type="double" indexed="true" stored="false" multiValued="true"/>
<dynamicField name="*_dt" type="date" indexed="true" stored="false" docValues="false"/>
- <dynamicField name="*_dt_dv" type="date" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_dts_dv" type="date" indexed="true" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_dt_dv" type="date" indexed="true" stored="false"/>
+ <dynamicField name="*_dts_dv" type="date" indexed="true" stored="false" multiValued="true"/>
<dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
<dynamicField name="*_ti1" type="int" indexed="true" stored="true" multiValued="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
index 21874498e20..84d628f7da5 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test-distributed-missing-sort" version="1.6">
+<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"/>
@@ -70,13 +70,13 @@
<dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
<dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
+ <dynamicField name="*_b" type="boolean" indexed="true" stored="true" docValues="false"/>
- <dynamicField name="*_s1_ml" type="string_ml" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_s1_mf" type="string_mf" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_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="*_mfacet" type="string_ml" indexed="true" stored="false" multiValued="true"/>
- <dynamicField name="*_sS" type="string_ml" indexed="false" stored="true"/>
+ <dynamicField name="*_mfacet" type="string_ml" indexed="true" stored="false" multiValued="true" docValues="false"/>
+ <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 -->
<field name="id_i" type="int" indexed="true" stored="true" multiValued="false" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
index 4a5ab17843e..ddb42f36e8f 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
@@ -25,7 +25,7 @@
-->
-<schema name="schema-docValues" version="1.6">
+<schema name="schema-docValues" version="1.7">
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
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.xml
index a18f230d3ce..8db18dc2996 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.6">
+<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"/>
@@ -31,42 +31,42 @@
<fieldType name="pdate" class="solr.DatePointField"/>
<field name="id" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="true"/>
- <field name="id_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="false"
+ <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_dv" type="int" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_i_p" type="pint" indexed="true" 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_dv" type="int" indexed="false" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_is_p" type="pint" indexed="true" stored="false" docValues="true" multiValued="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_dv" type="string" indexed="false" stored="false" docValues="true"/>
<dynamicField name="*_ss" type="string" indexed="true" stored="false" docValues="false" multiValued="true"/>
<dynamicField name="*_ss_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="true"/>
<dynamicField name="*_f" type="float" indexed="true" stored="false" docValues="${solr.tests.numeric.dv}"/>
<dynamicField name="*_f_dv" type="float" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_f_p" type="pfloat" 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_dv" type="float" indexed="true" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_fs_p" type="pfloat" 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_dv" type="long" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_l_p" type="plong" 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_dv" type="long" indexed="true" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_ls_p" type="plong" 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_dv" type="double" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_d_p" type="pdouble" 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_dv" type="double" indexed="true" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_ds_p" type="pdouble" 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_dv" type="date" indexed="true" stored="false" docValues="true"/>
- <dynamicField name="*_dt_p" type="pdate" 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_dv" type="date" indexed="true" stored="false" docValues="true" multiValued="true"/>
- <dynamicField name="*_dts_p" type="pdate" indexed="true" stored="false" docValues="true" multiValued="true"/>
+ <dynamicField name="*_dts_p" type="pdate" indexed="true" stored="false" multiValued="true"/>
<uniqueKey>id</uniqueKey>
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.xml
index 844a472f091..646956e43a6 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="doc-values-for-Join" version="1.6">
+<schema name="doc-values-for-Join" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="x.y" is Solr's version number for the schema syntax and semantics. It should
@@ -28,6 +28,7 @@
1.4: default auto-phrase (QueryParser feature) to off
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.
-->
<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,7 +66,7 @@
</fieldType>
<field name="id" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="true"/>
- <field name="id_dv" type="string" indexed="false" stored="false" docValues="true" multiValued="false"
+ <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_dv" type="int" indexed="true" stored="true" docValues="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
index d80a426d23c..7571a840de3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
@@ -18,97 +18,97 @@
<!-- schema file for testing sorting/faceting/functions on single-valued DV with missing values -->
-<schema name="schema-docValuesMissing" version="1.6">
- <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"/>
+<schema name="schema-docValuesMissing" version="1.7">
+ <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}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField"/>
<fieldType name="boolean" class="solr.BoolField"/>
<field name="id" type="string" required="true"/>
- <field name="floatdv" type="float" indexed="false" stored="false" docValues="true"/>
- <field name="floatdv_missingfirst" type="float" indexed="false" stored="false" docValues="true"
+ <field name="floatdv" type="float" indexed="false" stored="false"/>
+ <field name="floatdv_missingfirst" type="float" indexed="false" stored="false"
sortMissingFirst="true"/>
- <field name="floatdv_missinglast" type="float" indexed="false" stored="false" docValues="true"
+ <field name="floatdv_missinglast" type="float" indexed="false" stored="false"
sortMissingLast="true"/>
- <field name="intdv" type="int" indexed="false" stored="false" docValues="true"/>
- <field name="intdv_missingfirst" type="int" indexed="false" stored="false" docValues="true" sortMissingFirst="true"/>
- <field name="intdv_missinglast" type="int" indexed="false" stored="false" docValues="true" sortMissingLast="true"/>
+ <field name="intdv" type="int" indexed="false" stored="false"/>
+ <field name="intdv_missingfirst" type="int" indexed="false" stored="false" sortMissingFirst="true"/>
+ <field name="intdv_missinglast" type="int" indexed="false" stored="false" sortMissingLast="true"/>
- <field name="doubledv" type="double" indexed="false" stored="false" docValues="true"/>
- <field name="doubledv_missingfirst" type="double" indexed="false" stored="false" docValues="true"
+ <field name="doubledv" type="double" indexed="false" stored="false"/>
+ <field name="doubledv_missingfirst" type="double" indexed="false" stored="false"
sortMissingFirst="true"/>
- <field name="doubledv_missinglast" type="double" indexed="false" stored="false" docValues="true"
+ <field name="doubledv_missinglast" type="double" indexed="false" stored="false"
sortMissingLast="true"/>
- <field name="longdv" type="long" indexed="false" stored="false" docValues="true"/>
- <field name="longdv_missingfirst" type="long" indexed="false" stored="false" docValues="true"
+ <field name="longdv" type="long" indexed="false" stored="false"/>
+ <field name="longdv_missingfirst" type="long" indexed="false" stored="false"
sortMissingFirst="true"/>
- <field name="longdv_missinglast" type="long" indexed="false" stored="false" docValues="true" sortMissingLast="true"/>
+ <field name="longdv_missinglast" type="long" indexed="false" stored="false" sortMissingLast="true"/>
- <field name="datedv" type="date" indexed="false" stored="false" docValues="true"/>
- <field name="datedv_missingfirst" type="date" indexed="false" stored="false" docValues="true"
+ <field name="datedv" type="date" indexed="false" stored="false"/>
+ <field name="datedv_missingfirst" type="date" indexed="false" stored="false"
sortMissingFirst="true"/>
- <field name="datedv_missinglast" type="date" indexed="false" stored="false" docValues="true" sortMissingLast="true"/>
+ <field name="datedv_missinglast" type="date" indexed="false" stored="false" sortMissingLast="true"/>
- <field name="stringdv" type="string" indexed="false" stored="false" docValues="true"/>
- <field name="stringdv_missingfirst" type="string" indexed="false" stored="false" docValues="true"
+ <field name="stringdv" type="string" indexed="false" stored="false"/>
+ <field name="stringdv_missingfirst" type="string" indexed="false" stored="false"
sortMissingFirst="true"/>
- <field name="stringdv_missinglast" type="string" indexed="false" stored="false" docValues="true"
+ <field name="stringdv_missinglast" type="string" indexed="false" stored="false"
sortMissingLast="true"/>
- <field name="booldv" type="boolean" indexed="false" stored="false" docValues="true"/>
- <field name="booldv_missingfirst" type="boolean" indexed="false" stored="false" docValues="true"
+ <field name="booldv" type="boolean" indexed="false" stored="false"/>
+ <field name="booldv_missingfirst" type="boolean" indexed="false" stored="false"
sortMissingFirst="true"/>
- <field name="booldv_missinglast" type="boolean" indexed="false" stored="false" docValues="true"
+ <field name="booldv_missinglast" type="boolean" indexed="false" stored="false"
sortMissingLast="true"/>
- <dynamicField name="*_floatdv" type="float" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_floatdv_missingfirst" type="float" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_floatdv" type="float" indexed="false" stored="false"/>
+ <dynamicField name="*_floatdv_missingfirst" type="float" indexed="false" stored="false"
sortMissingFirst="true"/>
- <dynamicField name="*_floatdv_missinglast" type="float" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_floatdv_missinglast" type="float" indexed="false" stored="false"
sortMissingLast="true"/>
- <dynamicField name="*_intdv" type="int" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_intdv_missingfirst" type="int" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_intdv" type="int" indexed="false" stored="false"/>
+ <dynamicField name="*_intdv_missingfirst" type="int" indexed="false" stored="false"
sortMissingFirst="true"/>
- <dynamicField name="*_intdv_missinglast" type="int" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_intdv_missinglast" type="int" indexed="false" stored="false"
sortMissingLast="true"/>
- <dynamicField name="*_doubledv" type="double" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_doubledv_missingfirst" type="double" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_doubledv" type="double" indexed="false" stored="false"/>
+ <dynamicField name="*_doubledv_missingfirst" type="double" indexed="false" stored="false"
sortMissingFirst="true"/>
- <dynamicField name="*_doubledv_missinglast" type="double" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_doubledv_missinglast" type="double" indexed="false" stored="false"
sortMissingLast="true"/>
- <dynamicField name="*_longdv" type="long" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_longdv_missingfirst" type="long" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_longdv" type="long" indexed="false" stored="false"/>
+ <dynamicField name="*_longdv_missingfirst" type="long" indexed="false" stored="false"
sortMissingFirst="true"/>
- <dynamicField name="*_longdv_missinglast" type="long" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_longdv_missinglast" type="long" indexed="false" stored="false"
sortMissingLast="true"/>
- <dynamicField name="*_datedv" type="date" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_datedv_missingfirst" type="date" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_datedv" type="date" indexed="false" stored="false"/>
+ <dynamicField name="*_datedv_missingfirst" type="date" indexed="false" stored="false"
sortMissingFirst="true"/>
- <dynamicField name="*_datedv_missinglast" type="date" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_datedv_missinglast" type="date" indexed="false" stored="false"
sortMissingLast="true"/>
- <dynamicField name="*_stringdv" type="string" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_stringdv_missingfirst" type="string" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_stringdv" type="string" indexed="false" stored="false"/>
+ <dynamicField name="*_stringdv_missingfirst" type="string" indexed="false" stored="false"
sortMissingFirst="true"/>
- <dynamicField name="*_stringdv_missinglast" type="string" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_stringdv_missinglast" type="string" indexed="false" stored="false"
sortMissingLast="true"/>
- <dynamicField name="*_booldv" type="boolean" indexed="false" stored="false" docValues="true"/>
- <dynamicField name="*_booldv_missingfirst" type="boolean" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_booldv" type="boolean" indexed="false" stored="false"/>
+ <dynamicField name="*_booldv_missingfirst" type="boolean" indexed="false" stored="false"
sortMissingFirst="true"/>
- <dynamicField name="*_booldv_missinglast" type="boolean" indexed="false" stored="false" docValues="true"
+ <dynamicField name="*_booldv_missinglast" type="boolean" indexed="false" stored="false"
sortMissingLast="true"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml
index eb841890e16..71d0bcc7420 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml
@@ -16,16 +16,16 @@
limitations under the License.
-->
-<schema name="schema-docValuesMulti" version="1.6">
+<schema name="schema-docValuesMulti" 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="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}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="boolean" class="solr.BoolField"/>
<fieldType name="string" class="solr.StrField"/>
@@ -35,14 +35,14 @@
<field name="id" type="string" required="true"/>
- <field name="floatdv" type="float" indexed="false" stored="false" docValues="true" multiValued="true"/>
- <field name="intdv" type="int" indexed="false" stored="false" docValues="true" multiValued="true"/>
- <field name="doubledv" type="double" indexed="false" stored="false" docValues="true" multiValued="true"/>
- <field name="longdv" type="long" indexed="false" stored="false" docValues="true" multiValued="true"/>
- <field name="datedv" type="date" indexed="false" stored="false" docValues="true" multiValued="true"/>
+ <field name="floatdv" type="float" indexed="false" stored="false" multiValued="true"/>
+ <field name="intdv" type="int" indexed="false" stored="false" multiValued="true"/>
+ <field name="doubledv" type="double" indexed="false" stored="false" multiValued="true"/>
+ <field name="longdv" type="long" indexed="false" stored="false" multiValued="true"/>
+ <field name="datedv" type="date" indexed="false" stored="false" multiValued="true"/>
- <field name="stringdv" type="string" indexed="false" stored="false" docValues="true" multiValued="true"/>
- <field name="booldv" type="boolean" indexed="false" stored="false" docValues="true" multiValued="true"/>
+ <field name="stringdv" type="string" indexed="false" stored="false" multiValued="true"/>
+ <field name="booldv" type="boolean" indexed="false" stored="false" multiValued="true"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml b/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml
index d68a3da9021..208c011c8fc 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<schema name="example" version="1.6">
+<schema name="example" version="1.7">
<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml b/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml
index 2443da4e125..40a6b4441ae 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="tiny" version="1.1">
+<schema name="tiny" version="1.7">
<field name="id" type="string" indexed="true" stored="true" required="true"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
index e6428af2eaa..c427320706e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test-custom-comparator" version="1.6">
+<schema name="test-custom-comparator" version="1.7">
<fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<fieldType name="text" class="solr.TextField">
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml b/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml
index 0b13a570c10..54fc2cc98f9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true" multiValued="false"/>
<fieldType name="text" class="solr.TextField" multiValued="false">
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
index e5dbd74fe51..67906be1cdb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<!-- field type definitions... note that the "name" attribute is
@@ -40,9 +40,9 @@
to create a schema that matches an existing lucene index.
-->
- <fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" 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}" precisionStep="0" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+ <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="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
@@ -112,7 +112,7 @@
<fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml b/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
index 7e66bb526bf..7ca1d12a69a 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for IBSimilarityFactory -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
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.xml
index be38c04741a..a98b16a6b84 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="id-and-version-fields-only" version="1.6">
+<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="string" class="solr.StrField" sortMissingLast="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-inplace-required-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-inplace-required-field.xml
index 6782cb55a82..2892e5eb39f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-inplace-required-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-inplace-required-field.xml
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="inplace-updates" version="1.6">
+<schema name="inplace-updates" version="1.7">
<uniqueKey>id</uniqueKey>
<field name="id" type="string" indexed="true" stored="true" docValues="true"/>
- <field name="_version_" type="long" indexed="false" stored="false" docValues="true" />
+ <field name="_version_" type="long" indexed="false" stored="false" docValues="true" />
<field name="name" type="string" indexed="true" stored="true" required="true"/>
<field name="inplace_updatable_int" type="int" indexed="false" stored="false" docValues="true" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-inplace-updates.xml b/solr/core/src/test-files/solr/collection1/conf/schema-inplace-updates.xml
index df9b2379fd4..5972c333481 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-inplace-updates.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-inplace-updates.xml
@@ -15,8 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="inplace-updates" version="1.6">
-
+<schema name="inplace-updates" version="1.7">
+
<uniqueKey>id</uniqueKey>
<field name="id" type="string" indexed="true" stored="true" docValues="true"/>
<field name="_root_" type="string" indexed="true" stored="true" docValues="true"/>
@@ -41,12 +41,12 @@
<dynamicField name="*_s" type="string" indexed="true" stored="true"/>
<dynamicField name="*_i" type="int" indexed="true" stored="true" docValues="true"/>
<dynamicField name="*_l" type="long" indexed="true" stored="true" docValues="true"/>
-
+
<!-- Copy fields -->
-
+
<!-- The id field has a non in-place updatable copy target, but in-place updates should still work. -->
<copyField source="id" dest="id_field_copy_that_does_not_support_in_place_update_s"/>
-
+
<!-- copyfield1: src and dest are both updatable -->
<field name="copyfield1_src__both_updatable" type="int" indexed="false" stored="false" docValues="true" />
<copyField source="copyfield1_src__both_updatable" dest="copyfield1_dest__both_updatable_i_dvo"/>
@@ -54,12 +54,12 @@
<!-- copyfield2: src is updatable but dest is not -->
<field name="copyfield2_src__only_src_updatable" type="int" indexed="false" stored="false" docValues="true" />
<copyField source="copyfield2_src__only_src_updatable" dest="copyfield2_dest__only_src_updatable_i"/>
-
+
<!-- cruft needed by the solrconfig used in our tests for startup, but not used in the tests -->
<field name="signatureField" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="true" stored="true"/>
-
+
<fieldType name="string" class="solr.StrField" multiValued="false" indexed="false" stored="false" docValues="false" />
<fieldType name="long" class="${solr.tests.LongFieldType}" multiValued="false" indexed="false" stored="false" docValues="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml b/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
index 3c250988054..2d0e98e108f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for LMDirichletSimilarityFactory -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
index a90fd6552fd..4a637b72309 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for LMJelinekMercerSimilarityFactory -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml b/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
index 832aa504988..70a0c51070b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="luceneMatchVersionTest" version="1.1">
+<schema name="luceneMatchVersionTest" version="1.7">
<fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}"/>
<fieldType name="string" class="solr.StrField"/>
<fieldType name="text40" class="solr.TextField">
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-minhash.xml b/solr/core/src/test-files/solr/collection1/conf/schema-minhash.xml
index 9465e83dfe4..fc1a9c6d2a7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-minhash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-minhash.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<!-- field type definitions... note that the "name" attribute is
@@ -40,9 +40,9 @@
to create a schema that matches an existing lucene index.
-->
- <fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" 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}" precisionStep="0" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+ <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="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
@@ -112,7 +112,7 @@
<fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-minimal-atomic-stress.xml b/solr/core/src/test-files/solr/collection1/conf/schema-minimal-atomic-stress.xml
index 39f0d581060..0e6f16dc14d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-minimal-atomic-stress.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-minimal-atomic-stress.xml
@@ -15,20 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal-atomic-stress" version="1.6">
+<schema name="minimal-atomic-stress" version="1.7">
<!-- minimal fields needed to stress test atomic updates
See: TestStressCloudBlindAtomicUpdates
-->
<uniqueKey>id</uniqueKey>
<field name="id" type="string" indexed="true" stored="true" docValues="true"/>
- <field name="_version_" type="long" indexed="false" stored="false" docValues="true" />
+ <field name="_version_" type="long" indexed="false" stored="false" docValues="true" />
<!-- atomic updates should work on all of these permutations -->
- <field name="long_dv" type="long" indexed="false" stored="false" docValues="true" />
- <field name="long_dv_stored" type="long" indexed="false" stored="true" docValues="true" />
- <field name="long_dv_stored_idx" type="long" indexed="true" stored="true" docValues="true" />
- <field name="long_dv_idx" type="long" indexed="true" stored="false" docValues="true" />
- <field name="long_stored_idx" type="long" indexed="true" stored="true" docValues="false" />
+ <field name="long_dv" type="long" indexed="false" stored="false" docValues="true" />
+ <field name="long_dv_stored" type="long" indexed="false" stored="true" docValues="true" />
+ <field name="long_dv_stored_idx" type="long" indexed="true" stored="true" docValues="true" />
+ <field name="long_dv_idx" type="long" indexed="true" stored="false" docValues="true" />
+ <field name="long_stored_idx" type="long" indexed="true" stored="true" docValues="false" />
<fieldType name="string" class="solr.StrField" multiValued="false" indexed="false" stored="false" docValues="false" />
<fieldType name="long" class="${solr.tests.LongFieldType}" multiValued="false" indexed="false" stored="false" docValues="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-minimal-with-another-uniqkey.xml b/solr/core/src/test-files/solr/collection1/conf/schema-minimal-with-another-uniqkey.xml
index 2087a1daae0..e44c77f43b3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-minimal-with-another-uniqkey.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-minimal-with-another-uniqkey.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="schema-minimal-with-another-uniqkey" version="1.1">
+<schema name="schema-minimal-with-another-uniqkey" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<uniqueKey>notid</uniqueKey>
<field name="notid" type="string" indexed="true" stored="true" docValues="false" multiValued="false" required="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.xml
index c7ebb36487c..92989ce2b64 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test-multi-word-synonyms" version="1.6">
+<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"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-nest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-nest.xml
index 537009a0431..86775a6c61c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-nest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-nest.xml
@@ -17,15 +17,15 @@
-->
-<schema name="nested-docs" version="1.6">
+<schema name="nested-docs" version="1.7">
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
- <field name="id_i" type="int" indexed="true" multiValued="false" docValues="true" stored="false" useDocValuesAsStored="false" />
+ <field name="id_i" type="int" indexed="true" multiValued="false" stored="false" useDocValuesAsStored="false" />
<!-- copy id field as int -->
<copyField source="id" dest="id_i"/>
<!-- for versioning -->
- <field name="_version_" type="long" indexed="false" stored="false" docValues="true"/>
+ <field name="_version_" type="long" indexed="false" stored="false"/>
<!-- points to the root document of a block of nested documents -->
<field name="_root_" type="string" indexed="true" stored="false"/>
@@ -37,25 +37,25 @@
<dynamicField name="*_ss" type="string" indexed="true" stored="true" multiValued="true"/>
<!-- required to test updates nested inplaceUpdates -->
- <field name="inplace_updatable_int" type="int" indexed="false" stored="false" docValues="true"/>
+ <field name="inplace_updatable_int" type="int" indexed="false" stored="false"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<fieldType name="_nest_path_" class="solr.NestPathField" />
<!-- Point Fields -->
- <fieldType name="int" class="solr.IntPointField" docValues="true"/>
- <fieldType name="long" class="solr.LongPointField" docValues="true"/>
- <fieldType name="double" class="solr.DoublePointField" docValues="true"/>
- <fieldType name="float" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="date" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="int" class="solr.IntPointField"/>
+ <fieldType name="long" class="solr.LongPointField"/>
+ <fieldType name="double" class="solr.DoublePointField"/>
+ <fieldType name="float" class="solr.FloatPointField"/>
+ <fieldType name="date" class="solr.DatePointField"/>
<!-- Fields required for SignatureUpdateProcessor -->
<field name="signatureField" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="true" stored="true" multiValued="true"/>
<!-- Fields required for LatLonDocValuesField test -->
- <fieldType name="latlon" class="solr.LatLonPointSpatialField" docValues="true"/>
+ <fieldType name="latlon" class="solr.LatLonPointSpatialField"/>
<field name="latlon" type="latlon" indexed="true" stored="false"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml b/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml
index 6477bd52754..c78d388f418 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml
@@ -16,54 +16,54 @@
limitations under the License.
-->
-<schema name="test-non-stored-docvalues" version="1.6">
+<schema name="test-non-stored-docvalues" 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="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}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0"/>
+ <fieldType name="date" class="${solr.tests.DateFieldType}" precisionStep="0"/>
<fieldType name="enumField" class="${solr.tests.EnumFieldType}" enumsConfig="enumsConfig.xml" enumName="severity"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
- <field name="_version_" type="long" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
<field name="nonstored_dv_str" type="string" indexed="true" stored="false"
- docValues="true" useDocValuesAsStored="false" multiValued="false"/>
+ useDocValuesAsStored="false" multiValued="false"/>
- <field name="test_nonstored_dv_str" type="string" indexed="true" stored="false" docValues="true" multiValued="false"/>
+ <field name="test_nonstored_dv_str" type="string" indexed="true" stored="false" multiValued="false"/>
- <field name="test_mvt_dvt_st_str" type="string" indexed="true" multiValued="true" docValues="true" stored="true"/>
- <field name="test_mvt_dvt_sf_str" type="string" indexed="true" multiValued="true" docValues="true" stored="false"/>
+ <field name="test_mvt_dvt_st_str" type="string" indexed="true" multiValued="true" stored="true"/>
+ <field name="test_mvt_dvt_sf_str" type="string" indexed="true" multiValued="true" stored="false"/>
<field name="test_mvt_dvf_st_str" type="string" indexed="true" multiValued="true" docValues="false" stored="true"/>
<field name="test_mvt_dvu_st_str" type="string" indexed="true" multiValued="true" stored="true"/>
<!-- single valued fields -->
- <field name="enum_dvo" type="enumField" indexed="true" stored="false" multiValued="false" docValues="true"/>
- <dynamicField name="*_s_dvo2" multiValued="false" type="string" docValues="true" indexed="false" stored="false"/>
- <dynamicField name="*_s_dv" multiValued="false" type="string" docValues="true" indexed="true" stored="true"/>
- <dynamicField name="*_s_dvo" multiValued="false" type="string" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_i_dvo" multiValued="false" type="int" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_f_dvo" multiValued="false" type="float" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_d_dvo" multiValued="false" type="double" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_l_dvo" multiValued="false" type="long" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_dt_dvo" multiValued="false" type="date" docValues="true" indexed="true" stored="false"/>
+ <field name="enum_dvo" type="enumField" indexed="true" stored="false" multiValued="false"/>
+ <dynamicField name="*_s_dvo2" multiValued="false" type="string" indexed="false" stored="false"/>
+ <dynamicField name="*_s_dv" multiValued="false" type="string" indexed="true" stored="true"/>
+ <dynamicField name="*_s_dvo" multiValued="false" type="string" indexed="true" stored="false"/>
+ <dynamicField name="*_i_dvo" multiValued="false" type="int" indexed="true" stored="false"/>
+ <dynamicField name="*_f_dvo" multiValued="false" type="float" indexed="true" stored="false"/>
+ <dynamicField name="*_d_dvo" multiValued="false" type="double" indexed="true" stored="false"/>
+ <dynamicField name="*_l_dvo" multiValued="false" type="long" indexed="true" stored="false"/>
+ <dynamicField name="*_dt_dvo" multiValued="false" type="date" indexed="true" stored="false"/>
<!-- multi valued fields -->
- <field name="enums_dvo" type="enumField" indexed="true" stored="false" multiValued="true" docValues="true"/>
- <dynamicField name="*_ss_dvo2" multiValued="true" type="string" docValues="true" indexed="false" stored="false"/>
- <dynamicField name="*_ss_dv" multiValued="true" type="string" docValues="true" indexed="true" stored="true"/>
- <dynamicField name="*_ss_dvo" multiValued="true" type="string" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_is_dvo" multiValued="true" type="int" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_fs_dvo" multiValued="true" type="float" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_ds_dvo" multiValued="true" type="double" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_ls_dvo" multiValued="true" type="long" docValues="true" indexed="true" stored="false"/>
- <dynamicField name="*_dts_dvo" multiValued="true" type="date" docValues="true" indexed="true" stored="false"/>
+ <field name="enums_dvo" type="enumField" indexed="true" stored="false" multiValued="true"/>
+ <dynamicField name="*_ss_dvo2" multiValued="true" type="string" indexed="false" stored="false"/>
+ <dynamicField name="*_ss_dv" multiValued="true" type="string" indexed="true" stored="true"/>
+ <dynamicField name="*_ss_dvo" multiValued="true" type="string" indexed="true" stored="false"/>
+ <dynamicField name="*_is_dvo" multiValued="true" type="int" indexed="true" stored="false"/>
+ <dynamicField name="*_fs_dvo" multiValued="true" type="float" indexed="true" stored="false"/>
+ <dynamicField name="*_ds_dvo" multiValued="true" type="double" indexed="true" stored="false"/>
+ <dynamicField name="*_ls_dvo" multiValued="true" type="long" indexed="true" stored="false"/>
+ <dynamicField name="*_dts_dvo" multiValued="true" type="date" indexed="true" stored="false"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
index 484e29608af..174254d1a40 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
@@ -21,7 +21,7 @@
observed for the uniqueKey field
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<fieldType name="text" class="solr.TextField">
<analyzer>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-null-charfilters-analyzer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-null-charfilters-analyzer.xml
index 1ad96ca958a..c11f6c623d1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-null-charfilters-analyzer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-null-charfilters-analyzer.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.4">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<!-- field type with custom TokenizerChain analyzer (created with 2-arg constructor, see SOLR-7765) -->
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.xml
index a343cf8376b..78b13270b80 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
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<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"
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field-unique-key.xml b/solr/core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field-unique-key.xml
index 49a587aef72..b91caa31278 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field-unique-key.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field-unique-key.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="one_field_no_dynamic_field_unique_key" version="1.1">
+<schema name="one_field_no_dynamic_field_unique_key" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<fieldType name="text" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field.xml
index 8a22324f3d5..6c5f788ffc1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="one_field_no_dynamic_field" version="1.1">
+<schema name="one_field_no_dynamic_field" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<fieldType name="text" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-phrases-identification.xml b/solr/core/src/test-files/solr/collection1/conf/schema-phrases-identification.xml
index ab38f9fee3b..522c37617b4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-phrases-identification.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-phrases-identification.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="phrase-identification" version="1.6">
+<schema name="phrase-identification" version="1.7">
<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-phrasesuggest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
index 7059cd399b4..6fad6fd2212 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for phrase suggestions -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml b/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
index e68ba0f117b..cd8cad3f1b2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for PostingsHighlighter -->
-<schema name="postingshighlight" version="1.0">
+<schema name="postingshighlight" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field: no offsets! -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml b/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
index 7de08d62e96..dd286865d76 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="tiny" version="1.1">
+<schema name="tiny" version="1.7">
<fieldType name="preanalyzed-no-analyzer" class="solr.PreAnalyzedField" parserImpl="json"/>
<fieldType name="preanalyzed-with-analyzer" class="solr.PreAnalyzedField">
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-protected-term.xml b/solr/core/src/test-files/solr/collection1/conf/schema-protected-term.xml
index 229439444b3..d401e51ffb2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-protected-term.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-protected-term.xml
@@ -16,16 +16,16 @@
limitations under the License.
-->
-<!-- The Solr schema file, version 1.6 -->
+<!-- The Solr schema file, version 1.7 -->
-<schema name="schema-protected-term" version="1.6">
+<schema name="schema-protected-term" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>
- <field name="_version_" type="long" indexed="false" stored="false" docValues="true"/>
+ <fieldType name="long" class="${solr.tests.LongFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <field name="_version_" type="long" indexed="false" stored="false"/>
<fieldType name="prefix4_lower_with_exceptions" class="solr.TextField">
<analyzer type="index">
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.xml
index 17cbececca8..19bedf66555 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
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="test" version="1.4">
+<schema name="test" version="1.7">
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
- <field name="_version_" type="long" indexed="false" stored="false" docValues="true" multiValued="false"/>
+ <field name="_version_" type="long" indexed="false" stored="false" docValues="true" multiValued="false" useDocValuesAsStored="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
<field name="ssto" type="string" indexed="false" stored="true"/>
@@ -36,7 +36,7 @@
<uniqueKey>id</uniqueKey>
- <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false"/>
+ <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="string" class="solr.StrField" sortMissingLast="true" />
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-rank-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-rank-fields.xml
index 2da0c0de62f..2994525a614 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-rank-fields.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-rank-fields.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="rank_fields" version="1.6">
+<schema name="rank_fields" version="1.7">
<fieldType name="string" class="solr.StrField" />
<fieldType name="rank" class="solr.RankField" />
<fields>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml b/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
index 1a4e32e2645..2ca637afe58 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.2">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml b/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
index 8b831272719..2d777e08305 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.2">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml b/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml
index 23c418c478b..f2574ddb362 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="test-class-name-shortening-on-serialization" version="1.6">
+<schema name="test-class-name-shortening-on-serialization" version="1.7">
<fieldType name="explicitLuceneMatchVersions" class="org.apache.solr.schema.TextField">
<analyzer>
<charFilter class="org.apache.solr.analysis.MockCharFilterFactory" luceneMatchVersion="LUCENE_40" remainder="0"/>
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.xml
index 66249e1cb50..2f5e04790fd 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
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<!-- The Solr schema file, version 1.6 -->
+<!-- The Solr schema file, version 1.7 -->
-<schema name="test-rest" version="1.6">
+<schema name="test-rest" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="x.y" is Solr's version number for the schema syntax and semantics. It should
@@ -30,6 +30,7 @@
1.4: default auto-phrase (QueryParser feature) to off
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.
-->
<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"/>
@@ -473,7 +474,7 @@
</fieldType>
<fieldType name="uuid" class="solr.UUIDField"/>
- <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false"/>
+ <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" docValues="false"/>
<fieldType name="random" class="solr.RandomSortField" indexed="true"/>
@@ -529,20 +530,20 @@
<!--
Numeric field types that index values using KD-trees. *Point fields are faster and more efficient than Trie* fields both, at
search time and at index time, but some features are still not supported.
- Point fields don't support FieldCache, so they must have docValues="true" if needed for sorting, faceting, functions, etc.
+ Point fields don't support FieldCache, so they must have if needed for sorting, faceting, functions, etc.
-->
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
- <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
- <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
- <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="pints" class="solr.IntPointField" multiValued="true"/>
+ <fieldType name="pfloat" class="solr.FloatPointField"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" multiValued="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
+ <fieldType name="plongs" class="solr.LongPointField" multiValued="true"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" multiValued="true"/>
<!-- KD-tree versions of date fields -->
- <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
- <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdate" class="solr.DatePointField"/>
+ <fieldType name="pdates" class="solr.DatePointField" multiValued="true"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
index bb9f981beed..76e7d8ee9b9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
@@ -21,7 +21,7 @@
For testing reversed wildcards.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}"/>
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-root.xml b/solr/core/src/test-files/solr/collection1/conf/schema-root.xml
index aef3c9767fb..592c16161d2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-root.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-root.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="root" version="1.6">
+<schema name="root" version="1.7">
<field name="id" type="string" indexed="true" stored="true"/>
<!-- points to the root document of a block of nested documents -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
index 276432441bb..122ee7cd78c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
@@ -18,7 +18,7 @@
<!-- Per-field similarity testing where default for fieldtypes w/o sim is overridden -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<similarity class="solr.SchemaSimilarityFactory" >
<str name="defaultSimFromFieldType">sim-used-as-default-override</str>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
index b9415711df6..1e4bdc26c11 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
@@ -18,7 +18,7 @@
<!-- Per-field similarity example for testing -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- some per-field similarity examples -->
<!-- specify a Similarity classname directly -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml b/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
index 0ed7e10f6e0..00618d9fcb7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for SimpleQParserPlugin. -->
-<schema name="simpleqp" version="1.0">
+<schema name="simpleqp" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field: no offsets -->
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.xml
index cf526b765b2..cc814ab58ca 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
@@ -15,37 +15,37 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.6">
+<schema name="minimal" version="1.7">
<uniqueKey>id</uniqueKey>
- <field name="id" type="str" indexed="true" docValues="true" stored="true" />
- <field name="id_i" type="int" indexed="true" docValues="true" stored="true" />
+ <field name="id" type="str" indexed="true" stored="true" />
+ <field name="id_i" type="int" indexed="true" stored="true" />
- <!-- NOTE: docValues="true" should be implicit for SortableTextField -->
+ <!-- NOTE: should be implicit for SortableTextField -->
<field name="whitespace_stxt" type="whitespace_stxt" indexed="true" stored="true" />
<field name="whitespace_m_stxt" type="whitespace_stxt" indexed="true" stored="true" multiValued="true" />
<!-- explicit docValues="false" in this version... -->
<field name="whitespace_nodv_stxt" type="whitespace_stxt" indexed="true" docValues="false" stored="true" />
<!-- only docValues in this version, no index or stored... -->
- <field name="whitespace_nois_stxt" type="whitespace_stxt" indexed="false" docValues="true" stored="false" />
+ <field name="whitespace_nois_stxt" type="whitespace_stxt" indexed="false" stored="false" />
<field name="whitespace_max3_stxt" type="whitespace_max3_stxt" />
<field name="whitespace_max6_stxt" type="whitespace_max6_stxt" />
<field name="whitespace_max0_stxt" type="whitespace_max0_stxt" />
<field name="whitespace_maxNeg_stxt" type="whitespace_maxNeg_stxt" />
- <field name="whitespace_f_stxt" type="whitespace_f_stxt" indexed="true" docValues="true" stored="true" />
- <field name="whitespace_l_stxt" type="whitespace_l_stxt" indexed="true" docValues="true" stored="true" />
+ <field name="whitespace_f_stxt" type="whitespace_f_stxt" indexed="true" stored="true" />
+ <field name="whitespace_l_stxt" type="whitespace_l_stxt" indexed="true" stored="true" />
<field name="keyword_stxt" type="keyword_stxt" indexed="true" stored="true" />
- <!-- explicit docValues="true" in this field version... -->
- <field name="keyword_dv_stxt" type="keyword_stxt" indexed="true" docValues="true" stored="true" />
+ <!-- explicit in this field version... -->
+ <field name="keyword_dv_stxt" type="keyword_stxt" indexed="true" stored="true" />
<!-- for behavioral equivilency testing -->
<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" docValues="true" stored="true" />
+ <field name="keyword_s_dv" type="str" indexed="false" stored="true" />
<field name="keyword_s" type="str" indexed="true" docValues="false" stored="true" />
<!-- . -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
index 9fb224b34a3..d821c3935f2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="schema-docValuesMulti" version="1.6">
+<schema name="schema-docValuesMulti" 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"/>
@@ -28,11 +28,11 @@
<fieldType name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- Point Fields -->
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
- <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
+ <fieldType name="pfloat" class="solr.FloatPointField"/>
+ <fieldType name="pdate" class="solr.DatePointField"/>
<fieldType name="boolean" class="solr.BoolField"/>
@@ -78,11 +78,11 @@
<field name="longdv" type="long" indexed="false" stored="false" docValues="true"/>
<field name="datedv" type="date" indexed="false" stored="false" docValues="true"/>
<field name="stringdv" type="string" indexed="false" stored="false" docValues="true"/>
- <field name="booleandv" type="boolean" indexed="false" stored="false" docValues="true" />
+ <field name="booleandv" type="boolean" indexed="false" stored="false" docValues="true"/>
<field name="sortabledv" type="text_gen_sort" indexed="true" stored="true" multiValued="false" />
<field name="sortabledv_udvas" type="text_gen_sort" indexed="true" stored="true" multiValued="false" useDocValuesAsStored="true" />
- <dynamicField name="*_s_dv" type="string" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <dynamicField name="*_s_dv" type="string" indexed="true" stored="true" multiValued="false" docValues="true"/>
<!-- Point fields explicitly -->
<dynamicField name="*_i_p" type="pint" indexed="true" stored="true" docValues="true" multiValued="false"/>
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.xml
index ffb473b7dc3..bfee166fb0d 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.4">
+<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"/>
@@ -25,9 +25,9 @@
<!-- 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="tdoubleDV" class="${solr.tests.DoubleFieldType}" precisionStep="8" docValues="true"/>
+ <fieldType name="tdoubleDV" class="${solr.tests.DoubleFieldType}" precisionStep="8"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
<fieldType name="boolean" class="solr.BoolField"/>
@@ -82,15 +82,15 @@
<field name="bbox" type="bbox"/>
<field name="pbbox" type="pbbox"/>
<field name="bbox_ndv" type="bbox_ndv"/>
- <field name="llp" type="llp" indexed="true" docValues="true" />
+ <field name="llp" type="llp" indexed="true" />
<field name="llp_idx" type="llp" indexed="true" docValues="false" />
- <field name="llp_dv" type="llp" indexed="false" docValues="true" />
- <field name="llp_1_dv_st" type="llp" indexed="false" docValues="true" stored="true" multiValued="false"/>
- <field name="llp_N_dv_st" type="llp" indexed="false" docValues="true" stored="true" multiValued="true"/>
- <field name="llp_1_dv" type="llp" indexed="false" docValues="true" stored="false" multiValued="false" useDocValuesAsStored="false"/>
- <field name="llp_N_dv" type="llp" indexed="false" docValues="true" stored="false" multiValued="true" useDocValuesAsStored="false"/>
- <field name="llp_1_dv_dvasst" type="llp" indexed="false" docValues="true" stored="false" multiValued="false" useDocValuesAsStored="true"/>
- <field name="llp_N_dv_dvasst" type="llp" indexed="false" docValues="true" stored="false" multiValued="true" useDocValuesAsStored="true"/>
+ <field name="llp_dv" type="llp" indexed="false" />
+ <field name="llp_1_dv_st" type="llp" indexed="false" stored="true" multiValued="false"/>
+ <field name="llp_N_dv_st" type="llp" indexed="false" stored="true" multiValued="true"/>
+ <field name="llp_1_dv" type="llp" indexed="false" stored="false" multiValued="false" useDocValuesAsStored="false"/>
+ <field name="llp_N_dv" type="llp" indexed="false" stored="false" multiValued="true" useDocValuesAsStored="false"/>
+ <field name="llp_1_dv_dvasst" type="llp" indexed="false" stored="false" multiValued="false" useDocValuesAsStored="true"/>
+ <field name="llp_N_dv_dvasst" type="llp" indexed="false" stored="false" multiValued="true" useDocValuesAsStored="true"/>
<dynamicField name="bboxD_*" type="bbox" indexed="true"/>
<dynamicField name="str_*" type="string" indexed="true" stored="true"/>
@@ -101,7 +101,7 @@
geo="true" prefixTree="geohash" distanceUnits="kilometers"
/>
<field name="srpt_geohash_km" type="srpt_geohash_km"/>
- <field name="llp_km" type="llp_km" docValues="true"/>
+ <field name="llp_km" type="llp_km"/>
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<field name="point" type="point2D" indexed="true" stored="true" multiValued="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml b/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
index 8026721b089..a237c95ca70 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="Solr SpellCheck Test" version="1.1">
+<schema name="Solr SpellCheck Test" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.1" is Solr's version number for the schema syntax and semantics. It should
@@ -68,7 +68,7 @@
<field name="suggest" type="spellText" indexed="true" stored="true"/>
<field name="teststop" type="teststop_type" indexed="true" stored="true"/>
<field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
- <field name="_version_" type="long" indexed="false" stored="false" docValues="true"/>
+ <field name="_version_" type="long" indexed="false" stored="false"/>
<copyField source="text" dest="spell"/>
<copyField source="text" dest="suggest"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
index 7b5e2ae9e6d..9c72df4d803 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
@@ -40,9 +40,9 @@
-->
- <fieldType name="int" docValues="true" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true"
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
- <fieldType name="float" docValues="true" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true"
+ <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"/>
@@ -53,11 +53,11 @@
<fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
<!-- Point Fields -->
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
- <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
+ <fieldType name="pfloat" class="solr.FloatPointField"/>
+ <fieldType name="pdate" class="solr.DatePointField"/>
<!-- numeric field types that manipulate the value into
@@ -122,7 +122,7 @@
<fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
@@ -421,11 +421,11 @@
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
- <field name="s_multi" type="string" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <field name="i_multi" type="int" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <field name="f_multi" type="float" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <field name="l_multi" type="long" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <field name="d_multi" type="double" indexed="true" stored="true" docValues="true" multiValued="true"/>
+ <field name="s_multi" type="string" indexed="true" stored="true" multiValued="true"/>
+ <field name="i_multi" type="int" indexed="true" stored="true" multiValued="true"/>
+ <field name="f_multi" type="float" indexed="true" stored="true" multiValued="true"/>
+ <field name="l_multi" type="long" indexed="true" stored="true" multiValued="true"/>
+ <field name="d_multi" type="double" indexed="true" stored="true" multiValued="true"/>
<field name="uuid" type="uuid" stored="true"/>
<field name="name" type="nametext" indexed="true" stored="true"/>
@@ -512,7 +512,7 @@
<field name="tlong" type="tlong" indexed="true" stored="true"/>
- <field name="_version_" type="long" indexed="true" docValues="true" stored="true"/>
+ <field name="_version_" type="long" indexed="true" stored="true"/>
<!-- Dynamic field definitions. If a field name is not found, dynamicFields
will be used if the name matches any of the patterns.
@@ -574,22 +574,22 @@
<!-- Test point fields explicitly -->
- <dynamicField name="*_i_p" type="pint" indexed="true" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_is_p" type="pint" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_i_ni_p" type="pint" indexed="false" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_is_ni_p" type="pint" indexed="false" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_l_p" type="plong" indexed="true" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_ls_p" type="plong" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_l_ni_p" type="plong" indexed="false" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_ls_ni_p" type="plong" indexed="false" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_f_p" type="pfloat" indexed="true" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_fs_p" type="pfloat" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_f_ni_p" type="pfloat" indexed="false" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_fs_ni_p" type="pfloat" indexed="false" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_d_p" type="pdouble" indexed="true" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_ds_p" type="pdouble" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_d_ni_p" type="pdouble" indexed="false" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_ds_ni_p" type="pdouble" indexed="false" stored="true" docValues="true" multiValued="true"/>
+ <dynamicField name="*_i_p" type="pint" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_is_p" type="pint" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_i_ni_p" type="pint" indexed="false" stored="true" multiValued="false"/>
+ <dynamicField name="*_is_ni_p" type="pint" indexed="false" stored="true" multiValued="true"/>
+ <dynamicField name="*_l_p" type="plong" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_ls_p" type="plong" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_l_ni_p" type="plong" indexed="false" stored="true" multiValued="false"/>
+ <dynamicField name="*_ls_ni_p" type="plong" indexed="false" stored="true" multiValued="true"/>
+ <dynamicField name="*_f_p" type="pfloat" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_fs_p" type="pfloat" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_f_ni_p" type="pfloat" indexed="false" stored="true" multiValued="false"/>
+ <dynamicField name="*_fs_ni_p" type="pfloat" indexed="false" stored="true" multiValued="true"/>
+ <dynamicField name="*_d_p" type="pdouble" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_ds_p" type="pdouble" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_d_ni_p" type="pdouble" indexed="false" stored="true" multiValued="false"/>
+ <dynamicField name="*_ds_ni_p" type="pdouble" indexed="false" stored="true" multiValued="true"/>
<!-- make sure custom sims work with dynamic fields -->
<!--
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
index 080faabfacc..a9c6b707bdb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for SweetSpotSimilarityFactory -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
index 8ab64afdbb3..0e7d63035a3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
@@ -17,7 +17,7 @@
<!-- Test schema file for SynonymGraphFilterFactory argument "tokenizerFactory" -->
-<schema name="synonym-test" version="1.0">
+<schema name="synonym-test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="text_synonyms" class="solr.TextField" positionIncrementGap="100">
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-tagger.xml b/solr/core/src/test-files/solr/collection1/conf/schema-tagger.xml
index 051cd10c7a5..1867bcf0d53 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-tagger.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-tagger.xml
@@ -20,10 +20,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.6">
+<schema name="minimal" version="1.7">
<fields>
- <field name="id" type="string" docValues="true" required="true"/>
+ <field name="id" type="string" required="true"/>
<field name="name" type="string"/>
<!-- freq, positions, and norms are not needed by the tagger. However if you
intend to have this field be used for general search, you should not exclude
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml b/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
index df05e82d15b..2de1787f633 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
@@ -20,7 +20,7 @@
See TestClassicSimilarityFactory
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<!-- testDefaults -->
<field name="text" type="text" indexed="true" stored="false"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-tiny.xml b/solr/core/src/test-files/solr/collection1/conf/schema-tiny.xml
index 555ee3571b7..50cf4d5a283 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-tiny.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-tiny.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="tiny" version="1.1">
+<schema name="tiny" version="1.7">
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
index 5613c66be2f..badb1982335 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
@@ -25,7 +25,7 @@ more concise example.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" />
<fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema.xml b/solr/core/src/test-files/solr/collection1/conf/schema.xml
index ec039ac0bf0..e8795c81104 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema.xml
@@ -584,14 +584,14 @@
<field name="oer_amount_CFT" type="oer_currency_CFT" indexed="true" stored="true"/>
<!-- test different combinations of indexed and stored -->
- <field name="bind" type="boolean" indexed="true" stored="false"/>
- <field name="bsto" type="boolean" indexed="false" stored="true"/>
- <field name="bindsto" type="boolean" indexed="true" stored="true"/>
+ <field name="bind" type="boolean" indexed="true" stored="false" docValues="false"/>
+ <field name="bsto" type="boolean" indexed="false" stored="true" docValues="false"/>
+ <field name="bindsto" type="boolean" indexed="true" stored="true" docValues="false"/>
<field name="isto" type="int" indexed="false" stored="true"/>
<field name="iind" type="int" indexed="true" stored="false"/>
- <field name="ssto" type="string" indexed="false" stored="true"/>
- <field name="sind" type="string" indexed="true" stored="false"/>
- <field name="sindsto" type="string" indexed="true" stored="true"/>
+ <field name="ssto" type="string" indexed="false" stored="true" docValues="false"/>
+ <field name="sind" type="string" indexed="true" stored="false" docValues="false"/>
+ <field name="sindsto" type="string" indexed="true" stored="true" docValues="false"/>
<!-- test combinations of term vector settings -->
<field name="test_basictv" type="text" termVectors="true"/>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
index a6d0a8e7658..29e62e3c88c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="codec" version="1.2">
+<schema name="codec" version="1.7">
<!-- NOTE: Direct (and Disk) DocValues formats were removed, so we use "Asserting"
as a way to vet that the configuration actually matters.
-->
@@ -40,15 +40,15 @@
<field name="string_direct_f" type="string_direct" indexed="true" stored="true"/>
<field name="string_standard_f" type="string_standard" indexed="true" stored="true"/>
- <field name="string_disk_f" type="string_disk" indexed="false" stored="false" docValues="true" default=""/>
+ <field name="string_disk_f" type="string_disk" indexed="false" stored="false" default=""/>
- <field name="string_f" type="string" indexed="true" stored="true" docValues="true" required="true"/>
+ <field name="string_f" type="string" indexed="true" stored="true" required="true"/>
<field name="text" type="text_general" indexed="true" stored="true"/>
<dynamicField name="*_direct" type="string_direct" indexed="true" stored="true"/>
<dynamicField name="*_standard" type="string_standard" indexed="true" stored="true"/>
- <dynamicField name="*_disk" type="string_disk" indexed="false" stored="false" docValues="true"/>
+ <dynamicField name="*_disk" type="string_disk" indexed="false" stored="false"/>
<uniqueKey>string_f</uniqueKey>
</schema>
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.xml
index 746b530ed7f..100abb67981 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="example" version="1.6">
+<schema name="example" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
version="x.y" is Solr's version number for the schema syntax and
semantics. It should not normally be changed by applications.
@@ -33,6 +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.
-->
<!-- Valid attributes for fields:
@@ -85,7 +86,7 @@
<!-- points to the root document of a block of nested documents. Required for nested
document support, may be removed otherwise
-->
- <field name="_root_" type="string" indexed="true" stored="false"/>
+ <field name="_root_" type="string" indexed="true" stored="false" useDocValuesAsStored="false"/>
<!-- Only remove the "id" field if you have a very good reason to. While not strictly
required, it is highly recommended. A <uniqueKey> is present in almost all Solr
@@ -154,9 +155,9 @@
<!--
Some fields such as popularity and manu_exact could be modified to
leverage doc values:
- <field name="popularity" type="int" indexed="true" stored="true" docValues="true" />
- <field name="manu_exact" type="string" indexed="false" stored="false" docValues="true" />
- <field name="cat" type="string" indexed="true" stored="true" docValues="true" multiValued="true"/>
+ <field name="popularity" type="int" indexed="true" stored="true" />
+ <field name="manu_exact" type="string" indexed="false" stored="false" />
+ <field name="cat" type="string" indexed="true" stored="true" multiValued="true"/>
Although it would make indexing slightly slower and the index bigger, it
@@ -265,7 +266,7 @@
<!-- needed by dedup config -->
<field name="signatureField" type="string" indexed="true" stored="false"/>
- <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
+ <dynamicField name="*_sS" type="string" indexed="false" stored="true" docValues="false"/>
<!-- Indexed, but NOT uninvertible -->
<field name="where_s_multi_not_uninvert" type="string" indexed="true" stored="false" docValues="false" uninvertible="false" multiValued="true" />
@@ -353,11 +354,11 @@
-->
<!-- Point Fields -->
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
- <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
+ <fieldType name="pfloat" class="solr.FloatPointField"/>
+ <fieldType name="pdate" class="solr.DatePointField"/>
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
diff --git a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
index 95045bedfe9..eb6e5907b1a 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.4">
+<schema name="test" version="1.7">
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
@@ -445,7 +445,7 @@
</fieldType>
<fieldType name="uuid" class="solr.UUIDField"/>
- <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false"/>
+ <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" docValues="false"/>
<fieldType name="random" class="solr.RandomSortField" indexed="true"/>
diff --git a/solr/core/src/test-files/solr/configsets/_default/conf/managed-schema.xml b/solr/core/src/test-files/solr/configsets/_default/conf/managed-schema.xml
index fbf0cbbe6db..ce56facb337 100644
--- a/solr/core/src/test-files/solr/configsets/_default/conf/managed-schema.xml
+++ b/solr/core/src/test-files/solr/configsets/_default/conf/managed-schema.xml
@@ -16,13 +16,13 @@
limitations under the License.
-->
-<schema name="default-config" version="1.6">
+<schema name="default-config" version="1.7">
<uniqueKey>id</uniqueKey>
<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" />
- <fieldType name="string" class="solr.StrField" sortMissingLast="true" docValues="true" />
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
<field name="_version_" type="plong" indexed="false" stored="false"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
<dynamicField name="*_bs" type="booleans" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/configsets/backcompat/conf/schema.xml b/solr/core/src/test-files/solr/configsets/backcompat/conf/schema.xml
index 6bcc4e0e5e6..2c63b557874 100644
--- a/solr/core/src/test-files/solr/configsets/backcompat/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/backcompat/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" omitTermFreqAndPositions="true" />
<uniquekey>id</uniquekey>
diff --git a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/schema.xml b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/schema.xml
index 287d4fe0149..51d407dfc1d 100644
--- a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<dynamicField name="*" type="string" indexed="true" stored="true"/>
</schema>
diff --git a/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml
index 36d5cfd2588..9d85ec4f7f0 100644
--- a/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/core/src/test-files/solr/configsets/ccjoin/conf/schema.xml b/solr/core/src/test-files/solr/configsets/ccjoin/conf/schema.xml
index 7afc9a5d48b..3ca8302f71f 100644
--- a/solr/core/src/test-files/solr/configsets/ccjoin/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/ccjoin/conf/schema.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="xcjf" version="1.1">
- <fieldType name="string" class="solr.StrField" docValues="true"/>
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+<schema name="xcjf" version="1.7">
+ <fieldType name="string" class="solr.StrField"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
<field name="id" type="string" required="true"/>
<field name="_version_" type="plong" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/schema.xml
index 4124feab0c3..b539459ad5e 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --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.xml
index 06f1973c4fe..40241c3bda5 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
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<!-- The Solr schema file, version 1.6 -->
+<!-- The Solr schema file, version 1.7 -->
-<schema name="cloud-dynamic" version="1.6">
+<schema name="cloud-dynamic" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="x.y" is Solr's version number for the schema syntax and semantics. It should
@@ -30,6 +30,7 @@
1.4: default auto-phrase (QueryParser feature) to off
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.
-->
<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"/>
@@ -156,7 +157,7 @@
</fieldType>
<fieldType name="uuid" class="solr.UUIDField"/>
- <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false"/>
+ <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" docValues="false"/>
<fieldType name="random" class="solr.RandomSortField" indexed="true"/>
@@ -187,14 +188,14 @@
<!-- test different combinations of indexed and stored -->
- <field name="bind" type="boolean" indexed="true" stored="false"/>
- <field name="bsto" type="boolean" indexed="false" stored="true"/>
- <field name="bindsto" type="boolean" indexed="true" stored="true"/>
- <field name="isto" type="int" indexed="false" stored="true"/>
- <field name="iind" type="int" indexed="true" stored="false"/>
- <field name="ssto" type="string" indexed="false" stored="true"/>
- <field name="sind" type="string" indexed="true" stored="false"/>
- <field name="sindsto" type="string" indexed="true" stored="true"/>
+ <field name="bind" type="boolean" indexed="true" stored="false" docValues="false"/>
+ <field name="bsto" type="boolean" indexed="false" stored="true" docValues="false"/>
+ <field name="bindsto" type="boolean" indexed="true" stored="true" docValues="false"/>
+ <field name="isto" type="int" indexed="false" stored="true" docValues="false"/>
+ <field name="iind" type="int" indexed="true" stored="false" docValues="false"/>
+ <field name="ssto" type="string" indexed="false" stored="true" docValues="false"/>
+ <field name="sind" type="string" indexed="true" stored="false" docValues="false"/>
+ <field name="sindsto" type="string" indexed="true" stored="true" docValues="false"/>
<!-- test combinations of term vector settings -->
<field name="test_basictv" type="text" termVectors="true"/>
@@ -215,7 +216,7 @@
<field name="point" type="xy" indexed="true" stored="true" multiValued="false"/>
- <field name="store" type="location" indexed="true" stored="true" docValues="true"/>
+ <field name="store" type="location" indexed="true" stored="true"/>
<!-- to test uniq fields -->
<field name="uniq" type="string" indexed="true" stored="true" multiValued="true"/>
@@ -227,7 +228,7 @@
<field name="copyfield_source" type="string" indexed="true" stored="true" multiValued="true"/>
<field name="payload" type="sortable_binary" indexed="false"
- stored="true" multiValued="false" docValues="true"/>
+ stored="true" multiValued="false"/>
<!-- for versioning -->
<field name="_version_" type="long" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-hdfs/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-hdfs/conf/schema.xml
index 52a63f41944..53ca02dbde2 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-hdfs/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-hdfs/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml
index 4124feab0c3..b539459ad5e 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema.xml
index d9a439d6cea..338551bbdd7 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="managed-preanalyzed" version="1.6">
+<schema name="managed-preanalyzed" 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"/>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/schema.xml
index 7ce25e97b91..5807a7c91cd 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
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.xml
index a3176d2d412..2714a21b5de 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
@@ -15,14 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
<!-- 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"/>
+ <field name="id" type="string" indexed="true" stored="true" docValues="false"/>
<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-field-limiting/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/schema.xml
index d6a2fa7a916..c50f70b11e1 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/schema.xml
index f4561cf1a6c..ef449bef519 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<field name="inplace_updatable_int" type="int" indexed="false" stored="false" docValues="true" />
<dynamicField name="*" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/schema.xml
index 4124feab0c3..b539459ad5e 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
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.xml
index 4124feab0c3..b539459ad5e 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
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/schema.xml
index 4124feab0c3..b539459ad5e 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/schema.xml
index 52a63f41944..53ca02dbde2 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/core/src/test-files/solr/configsets/conf-using-mypkg-version-1/conf/schema.xml b/solr/core/src/test-files/solr/configsets/conf-using-mypkg-version-1/conf/schema.xml
index 7f98ce061d0..12772856451 100644
--- a/solr/core/src/test-files/solr/configsets/conf-using-mypkg-version-1/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/conf-using-mypkg-version-1/conf/schema.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="schema-with-dependency-on-mypkg" version="1.1">
+<schema name="schema-with-dependency-on-mypkg" version="1.7">
<uniqueKey>id</uniqueKey>
diff --git a/solr/core/src/test-files/solr/configsets/conf2/conf/schema.xml b/solr/core/src/test-files/solr/configsets/conf2/conf/schema.xml
index 85f7ed35453..a1afcbd5a82 100644
--- a/solr/core/src/test-files/solr/configsets/conf2/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/conf2/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/core/src/test-files/solr/configsets/conf3/conf/schema.xml b/solr/core/src/test-files/solr/configsets/conf3/conf/schema.xml
index 85f7ed35453..a1afcbd5a82 100644
--- a/solr/core/src/test-files/solr/configsets/conf3/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/conf3/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
index 1eaa8a19536..2f1ee7dec00 100644
--- a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
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.xml
index 1a4ef0d00a5..fadaa72eac9 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
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="dedup" version="1.6">
+<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"/>
@@ -25,7 +25,7 @@
<field name="_root_" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="id" type="string" indexed="true" stored="true"/>
- <dynamicField name="*_s" type="string" indexed="true" stored="true" docValues="true"/>
+ <dynamicField name="*_s" type="string" indexed="true" stored="true"/>
<uniqueKey>id</uniqueKey>
</schema>
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.xml
index ca480852d9b..1875c733f96 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
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<!-- The Solr schema file, version 1.6 -->
+<!-- The Solr schema file, version 1.7 -->
-<schema name="collectionA" version="1.6">
+<schema name="collectionA" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="x.y" is Solr's version number for the schema syntax and semantics. It should
@@ -30,6 +30,7 @@
1.4: default auto-phrase (QueryParser feature) to off
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.
-->
<!-- Collection meant to hold whitespace delimited text -->
@@ -72,12 +73,12 @@
</analyzer>
</fieldType>
- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="true" sortMissingLast="true"/>
+ <fieldType name="date" class="${solr.tests.DateFieldType}" sortMissingLast="true"/>
- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" precisionStep="0" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
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.xml
index 84cfbfb5074..98fc0a8c5c9 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
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<!-- The Solr schema file, version 1.6 -->
+<!-- The Solr schema file, version 1.7 -->
-<schema name="collectionA" version="1.6">
+<schema name="collectionA" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="x.y" is Solr's version number for the schema syntax and semantics. It should
@@ -30,6 +30,7 @@
1.4: default auto-phrase (QueryParser feature) to off
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.
-->
<!-- Collection meant to hold whitespace delimited text -->
@@ -72,12 +73,12 @@
</analyzer>
</fieldType>
- <fieldType name="date" class="${solr.tests.DateFieldType}" docValues="true" sortMissingLast="true"/>
+ <fieldType name="date" class="${solr.tests.DateFieldType}" sortMissingLast="true"/>
- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" precisionStep="0" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
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.xml
index 5afe4124df9..62d52896700 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
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<!-- The Solr schema file, version 1.6 -->
+<!-- The Solr schema file, version 1.7 -->
-<schema name="cloud-dynamic" version="1.6">
+<schema name="cloud-dynamic" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="x.y" is Solr's version number for the schema syntax and semantics. It should
@@ -30,6 +30,7 @@
1.4: default auto-phrase (QueryParser feature) to off
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.
-->
<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"/>
@@ -156,7 +157,7 @@
</fieldType>
<fieldType name="uuid" class="solr.UUIDField"/>
- <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false"/>
+ <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" docValues="false"/>
<fieldType name="random" class="solr.RandomSortField" indexed="true"/>
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.xml
index 76c9ebe1439..4ade7650b81 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
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
- <fieldType name="string" class="solr.StrField"/>
- <fieldType name="string_dv" class="solr.StrField" docValues="true"/>
- <fieldType name="string_dvs" class="solr.StrField" docValues="true" multiValued="true"/>
+<schema name="minimal" version="1.7">
+ <fieldType name="string" class="solr.StrField" docValues="false"/>
+ <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"/>
<dynamicField name="*" type="string" indexed="true" stored="true"/>
diff --git a/solr/core/src/test-files/solr/configsets/minimal/conf/schema.xml b/solr/core/src/test-files/solr/configsets/minimal/conf/schema.xml
index 287d4fe0149..51d407dfc1d 100644
--- a/solr/core/src/test-files/solr/configsets/minimal/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/minimal/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<dynamicField name="*" type="string" indexed="true" stored="true"/>
</schema>
diff --git a/solr/core/src/test-files/solr/configsets/schema-package/conf/schema.xml b/solr/core/src/test-files/solr/configsets/schema-package/conf/schema.xml
index f5b5de63c41..133cf657fef 100644
--- a/solr/core/src/test-files/solr/configsets/schema-package/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/schema-package/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<uniqueKey>id</uniqueKey>
<fieldType name="composite_id_prefix" class="solr.TextField">
<analyzer>
diff --git a/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema b/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema
index c0cfa75bffe..108c81619b3 100644
--- a/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema
+++ b/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema
@@ -18,7 +18,7 @@
<!-- This file should be called managed-schema.xml, but leaving it here to prove
that we still are backwards compatible with this format. -->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<types>
<fieldType name="string" class="solr.StrField"/>
</types>
diff --git a/solr/core/src/test-files/solr/configsets/upload/regular/managed-schema.xml b/solr/core/src/test-files/solr/configsets/upload/regular/managed-schema.xml
index 9e2f9471026..25a37e6eee3 100644
--- a/solr/core/src/test-files/solr/configsets/upload/regular/managed-schema.xml
+++ b/solr/core/src/test-files/solr/configsets/upload/regular/managed-schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<types>
<fieldType name="string" class="solr.StrField"/>
</types>
diff --git a/solr/core/src/test-files/solr/configsets/upload/with-lib-directive/managed-schema.xml b/solr/core/src/test-files/solr/configsets/upload/with-lib-directive/managed-schema.xml
index 9e2f9471026..25a37e6eee3 100644
--- a/solr/core/src/test-files/solr/configsets/upload/with-lib-directive/managed-schema.xml
+++ b/solr/core/src/test-files/solr/configsets/upload/with-lib-directive/managed-schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<types>
<fieldType name="string" class="solr.StrField"/>
</types>
diff --git a/solr/core/src/test-files/solr/configsets/upload/with-script-processor/managed-schema.xml b/solr/core/src/test-files/solr/configsets/upload/with-script-processor/managed-schema.xml
index 9e2f9471026..25a37e6eee3 100644
--- a/solr/core/src/test-files/solr/configsets/upload/with-script-processor/managed-schema.xml
+++ b/solr/core/src/test-files/solr/configsets/upload/with-script-processor/managed-schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<types>
<fieldType name="string" class="solr.StrField"/>
</types>
diff --git a/solr/core/src/test-files/solr/crazy-path-to-schema.xml b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
index fbfdfee9076..28bb5d812d4 100644
--- a/solr/core/src/test-files/solr/crazy-path-to-schema.xml
+++ b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
@@ -21,7 +21,7 @@
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<types>
<fieldType name="string" class="solr.StrField" />
<fieldType name="text" class="solr.TextField">
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
index f77794c5aaf..665435ce015 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
@@ -28,7 +28,7 @@ public class TestSchemaResource extends SolrRestletTestBase {
"count(/response/lst[@name='schema']/str[@name='name']) = 1",
"/response/lst[@name='schema']/str[@name='name'][.='test-rest']",
"count(/response/lst[@name='schema']/float[@name='version']) = 1",
- "/response/lst[@name='schema']/float[@name='version'][.='1.6']",
+ "/response/lst[@name='schema']/float[@name='version'][.='1.7']",
"count(/response/lst[@name='schema']/str[@name='uniqueKey']) = 1",
"/response/lst[@name='schema']/str[@name='uniqueKey'][.='id']",
"(/response/lst[@name='schema']/arr[@name='fieldTypes']/lst/str[@name='name'])[1] = 'HTMLstandardtok'",
@@ -85,7 +85,7 @@ public class TestSchemaResource extends SolrRestletTestBase {
assertJQ(
"/schema",
"/schema/name=='test-rest'",
- "/schema/version==1.6",
+ "/schema/version==1.7",
"/schema/uniqueKey=='id'",
"/schema/fieldTypes/[0]/name=='HTMLstandardtok'",
"/schema/fieldTypes/[1]/name=='HTMLwhitetok'",
@@ -117,7 +117,7 @@ public class TestSchemaResource extends SolrRestletTestBase {
assertQ(
"/schema?wt=schema.xml",
"/schema/@name = 'test-rest'",
- "/schema/@version = '1.6'",
+ "/schema/@version = '1.7'",
"/schema/uniqueKey = 'id'",
"(/schema/fieldType)[1]/@name = 'HTMLstandardtok'",
"(/schema/fieldType)[2]/@name = 'HTMLwhitetok'",
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaVersionResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaVersionResource.java
index 19ccf9e15c6..e8995fcd4e9 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaVersionResource.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaVersionResource.java
@@ -25,6 +25,6 @@ public class TestSchemaVersionResource extends SolrRestletTestBase {
assertQ(
"/schema/version?indent=on&wt=xml",
"count(/response/float[@name='version']) = 1",
- "/response/float[@name='version'][.='1.6']");
+ "/response/float[@name='version'][.='1.7']");
}
}
diff --git a/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java b/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
index d0e54314777..0ddbc7a28a6 100644
--- a/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
@@ -21,7 +21,7 @@ import org.apache.solr.SolrTestCaseJ4;
public class SchemaVersionSpecificBehaviorTest extends SolrTestCaseJ4 {
public void testVersionBehavior() throws Exception {
- for (float v : new float[] {1.0F, 1.1F, 1.2F, 1.3F, 1.4F, 1.5F, 1.6F}) {
+ for (float v : new float[] {1.0F, 1.1F, 1.2F, 1.3F, 1.4F, 1.5F, 1.6F, 1.7F}) {
try {
final IndexSchema schema = initCoreUsingSchemaVersion(v);
final String ver = String.valueOf(v);
@@ -70,6 +70,12 @@ public class SchemaVersionSpecificBehaviorTest extends SolrTestCaseJ4 {
(v < 1.6F ? false : true),
field.useDocValuesAsStored());
+ // 1.7: docValues defaults to true
+ assertEquals(
+ f + " field's type has wrong docValues for ver=" + ver,
+ ((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());
@@ -137,7 +143,7 @@ public class SchemaVersionSpecificBehaviorTest extends SolrTestCaseJ4 {
if (f.contains("ft_")) {
// sanity check that we really are inheriting from fieldtype
assertEquals(
- f + " field's omitTfP doesn't match type for ver=" + ver,
+ f + " field's type has wrong useDocValuesAsStored for ver=" + ver,
expected,
ft.hasProperty(FieldType.USE_DOCVALUES_AS_STORED));
} else {
@@ -151,6 +157,42 @@ public class SchemaVersionSpecificBehaviorTest extends SolrTestCaseJ4 {
}
}
+ // regardless of version, explicit docValues values on field or type should be correct
+ for (String f :
+ new String[] {
+ "ft_dv_f",
+ "ft_dv_t",
+ "dv_f",
+ "dv_t",
+ "xx_dyn_ft_dv_f",
+ "xx_dyn_ft_dv_f",
+ "xx_dyn_dv_f",
+ "xx_dyn_dv_f"
+ }) {
+
+ boolean expected = f.endsWith("dv_t");
+ SchemaField field = schema.getField(f);
+ assertEquals(
+ f + " field's docValues is wrong for ver=" + ver, expected, field.hasDocValues());
+
+ FieldType ft = field.getType();
+ if (f.contains("ft_")) {
+ // sanity check that we really are inheriting from fieldtype
+ assertEquals(
+ f + " field's type has wrong docValues for ver=" + ver,
+ expected,
+ ft.hasProperty(FieldType.DOC_VALUES));
+ } else {
+ // for fields where the property is explicit, make sure
+ // we aren't getting a false negative because someone changed the
+ // schema, and we're inheriting from fieldType
+ assertEquals(
+ f + " field's type has wrong docValues for ver=" + ver,
+ (v < 1.7F ? false : true),
+ ft.hasProperty(FieldType.DOC_VALUES));
+ }
+ }
+
// regardless of version, explicit omitTfP values on field or type
// should be correct
for (String f :
diff --git a/solr/modules/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java b/solr/modules/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
index 7931d58393a..87a09c56212 100644
--- a/solr/modules/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
+++ b/solr/modules/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
@@ -315,6 +315,11 @@ public class ICUCollationField extends FieldType {
protected void checkSupportsDocValues() { // we support DocValues
}
+ @Override
+ protected boolean doesTypeSupportDocValues() {
+ return true;
+ }
+
@Override
public List<IndexableField> createFields(SchemaField field, Object value) {
if (field.hasDocValues()) {
diff --git a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
index 2f7474f1e88..f8ee995fa65 100644
--- a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
+++ b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true" multiValued="false"/>
diff --git a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
index 6ebdffe9132..2b315c5a0c0 100644
--- a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
+++ b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for CollationField (docvalues) -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
@@ -42,13 +42,13 @@
<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="false" stored="false" multiValued="false" docValues="true"/>
- <field name="sort_de" type="sort_de_t" indexed="false" stored="false" multiValued="false" docValues="true"
+ <field name="sort_ar" type="sort_ar_t" indexed="false" stored="false" multiValued="false"/>
+ <field name="sort_de" type="sort_de_t" indexed="false" stored="false" multiValued="false"
useDocValuesAsStored="${tests.icu_collation_field.udvas:false}"/>
<field name="sort_tr_canon" type="sort_tr_canon_t" indexed="false" stored="false" multiValued="true"
- docValues="true"/>
- <field name="sort_da" type="sort_da_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
- <field name="sort_custom" type="sort_custom_t" indexed="false" stored="false" multiValued="true" docValues="true"/>
+ />
+ <field name="sort_da" type="sort_da_t" indexed="false" stored="false" multiValued="false"/>
+ <field name="sort_custom" type="sort_custom_t" indexed="false" stored="false" multiValued="true"/>
<uniqueKey>id</uniqueKey>
diff --git a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
index 9698013aac6..490a9292846 100644
--- a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
+++ b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for CollationField -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
diff --git a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
index 59b8d251bfc..aaa2c395829 100644
--- a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
+++ b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for CollationField options -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
diff --git a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-opennlp-extract.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-opennlp-extract.xml
index fc13431b3f3..33fe08bc089 100644
--- a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-opennlp-extract.xml
+++ b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-opennlp-extract.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test-opennlp-extract" version="1.6">
+<schema name="test-opennlp-extract" version="1.7">
<fieldType name="opennlp-en-tokenization" class="solr.TextField">
<analyzer>
<tokenizer class="solr.OpenNLPTokenizerFactory"
diff --git a/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
index 34853ede6cf..966ecf6ffeb 100644
--- a/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
+++ b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<schema name="example" version="1.6">
+<schema name="example" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
diff --git a/solr/modules/gcs-repository/src/test-files/conf/schema.xml b/solr/modules/gcs-repository/src/test-files/conf/schema.xml
index 4124feab0c3..b539459ad5e 100644
--- a/solr/modules/gcs-repository/src/test-files/conf/schema.xml
+++ b/solr/modules/gcs-repository/src/test-files/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml b/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml
index 4124feab0c3..b539459ad5e 100644
--- a/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml
+++ b/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/modules/langid/src/test-files/langid/solr/collection1/conf/schema.xml b/solr/modules/langid/src/test-files/langid/solr/collection1/conf/schema.xml
index fe96000359f..9e46c4936a8 100644
--- a/solr/modules/langid/src/test-files/langid/solr/collection1/conf/schema.xml
+++ b/solr/modules/langid/src/test-files/langid/solr/collection1/conf/schema.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml
index 8291b9bc7d6..07779ce8a93 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="example" version="1.5">
+<schema name="example" version="1.7">
<fields>
<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" />
<field name="finalScore" type="string" indexed="true" stored="true" multiValued="false"/>
@@ -34,9 +34,9 @@
<field name="dvStringPopularities" type="string" indexed="false" docValues="true" stored="false" multiValued="true"/>
<field name="normHits" type="float" indexed="true" stored="true" />
- <field name="isTrendy" type="boolean" indexed="true" stored="true" />
- <field name="storedDvIsTrendy" type="boolean" indexed="true" stored="true" docValues="true"/>
- <field name="dvIsTrendy" type="boolean" indexed="true" stored="false" docValues="true"/>
+ <field name="isTrendy" type="boolean" indexed="true" stored="true" docValues="false" />
+ <field name="storedDvIsTrendy" type="boolean" indexed="true" stored="true"/>
+ <field name="dvIsTrendy" type="boolean" indexed="true" stored="false"/>
<field name="dvIntField" type="int" indexed="false" docValues="true" stored="false" default="-1" multiValued="false"/>
<field name="dvLongField" type="long" indexed="false" docValues="true" stored="false" default="-2" multiValued="false"/>
diff --git a/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml
index 4124feab0c3..b539459ad5e 100644
--- a/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml
+++ b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/modules/s3-repository/src/test-files/conf/schema.xml b/solr/modules/s3-repository/src/test-files/conf/schema.xml
index 4124feab0c3..b539459ad5e 100644
--- a/solr/modules/s3-repository/src/test-files/conf/schema.xml
+++ b/solr/modules/s3-repository/src/test-files/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xml
index 4eb1e20c27f..b1f11612b6b 100644
--- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xml
+++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xml
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.6">
+<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="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
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.xml
index a414d9c5afa..7c7131ba66b 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
@@ -16,20 +16,20 @@
limitations under the License.
-->
-<!-- The Solr schema file, version 1.6 -->
+<!-- The Solr schema file, version 1.7 -->
-<schema name="sql" version="1.6">
+<schema name="sql" version="1.7">
- <field name="pdoublexmv" type="pdouble" multiValued="true" stored="true" docValues="true"/>s
+ <field name="pdoublexmv" type="pdouble" multiValued="true" stored="true"/>
<field name="pdoublesx" type="pdoubles" stored="true"/>
<field name="stringsx" type="strings" stored="true" indexed="true"/>
- <field name="stringxmv" type="string" stored="true" multiValued="true" docValues="true"/>
+ <field name="stringxmv" type="string" stored="true" multiValued="true"/>
- <field name="booleans" type="boolean" stored="true" indexed="true" docValues="true" multiValued="true"/>
- <field name="longs" type="plongx" stored="true" indexed="true" docValues="true" multiValued="true"/>
+ <field name="booleans" type="boolean" stored="true" indexed="true" multiValued="true"/>
+ <field name="longs" type="plongx" stored="true" indexed="true" multiValued="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
- <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" multiValued="true"/>
<!-- attribute "name" is the name of this schema and is only used for display purposes.
@@ -43,28 +43,29 @@
1.4: default auto-phrase (QueryParser feature) to off
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.
-->
- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="${solr.tests.FloatFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongFieldType}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="true" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="true" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="true" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="true" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" precisionStep="8" positionIncrementGap="0"/>
<!-- Used to test proper type handling for custom field types based on built-in type classes -->
- <fieldType name="stringx" class="solr.StrField" docValues="true"/>
- <fieldType name="tintx" class="solr.TrieIntField" docValues="true"/>
- <fieldType name="pintx" class="solr.IntPointField" docValues="true"/>
- <fieldType name="tfloatx" class="solr.TrieFloatField" docValues="true"/>
- <fieldType name="pfloatx" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="tlongx" class="solr.TrieLongField" docValues="true"/>
- <fieldType name="plongx" class="solr.LongPointField" docValues="true"/>
- <fieldType name="tdoublex" class="solr.TrieDoubleField" docValues="true"/>
- <fieldType name="pdoublex" class="solr.DoublePointField" docValues="true"/>
- <fieldType name="pdatex" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="stringx" class="solr.StrField"/>
+ <fieldType name="tintx" class="solr.TrieIntField"/>
+ <fieldType name="pintx" class="solr.IntPointField"/>
+ <fieldType name="tfloatx" class="solr.TrieFloatField"/>
+ <fieldType name="pfloatx" class="solr.FloatPointField"/>
+ <fieldType name="tlongx" class="solr.TrieLongField"/>
+ <fieldType name="plongx" class="solr.LongPointField"/>
+ <fieldType name="tdoublex" class="solr.TrieDoubleField"/>
+ <fieldType name="pdoublex" class="solr.DoublePointField"/>
+ <fieldType name="pdatex" class="solr.DatePointField"/>
<field name="stringx" type="stringx" indexed="true" stored="true"/>
<field name="tintx" type="tintx" indexed="true" stored="true"/>
<field name="pintx" type="pintx" indexed="true" stored="true"/>
@@ -80,7 +81,7 @@
<field name="pdatexs" type="pdatex" indexed="true" stored="true" multiValued="true"/>
<field name="notstored" type="string" indexed="true" docValues="false" stored="false"/>
- <field name="dvonly" type="string" docValues="true" stored="false"/>
+ <field name="dvonly" type="string" stored="false"/>
<field name="textmv" type="text" multiValued="true"/>
<!-- Field type demonstrating an Analyzer failure -->
@@ -133,7 +134,7 @@
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" docValues="true" indexed="true"/>
+ <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" indexed="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
@@ -199,14 +200,14 @@
</fieldType>
<fieldType name="uuid" class="solr.UUIDField"/>
- <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false"/>
+ <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" docValues="false"/>
<fieldType name="random" class="solr.RandomSortField" indexed="true"/>
<fieldType class="org.apache.solr.schema.SortableBinaryField" name="sortable_binary"/>
- <field name="id" type="string" indexed="true" stored="true" multiValued="false" docValues="true" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<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"/>
@@ -261,7 +262,7 @@
<field name="copyfield_source" type="string" indexed="true" stored="true" multiValued="true"/>
<field name="payload" type="sortable_binary" indexed="false"
- stored="true" multiValued="false" docValues="true"/>
+ stored="true" multiValued="false"/>
<!-- for versioning -->
<field name="_version_" type="long" indexed="true" stored="true"/>
@@ -270,7 +271,7 @@
<field name="_route_" type="string" indexed="true" stored="true" multiValued="false"/>
- <field name="multi_int_with_docvals" type="tint" multiValued="true" docValues="true" indexed="false"/>
+ <field name="multi_int_with_docvals" type="tint" multiValued="true" indexed="false"/>
<dynamicField name="*_coordinate" type="tdouble" indexed="true" stored="false"/>
@@ -287,7 +288,7 @@
<dynamicField name="*_i" type="int" indexed="true" stored="true"/>
<dynamicField name="*_is" type="int" indexed="true" stored="true" multiValued="true"/>
<dynamicField name="*_s1" type="string" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_s" type="string" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="false"/>
<dynamicField name="*_l" type="long" indexed="true" stored="true"/>
<dynamicField name="*_ll" type="long" indexed="true" stored="true" multiValued="true"/>
<dynamicField name="*_t" type="text" indexed="true" stored="true"/>
diff --git a/solr/packaging/test/analysis_extras_config/conf/schema.xml b/solr/packaging/test/analysis_extras_config/conf/schema.xml
index 51fbedba4c9..ee9bb49a123 100644
--- a/solr/packaging/test/analysis_extras_config/conf/schema.xml
+++ b/solr/packaging/test/analysis_extras_config/conf/schema.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for CollationField -->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
@@ -37,7 +37,7 @@
<fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
- <field name="_version_" type="string" indexed="true" docValues="true" stored="false" multiValued="false"/>
+ <field name="_version_" type="string" indexed="true" stored="false" multiValued="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ar" type="sort_ar_t" indexed="true" stored="false" multiValued="false"/>
<field name="sort_de" type="sort_de_t" indexed="true" stored="false" multiValued="false"/>
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.xml
index bbf35d42ec2..76a6f64af34 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
@@ -38,7 +38,7 @@
catchall "text" field, and use that for searching.
-->
-<schema name="collection1-config" version="1.6">
+<schema name="collection1-config" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
version="x.y" is Solr's version number for the schema syntax and
semantics. It should not normally be changed by applications.
@@ -55,6 +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.
-->
<!-- Valid attributes for fields:
@@ -140,7 +141,7 @@
<dynamicField name="*_ds" type="pdoubles" indexed="true" stored="true"/>
<!-- Type used for data-driven schema, to add a string copy for each text field -->
- <dynamicField name="*_str" type="strings" stored="false" docValues="true" indexed="false" useDocValuesAsStored="false"/>
+ <dynamicField name="*_str" type="strings" stored="false" indexed="false" useDocValuesAsStored="false"/>
<dynamicField name="*_dt" type="pdate" indexed="true" stored="true"/>
<dynamicField name="*_dts" type="pdate" indexed="true" stored="true" multiValued="true"/>
@@ -190,8 +191,8 @@
-->
<!-- The StrField type is not analyzed, but indexed/stored verbatim. -->
- <fieldType name="string" class="solr.StrField" sortMissingLast="true" docValues="true" />
- <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" docValues="true" />
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
+ <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" />
<!-- boolean type: "true" or "false" -->
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
@@ -199,17 +200,17 @@
<!--
Numeric field types that index values using KD-trees.
- Point fields don't support FieldCache, so they must have docValues="true" if needed for sorting, faceting, functions, etc.
+ Point fields don't support FieldCache, so they must have if needed for sorting, faceting, functions, etc.
-->
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="pfloat" class="solr.FloatPointField"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
- <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
- <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
- <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
- <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pints" class="solr.IntPointField" multiValued="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" multiValued="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" multiValued="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" multiValued="true"/>
<!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
is a more restricted form of the canonical representation of dateTime
@@ -231,8 +232,8 @@
-->
<!-- KD-tree versions of date fields -->
- <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
- <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdate" class="solr.DatePointField"/>
+ <fieldType name="pdates" class="solr.DatePointField" multiValued="true"/>
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
<fieldType name="binary" class="solr.BinaryField"/>
@@ -369,7 +370,7 @@
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
<!-- A specialized field for geospatial search filters and distance sorting. -->
- <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
+ <fieldType name="location" class="solr.LatLonPointSpatialField"/>
<!-- A geospatial field type that supports multiValued and polygon shapes.
For more information about this and other spatial fields see:
diff --git a/solr/server/solr/configsets/_default/conf/managed-schema.xml b/solr/server/solr/configsets/_default/conf/managed-schema.xml
index 47319dc96ef..5250e837ff5 100644
--- a/solr/server/solr/configsets/_default/conf/managed-schema.xml
+++ b/solr/server/solr/configsets/_default/conf/managed-schema.xml
@@ -38,7 +38,7 @@
catchall "text" field, and use that for searching.
-->
-<schema name="default-config" version="1.6">
+<schema name="default-config" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
version="x.y" is Solr's version number for the schema syntax and
semantics. It should not normally be changed by applications.
@@ -55,6 +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.
-->
<!-- Valid attributes for fields:
@@ -116,7 +117,7 @@
<!-- If you don't use child/nested documents, then you should remove the next two fields: -->
<!-- for nested documents (minimal; points to root document) -->
- <field name="_root_" type="string" indexed="true" stored="false" docValues="false" />
+ <field name="_root_" type="string" indexed="true" stored="false" />
<!-- for nested documents (relationship tracking) -->
<field name="_nest_path_" type="_nest_path_" /><fieldType name="_nest_path_" class="solr.NestPathField" />
@@ -201,8 +202,8 @@
-->
<!-- The StrField type is not analyzed, but indexed/stored verbatim. -->
- <fieldType name="string" class="solr.StrField" sortMissingLast="true" docValues="true" />
- <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" docValues="true" />
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
+ <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" />
<!-- boolean type: "true" or "false" -->
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
@@ -210,22 +211,23 @@
<!--
Numeric field types that index values using KD-trees.
- Point fields don't support FieldCache, so they must have docValues="true" if needed for sorting, faceting, functions, etc.
+ Point fields don't support FieldCache, so they must have docValues enabled if needed for sorting, faceting, functions, etc.
+ This is the default, so it does not need to be set explicitly.
-->
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
-
- <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
- <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
- <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
- <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="pfloat" class="solr.FloatPointField"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
+
+ <fieldType name="pints" class="solr.IntPointField" multiValued="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" multiValued="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" multiValued="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" multiValued="true"/>
<fieldType name="random" class="solr.RandomSortField" indexed="true"/>
<!-- since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright. -->
- <fieldType name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" multiValued="true" docValues="false" class="solr.StrField" />
<!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
is a more restricted form of the canonical representation of dateTime
@@ -247,8 +249,8 @@
-->
<!-- KD-tree versions of date fields -->
- <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
- <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdate" class="solr.DatePointField"/>
+ <fieldType name="pdates" class="solr.DatePointField" multiValued="true"/>
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
<fieldType name="binary" class="solr.BinaryField"/>
@@ -532,7 +534,7 @@
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
<!-- A specialized field for geospatial search filters and distance sorting. -->
- <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
+ <fieldType name="location" class="solr.LatLonPointSpatialField"/>
<!-- A geospatial field type that supports multiValued and polygon shapes.
For more information about this and other spatial fields see:
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.xml
index 190214aebad..05cd8c431e6 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
@@ -45,7 +45,7 @@
that avoids logging every request
-->
-<schema name="example" version="1.6">
+<schema name="example" version="1.7">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
version="x.y" is Solr's version number for the schema syntax and
semantics. It should not normally be changed by applications.
@@ -62,6 +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.
-->
@@ -118,7 +119,7 @@
<!-- points to the root document of a block of nested documents. Required for nested
document support, may be removed otherwise
-->
- <field name="_root_" type="string" indexed="true" stored="false" docValues="false" />
+ <field name="_root_" type="string" indexed="true" stored="false" />
<!-- Only remove the "id" field if you have a very good reason to. While not strictly
required, it is highly recommended. A <uniqueKey> is present in almost all Solr
@@ -134,7 +135,7 @@
<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="manu" type="text_gen_sort" indexed="true" stored="true" omitNorms="true" multiValued="false" docValues="true" useDocValuesAsStored="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" />
@@ -185,11 +186,11 @@
<!-- non-tokenized version of manufacturer to make it easier to sort or group
results by manufacturer. copied from "manu" via copyField -->
- <field name="manu_exact" type="string" indexed="false" stored="false" docValues="true" />
+ <field name="manu_exact" type="string" indexed="false" stored="false" />
<!-- non-tokenized version of name to make it easier to sort or group
results by product name. copied from "name" via copyField -->
- <field name="name_exact" type="string" indexed="false" stored="false" docValues="true" />
+ <field name="name_exact" type="string" indexed="false" stored="false" />
<field name="payloads" type="payloads" indexed="true" stored="true"/>
@@ -286,7 +287,7 @@
<!-- The StrField type is not analyzed, but indexed/stored verbatim. -->
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
- <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" docValues="true" />
+ <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" />
<!-- boolean type: "true" or "false" -->
@@ -310,17 +311,18 @@
<!--
Numeric field types that index values using KD-trees.
- Point fields don't support FieldCache, so they must have docValues="true" if needed for sorting, faceting, functions, etc.
+ Point fields don't support FieldCache, so they must have docValues enabled if needed for sorting, faceting, functions, etc.
+ This is the default, so it does not need to be set explicitly.
-->
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="pfloat" class="solr.FloatPointField"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
- <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
- <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
- <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
- <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pints" class="solr.IntPointField" multiValued="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" multiValued="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" multiValued="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" multiValued="true"/>
<!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
is a more restricted form of the canonical representation of dateTime
@@ -344,8 +346,8 @@
-->
<!-- KD-tree versions of date fields -->
- <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
- <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdate" class="solr.DatePointField" />
+ <fieldType name="pdates" class="solr.DatePointField" multiValued="true"/>
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
<fieldType name="binary" class="solr.BinaryField"/>
@@ -685,7 +687,7 @@
<!-- since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright. -->
- <fieldType name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" multiValued="true" docValues="false" class="solr.StrField" />
<!-- This point type indexes the coordinates as separate fields (subFields)
If subFieldType is defined, it references a type, and a dynamic field
@@ -701,7 +703,7 @@
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
<!-- A specialized field for geospatial search filters and distance sorting. -->
- <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
+ <fieldType name="location" class="solr.LatLonPointSpatialField"/>
<!-- An alternative geospatial field type new to Solr 4. It supports multiValued and polygon shapes.
For more information about this and other Spatial fields new to Solr 4, see:
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/docvalues.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/docvalues.adoc
index e56b6beb345..1cf3edf9b92 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/docvalues.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/docvalues.adoc
@@ -34,7 +34,10 @@ This approach promises to relieve some of the memory requirements of the fieldCa
== Enabling DocValues
-To use docValues, you only need to enable it for a field that you will use it with.
+[IMPORTANT]
+DocValues are enabled by default for all field types that support them (when using a schemaVersion >= 1.7).
+
+When using an earlier schemaVersion (\<= 1.6), you only need to enable docValues for a field that you will use it with.
As with all schema design, you need to define a field type and then define fields of that type with docValues enabled.
All of these actions are done in the xref:schema-elements.adoc[schema].
@@ -116,3 +119,13 @@ When retrieving stored fields, the insertion order is the return order.
For docValues, it is the _sorted_ order.
. For field types using `SORTED_SET` (see above), multiple identical entries are collapsed into a single value.
Thus if values 4, 5, 2, 4, 1 are inserted, the values returned will be 1, 2, 4, 5.
+
+== Disabling DocValues
+
+DocValues are enabled by default for all field types that support them (when using a schemaVersion >= 1.7).
+Disabling docValues on a field or fieldType only requires adding `docValues="false"` to the definition:
+
+[source,xml]
+----
+<field name="field_a" type="string" docValues="false" />
+----
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/enum-fields.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/enum-fields.adoc
index 6981c227341..fdb199ae5d1 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/enum-fields.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/enum-fields.adoc
@@ -31,8 +31,8 @@ The EnumFieldType type definition is quite simple, as in this example defining f
[source,xml]
----
-<fieldType name="priorityLevel" class="solr.EnumFieldType" docValues="true" enumsConfig="enumsConfig.xml" enumName="priority"/>
-<fieldType name="riskLevel" class="solr.EnumFieldType" docValues="true" enumsConfig="enumsConfig.xml" enumName="risk" />
+<fieldType name="priorityLevel" class="solr.EnumFieldType" enumsConfig="enumsConfig.xml" enumName="priority"/>
+<fieldType name="riskLevel" class="solr.EnumFieldType" enumsConfig="enumsConfig.xml" enumName="risk" />
----
Besides the `name` and the `class`, which are common to all field types, this type also takes two additional parameters:
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/language-analysis.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/language-analysis.adoc
index fa60ebad0d0..cad5782584a 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/language-analysis.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/language-analysis.adoc
@@ -413,7 +413,7 @@ If you specify "de" as the language and "CH" as the country, you will get German
strength="primary" />
...
<!-- Define a field to store the German collated manufacturer names. -->
-<field name="manuGERMAN" type="collatedGERMAN" indexed="false" stored="false" docValues="true"/>
+<field name="manuGERMAN" type="collatedGERMAN" indexed="false" stored="false"/>
...
<!-- Copy the text to this field. We could create French, English, Spanish versions too,
and sort differently for different users! -->
@@ -604,7 +604,7 @@ See {java-javadocs}java/text/Collator.html[Java Collator javadocs] for more info
country="DE"
strength="primary" /> <!-- ignore Umlauts and letter case when sorting -->
...
-<field name="manuGERMAN" type="collatedGERMAN" indexed="false" stored="false" docValues="true" />
+<field name="manuGERMAN" type="collatedGERMAN" indexed="false" stored="false" />
...
<copyField source="manu" dest="manuGERMAN"/>
----
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/partial-document-updates.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/partial-document-updates.adoc
index 1caa5f66d5a..ad10ea3c4fc 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/partial-document-updates.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/partial-document-updates.adoc
@@ -272,6 +272,14 @@ If the price and popularity fields are defined in the schema as:
`<field name="popularity" type="float" indexed="false" stored="false" docValues="true"/>`
+[TIP]
+====
+.Doc Values Enabling
+
+
+`docValues="true"` is the default for schemas with version >= `1.7`, so it can be omitted.
+====
+
If the following document exists in our collection:
[source,json]
diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/schema-api.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-api.adoc
index 683f6f41fd5..0dd1656ab5f 100644
--- a/solr/solr-ref-guide/modules/indexing-guide/pages/schema-api.adoc
+++ b/solr/solr-ref-guide/modules/indexing-guide/pages/schema-api.adoc
@@ -842,7 +842,7 @@ curl http://localhost:8983/solr/techproducts/schema?wt=schema.xml
[source,xml]
----
-<schema name="example" version="1.5">
+<schema name="example" version="1.7">
<uniqueKey>id</uniqueKey>
<types>
<fieldType name="alphaOnlySort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
diff --git a/solr/solr-ref-guide/modules/query-guide/pages/spatial-search.adoc b/solr/solr-ref-guide/modules/query-guide/pages/spatial-search.adoc
index c8fdc34827a..868938e31e5 100644
--- a/solr/solr-ref-guide/modules/query-guide/pages/spatial-search.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/pages/spatial-search.adoc
@@ -51,7 +51,7 @@ Here's how `LatLonPointSpatialField` (LLPSF) should usually be configured in the
LLPSF supports toggling `indexed`, `stored`, `docValues`, and `multiValued`.
LLPSF internally uses a 2-dimensional Lucene "Points" (BDK tree) index when "indexed" is enabled (the default).
-When "docValues" is enabled, a latitude and longitudes pair are bit-interleaved into 64 bits and put into Lucene DocValues.
+When "docValues" is enabled (the default), a latitude and longitudes pair are bit-interleaved into 64 bits and put into Lucene DocValues.
The accuracy of the docValues data is about a centimeter.
== Indexing Points
@@ -705,7 +705,7 @@ To configure it in the schema, use a configuration like this:
BBoxField is actually based off of 4 instances of another field type referred to by numberType.
It also uses a boolean to flag a dateline cross.
-Assuming you want to use the relevancy feature, docValues is required.
+Assuming you want to use the relevancy feature, docValues is required (and is enabled by default).
Some of the attributes are in common with the RPT field like geo, units, worldBounds, and spatialContextFactory because they share some of the same spatial infrastructure.
To index a box, add a field value to a bbox field that's a string in the WKT/CQL ENVELOPE syntax.
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.adoc
index 13136088b9d..1b9697cc1d6 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
@@ -67,6 +67,21 @@ It is always strongly recommended that you fully reindex your documents after a
In Solr 8, it was possible to add docValues to a schema without re-indexing via `UninvertDocValuesMergePolicy`, an advanced/expert utility.
Due to changes in Lucene 9, that isn't possible any more.
+== Solr 9.7
+=== SchemaVersion upgraded to 1.7
+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.
+
+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**.
+https://issues.apache.org/jira/browse/LUCENE-9334[Lucene does not allow adding docValues to existing fields.]
+
+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.
+
== Solr 9.6
=== Dependency upgrades
Lucene 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.xml
index 0c9ee9c9688..74b073ae8b6 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
@@ -25,10 +25,10 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
- <fieldType name="int" docValues="true" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" docValues="true" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <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"/>
@@ -40,7 +40,7 @@
<fieldType name="random" class="solr.RandomSortField" indexed="true" />
<fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
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.xml
index 42b1e70017d..5784fd0ffe4 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
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
@@ -40,9 +40,9 @@
-->
- <fieldType name="int" docValues="true" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" docValues="true" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" docValues="true" class="${solr.tests.LongFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <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="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
@@ -110,13 +110,13 @@
<fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="${solr.tests.DateFieldType}" precisionStep="0" docValues="true"/>
- <fieldtype name="tdate" class="${solr.tests.DateFieldType}" precisionStep="6" docValues="true"/>
+ <fieldtype name="date" class="${solr.tests.DateFieldType}" precisionStep="0"/>
+ <fieldtype name="tdate" class="${solr.tests.DateFieldType}" precisionStep="6"/>
<!-- solr.TextField allows the specification of custom
@@ -356,7 +356,7 @@
<fieldType name="uuid" class="solr.UUIDField" />
<!-- A specialized field for geospatial search filters and distance sorting. -->
- <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
+ <fieldType name="location" class="solr.LatLonPointSpatialField"/>
<!-- some per-field similarity examples -->
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.xml
index db9ecd69039..691ada4ba64 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
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.2">
+<schema name="test" version="1.7">
<fieldType name="integer" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
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.xml
index 4f4e616f9ae..08dd32abf9d 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
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
@@ -40,11 +40,11 @@
-->
- <fieldType name="int" docValues="true" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true"
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
- <fieldType name="float" docValues="true" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true"
+ <fieldType name="float" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
- <fieldType name="long" docValues="true" class="${solr.tests.LongFieldType}" 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="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
@@ -114,7 +114,7 @@
<fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
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.xml
index 727f94a1387..0836a7f74a6 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
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/configset-1/conf/schema-minimal.xml b/solr/solrj/src/test-files/solrj/solr/configsets/configset-1/conf/schema-minimal.xml
index 287d4fe0149..51d407dfc1d 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/configset-1/conf/schema-minimal.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/configset-1/conf/schema-minimal.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<dynamicField name="*" type="string" indexed="true" stored="true"/>
</schema>
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/configset-2/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/configset-2/conf/schema.xml
index 287d4fe0149..51d407dfc1d 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/configset-2/conf/schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/configset-2/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<dynamicField name="*" type="string" indexed="true" stored="true"/>
</schema>
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.xml
index 0c9ee9c9688..544edf8ae04 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
@@ -25,10 +25,10 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
- <fieldType name="int" docValues="true" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" docValues="true" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <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"/>
@@ -40,7 +40,7 @@
<fieldType name="random" class="solr.RandomSortField" indexed="true" />
<fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
@@ -50,7 +50,7 @@
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
- <field name="_version_" type="long" indexed="true" stored="true" docValues="true"/>
+ <field name="_version_" type="long" indexed="true" stored="true"/>
<!-- Dynamic field definitions. If a field name is not found, dynamicFields
will be used if the name matches any of the patterns.
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.xml
index c46c8cbd935..4aad5690101 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="example core ${l10n:}" version="1.1">
+<schema name="example core ${l10n:}" version="1.7">
<fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="text-FR" class="solr.TextField" positionIncrementGap="100">
<analyzer type="index">
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/schema.xml
index 03865792ad9..7519343d446 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/schema.xml
@@ -19,11 +19,11 @@
<!-- A trivial schema containing a s spatial type for SolrJ testing.
Feel free to add other spatial types to this as required
-->
-<schema name="spatial" version="1.1">
+<schema name="spatial" version="1.7">
- <fieldType name="long" docValues="true" class="${solr.tests.LongFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="srpt_quad" class="solr.SpatialRecursivePrefixTreeFieldType" prefixTree="quad" distanceUnits="degrees" />
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_version_" type="long" indexed="true" stored="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.xml
index 42b1e70017d..5784fd0ffe4 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
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.6">
+<schema name="test" version="1.7">
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
@@ -40,9 +40,9 @@
-->
- <fieldType name="int" docValues="true" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" docValues="true" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" docValues="true" class="${solr.tests.LongFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <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="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
@@ -110,13 +110,13 @@
<fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="${solr.tests.DateFieldType}" precisionStep="0" docValues="true"/>
- <fieldtype name="tdate" class="${solr.tests.DateFieldType}" precisionStep="6" docValues="true"/>
+ <fieldtype name="date" class="${solr.tests.DateFieldType}" precisionStep="0"/>
+ <fieldtype name="tdate" class="${solr.tests.DateFieldType}" precisionStep="6"/>
<!-- solr.TextField allows the specification of custom
@@ -356,7 +356,7 @@
<fieldType name="uuid" class="solr.UUIDField" />
<!-- A specialized field for geospatial search filters and distance sorting. -->
- <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
+ <fieldType name="location" class="solr.LatLonPointSpatialField"/>
<!-- some per-field similarity examples -->
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.xml
index 4124feab0c3..b539459ad5e 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
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<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"/>
diff --git a/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml b/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
index 9d0cfa23f90..77728a9588b 100644
--- a/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
@@ -26,7 +26,7 @@ See comments from Yonik on SOLR-9083. It costs us nothing to leave these in give
that just finds leaf <fieldType> and <field> nodes and there's no reason to break schemas for people who leave
<fields> and <types> tags in their schema for no good purpose.
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<types> <!-- Intentionally left in. see comment above -->
<fieldType name="string" class="solr.StrField" />
<fieldType name="text" class="solr.TextField">
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.xml
index 68c251b34c1..8b3a3933996 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="example core zero" version="1.1">
+<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"/>
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.xml
index 9f4cde8ae35..fd1cac0374f 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
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="example core one" version="1.1">
+<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"/>
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
index bf45abad2f2..dd89fb97cbb 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
@@ -145,7 +145,7 @@ public class SchemaTest extends RestTestBase {
SchemaRepresentation schemaRepresentation = schemaResponse.getSchemaRepresentation();
assertNotNull(schemaRepresentation);
assertEquals("test", schemaRepresentation.getName());
- assertEquals(1.6, schemaRepresentation.getVersion(), 0.001f);
+ assertEquals(1.7, schemaRepresentation.getVersion(), 0.001f);
assertEquals("id", schemaRepresentation.getUniqueKey());
assertFalse(schemaRepresentation.getFields().isEmpty());
assertFalse(schemaRepresentation.getDynamicFields().isEmpty());
@@ -168,7 +168,7 @@ public class SchemaTest extends RestTestBase {
SchemaResponse.SchemaVersionResponse schemaVersionResponse =
schemaVersionRequest.process(getSolrClient());
assertValidSchemaResponse(schemaVersionResponse);
- assertEquals(1.6, schemaVersionResponse.getSchemaVersion(), 0.001);
+ assertEquals(1.7, schemaVersionResponse.getSchemaVersion(), 0.001);
}
@Test
diff --git a/solr/test-framework/src/java/org/apache/solr/schema/SortableBinaryField.java b/solr/test-framework/src/java/org/apache/solr/schema/SortableBinaryField.java
index b8969616d01..5c6d31c43ba 100644
--- a/solr/test-framework/src/java/org/apache/solr/schema/SortableBinaryField.java
+++ b/solr/test-framework/src/java/org/apache/solr/schema/SortableBinaryField.java
@@ -36,6 +36,11 @@ public class SortableBinaryField extends BinaryField {
protected void checkSupportsDocValues() { // we support DocValues
}
+ @Override
+ protected boolean doesTypeSupportDocValues() {
+ return true;
+ }
+
@Override
public List<IndexableField> createFields(SchemaField field, Object value) {
if (field.hasDocValues()) {
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.xml
index ec039ac0bf0..f18a9b7490f 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
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.0">
+<schema name="test" version="1.7">
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
@@ -45,11 +45,11 @@
<fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
<!-- Point Fields -->
- <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
- <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
- <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
- <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
- <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pint" class="solr.IntPointField"/>
+ <fieldType name="plong" class="solr.LongPointField"/>
+ <fieldType name="pdouble" class="solr.DoublePointField"/>
+ <fieldType name="pfloat" class="solr.FloatPointField"/>
+ <fieldType name="pdate" class="solr.DatePointField"/>
<!-- Dense Vector Fields -->
<fieldType name="knn_vector_cosine" class="solr.DenseVectorField" vectorDimension="4" similarityFunction="cosine"/>
@@ -104,7 +104,7 @@
<!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldType name="highlittext" class="solr.TextField" compressThreshold="345"/>
+ <fieldType name="highlittext" class="solr.TextField"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
@@ -114,7 +114,7 @@
-->
<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="tdatedv" class="${solr.tests.DateFieldType}" precisionStep="6" docValues="true"/>
+ <fieldType name="tdatedv" class="${solr.tests.DateFieldType}" precisionStep="6"/>
<fieldType name="dateRange" class="solr.DateRangeField"/>
<fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
@@ -431,7 +431,7 @@
<fieldType name="uuid" class="solr.UUIDField"/>
<!-- Try out some point types -->
- <fieldType name="xy" class="solr.PointType" dimension="2" subFieldType="double" docValues="true"/>
+ <fieldType name="xy" class="solr.PointType" dimension="2" subFieldType="double" />
<fieldType name="x" class="solr.PointType" dimension="1" subFieldType="double"/>
<fieldType name="tenD" class="solr.PointType" dimension="10" subFieldType="double"/>
<fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="_d1"/>
@@ -662,7 +662,7 @@
<field name="dateRemove" type="date" indexed="true" stored="true" multiValued="true"/>
<field name="floatRemove" type="float" indexed="true" stored="true" multiValued="true"/>
- <field name="binaryRemove" type="binary" indexed="true" stored="true" multiValued="true"/>
+ <field name="binaryRemove" type="binary" indexed="true" stored="true" multiValued="true" docValues="false"/>
<field name="booleanRemove" type="boolean" indexed="true" stored="true" multiValued="true"/>
<field name="collationRemove" type="collation" indexed="true" stored="true" multiValued="true"/>
<field name="datePointRemove" type="pdate" indexed="true" stored="true" multiValued="true"/>
@@ -691,7 +691,7 @@
<field name="title_stringNoNorms" type="string" omitNorms="true" indexed="true" stored="true"/>
- <field name="store" type="location" indexed="true" stored="true" docValues="true"/>
+ <field name="store" type="location" indexed="true" stored="true"/>
<field name="lower" type="lowerfilt" indexed="false" stored="true" multiValued="true"/>
<field name="_route_" type="string" indexed="true" stored="true" multiValued="false"/>
@@ -701,7 +701,7 @@
<field name="sortabuse_not_uninvertible" type="string" indexed="true" multiValued="false" uninvertible="false" />
<!-- EnumType -->
- <field name="severity" type="severityType" docValues="true" indexed="true" stored="true" multiValued="false"/>
+ <field name="severity" type="severityType" indexed="true" stored="true" multiValued="false"/>
<field name="max_chars" type="string" indexed="false" stored="true"/>
<field name="no_max_chars" type="string" indexed="false" stored="true"/>
@@ -741,7 +741,7 @@
<dynamicField name="*_f1" type="float" indexed="true" stored="true" multiValued="false"/>
<dynamicField name="*_d" type="double" indexed="true" stored="true"/>
<dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>
- <dynamicField name="*_d1_dv" type="double" indexed="true" docValues="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_d1_dv" type="double" indexed="true" stored="true" docValues="true" multiValued="false"/>
<dynamicField name="*_dt" type="date" indexed="true" stored="true"/>
<dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
@@ -797,7 +797,7 @@
<dynamicField name="*_ancestor" type="ancestor_path" indexed="true" stored="true" omitNorms="true"
multiValued="true"/>
- <dynamicField name="*_sev_enum" type="severityType" indexed="true" stored="true" docValues="true" multiValued="true"/>
+ <dynamicField name="*_sev_enum" type="severityType" indexed="true" stored="true" multiValued="true"/>
<!-- With DocValues=true -->
<dynamicField name="*_i_dv" type="int" indexed="true" stored="true" docValues="true"/>
@@ -854,28 +854,28 @@
useDocValuesAsStored="false"/>
<!-- Test point fields explicitly -->
- <dynamicField name="*_i_p" type="pint" indexed="true" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_is_p" type="pint" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_i_ni_p" type="pint" indexed="false" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_is_ni_p" type="pint" indexed="false" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_l_p" type="plong" indexed="true" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_ls_p" type="plong" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_l_ni_p" type="plong" indexed="false" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_ls_ni_p" type="plong" indexed="false" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_f_p" type="pfloat" indexed="true" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_fs_p" type="pfloat" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_f_ni_p" type="pfloat" indexed="false" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_fs_ni_p" type="pfloat" indexed="false" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_d_p" type="pdouble" indexed="true" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_ds_p" type="pdouble" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_d_ni_p" type="pdouble" indexed="false" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_ds_ni_p" type="pdouble" indexed="false" stored="true" docValues="true" multiValued="true"/>
+ <dynamicField name="*_i_p" type="pint" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_is_p" type="pint" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_i_ni_p" type="pint" indexed="false" stored="true" multiValued="false"/>
+ <dynamicField name="*_is_ni_p" type="pint" indexed="false" stored="true" multiValued="true"/>
+ <dynamicField name="*_l_p" type="plong" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_ls_p" type="plong" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_l_ni_p" type="plong" indexed="false" stored="true" multiValued="false"/>
+ <dynamicField name="*_ls_ni_p" type="plong" indexed="false" stored="true" multiValued="true"/>
+ <dynamicField name="*_f_p" type="pfloat" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_fs_p" type="pfloat" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_f_ni_p" type="pfloat" indexed="false" stored="true" multiValued="false"/>
+ <dynamicField name="*_fs_ni_p" type="pfloat" indexed="false" stored="true" multiValued="true"/>
+ <dynamicField name="*_d_p" type="pdouble" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_ds_p" type="pdouble" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_d_ni_p" type="pdouble" indexed="false" stored="true" multiValued="false"/>
+ <dynamicField name="*_ds_ni_p" type="pdouble" indexed="false" stored="true" multiValued="true"/>
<dynamicField name="*_sortable" type="sortable_text" indexed="true" multiValued="false" stored="true" />
- <dynamicField name="*_date_p" type="pdate" indexed="true" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_dates_p" type="pdate" indexed="true" stored="true" docValues="true" multiValued="true"/>
- <dynamicField name="*_date_ni_p" type="pdate" indexed="false" stored="true" docValues="true" multiValued="false"/>
- <dynamicField name="*_dates_ni_p" type="pdate" indexed="false" stored="true" docValues="true" multiValued="true"/>
+ <dynamicField name="*_date_p" type="pdate" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_dates_p" type="pdate" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_date_ni_p" type="pdate" indexed="false" stored="true" multiValued="false"/>
+ <dynamicField name="*_dates_ni_p" type="pdate" indexed="false" stored="true" multiValued="true"/>
<copyField source="single_i_dvn" dest="copy_single_i_dvn"/>
<copyField source="single_d_dvn" dest="copy_single_d_dvn"/>
diff --git a/solr/test-framework/src/test-files/solr/configsets/minimal/conf/schema.xml b/solr/test-framework/src/test-files/solr/configsets/minimal/conf/schema.xml
index 287d4fe0149..51d407dfc1d 100644
--- a/solr/test-framework/src/test-files/solr/configsets/minimal/conf/schema.xml
+++ b/solr/test-framework/src/test-files/solr/configsets/minimal/conf/schema.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
<fieldType name="string" class="solr.StrField"/>
<dynamicField name="*" type="string" indexed="true" stored="true"/>
</schema>