From 30bf6b657ff0f2d766c19f290708829afa53d2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Fri, 8 Jun 2018 15:12:48 +0200
Subject: [PATCH] SOLR-12350: Do not use docValues as stored for _str
 (copy)fields in _default configset

---
 solr/CHANGES.txt                              | 24 ++++++++++++++++++-
 .../collection1/conf/managed-schema           |  2 +-
 .../configsets/_default/conf/managed-schema   |  2 +-
 .../configsets/_default/conf/managed-schema   |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 38382130c5e..5e142046805 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -58,9 +58,31 @@ Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.11
 Jetty 9.4.10.v20180503
 
+Upgrade Notes
+----------------------
 
-(No Changes)
+* The data-driven schema no longer returns the *_str field-copy of text fields by default. The *_str field is still 
+  created and can be used for e.g. sorting, but to retrieve it you now need to explicitly list it in "fl" (SOLR-12350) 
 
+New Features
+----------------------
+
+(no changes)
+
+Bug Fixes
+----------------------
+
+(no changes)
+
+Optimizations
+----------------------
+
+* SOLR-12350: Do not use docValues as stored for _str (copy)fields in _default configset (janhoy)
+
+Other Changes
+----------------------
+
+(no changes)
 
 ==================  7.4.0 ==================
 
diff --git a/solr/contrib/prometheus-exporter/src/test-files/configsets/collection1/conf/managed-schema b/solr/contrib/prometheus-exporter/src/test-files/configsets/collection1/conf/managed-schema
index caa3317e632..e91098291ea 100644
--- a/solr/contrib/prometheus-exporter/src/test-files/configsets/collection1/conf/managed-schema
+++ b/solr/contrib/prometheus-exporter/src/test-files/configsets/collection1/conf/managed-schema
@@ -140,7 +140,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" />
+    <dynamicField name="*_str" type="strings" stored="false" docValues="true" indexed="false" useDocValuesAsStored="false"/>
 
     <dynamicField name="*_dt"  type="pdate"    indexed="true"  stored="true"/>
     <dynamicField name="*_dts" type="pdate"    indexed="true"  stored="true" multiValued="true"/>
diff --git a/solr/core/src/test-files/solr/configsets/_default/conf/managed-schema b/solr/core/src/test-files/solr/configsets/_default/conf/managed-schema
index 6f4e2ef1fb7..1a04009d8fe 100644
--- a/solr/core/src/test-files/solr/configsets/_default/conf/managed-schema
+++ b/solr/core/src/test-files/solr/configsets/_default/conf/managed-schema
@@ -142,7 +142,7 @@
     <dynamicField name="random_*" type="random"/>
 
     <!-- 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" />
+    <dynamicField name="*_str" type="strings" stored="false" docValues="true" indexed="false" useDocValuesAsStored="false"/>
 
     <dynamicField name="*_dt"  type="pdate"    indexed="true"  stored="true"/>
     <dynamicField name="*_dts" type="pdate"    indexed="true"  stored="true" multiValued="true"/>
diff --git a/solr/server/solr/configsets/_default/conf/managed-schema b/solr/server/solr/configsets/_default/conf/managed-schema
index 6f4e2ef1fb7..1a04009d8fe 100644
--- a/solr/server/solr/configsets/_default/conf/managed-schema
+++ b/solr/server/solr/configsets/_default/conf/managed-schema
@@ -142,7 +142,7 @@
     <dynamicField name="random_*" type="random"/>
 
     <!-- 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" />
+    <dynamicField name="*_str" type="strings" stored="false" docValues="true" indexed="false" useDocValuesAsStored="false"/>
 
     <dynamicField name="*_dt"  type="pdate"    indexed="true"  stored="true"/>
     <dynamicField name="*_dts" type="pdate"    indexed="true"  stored="true" multiValued="true"/>