SOLR-7041: Remove a lot of defaultOperator and defaultSearchField from test configs (still more work to do)

2017-04-28 22:12:17 +02:00 · 2017-04-28 22:12:17 +02:00 · 61f64829d8
parent e96dc4f21c
commit 61f64829d8
51 changed files with 14 additions and 208 deletions
--- a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
+++ b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
@ -337,9 +337,6 @@
  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
  <defaultSearchField>text</defaultSearchField>

-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="OR"/>
-
  <!-- copyField commands copy one field to another at the time a document
        is added to the index.  It's used either to index the same field differently,
        or to add multiple fields to the same field for easier/faster searching.  -->
--- a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
+++ b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
@ -205,8 +205,4 @@

  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
  <defaultSearchField>text</defaultSearchField>
-
-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="OR"/>
-
 </schema>
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
@ -68,5 +68,4 @@

  <uniqueKey>id</uniqueKey>
  <defaultSearchField>desc</defaultSearchField>
-  <solrQueryParser defaultOperator="OR"/>
 </schema>
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
@ -313,8 +313,4 @@

  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
  <defaultSearchField>desc</defaultSearchField>
-
-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="OR"/>
-
 </schema>
--- a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
+++ b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
@ -584,9 +584,6 @@
  -->
  <defaultSearchField>text</defaultSearchField>

-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="OR" />
-
  <!--
    copyField commands copy one field to another at the time a document
    is added to the index. It's used either to index the same field
--- a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
+++ b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
@ -582,9 +582,6 @@
  -->
  <defaultSearchField>text</defaultSearchField>

-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="OR"/>
-
  <!--
    copyField commands copy one field to another at the time a document
    is added to the index. It's used either to index the same field
--- a/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml
+++ b/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml
@ -25,7 +25,4 @@
  <uniqueKey>id</uniqueKey>

  <defaultSearchField>id</defaultSearchField>
-
-  <solrQueryParser defaultOperator="OR"/>
-
 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
@ -30,7 +30,6 @@
  <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>


-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
@ -27,6 +27,5 @@
  <field name="direct1text" type="direct1" indexed="true" stored="true"/>
  <dynamicField name="*" type="direct1"/>

-  <defaultSearchField>direct1text</defaultSearchField>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
@ -25,7 +25,6 @@
  <dynamicField name="*_c" type="currency" indexed="true" stored="true" multiValued="true"/>
  <!-- END BAD STUFF -->

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
@ -28,7 +28,6 @@
  <field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
  <field name="money" type="currency" indexed="true" stored="true"/>

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
@ -28,7 +28,6 @@
  <field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
  <field name="money" type="currency" indexed="true" stored="true"/>

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
@ -24,7 +24,6 @@
  <field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
  <field name="money" type="currency" indexed="true" stored="true"/>

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
@ -27,7 +27,6 @@
  <field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
  <field name="money" type="currency" indexed="true" stored="true"/>

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
@ -25,7 +25,6 @@
  <field name="money" type="currency" indexed="true" stored="true" multiValued="true"/>
  <!-- END BAD STUFF -->

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
@ -30,7 +30,6 @@
  <dynamicField name="*_twice" type="string" indexed="true" stored="true"/>
  <!-- END BAD STUFF -->

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
@ -33,7 +33,6 @@
  <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>


-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
@ -32,7 +32,6 @@
  <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>


-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
@ -24,7 +24,6 @@
  <dynamicField name="bad_*" type="string" default="BAD"/>
  <!-- END BAD STUFF -->

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
@ -24,7 +24,6 @@
  <dynamicField name="bad_*" type="string" required="true"/>
  <!-- END BAD STUFF -->

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
@ -28,7 +28,6 @@
  <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>


-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
@ -30,7 +30,6 @@
  <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>


-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
@ -30,7 +30,6 @@
  <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>


-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
@ -29,7 +29,6 @@

  <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
@ -30,7 +30,6 @@

  <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml
@ -38,6 +38,4 @@

  <field name="sim1text" type="ft-overrides-default-sim" indexed="true" stored="true"/>

- <defaultSearchField>sim1text</defaultSearchField>
-
 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml
@ -38,6 +38,4 @@

  <field name="sim1text" type="ft-overrides-default-sim" indexed="true" stored="true"/>

- <defaultSearchField>sim1text</defaultSearchField>
-
 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
@ -31,6 +31,4 @@
  <field name="sim1text" type="sim1" indexed="true" stored="true"/>
  <dynamicField name="*" type="sim1"/>

-  <defaultSearchField>sim1text</defaultSearchField>
-
 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
@ -38,7 +38,6 @@
  <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>


-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
@ -34,7 +34,6 @@
  <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>


