From 61f64829d84d5a6b8c8bdff0e1a1f32c5e0a86f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Fri, 28 Apr 2017 22:12:17 +0200
Subject: [PATCH] SOLR-7041: Remove a lot of defaultOperator and
 defaultSearchField from test configs (still more work to do)

---
 .../solr/collection1/conf/schema.xml          |  3 --
 .../conf/dataimport-schema-no-unique-key.xml  |  4 ---
 .../collection1/conf/dataimport-schema.xml    |  1 -
 .../conf/dataimport-solr_id-schema.xml        |  4 ---
 .../uima/solr/collection1/conf/schema.xml     |  3 --
 .../uima/uima-tokenizers-schema.xml           |  3 --
 .../velocity/solr/collection1/conf/schema.xml |  3 --
 .../bad-schema-analyzer-class-and-nested.xml  |  1 -
 ...bad-schema-codec-global-vs-ft-mismatch.xml |  1 -
 ...ad-schema-currency-dynamic-multivalued.xml |  1 -
 ...d-schema-currency-ft-bogus-code-in-xml.xml |  1 -
 ...-schema-currency-ft-bogus-default-code.xml |  1 -
 .../bad-schema-currency-ft-multivalued.xml    |  1 -
 .../bad-schema-currency-ft-oer-norates.xml    |  1 -
 .../conf/bad-schema-currency-multivalued.xml  |  1 -
 .../conf/bad-schema-dup-dynamicField.xml      |  1 -
 .../collection1/conf/bad-schema-dup-field.xml |  1 -
 .../conf/bad-schema-dup-fieldType.xml         |  1 -
 .../bad-schema-dynamicfield-default-val.xml   |  1 -
 .../conf/bad-schema-dynamicfield-required.xml |  1 -
 .../conf/bad-schema-nontext-analyzer.xml      |  1 -
 .../conf/bad-schema-not-indexed-but-norms.xml |  1 -
 .../conf/bad-schema-not-indexed-but-pos.xml   |  1 -
 .../conf/bad-schema-not-indexed-but-tf.xml    |  1 -
 .../conf/bad-schema-omit-tf-but-not-pos.xml   |  1 -
 .../bad-schema-sim-default-does-not-exist.xml |  2 --
 ...schema-sim-default-has-no-explicit-sim.xml |  2 --
 .../bad-schema-sim-global-vs-ft-mismatch.xml  |  2 --
 .../conf/bad-schema-sweetspot-both-tf.xml     |  1 -
 .../bad-schema-sweetspot-partial-baseline.xml |  1 -
 ...ad-schema-sweetspot-partial-hyperbolic.xml |  3 +-
 .../bad-schema-sweetspot-partial-norms.xml    |  3 +-
 ...bad-schema-uniquekey-is-copyfield-dest.xml |  1 -
 .../conf/bad-schema-uniquekey-multivalued.xml |  1 -
 .../bad-schema-uniquekey-uses-default.xml     |  1 -
 .../conf/schema-HighlighterMaxOffsetTest.xml  |  1 -
 .../conf/schema-complex-phrase.xml            | 36 -------------------
 .../solr/collection1/conf/schema-rest.xml     |  3 --
 .../conf/schema-single-dynamic-copy-field.xml |  3 --
 .../collection1/conf/schema-spellchecker.xml  |  4 ---
 .../solr/collection1/conf/schema_latest.xml   | 15 --------
 .../solr/rest/schema/TestSchemaResource.java  |  5 ---
 .../example-DIH/solr/db/conf/managed-schema   | 20 ++---------
 .../example-DIH/solr/mail/conf/managed-schema | 20 ++---------
 .../example-DIH/solr/solr/conf/managed-schema | 20 ++---------
 .../basic_configs/conf/managed-schema         |  5 ++-
 .../conf/managed-schema                       |  5 ++-
 .../conf/managed-schema                       | 20 ++---------
 .../solr/configsets/shared/conf/schema.xml    |  3 --
 .../solr/multicore/core0/conf/schema.xml      |  3 --
 .../solr/multicore/core1/conf/schema.xml      |  3 --
 51 files changed, 14 insertions(+), 208 deletions(-)
 delete mode 100644 solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml

diff --git 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
index e9ef1155cc0..254cc854c8b 100644
--- 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.  -->
diff --git 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
index 5ef7eda34fe..bfe918c4724 100644
--- 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>
diff --git 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
index 86bd231efed..e77052308a6 100644
--- 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>
diff --git 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
index a99a0b42332..8927bcea354 100644
--- 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>
diff --git 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
index f1aebb61f0a..e15fed8895f 100644
--- 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
diff --git a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
index a6a4943e928..38241fc6596 100644
--- 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
diff --git 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
index 85b129e3f5b..e1564061450 100644
--- 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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
index 38dc9375e5f..8321405c120 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
@@ -30,7 +30,6 @@
   <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
index 8f3f0829609..5c8e4e330f0 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
@@ -27,6 +27,5 @@
   <field name="direct1text" type="direct1" indexed="true" stored="true"/>
   <dynamicField name="*" type="direct1"/>
 
