From 1cc8bb8d4218f8c499694f4f11e82ccba71487a2 Mon Sep 17 00:00:00 2001
From: Luca Favatella <luca.favatella@erlang-solutions.com>
Date: Wed, 30 Nov 2016 15:20:43 +0000
Subject: [PATCH 1/2] Remove deprecated tags `types` and `fields` from default
 schema

Tags `types` and `fields` [deprecated in Solr
4.8](https://github.com/apache/lucene-solr/blob/releases/lucene-solr/6.3.0/solr/CHANGES.txt#L5572). See
also other
[ref](https://github.com/apache/lucene-solr/commit/5341918a0c626afb29343c42d651911f19b084a2).

Riak 2.2.0 integrates Solr 4.10.4:
* https://github.com/basho/riak/blob/riak-2.2.0/rebar.config#L23
* https://github.com/basho/yokozuna/blob/2.1.7/rebar.config#L19
* https://github.com/basho/yokozuna/blob/2.1.7/tools/grab-solr.sh#L21

Riak 2.0.7 integrates Solr 4.7.0 hence shall not get this change
merged:
* https://github.com/basho/riak/blob/riak-2.0.7/rebar.config#L25
* https://github.com/basho/yokozuna/blob/94e847b68e33e50e73f0a26592109cf66c08c77e/tools/grab-solr.sh#L21
---
 priv/default_schema.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/priv/default_schema.xml b/priv/default_schema.xml
index 16fd1a43..c47c55a0 100644
--- a/priv/default_schema.xml
+++ b/priv/default_schema.xml
@@ -17,7 +17,6 @@
 -->
 
 <schema name="default" version="1.5">
- <fields>
 
    <!-- TODO: is this needed? -->
    <field name="_version_" type="long" indexed="true" stored="true"/>
@@ -134,11 +133,9 @@
 
    <!-- Flag indicating if this doc is the product of a failed object extraction -->
    <field name="_yz_err" type="_yz_str" indexed="true" stored="false" multiValued="false"/>
- </fields>
 
  <uniqueKey>_yz_id</uniqueKey>
 
-  <types>
     <!-- YZ String: Used for non-analyzed fields -->
     <fieldType name="_yz_str" class="solr.StrField" sortMissingLast="true" />
 
@@ -803,6 +800,5 @@
         <filter class="solr.SnowballPorterFilterFactory" language="Turkish"/>
       </analyzer>
     </fieldType>
- </types>
 
 </schema>

From 2b6a63e8327473a4206f13d65bdff4a5e0581390 Mon Sep 17 00:00:00 2001
From: Luca Favatella <luca.favatella@erlang-solutions.com>
Date: Wed, 30 Nov 2016 16:09:35 +0000
Subject: [PATCH 2/2] Review field `text` in default schema

In 2013, [usage] of `text` field was deleted. In 2014, `text` stopped
to be [default] field and [comment] on aim of `text` field was
deleted. Hence only the definition of field `text` was left.

[usage]: https://github.com/basho/yokozuna/commit/5ed36bb7bd64f4e17387bcd84621a63f0aae4ef9#diff-a5640d83f118f6b45ab6c388a89507dcL258
[default]: https://github.com/basho/yokozuna/commit/7e106dc114c87f4569800911f3fb410a8ed92664#diff-a54ecf58f2bd4054b393a8c7b4cbc782L540
[comment]: https://github.com/basho/yokozuna/commit/5d813cc42215671240a0e0f43a208841dd65e05d#diff-a5640d83f118f6b45ab6c388a89507dcL26

This change reviews field `text` in the following way:
* Comment field definition, alongside commented sample intended usage;
* Rename field to `_text_` as apparent upstream [preference].

[preference]: https://github.com/apache/lucene-solr/commit/a4be57c1a11b7fc3e1988cb688fdfa949a3f5884

Note:
* Is is ok to use wildcard as source i.e. [`<copyField source="*"
  ...`](https://github.com/apache/lucene-solr/blob/releases/lucene-solr/6.3.0/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema#L128).
---
 priv/default_schema.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/priv/default_schema.xml b/priv/default_schema.xml
index c47c55a0..faff2d99 100644
--- a/priv/default_schema.xml
+++ b/priv/default_schema.xml
@@ -21,8 +21,6 @@
    <!-- TODO: is this needed? -->
    <field name="_version_" type="long" indexed="true" stored="true"/>
 
-   <field name="text" type="text_general" indexed="true" stored="false" multiValued="true"/>
-
    <dynamicField name="*_i"  type="int"    indexed="true"  stored="true"  multiValued="false"/>
    <dynamicField name="*_is" type="int"    indexed="true"  stored="true"  multiValued="true"/>
    <dynamicField name="*_l"  type="long"   indexed="true"  stored="true"  multiValued="false"/>
@@ -136,6 +134,12 @@
 
  <uniqueKey>_yz_id</uniqueKey>
 
+  <!-- Enable only if the client does not know what fields may be
+       searched because it's very expensive to index everything
+       twice. -->
+  <!-- <field name="_text_" type="text_general" indexed="true" stored="false" multiValued="true"/> -->
+  <!-- <copyField source="*" dest="_text_"/> -->
+
     <!-- YZ String: Used for non-analyzed fields -->
     <fieldType name="_yz_str" class="solr.StrField" sortMissingLast="true" />