-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
@ -35,8 +35,7 @@

  <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>

-
-  <defaultSearchField>id</defaultSearchField>
+  
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
@ -34,8 +34,7 @@

  <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>

-
-  <defaultSearchField>id</defaultSearchField>
+  
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
@ -26,7 +26,6 @@
  <copyField source="XXX" dest="id"/>
  <!-- END BAD STUFF -->

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
@ -23,7 +23,6 @@
  <field name="id" type="string" indexed="true" stored="true"/>
  <!-- END BAD STUFF -->

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
@ -23,7 +23,6 @@
  <field name="id" type="string" indexed="true" stored="true" default="XXX"/>
  <!-- END BAD STUFF -->

-  <defaultSearchField>id</defaultSearchField>
  <uniqueKey>id</uniqueKey>

 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
@ -38,7 +38,6 @@ Test for HighlighterMaxOffsetTest which requires the use of ReversedWildcardFilt

  <uniqueKey>id</uniqueKey>
  <defaultSearchField>content</defaultSearchField>
-  <solrQueryParser defaultOperator="AND"/>


  <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
--- a/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml
@ -1,36 +0,0 @@
-<?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" version="1.2">
-
-  <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-
-  <fieldType name="nametext" class="solr.TextField">
-    <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
-  </fieldType>
-
-  <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
-  <field name="name" type="nametext" indexed="true" stored="true"/>
-  <field name="title" type="nametext" indexed="true" stored="true"/>
-  <field name="text" type="nametext" indexed="true" stored="true"/>
-
-  <defaultSearchField>text</defaultSearchField>
-  <solrQueryParser defaultOperator="AND"/>
-  <uniqueKey>id</uniqueKey>
-
-</schema>
-
--- a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
@ -692,7 +692,4 @@
  <copyField source="title_*" dest="*_s"/>
  <copyField source="title_*" dest="*_dest_sub_s"/>
  <copyField source="title_*" dest="dest_sub_no_ast_s"/>
-
-  <solrQueryParser defaultOperator="OR"/>
-
 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
@ -661,7 +661,4 @@
  <uniqueKey>id</uniqueKey>

  <copyField source="*" dest="text"/>
-
-  <solrQueryParser defaultOperator="OR"/>
-
 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
@ -74,8 +74,4 @@

  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
  <defaultSearchField>text</defaultSearchField>
-
-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="OR"/>
-
 </schema>
--- a/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
@ -284,21 +284,6 @@
    -->
  <uniqueKey>id</uniqueKey>