-  <defaultSearchField>direct1text</defaultSearchField>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
index b11ea566bbf..9956c391fc3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
@@ -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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
index 917ca2efd3c..879daa2aae9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
@@ -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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
index 9524c74219a..4c47f6b50ed 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
@@ -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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
index 110f60406fc..ccd014b6714 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
@@ -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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
index c1a78acdb6e..539f503eedc 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
@@ -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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
index 83880a0d4a3..984445669ff 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
@@ -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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
index 41a8c758bdd..48990d628b3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
@@ -30,7 +30,6 @@
   <dynamicField name="*_twice" type="string" indexed="true" stored="true"/>
   <!-- END BAD STUFF -->
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
index 12b6a111fd6..aee203e6a6e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
@@ -33,7 +33,6 @@
   <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
index fbb43056072..cd60df5c5e1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
@@ -32,7 +32,6 @@
   <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
index 04b251102bd..a4a7444f333 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
@@ -24,7 +24,6 @@
   <dynamicField name="bad_*" type="string" default="BAD"/>
   <!-- END BAD STUFF -->
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
index aed2024880a..359fa1b2079 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
@@ -24,7 +24,6 @@
   <dynamicField name="bad_*" type="string" required="true"/>
   <!-- END BAD STUFF -->
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
index f8fd0b5ccd1..a8b6642d6bc 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
@@ -28,7 +28,6 @@
   <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
index a42805edae0..4b39ba4e21e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
@@ -30,7 +30,6 @@
   <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
index d74ce67ff91..476a0b0a2c4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
@@ -30,7 +30,6 @@
   <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
index 1f872ecad58..3c56a57bb0d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
@@ -29,7 +29,6 @@
 
   <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
index 338b236fdce..827879e25df 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
@@ -30,7 +30,6 @@
 
   <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml
index 828aa578090..eeb0242541f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-does-not-exist.xml
@@ -38,6 +38,4 @@
 
   <field name="sim1text" type="ft-overrides-default-sim" indexed="true" stored="true"/>
 
- <defaultSearchField>sim1text</defaultSearchField>
-
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml
index b5ce4aa1b3d..fef7f1f296b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-default-has-no-explicit-sim.xml
@@ -38,6 +38,4 @@
 
   <field name="sim1text" type="ft-overrides-default-sim" indexed="true" stored="true"/>
 
- <defaultSearchField>sim1text</defaultSearchField>
-
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
index ac8ee89099c..c8406ea33bd 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
@@ -31,6 +31,4 @@
   <field name="sim1text" type="sim1" indexed="true" stored="true"/>
   <dynamicField name="*" type="sim1"/>
 
-  <defaultSearchField>sim1text</defaultSearchField>
-
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
index 12ee4e93286..64a41baa7a5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
@@ -38,7 +38,6 @@
   <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
index dd9959fa78c..6605a51b5f8 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
@@ -34,7 +34,6 @@
   <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
index 7ba1aad550b..e1ced325247 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
@@ -35,8 +35,7 @@
 
   <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
 
-
-  <defaultSearchField>id</defaultSearchField>
+  
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
index 5e6ae96c5e0..eae48aa43ca 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
@@ -34,8 +34,7 @@
 
   <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
 
-
-  <defaultSearchField>id</defaultSearchField>
+  
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
index 29395359889..19db42d5554 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
@@ -26,7 +26,6 @@
   <copyField source="XXX" dest="id"/>
   <!-- END BAD STUFF -->
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
index 130e3a6a5bf..a1c384f8e0f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
@@ -23,7 +23,6 @@
   <field name="id" type="string" indexed="true" stored="true"/>
   <!-- END BAD STUFF -->
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
index ccf38224ec9..2c7583abf81 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
@@ -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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
index fce717c9b6d..b13f598cc81 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
@@ -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"/>
diff --git 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
deleted file mode 100644
index caf877867e5..00000000000
--- a/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml
+++ /dev/null
@@ -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>
-
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
index 85c822a319a..ca50051fe0f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
@@ -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>
diff --git 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
index 96be1d97497..b185576bcb0 100644
--- 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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml b/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
index 42c17da8e58..7d3618a3bcf 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
@@ -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>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml b/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
index b19a5120d2b..e55c142b305 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml
@@ -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.  -->
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
index 24638e46df7..9fa75df7667 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
@@ -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'",
 
diff --git a/solr/example/example-DIH/solr/db/conf/managed-schema b/solr/example/example-DIH/solr/db/conf/managed-schema
index 067767ed460..de138ba1345 100644
--- 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>
diff --git a/solr/example/example-DIH/solr/mail/conf/managed-schema b/solr/example/example-DIH/solr/mail/conf/managed-schema
index 382dacfb3b2..7b058ebd108 100644
--- 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>
diff --git a/solr/example/example-DIH/solr/solr/conf/managed-schema b/solr/example/example-DIH/solr/solr/conf/managed-schema
index f6c5103a493..679f567710c 100644
--- 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>
diff --git a/solr/server/solr/configsets/basic_configs/conf/managed-schema b/solr/server/solr/configsets/basic_configs/conf/managed-schema
index 360a2967cbc..599b0cca4d3 100644
--- 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">
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema b/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema
index 2635a602ca0..68f686760b1 100644
--- 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">
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
index 27565163d47..6bda7486880 100644
--- 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>
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml
index fc286c24bea..21f046914b4 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml
@@ -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>
 
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml
index 1f2d33ed3df..a724bd93fea 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml
@@ -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>
 
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml
index c9584537a39..ecfc2af0799 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml
@@ -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>