You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2022/08/10 11:13:53 UTC
[solr] branch branch_9x updated: SOLR-16331: add xml suffix to remaining managed schema files (#969)
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new ff017632f45 SOLR-16331: add xml suffix to remaining managed schema files (#969)
ff017632f45 is described below
commit ff017632f45bc61b4f53b1e45ce6bed585a8e6ff
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Wed Aug 10 07:12:56 2022 -0400
SOLR-16331: add xml suffix to remaining managed schema files (#969)
There is one remaining "managed-schema" in the core tests to verify backwards compatibility.
---
solr/CHANGES.txt | 2 ++
.../conf/bad-solrconfig-unexpected-schema-attribute.xml | 2 +-
.../solrconfig-add-schema-fields-update-processor-chains.xml | 6 +++---
.../test-files/solr/collection1/conf/solrconfig-schemaless.xml | 6 +++---
.../conf/{managed-schema => managed-schema.xml} | 0
.../configsets/cloud-managed-autocommit/conf/solrconfig.xml | 4 ++--
.../conf/{managed-schema => managed-schema.xml} | 0
.../configsets/cloud-managed-preanalyzed/conf/solrconfig.xml | 2 +-
.../cloud-managed/conf/{managed-schema => managed-schema.xml} | 0
.../solr/configsets/cloud-managed/conf/solrconfig.xml | 2 +-
.../configsets/upload/legacy-managed-schema/managed-schema | 3 +++
.../apache/solr/handler/admin/ShowFileRequestHandlerTest.java | 2 +-
.../collection1/conf/{managed-schema => managed-schema.xml} | 10 +++++-----
.../conf/{managed-schema => managed-schema.xml} | 0
.../test-files/solrj/solr/multicore/core0/conf/solrconfig.xml | 2 +-
.../test-files/solrj/solr/multicore/core1/conf/solrconfig.xml | 2 +-
16 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5e444c59248..5aa5073be31 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -123,6 +123,8 @@ Other Changes
* SOLR-16304: No more @Slow annotation for tests! (Mike Drob)
+* SOLR-16331: Migrate remaining managed-schema files to be managed-schema.xml. (Eric Pugh)
+
Build
---------------------
* SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti)
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml b/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml
index ec2e9affb3c..00166aa2e60 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml
@@ -24,7 +24,7 @@
<!-- The presence of bogusParam should trigger failure -->
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">false</bool>
- <str name="managedSchemaResourceName">managed-schema</str>
+ <str name="managedSchemaResourceName">managed-schema.xml</str>
<str name="bogusParam">bogusValue</str>
</schemaFactory>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
index 46ce9ad9a65..34ee4f7d038 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
@@ -18,7 +18,7 @@
-->
<!--
- Test Config that enumerates many different parsing update processor chain
+ Test Config that enumerates many different parsing update processor chain
configurations.
-->
<config>
@@ -28,7 +28,7 @@
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">true</bool>
- <str name="managedSchemaResourceName">managed-schema</str>
+ <str name="managedSchemaResourceName">managed-schema.xml</str>
</schemaFactory>
<updateRequestProcessorChain name="add-fields-no-run-processor">
@@ -128,7 +128,7 @@
<processor class="solr.DistributedUpdateProcessorFactory" />
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
-
+
<!-- This chain has one of the typeMappings set as default=true, instead of falling back to the defaultFieldType -->
<updateRequestProcessorChain name="add-fields-default-mapping">
<processor class="solr.AddSchemaFieldsUpdateProcessorFactory">
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
index d2f842611c9..51079d19afd 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
@@ -24,7 +24,7 @@
<!-- This is intentionally commented out, see SOLR-8131 -->
<!--<schemaFactory class="ManagedIndexSchemaFactory">-->
<!--<bool name="mutable">${managed.schema.mutable}</bool>-->
- <!--<str name="managedSchemaResourceName">managed-schema</str>-->
+ <!--<str name="managedSchemaResourceName">managed-schema.xml</str>-->
<!--</schemaFactory>-->
<codecFactory class="solr.SchemaCodecFactory"/>
@@ -38,7 +38,7 @@
<requestDispatcher>
<requestParsers enableStreamBody="true" />
</requestDispatcher>
-
+
<requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
@@ -70,7 +70,7 @@
<str>EEE MMM ppd HH:mm:ss [z ]yyyy</str>
</arr>
</processor>
-
+
<processor class="solr.AddSchemaFieldsUpdateProcessorFactory">
<str name="defaultFieldType">text</str>
<lst name="typeMapping">
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml
similarity index 100%
rename from solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema
rename to solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml
index 9ec69436b3c..18b06a2e8f0 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml
@@ -28,7 +28,7 @@
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">${managed.schema.mutable}</bool>
- <str name="managedSchemaResourceName">managed-schema</str>
+ <str name="managedSchemaResourceName">managed-schema.xml</str>
</schemaFactory>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
@@ -57,4 +57,4 @@
</lst>
</requestHandler>
-</config>
\ No newline at end of file
+</config>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema.xml
similarity index 100%
rename from solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema
rename to solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema.xml
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/solrconfig.xml
index 1beaf76877f..e4ef7eb551c 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/solrconfig.xml
@@ -28,7 +28,7 @@
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">${managed.schema.mutable:true}</bool>
- <str name="managedSchemaResourceName">managed-schema</str>
+ <str name="managedSchemaResourceName">managed-schema.xml</str>
</schemaFactory>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml
similarity index 100%
rename from solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema
rename to solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml
index aabfa2f9b66..fd91ee6178a 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml
@@ -28,7 +28,7 @@
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">${managed.schema.mutable}</bool>
- <str name="managedSchemaResourceName">managed-schema</str>
+ <str name="managedSchemaResourceName">managed-schema.xml</str>
</schemaFactory>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
diff --git a/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema b/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema
index 9e2f9471026..c0cfa75bffe 100644
--- a/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema
+++ b/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema
@@ -15,6 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- This file should be called managed-schema.xml, but leaving it here to prove
+that we still are backwards compatible with this format. -->
<schema name="minimal" version="1.1">
<types>
<fieldType name="string" class="solr.StrField"/>
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
index f33cfd23532..8f4c542d8e8 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
@@ -89,7 +89,7 @@ public class ShowFileRequestHandlerTest extends SolrJettyTestBase {
SolrClient client = getSolrClient();
// assertQ(req("qt", "/admin/file"));
// TODO file bug that SolrJettyTestBase extends SolrTestCaseJ4
- QueryRequest request = new QueryRequest(params("file", "managed-schema"));
+ QueryRequest request = new QueryRequest(params("file", "managed-schema.xml"));
request.setPath("/admin/file");
final AtomicBoolean readFile = new AtomicBoolean();
request.setResponseParser(
diff --git a/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema b/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml
similarity index 98%
rename from solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema
rename to solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml
index 585a5c3ebd0..bbf35d42ec2 100644
--- a/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema
+++ b/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml
@@ -267,10 +267,10 @@
<!-- A general text field that has reasonable, generic
cross-language defaults: it tokenizes with StandardTokenizer,
- removes stop words from case-insensitive "stopwords.txt"
- (empty by default), and down cases. At query time only, it
- also applies synonyms.
- -->
+ removes stop words from case-insensitive "stopwords.txt"
+ (empty by default), and down cases. At query time only, it
+ also applies synonyms.
+ -->
<fieldType name="text_general" class="solr.TextField" positionIncrementGap="100" multiValued="true">
<analyzer type="index">
<tokenizer class="solr.StandardTokenizerFactory"/>
@@ -290,7 +290,7 @@
</fieldType>
<!-- Just like text_general except it reverses the characters of
- each token, to enable more efficient leading wildcard queries.
+ each token, to enable more efficient leading wildcard queries.
-->
<dynamicField name="*_txt_rev" type="text_general_rev" indexed="true" stored="true"/>
<fieldType name="text_general_rev" class="solr.TextField" positionIncrementGap="100">
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema.xml
similarity index 100%
rename from solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
rename to solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema.xml
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
index c674520b76d..aab8d2787cd 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
@@ -33,7 +33,7 @@
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">true</bool>
- <str name="managedSchemaResourceName">managed-schema</str>
+ <str name="managedSchemaResourceName">managed-schema.xml</str>
</schemaFactory>
When ManagedIndexSchemaFactory is specified, Solr will load the schema from
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
index 012e88a7476..99a57867247 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
@@ -33,7 +33,7 @@
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">true</bool>
- <str name="managedSchemaResourceName">managed-schema</str>
+ <str name="managedSchemaResourceName">managed-schema.xml</str>
</schemaFactory>
When ManagedIndexSchemaFactory is specified, Solr will load the schema from