-  <!-- DEPRECATED: The defaultSearchField is consulted by various query parsers when
-   parsing a query string that isn't explicit about the field.  Machine (non-user)
-   generated queries are best made explicit, or they can use the "df" request parameter
-   which takes precedence over this.
-   Note: Un-commenting defaultSearchField will be insufficient if your request handler
-   in solrconfig.xml defines "df", which takes precedence. That would need to be removed.
-  <defaultSearchField>text</defaultSearchField> -->
-
-  <!-- DEPRECATED: The defaultOperator (AND|OR) is consulted by various query parsers
-   when parsing a query string to determine if a clause of the query should be marked as
-   required or optional, assuming the clause isn't already marked by some operator.
-   The default is OR, which is generally assumed so it is not a good idea to change it
-   globally here.  The "q.op" request parameter takes precedence over this.
-  <solrQueryParser defaultOperator="OR"/> -->
-
  <!-- copyField commands copy one field to another at the time a document
        is added to the index.  It's used either to index the same field differently,
        or to add multiple fields to the same field for easier/faster searching.  -->
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
@ -29,9 +29,6 @@ public class TestSchemaResource extends SolrRestletTestBase {
            "count(/response/lst[@name='schema']/float[@name='version']) = 1",
            "/response/lst[@name='schema']/float[@name='version'][.='1.6']",

-            "count(/response/lst[@name='schema']/lst[@name='solrQueryParser']/str[@name='defaultOperator']) = 1",
-            "/response/lst[@name='schema']/lst[@name='solrQueryParser']/str[@name='defaultOperator'][.='OR']",
-
            "count(/response/lst[@name='schema']/str[@name='uniqueKey']) = 1",
            "/response/lst[@name='schema']/str[@name='uniqueKey'][.='id']",
        
@ -113,7 +110,6 @@ public class TestSchemaResource extends SolrRestletTestBase {

             "/schema/name=='test-rest'",
             "/schema/version==1.6",
-             "/schema/solrQueryParser/defaultOperator=='OR'",
             "/schema/uniqueKey=='id'",
             "/schema/defaultSearchField=='text'",
        
@ -154,7 +150,6 @@ public class TestSchemaResource extends SolrRestletTestBase {

            "/schema/@name = 'test-rest'",
            "/schema/@version = '1.6'",
-            "/schema/solrQueryParser/@defaultOperator = 'OR'",
            "/schema/uniqueKey = 'id'",
            "/schema/defaultSearchField = 'text'",

--- a/solr/example/example-DIH/solr/db/conf/managed-schema
+++ b/solr/example/example-DIH/solr/db/conf/managed-schema
@ -250,21 +250,6 @@
   -->
 <uniqueKey>id</uniqueKey>

- <!-- DEPRECATED: The defaultSearchField is consulted by various query parsers when
-  parsing a query string that isn't explicit about the field.  Machine (non-user)
-  generated queries are best made explicit, or they can use the "df" request parameter
-  which takes precedence over this.
-  Note: Un-commenting defaultSearchField will be insufficient if your request handler
-  in solrconfig.xml defines "df", which takes precedence. That would need to be removed.
- <defaultSearchField>text</defaultSearchField> -->
-
- <!-- DEPRECATED: The defaultOperator (AND|OR) is consulted by various query parsers
-  when parsing a query string to determine if a clause of the query should be marked as
-  required or optional, assuming the clause isn't already marked by some operator.
-  The default is OR, which is generally assumed so it is not a good idea to change it
-  globally here.  The "q.op" request parameter takes precedence over this.
- <solrQueryParser defaultOperator="OR"/> -->
-
  <!-- copyField commands copy one field to another at the time a document
        is added to the index.  It's used either to index the same field differently,
        or to add multiple fields to the same field for easier/faster searching.  -->
@ -981,9 +966,8 @@
    
    <!-- Japanese using morphological analysis (see text_cjk for a configuration using bigramming)

-         NOTE: If you want to optimize search for precision, use default operator AND in your query
-         parser config with <solrQueryParser defaultOperator="AND"/> further down in this file.  Use 
-         OR if you would like to optimize for recall (default).
+         NOTE: If you want to optimize search for precision, use default operator AND in your request
+         handler config (q.op) Use OR if you would like to optimize for recall (default).
    -->
    <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
      <analyzer>
--- a/solr/example/example-DIH/solr/mail/conf/managed-schema
+++ b/solr/example/example-DIH/solr/mail/conf/managed-schema
@ -186,21 +186,6 @@
   -->
 <uniqueKey>messageId</uniqueKey>

- <!-- DEPRECATED: The defaultSearchField is consulted by various query parsers when
-  parsing a query string that isn't explicit about the field.  Machine (non-user)
-  generated queries are best made explicit, or they can use the "df" request parameter
-  which takes precedence over this.
-  Note: Un-commenting defaultSearchField will be insufficient if your request handler
-  in solrconfig.xml defines "df", which takes precedence. That would need to be removed.
- <defaultSearchField>text</defaultSearchField> -->
-
- <!-- DEPRECATED: The defaultOperator (AND|OR) is consulted by various query parsers
-  when parsing a query string to determine if a clause of the query should be marked as
-  required or optional, assuming the clause isn't already marked by some operator.
-  The default is OR, which is generally assumed so it is not a good idea to change it
-  globally here.  The "q.op" request parameter takes precedence over this.
- <solrQueryParser defaultOperator="OR"/> -->
-
  <!-- copyField commands copy one field to another at the time a document
        is added to the index.  It's used either to index the same field differently,
        or to add multiple fields to the same field for easier/faster searching.  -->
@ -901,9 +886,8 @@
    
    <!-- Japanese using morphological analysis (see text_cjk for a configuration using bigramming)

-         NOTE: If you want to optimize search for precision, use default operator AND in your query
-         parser config with <solrQueryParser defaultOperator="AND"/> further down in this file.  Use 
-         OR if you would like to optimize for recall (default).
+         NOTE: If you want to optimize search for precision, use default operator AND in your request
+         handler config (q.op) Use OR if you would like to optimize for recall (default).
    -->
    <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
      <analyzer>
--- a/solr/example/example-DIH/solr/solr/conf/managed-schema
+++ b/solr/example/example-DIH/solr/solr/conf/managed-schema
@ -250,21 +250,6 @@
   -->
 <uniqueKey>id</uniqueKey>

- <!-- DEPRECATED: The defaultSearchField is consulted by various query parsers when
-  parsing a query string that isn't explicit about the field.  Machine (non-user)
-  generated queries are best made explicit, or they can use the "df" request parameter
-  which takes precedence over this.
-  Note: Un-commenting defaultSearchField will be insufficient if your request handler
-  in solrconfig.xml defines "df", which takes precedence. That would need to be removed.
- <defaultSearchField>text</defaultSearchField> -->
-
- <!-- DEPRECATED: The defaultOperator (AND|OR) is consulted by various query parsers
-  when parsing a query string to determine if a clause of the query should be marked as
-  required or optional, assuming the clause isn't already marked by some operator.
-  The default is OR, which is generally assumed so it is not a good idea to change it
-  globally here.  The "q.op" request parameter takes precedence over this.
- <solrQueryParser defaultOperator="OR"/> -->
-
  <!-- copyField commands copy one field to another at the time a document
        is added to the index.  It's used either to index the same field differently,
        or to add multiple fields to the same field for easier/faster searching.  -->
@ -981,9 +966,8 @@
    
    <!-- Japanese using morphological analysis (see text_cjk for a configuration using bigramming)

-         NOTE: If you want to optimize search for precision, use default operator AND in your query
-         parser config with <solrQueryParser defaultOperator="AND"/> further down in this file.  Use 
-         OR if you would like to optimize for recall (default).
+         NOTE: If you want to optimize search for precision, use default operator AND in your request
+         handler config (q.op) Use OR if you would like to optimize for recall (default).
    -->
    <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
      <analyzer>
--- a/solr/server/solr/configsets/basic_configs/conf/managed-schema
+++ b/solr/server/solr/configsets/basic_configs/conf/managed-schema
@ -874,9 +874,8 @@
    
    <!-- Japanese using morphological analysis (see text_cjk for a configuration using bigramming)

-         NOTE: If you want to optimize search for precision, use default operator AND in your query
-         parser config with <solrQueryParser defaultOperator="AND"/> further down in this file.  Use 
-         OR if you would like to optimize for recall (default).
+         NOTE: If you want to optimize search for precision, use default operator AND in your request
+         handler config (q.op) Use OR if you would like to optimize for recall (default).
    -->
    <dynamicField name="*_txt_ja" type="text_ja"  indexed="true"  stored="true"/>
    <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema
@ -873,9 +873,8 @@
    
    <!-- Japanese using morphological analysis (see text_cjk for a configuration using bigramming)

-         NOTE: If you want to optimize search for precision, use default operator AND in your query
-         parser config with <solrQueryParser defaultOperator="AND"/> further down in this file.  Use 
-         OR if you would like to optimize for recall (default).
+         NOTE: If you want to optimize search for precision, use default operator AND in your request
+         handler config (q.op) Use OR if you would like to optimize for recall (default).
    -->
    <dynamicField name="*_txt_ja" type="text_ja"  indexed="true"  stored="true"/>
    <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
@ -256,21 +256,6 @@
   -->
 <uniqueKey>id</uniqueKey>

- <!-- DEPRECATED: The defaultSearchField is consulted by various query parsers when
-  parsing a query string that isn't explicit about the field.  Machine (non-user)
-  generated queries are best made explicit, or they can use the "df" request parameter
-  which takes precedence over this.
-  Note: Un-commenting defaultSearchField will be insufficient if your request handler
-  in solrconfig.xml defines "df", which takes precedence. That would need to be removed.
- <defaultSearchField>text</defaultSearchField> -->
-
- <!-- DEPRECATED: The defaultOperator (AND|OR) is consulted by various query parsers
-  when parsing a query string to determine if a clause of the query should be marked as
-  required or optional, assuming the clause isn't already marked by some operator.
-  The default is OR, which is generally assumed so it is not a good idea to change it
-  globally here.  The "q.op" request parameter takes precedence over this.
- <solrQueryParser defaultOperator="OR"/> -->
-
  <!-- copyField commands copy one field to another at the time a document
        is added to the index.  It's used either to index the same field differently,
        or to add multiple fields to the same field for easier/faster searching.  -->
@ -1032,9 +1017,8 @@
    
    <!-- Japanese using morphological analysis (see text_cjk for a configuration using bigramming)

-         NOTE: If you want to optimize search for precision, use default operator AND in your query
-         parser config with <solrQueryParser defaultOperator="AND"/> further down in this file.  Use 
-         OR if you would like to optimize for recall (default).
+         NOTE: If you want to optimize search for precision, use default operator AND in your request
+         handler config (q.op) Use OR if you would like to optimize for recall (default).
    -->
    <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
      <analyzer>
--- a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml
@ -60,8 +60,5 @@

  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
  <defaultSearchField>name</defaultSearchField>
-
-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="OR"/>
 </schema>

--- a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml
@ -32,8 +32,5 @@

 <!-- field for the QueryParser to use when an explicit fieldname is absent -->
 <defaultSearchField>name</defaultSearchField>
-
- <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
 </schema>

--- a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml
@ -33,8 +33,5 @@

 <!-- field for the QueryParser to use when an explicit fieldname is absent -->
 <defaultSearchField>name</defaultSearchField>
-
- <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
 </schema>