You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/12/27 11:27:01 UTC
svn commit: r1721795 [1/2] - in /lucene/dev/trunk/solr: ./
contrib/analytics/src/test-files/solr/collection1/conf/
contrib/langid/src/test-files/langid/solr/collection1/conf/
contrib/morphlines-core/src/test-files/solr/collection1/conf/
contrib/morphli...
Author: shalin
Date: Sun Dec 27 10:27:00 2015
New Revision: 1721795
URL: http://svn.apache.org/viewvc?rev=1721795&view=rev
Log:
SOLR-8220: Read field from DocValues for non stored fields
Added:
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml (with props)
lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java (with props)
lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java (with props)
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
lucene/dev/trunk/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml
lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml
lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml
lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml
lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldProperties.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaField.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrReturnFields.java
lucene/dev/trunk/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-init-error.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-graph.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-dv.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-indexed.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-xinclude.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema15.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaVersionResource.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/managed-schema
lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/managed-schema
lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/managed-schema
lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/managed-schema
lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/managed-schema
lucene/dev/trunk/solr/example/files/conf/managed-schema
lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/managed-schema
lucene/dev/trunk/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema
lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-sql.xml
lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-streaming.xml
lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sun Dec 27 10:27:00 2015
@@ -217,6 +217,21 @@ Jetty 9.2.13.v20150730
Upgrading from Solr 5.4
-----------------------
+* The Solr schema version has been increased to 1.6. Since schema version 1.6, all non-stored docValues fields
+ will be returned along with other stored fields when all fields (or pattern matching globs) are specified
+ to be returned (e.g. fl=*) for search queries. This behavior can be turned on and off by setting
+ 'useDocValuesAsStored' parameter for a field or a field type to true (default since schema version 1.6)
+ or false (default till schema version 1.5).
+ Note that enabling this property has performance implications because DocValues are column-oriented and may
+ therefore incur additional cost to retrieve for each returned document. All example schema are upgraded to
+ version 1.6 but any older schemas will default to useDocValuesAsStored=false and continue to work as in
+ older versions of Solr. If this new behavior is desirable, then you should set version attribute in your
+ schema file to '1.6'.
+ Also note that returning stored fields from docValues (default in schema versions 1.6+) returns multiValued
+ fields in sorted order. If you require the older behavior of multiValued fields being returned in the
+ original insertion order, set useDocValuesAsStored="false" for the individual fields or make
+ sure your schema version is < 1.6. This does not require re-indexing.
+ See SOLR-8220 for more details.
Detailed Change List
----------------------
@@ -246,6 +261,9 @@ New Features
child.facet.field parameter with {!parent ..}.. query. They count facets on children documents
aggregating (deduplicating) counts by parent documents (Dr. Oleg Savrasov via Mikhail Khludnev)
+* SOLR-8220: Read field from DocValues for non stored fields.
+ (Keith Laban, yonik, Erick Erickson, Ishan Chattopadhyaya, shalin)
+
Bug Fixes
----------------------
Modified: lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml Sun Dec 27 10:27:00 2015
@@ -25,7 +25,7 @@
-->
-<schema name="schema-docValues" version="1.5">
+<schema name="schema-docValues" version="1.6">
<types>
<!-- field type definitions... note that the "name" attribute is
Modified: lucene/dev/trunk/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml Sun Dec 27 10:27:00 2015
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
Modified: lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml Sun Dec 27 10:27:00 2015
@@ -45,7 +45,7 @@
that avoids logging every request
-->
-<schema name="example" version="1.5">
+<schema name="example" version="1.6">
<!-- 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.
@@ -61,6 +61,7 @@
to off for version >= 1.4
1.5: omitNorms defaults to true for primitive field types
(int, float, boolean, string...)
+ 1.6: useDocValuesAsStored defaults to true.
-->
<fields>
Modified: lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml Sun Dec 27 10:27:00 2015
@@ -45,7 +45,7 @@
that avoids logging every request
-->
-<schema name="example" version="1.5">
+<schema name="example" version="1.6">
<!-- 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.
@@ -61,6 +61,7 @@
to off for version >= 1.4
1.5: omitNorms defaults to true for primitive field types
(int, float, boolean, string...)
+ 1.6: useDocValuesAsStored defaults to true.
-->
<fields>
Modified: lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml Sun Dec 27 10:27:00 2015
@@ -45,7 +45,7 @@
that avoids logging every request
-->
-<schema name="example" version="1.5">
+<schema name="example" version="1.6">
<!-- 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.
@@ -61,6 +61,7 @@
to off for version >= 1.4
1.5: omitNorms defaults to true for primitive field types
(int, float, boolean, string...)
+ 1.6: useDocValuesAsStored defaults to true.
-->
<fields>
Modified: lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml Sun Dec 27 10:27:00 2015
@@ -45,7 +45,7 @@
that avoids logging every request
-->
-<schema name="example" version="1.5">
+<schema name="example" version="1.6">
<!-- 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.
@@ -61,6 +61,7 @@
to off for version >= 1.4
1.5: omitNorms defaults to true for primitive field types
(int, float, boolean, string...)
+ 1.6: useDocValuesAsStored defaults to true.
-->
<fields>
Modified: lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="minimal-velocity" version="1.5">
+<schema name="minimal-velocity" version="1.6">
<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
</types>
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/DocsStreamer.java?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/DocsStreamer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/DocsStreamer.java Sun Dec 27 10:27:00 2015
@@ -61,6 +61,7 @@ public class DocsStreamer implements Ite
private boolean onlyPseudoFields;
private Set<String> fnames;
+ private Set<String> dvFieldsToReturn;
private int idx = -1;
public DocsStreamer(ResultContext rctx) {
@@ -71,6 +72,41 @@ public class DocsStreamer implements Ite
fnames = rctx.getReturnFields().getLuceneFieldNames();
onlyPseudoFields = (fnames == null && !rctx.getReturnFields().wantsAllFields() && !rctx.getReturnFields().hasPatternMatching())
|| (fnames != null && fnames.size() == 1 && SolrReturnFields.SCORE.equals(fnames.iterator().next()));
+
+ // add non-stored DV fields that may have been requested
+ if (rctx.getReturnFields().wantsAllFields()) {
+ // check whether there are no additional fields
+ Set<String> fieldNames = rctx.getReturnFields().getLuceneFieldNames(true);
+ if (fieldNames == null) {
+ dvFieldsToReturn = rctx.getSearcher().getNonStoredDVs(true);
+ } else {
+ dvFieldsToReturn = new HashSet<>(rctx.getSearcher().getNonStoredDVs(true)); // copy
+ // add all requested fields that may be useDocValuesAsStored=false
+ for (String fl : fieldNames) {
+ if (rctx.getSearcher().getNonStoredDVs(false).contains(fl)) {
+ dvFieldsToReturn.add(fl);
+ }
+ }
+ }
+ } else {
+ if (rctx.getReturnFields().hasPatternMatching()) {
+ for (String s : rctx.getSearcher().getNonStoredDVs(true)) {
+ if (rctx.getReturnFields().wantsField(s)) {
+ if (null == dvFieldsToReturn) {
+ dvFieldsToReturn = new HashSet<>();
+ }
+ dvFieldsToReturn.add(s);
+ }
+ }
+ } else if (fnames != null) {
+ dvFieldsToReturn = new HashSet<>(fnames); // copy
+ // here we get all non-stored dv fields because even if a user has set
+ // useDocValuesAsStored=false in schema, he may have requested a field
+ // explicitly using the fl parameter
+ dvFieldsToReturn.retainAll(rctx.getSearcher().getNonStoredDVs(false));
+ }
+ }
+
if (transformer != null) transformer.setContext(rctx);
}
@@ -95,6 +131,11 @@ public class DocsStreamer implements Ite
try {
StoredDocument doc = rctx.getSearcher().doc(id, fnames);
sdoc = getDoc(doc, rctx.getSearcher().getSchema()); // make sure to use the schema from the searcher and not the request (cross-core)
+
+ // decorate the document with non-stored docValues fields
+ if (dvFieldsToReturn != null) {
+ rctx.getSearcher().decorateDocValueFields(sdoc, id, dvFieldsToReturn);
+ }
} catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error reading document with docId " + id, e);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldProperties.java?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldProperties.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldProperties.java Sun Dec 27 10:27:00 2015
@@ -53,6 +53,7 @@ public abstract class FieldProperties {
protected final static int DOC_VALUES = 0x00008000;
protected final static int STORE_TERMPAYLOADS = 0x00010000;
+ protected final static int USE_DOCVALUES_AS_STORED = 0x00020000;
static final String[] propertyNames = {
"indexed", "tokenized", "stored",
@@ -60,7 +61,7 @@ public abstract class FieldProperties {
"termVectors", "termPositions", "termOffsets",
"multiValued",
"sortMissingFirst","sortMissingLast","required", "omitPositions",
- "storeOffsetsWithPositions", "docValues", "termPayloads"
+ "storeOffsetsWithPositions", "docValues", "termPayloads", "useDocValuesAsStored"
};
static final Map<String,Integer> propertyMap = new HashMap<>();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldType.java Sun Dec 27 10:27:00 2015
@@ -46,8 +46,8 @@ import org.apache.lucene.search.MultiTer
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.SortedSetSelector;
import org.apache.lucene.search.SortedNumericSelector;
+import org.apache.lucene.search.SortedSetSelector;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.uninverting.UninvertingReader;
@@ -124,7 +124,12 @@ public abstract class FieldType extends
return false;
}
-
+ /**
+ * Returns true if the fields' docValues should be used for obtaining stored value
+ */
+ public boolean useDocValuesAsStored() {
+ return (properties & USE_DOCVALUES_AS_STORED) != 0;
+ }
/** Returns true if a single field value of this type has multiple logical values
* for the purposes of faceting, sorting, etc. Text fields normally return
@@ -153,6 +158,7 @@ public abstract class FieldType extends
if (schemaVersion < 1.3) {
args.remove("compressThreshold");
}
+ if (schemaVersion >= 1.6f) properties |= USE_DOCVALUES_AS_STORED;
this.args = Collections.unmodifiableMap(args);
Map<String,String> initArgs = new HashMap<>(args);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaField.java?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaField.java Sun Dec 27 10:27:00 2015
@@ -99,6 +99,8 @@ public final class SchemaField extends F
public boolean omitPositions() { return (properties & OMIT_POSITIONS)!=0; }
public boolean storeOffsetsWithPositions() { return (properties & STORE_OFFSETS)!=0; }
+ public boolean useDocValuesAsStored() { return (properties & USE_DOCVALUES_AS_STORED)!=0; }
+
public boolean multiValued() { return (properties & MULTIVALUED)!=0; }
public boolean sortMissingFirst() { return (properties & SORT_MISSING_FIRST)!=0; }
public boolean sortMissingLast() { return (properties & SORT_MISSING_LAST)!=0; }
@@ -335,6 +337,7 @@ public final class SchemaField extends F
}
properties.add(getPropertyName(REQUIRED), isRequired());
properties.add(getPropertyName(TOKENIZED), isTokenized());
+ properties.add(getPropertyName(USE_DOCVALUES_AS_STORED), useDocValuesAsStored());
// The BINARY property is always false
// properties.add(getPropertyName(BINARY), isBinary());
} else {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
*/
package org.apache.solr.search;
-import java.util.*;
+import java.util.Set;
import org.apache.solr.response.transform.DocTransformer;
@@ -36,6 +36,17 @@ public abstract class ReturnFields {
public abstract Set<String> getLuceneFieldNames();
/**
+ * Set of field names with their exact names from the lucene index.
+ *
+ * @param ignoreWantsAll If true, it returns any additional specified field names, in spite of
+ * also wanting all fields. Example: when fl=*,field1, returns ["field1"].
+ * If false, the method returns null when all fields are wanted. Example: when fl=*,field1, returns null.
+ * Note that this method returns null regardless of ignoreWantsAll if all fields
+ * are requested and no explicit field names are specified.
+ */
+ public abstract Set<String> getLuceneFieldNames(boolean ignoreWantsAll);
+
+ /**
* The requested field names (includes pseudo fields)
* <p>
* @return Set of field names or <code>null</code> (all fields).
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Sun Dec 27 10:27:00 2015
@@ -37,32 +37,16 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.LegacyDoubleField;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.LazyDocument;
+import org.apache.lucene.document.LegacyDoubleField;
import org.apache.lucene.document.LegacyFloatField;
import org.apache.lucene.document.LegacyIntField;
-import org.apache.lucene.document.LazyDocument;
import org.apache.lucene.document.LegacyLongField;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.ExitableDirectoryReader;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.index.MultiPostingsEnum;
-import org.apache.lucene.index.PostingsEnum;
-import org.apache.lucene.index.SlowCompositeReaderWrapper;
-import org.apache.lucene.index.StorableField;
-import org.apache.lucene.index.StoredDocument;
-import org.apache.lucene.index.StoredFieldVisitor;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermContext;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.index.*;
import org.apache.lucene.search.*;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.store.Directory;
@@ -70,6 +54,9 @@ import org.apache.lucene.uninverting.Uni
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
+import org.apache.lucene.util.LegacyNumericUtils;
+import org.apache.lucene.util.NumericUtils;
+import org.apache.solr.common.SolrDocumentBase;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.ModifiableSolrParams;
@@ -84,8 +71,15 @@ import org.apache.solr.request.LocalSolr
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.schema.EnumField;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
+import org.apache.solr.schema.StrField;
+import org.apache.solr.schema.TrieDateField;
+import org.apache.solr.schema.TrieDoubleField;
+import org.apache.solr.schema.TrieFloatField;
+import org.apache.solr.schema.TrieIntField;
+import org.apache.solr.schema.TrieLongField;
import org.apache.solr.search.facet.UnInvertedField;
import org.apache.solr.search.stats.StatsSource;
import org.apache.solr.update.SolrIndexConfig;
@@ -144,6 +138,17 @@ public class SolrIndexSearcher extends I
private final FieldInfos fieldInfos;
// TODO: do we need this separate set of field names? we can just use the fieldinfos?
private final Collection<String> fieldNames;
+
+ /**
+ * Contains the names/patterns of all docValues=true,stored=false fields in the schema
+ */
+ private final Set<String> allNonStoredDVs;
+
+ /**
+ * Contains the names/patterns of all docValues=true,stored=false,useDocValuesAsStored=true fields in the schema
+ */
+ private final Set<String> nonStoredDVsUsedAsStored;
+
private Collection<String> storedHighlightFieldNames;
private DirectoryFactory directoryFactory;
@@ -298,11 +303,23 @@ public class SolrIndexSearcher extends I
}
fieldNames = new HashSet<>();
+ Set<String> nonStoredDVsUsedAsStored = new HashSet<>();
+ Set<String> allNonStoredDVs = new HashSet<>();
fieldInfos = leafReader.getFieldInfos();
for(FieldInfo fieldInfo : fieldInfos) {
fieldNames.add(fieldInfo.name);
+ SchemaField schemaField = schema.getFieldOrNull(fieldInfo.name);
+ if (schemaField != null && !schemaField.stored() && schemaField.hasDocValues()) {
+ if (schemaField.useDocValuesAsStored()) {
+ nonStoredDVsUsedAsStored.add(fieldInfo.name);
+ }
+ allNonStoredDVs.add(fieldInfo.name);
+ }
}
+ this.nonStoredDVsUsedAsStored = Collections.unmodifiableSet(nonStoredDVsUsedAsStored);
+ this.allNonStoredDVs = Collections.unmodifiableSet(allNonStoredDVs);
+
// We already have our own filter cache
setQueryCache(null);
@@ -758,6 +775,88 @@ public class SolrIndexSearcher extends I
}
/**
+ * This will fetch and add the docValues fields to a given SolrDocument/SolrInputDocument
+ *
+ * @param doc A SolrDocument or SolrInputDocument instance where docValues will be added
+ * @param docid The lucene docid of the document to be populated
+ * @param fields The list of docValues fields to be decorated
+ */
+ @SuppressWarnings("deprecation")
+ public void decorateDocValueFields(@SuppressWarnings("rawtypes") SolrDocumentBase doc, int docid,
+ Set<String> fields) throws IOException {
+ for (String fieldName : fields) {
+ SchemaField schemaField = schema.getFieldOrNull(fieldName);
+ if (schemaField == null || !schemaField.hasDocValues() || doc.containsKey(fieldName)) {
+ log.warn("Couldn't decorate docValues for field: {}, schemaField: {}", fieldName, schemaField);
+ continue;
+ }
+
+ if (schemaField.multiValued()) {
+ SortedSetDocValues values = getLeafReader().getSortedSetDocValues(fieldName);
+ if (values != null && values.getValueCount() > 0 &&
+ DocValues.getDocsWithField(leafReader, fieldName).get(docid)) {
+ values.setDocument(docid);
+ List<Object> outValues = new LinkedList<Object>();
+ for (long ord = values.nextOrd(); ord != SortedSetDocValues.NO_MORE_ORDS; ord = values.nextOrd()) {
+ if (schemaField.getType() instanceof TrieIntField) {
+ outValues.add(LegacyNumericUtils.prefixCodedToInt(values.lookupOrd(ord)));
+ } else if (schemaField.getType() instanceof TrieLongField) {
+ outValues.add(LegacyNumericUtils.prefixCodedToLong(values.lookupOrd(ord)));
+ } else if (schemaField.getType() instanceof TrieFloatField) {
+ outValues.add(LegacyNumericUtils.sortableIntToFloat(LegacyNumericUtils.prefixCodedToInt(values.lookupOrd(ord))));
+ } else if (schemaField.getType() instanceof TrieDoubleField) {
+ outValues.add(LegacyNumericUtils.sortableLongToDouble(LegacyNumericUtils.prefixCodedToLong(values.lookupOrd(ord))));
+ } else if (schemaField.getType() instanceof TrieDateField) {
+ outValues.add(new Date(LegacyNumericUtils.prefixCodedToLong(values.lookupOrd(ord))));
+ } else if (schemaField.getType() instanceof EnumField) {
+ outValues.add(((EnumField) schemaField.getType()).intValueToStringValue(
+ LegacyNumericUtils.prefixCodedToInt(values.lookupOrd(ord))));
+ } else if (schemaField.getType() instanceof StrField) {
+ outValues.add(values.lookupOrd(ord).utf8ToString());
+ }
+ }
+ if (outValues.size() > 0)
+ doc.addField(fieldName, outValues);
+ }
+ } else {
+ DocValuesType dvType = fieldInfos.fieldInfo(fieldName).getDocValuesType();
+ switch (dvType) {
+ case NUMERIC:
+ if (DocValues.getDocsWithField(leafReader, fieldName).get(docid)) {
+ NumericDocValues ndv = leafReader.getNumericDocValues(fieldName);
+ Object val = ndv.get(docid);
+ if (schemaField.getType() instanceof TrieIntField) {
+ val = ((Long) val).intValue();
+ } else if (schemaField.getType() instanceof TrieFloatField) {
+ val = NumericUtils.sortableIntToFloat(((Long) val).intValue());
+ } else if (schemaField.getType() instanceof TrieDoubleField) {
+ val = NumericUtils.sortableLongToDouble((long) val);
+ } else if (schemaField.getType() instanceof TrieDateField) {
+ val = new Date((long) val);
+ } else if (schemaField.getType() instanceof EnumField) {
+ val = ((EnumField) schemaField.getType()).intValueToStringValue(((Long) val).intValue());
+ }
+ doc.addField(fieldName, val);
+ }
+ break;
+ case BINARY:
+ if (DocValues.getDocsWithField(leafReader, fieldName).get(docid)) {
+ BinaryDocValues bdv = leafReader.getBinaryDocValues(fieldName);
+ doc.addField(fieldName, bdv.get(docid));
+ }
+ break;
+ case SORTED:
+ SortedDocValues sdv = leafReader.getSortedDocValues(fieldName);
+ if (sdv.getOrd(docid) >= 0) {
+ doc.addField(fieldName, sdv.get(docid).utf8ToString());
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ /**
* Takes a list of docs (the doc ids actually), and reads them into an array
* of Documents.
*/
@@ -775,6 +874,17 @@ public class SolrIndexSearcher extends I
}
}
+ /**
+ * Returns an unmodifiable set of non-stored docValues field names.
+ *
+ * @param onlyUseDocValuesAsStored If false, returns all non-stored docValues.
+ * If true, returns only those non-stored docValues
+ * which have the {@link SchemaField#useDocValuesAsStored()} flag true.
+ */
+ public Set<String> getNonStoredDVs(boolean onlyUseDocValuesAsStored) {
+ return onlyUseDocValuesAsStored ? nonStoredDVsUsedAsStored : allNonStoredDVs;
+ }
+
/* ********************** end document retrieval *************************/
////////////////////////////////////////////////////////////////////////////////
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrReturnFields.java?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrReturnFields.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrReturnFields.java Sun Dec 27 10:27:00 2015
@@ -398,7 +398,16 @@ public class SolrReturnFields extends Re
@Override
public Set<String> getLuceneFieldNames()
{
- return (_wantsAllFields || fields.isEmpty()) ? null : fields;
+ return getLuceneFieldNames(false);
+ }
+
+ @Override
+ public Set<String> getLuceneFieldNames(boolean ignoreWantsAll)
+ {
+ if (ignoreWantsAll)
+ return fields;
+ else
+ return (_wantsAllFields || fields.isEmpty()) ? null : fields;
}
@Override
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml Sun Dec 27 10:27:00 2015
@@ -20,7 +20,7 @@
text field that blows up in analysis, and an ID field for diagnosis.
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<fieldType name="long" class="solr.TrieLongField" stored="true" indexed="true" />
<fieldType name="int" class="solr.TrieIntField" precisionStep="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-bogus-analysis-parameters" version="1.5">
+<schema name="bad-schema-bogus-analysis-parameters" version="1.6">
<types>
<fieldType name="text" class="solr.TextField">
<analyzer>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-bogus-field-parameters" version="1.5">
+<schema name="bad-schema-bogus-field-parameters" version="1.6">
<types>
<fieldType name="binary" class="solr.BinaryField" />
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-init-error.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-init-error.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-init-error.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-init-error.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-throws-java-error" version="1.5">
+<schema name="bad-schema-throws-java-error" version="1.6">
<types>
<fieldType name="error_ft" class="solr.ThrowErrorOnInitFieldType" />
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="bad-schema-docValues-unsupported" version="1.5">
+<schema name="bad-schema-docValues-unsupported" version="1.6">
<types>
<fieldType name="binary" class="solr.BinaryField" />
</types>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml Sun Dec 27 10:27:00 2015
@@ -21,7 +21,7 @@
Test for HighlighterMaxOffsetTest which requires the use of ReversedWildcardFilterFactory
-->
-<schema name="example" version="1.5">
+<schema name="example" version="1.6">
<fields>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="add-schema-fields-update-processor" version="1.5">
+<schema name="add-schema-fields-update-processor" version="1.6">
<fieldType name="tint" class="solr.TrieIntField" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
<fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml Sun Dec 27 10:27:00 2015
@@ -27,6 +27,7 @@
<fieldType name="text" class="solr.TextField"/>
<fieldType name="bool" class="solr.BoolField"/>
<fieldType name="str" class="solr.StrField"/>
+ <fieldType name="int" class="solr.TrieIntField"/>
<!-- explicit props on type -->
<fieldType name="multi_f" class="solr.StrField" multiValued="false"/>
@@ -42,80 +43,94 @@
<fieldType name="txtTfP_f" class="solr.TextField" omitTermFreqAndPositions="false"/>
<fieldType name="txtTfP_t" class="solr.TextField" omitTermFreqAndPositions="true"/>
- <fieldType name="txt_phrase_f" class="solr.TextField"
+ <fieldType name="txt_phrase_f" class="solr.TextField"
autoGeneratePhraseQueries="false"/>
<fieldType name="txt_phrase_t" class="solr.TextField"
- autoGeneratePhraseQueries="true" />
+ autoGeneratePhraseQueries="true"/>
+ <fieldType name="int_dvas_t" class="solr.TrieIntField" useDocValuesAsStored="true"/>
+ <fieldType name="int_dvas_f" class="solr.TrieIntField" useDocValuesAsStored="false"/>
</types>
<fields>
<!-- all behavior is default -->
- <field name="text" type="text" />
- <field name="bool" type="bool" />
- <field name="str" type="str" />
-
- <dynamicField name="*_dyn_text" type="text" />
- <dynamicField name="*_dyn_bool" type="bool" />
- <dynamicField name="*_dyn_str" type="str" />
+ <field name="text" type="text"/>
+ <field name="bool" type="bool"/>
+ <field name="str" type="str"/>
+ <field name="int" type="int"/>
+
+ <dynamicField name="*_dyn_text" type="text"/>
+ <dynamicField name="*_dyn_bool" type="bool"/>
+ <dynamicField name="*_dyn_str" type="str"/>
+ <dynamicField name="*_dyn_int" type="int"/>
<!-- explicit props on type -->
- <field name="ft_multi_f" type="multi_f" />
- <field name="ft_multi_t" type="multi_t" />
- <dynamicField name="*_dyn_str_ft_multi_f" type="multi_f" />
- <dynamicField name="*_dyn_str_ft_multi_t" type="multi_t" />
-
- <field name="ft_strnorm_f" type="strnorm_f" />
- <field name="ft_strnorm_t" type="strnorm_t" />
- <dynamicField name="*_dyn_ft_strnorm_f" type="strnorm_f" />
- <dynamicField name="*_dyn_ft_strnorm_t" type="strnorm_t" />
-
- <field name="ft_txtnorm_f" type="txtnorm_f" />
- <field name="ft_txtnorm_t" type="txtnorm_t" />
- <dynamicField name="*_dyn_ft_txtnorm_f" type="txtnorm_f" />
- <dynamicField name="*_dyn_ft_txtnorm_t" type="txtnorm_t" />
-
- <field name="ft_strTfP_f" type="strTfP_f" />
- <field name="ft_strTfP_t" type="strTfP_t" />
- <dynamicField name="*_dyn_ft_strTfP_f" type="strTfP_f" />
- <dynamicField name="*_dyn_ft_strTfP_t" type="strTfP_t" />
-
- <field name="ft_txtTfP_f" type="txtTfP_f" />
- <field name="ft_txtTfP_t" type="txtTfP_t" />
- <dynamicField name="*_dyn_ft_txtTfP_f" type="txtTfP_f" />
- <dynamicField name="*_dyn_ft_txtTfP_t" type="txtTfP_t" />
-
- <field name="ft_txt_phrase_f" type="txt_phrase_f" />
- <field name="ft_txt_phrase_t" type="txt_phrase_t" />
- <dynamicField name="*_dyn_ft_txt_phrase_f" type="txt_phrase_f" />
- <dynamicField name="*_dyn_ft_txt_phrase_t" type="txt_phrase_t" />
-
+ <field name="ft_multi_f" type="multi_f"/>
+ <field name="ft_multi_t" type="multi_t"/>
+ <dynamicField name="*_dyn_str_ft_multi_f" type="multi_f"/>
+ <dynamicField name="*_dyn_str_ft_multi_t" type="multi_t"/>
+
+ <field name="ft_strnorm_f" type="strnorm_f"/>
+ <field name="ft_strnorm_t" type="strnorm_t"/>
+ <dynamicField name="*_dyn_ft_strnorm_f" type="strnorm_f"/>
+ <dynamicField name="*_dyn_ft_strnorm_t" type="strnorm_t"/>
+
+ <field name="ft_txtnorm_f" type="txtnorm_f"/>
+ <field name="ft_txtnorm_t" type="txtnorm_t"/>
+ <dynamicField name="*_dyn_ft_txtnorm_f" type="txtnorm_f"/>
+ <dynamicField name="*_dyn_ft_txtnorm_t" type="txtnorm_t"/>
+
+ <field name="ft_strTfP_f" type="strTfP_f"/>
+ <field name="ft_strTfP_t" type="strTfP_t"/>
+ <dynamicField name="*_dyn_ft_strTfP_f" type="strTfP_f"/>
+ <dynamicField name="*_dyn_ft_strTfP_t" type="strTfP_t"/>
+
+ <field name="ft_txtTfP_f" type="txtTfP_f"/>
+ <field name="ft_txtTfP_t" type="txtTfP_t"/>
+ <dynamicField name="*_dyn_ft_txtTfP_f" type="txtTfP_f"/>
+ <dynamicField name="*_dyn_ft_txtTfP_t" type="txtTfP_t"/>
+
+ <field name="ft_txt_phrase_f" type="txt_phrase_f"/>
+ <field name="ft_txt_phrase_t" type="txt_phrase_t"/>
+ <dynamicField name="*_dyn_ft_txt_phrase_f" type="txt_phrase_f"/>
+ <dynamicField name="*_dyn_ft_txt_phrase_t" type="txt_phrase_t"/>
+
+ <field name="ft_intdvas_t" type="int_dvas_t"/>
+ <field name="ft_intdvas_f" type="int_dvas_f"/>
+ <dynamicField name="*_dyn_ft_intdvas_t" type="int_dvas_t"/>
+ <dynamicField name="*_dyn_ft_intdvas_f" type="int_dvas_f"/>
+
<!-- explicit props on field -->
- <field name="multi_f" type="str" multiValued="false" />
- <field name="multi_t" type="str" multiValued="true" />
- <dynamicField name="*_dyn_str_multi_f" type="str" multiValued="false" />
- <dynamicField name="*_dyn_str_multi_t" type="str" multiValued="true" />
-
- <field name="strnorm_f" type="str" omitNorms="false" />
- <field name="strnorm_t" type="str" omitNorms="true" />
- <dynamicField name="*_dyn_strnorm_f" type="str" omitNorms="false" />
- <dynamicField name="*_dyn_strnorm_t" type="str" omitNorms="true" />
-
- <field name="txtnorm_f" type="text" omitNorms="false" />
- <field name="txtnorm_t" type="text" omitNorms="true" />
- <dynamicField name="*_dyn_txtnorm_f" type="text" omitNorms="false" />
- <dynamicField name="*_dyn_txtnorm_t" type="text" omitNorms="true" />
-
- <field name="strTfP_f" type="str" omitTermFreqAndPositions="false" />
- <field name="strTfP_t" type="str" omitTermFreqAndPositions="true" />
- <dynamicField name="*_dyn_strTfP_f" type="str" omitTermFreqAndPositions="false" />
- <dynamicField name="*_dyn_strTfP_t" type="str" omitTermFreqAndPositions="true" />
-
- <field name="txtTfP_f" type="text" omitTermFreqAndPositions="false" />
- <field name="txtTfP_t" type="text" omitTermFreqAndPositions="true" />
- <dynamicField name="*_dyn_txtTfP_f" type="text" omitTermFreqAndPositions="false" />
- <dynamicField name="*_dyn_txtTfP_t" type="text" omitTermFreqAndPositions="true" />
+ <field name="multi_f" type="str" multiValued="false"/>
+ <field name="multi_t" type="str" multiValued="true"/>
+ <dynamicField name="*_dyn_str_multi_f" type="str" multiValued="false"/>
+ <dynamicField name="*_dyn_str_multi_t" type="str" multiValued="true"/>
+
+ <field name="strnorm_f" type="str" omitNorms="false"/>
+ <field name="strnorm_t" type="str" omitNorms="true"/>
+ <dynamicField name="*_dyn_strnorm_f" type="str" omitNorms="false"/>
+ <dynamicField name="*_dyn_strnorm_t" type="str" omitNorms="true"/>
+
+ <field name="txtnorm_f" type="text" omitNorms="false"/>
+ <field name="txtnorm_t" type="text" omitNorms="true"/>
+ <dynamicField name="*_dyn_txtnorm_f" type="text" omitNorms="false"/>
+ <dynamicField name="*_dyn_txtnorm_t" type="text" omitNorms="true"/>
+
+ <field name="strTfP_f" type="str" omitTermFreqAndPositions="false"/>
+ <field name="strTfP_t" type="str" omitTermFreqAndPositions="true"/>
+ <dynamicField name="*_dyn_strTfP_f" type="str" omitTermFreqAndPositions="false"/>
+ <dynamicField name="*_dyn_strTfP_t" type="str" omitTermFreqAndPositions="true"/>
+
+ <field name="txtTfP_f" type="text" omitTermFreqAndPositions="false"/>
+ <field name="txtTfP_t" type="text" omitTermFreqAndPositions="true"/>
+ <dynamicField name="*_dyn_txtTfP_f" type="text" omitTermFreqAndPositions="false"/>
+ <dynamicField name="*_dyn_txtTfP_t" type="text" omitTermFreqAndPositions="true"/>
+
+ <field name="intdvas_t" type="int" useDocValuesAsStored="true"/>
+ <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"/>
</fields>
</schema>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml Sun Dec 27 10:27:00 2015
@@ -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.5">
+<schema name="test-class-name-shortening-on-serialization" version="1.6">
<types>
<fieldType name="fullClassNames" class="org.apache.solr.schema.TextField">
<analyzer>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test-custom-field-sort" version="1.5">
+<schema name="test-custom-field-sort" version="1.6">
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test-distributed-missing-sort" version="1.5">
+<schema name="test-distributed-missing-sort" version="1.6">
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml Sun Dec 27 10:27:00 2015
@@ -25,7 +25,7 @@
-->
-<schema name="schema-docValues" version="1.5">
+<schema name="schema-docValues" version="1.6">
<types>
<!-- field type definitions... note that the "name" attribute is
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml Sun Dec 27 10:27:00 2015
@@ -16,14 +16,26 @@
limitations under the License.
-->
-<schema name="doc-values-for-Join" version="1.5">
+<schema name="doc-values-for-Join" version="1.6">
+ <!-- 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
+ not normally be changed by applications.
+ 1.0: multiValued attribute did not exist, all fields are multiValued by nature
+ 1.1: multiValued attribute introduced, false by default
+ 1.2: omitTermFreqAndPositions attribute introduced, true by default except for text fields.
+ 1.3: removed optional field compress feature
+ 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.
+ -->
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true" useDocValuesAsStored="false"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true" >
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
@@ -86,4 +98,5 @@
<copyField source="*_s" dest="*_s_dv" />
<copyField source="*_ss" dest="*_ss_dv" />
<copyField source="id" dest="id_dv" />
+
</schema>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml Sun Dec 27 10:27:00 2015
@@ -18,7 +18,7 @@
<!-- schema file for testing sorting/faceting/functions on single-valued DV with missing values -->
-<schema name="schema-docValuesMissing" version="1.5">
+<schema name="schema-docValuesMissing" version="1.6">
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="schema-docValuesMulti" version="1.5">
+<schema name="schema-docValuesMulti" version="1.6">
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml Sun Dec 27 10:27:00 2015
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<schema name="example" version="1.5">
+<schema name="example" version="1.6">
<fields>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="test-custom-comparator" version="1.5">
+<schema name="test-custom-comparator" version="1.6">
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-graph.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-graph.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-graph.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-graph.xml Sun Dec 27 10:27:00 2015
@@ -13,7 +13,7 @@
<!-- This is a stripped down schema that includes the node_id and edge_id
fields to test graph queries -->
-<schema name="graphexample" version="1.5">
+<schema name="graphexample" version="1.6">
<!-- field names should consist of alphanumeric or underscore characters
only and not start with a digit. This is not currently strictly enforced,
but other field names will not have first class support from all components
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml Sun Dec 27 10:27:00 2015
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<!-- field type definitions... note that the "name" attribute is
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="id-and-version-fields-only" version="1.5">
+<schema name="id-and-version-fields-only" version="1.6">
<types>
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
Added: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml?rev=1721795&view=auto
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml (added)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml Sun Dec 27 10:27:00 2015
@@ -0,0 +1,108 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<schema name="test-non-stored-docvalues" version="1.6">
+ <!-- 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.
+
+ 1.0: multiValued attribute did not exist, all fields are multiValued
+ by nature
+ 1.1: multiValued attribute introduced, false by default
+ 1.2: omitTermFreqAndPositions attribute introduced, true by default
+ except for text fields.
+ 1.3: removed optional field compress feature
+ 1.4: autoGeneratePhraseQueries attribute introduced to drive QueryParser
+ behavior when a single string produces multiple tokens. Defaults
+ to off for version >= 1.4
+ 1.5: omitNorms defaults to true for primitive field types
+ (int, float, boolean, string...)
+ 1.6: useDocValuesAsStored defaults to true.
+ -->
+
+ <types>
+
+ <!-- field type definitions... note that the "name" attribute is
+ just a label to be used by field definitions. The "class"
+ attribute and any other attributes determine the real type and
+ behavior of the fieldType.
+ -->
+
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+
+
+ <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+
+
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
+
+ <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
+ seconds part (.999) is optional.
+ -->
+ <fieldType name="date" class="solr.TrieDateField" precisionStep="0"/>
+ <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6"/>
+ <fieldType name="tdatedv" class="solr.TrieDateField" precisionStep="6" docValues="true"/>
+ <fieldType name="enumField" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity"/>
+ </types>
+
+ <fields>
+ <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="nonstored_dv_str" type="string" indexed="true" stored="false"
+ docValues="true" useDocValuesAsStored="false" multiValued="false"/>
+
+ <field name="test_nonstored_dv_str" type="string" indexed="true" stored="false" docValues="true" multiValued="false"/>
+
+ <!-- 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"/>
+
+ <!-- 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"/>
+ </fields>
+
+ <uniqueKey>id</uniqueKey>
+
+</schema>
+
+
+
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml Sun Dec 27 10:27:00 2015
@@ -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.5">
+<schema name="test-class-name-shortening-on-serialization" version="1.6">
<types>
<fieldType name="explicitLuceneMatchVersions" class="org.apache.solr.schema.TextField">
<analyzer>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml Sun Dec 27 10:27:00 2015
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<!-- The Solr schema file, version 1.5 -->
+<!-- The Solr schema file, version 1.6 -->
-<schema name="test-rest" version="1.5">
+<schema name="test-rest" version="1.6">
<!-- 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
@@ -29,6 +29,7 @@
1.3: removed optional field compress feature
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.
-->
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml Sun Dec 27 10:27:00 2015
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<!-- The Solr schema file, version 1.5 -->
+<!-- The Solr schema file, version 1.6 -->
-<schema name="test-rest" version="1.5">
+<schema name="test-rest" version="1.6">
<!-- 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
@@ -29,6 +29,7 @@
1.3: removed optional field compress feature
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.
-->
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml Sun Dec 27 10:27:00 2015
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<schema name="schema-docValuesMulti" version="1.5">
+<schema name="schema-docValuesMulti" version="1.6">
<types>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml Sun Dec 27 10:27:00 2015
@@ -22,7 +22,7 @@ NOTE: Tests expect every field in this s
-->
-<schema name="sortable" version="1.5">
+<schema name="sortable" version="1.6">
<uniqueKey>id</uniqueKey>
<fields>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml Sun Dec 27 10:27:00 2015
@@ -25,7 +25,7 @@
-->
-<schema name="test" version="1.5">
+<schema name="test" version="1.6">
<types>
<!-- field type definitions... note that the "name" attribute is
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-dv.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-dv.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-dv.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-dv.xml Sun Dec 27 10:27:00 2015
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="example" version="1.5">
+<schema name="example" version="1.6">
<fields>
<field name="_version_" type="long" indexed="false" stored="true" docValues="true"/>
<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-indexed.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-indexed.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-indexed.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-version-indexed.xml Sun Dec 27 10:27:00 2015
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="example" version="1.5">
+<schema name="example" version="1.6">
<fields>
<field name="_version_" type="long" indexed="true" stored="true"/>
<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false"/>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-xinclude.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-xinclude.xml?rev=1721795&r1=1721794&r2=1721795&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-xinclude.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-xinclude.xml Sun Dec 27 10:27:00 2015
@@ -18,7 +18,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<schema name="xinclude" version="1.5" xmlns:xi="http://www.w3.org/2001/XInclude">
+<schema name="xinclude" version="1.6" xmlns:xi="http://www.w3.org/2001/XInclude">
<types>
<fieldType name="string" class="solr.StrField"/>
<xi:include href="schema-snippet-type.xml" />