From 5b63d013bcf568de5d7065636b48561ed596b5a5 Mon Sep 17 00:00:00 2001 From: "epugh@opensourceconnections.com" Date: Tue, 9 Aug 2022 10:04:12 -0400 Subject: [PATCH 1/8] migrate to default naming strategy --- .../conf/{managed-schema => managed-schema.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename solr/server/solr/configsets/sample_techproducts_configs/conf/{managed-schema => managed-schema.xml} (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 From cfab562a3a4853719a0a1600e8e00cf7b5fb8f2e Mon Sep 17 00:00:00 2001 From: "epugh@opensourceconnections.com" Date: Tue, 9 Aug 2022 12:18:01 -0400 Subject: [PATCH 2/8] update test to use the default managed schema file name. There isn't any reason to have a test for "managed-schema", as that isn't what this test is about. --- .../apache/solr/handler/admin/ShowFileRequestHandlerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f33cfd235324..8f4c542d8e87 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 void testGetRawFile() throws SolrServerException, IOException { 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( From 2d819d0f644eb07473e063bc0cf0c198444f918f Mon Sep 17 00:00:00 2001 From: "epugh@opensourceconnections.com" Date: Tue, 9 Aug 2022 12:19:45 -0400 Subject: [PATCH 3/8] use the default name for the managed schema file. --- .../conf/bad-solrconfig-unexpected-schema-attribute.xml | 2 +- ...solrconfig-add-schema-fields-update-processor-chains.xml | 6 +++--- .../solr/collection1/conf/solrconfig-schemaless.xml | 6 +++--- .../configsets/cloud-managed-autocommit/conf/solrconfig.xml | 4 ++-- .../cloud-managed-preanalyzed/conf/solrconfig.xml | 2 +- .../solr/configsets/cloud-managed/conf/solrconfig.xml | 2 +- .../solrj/solr/multicore/core0/conf/solrconfig.xml | 2 +- .../solrj/solr/multicore/core1/conf/solrconfig.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) 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 ec2e9affb3c6..00166aa2e60d 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 @@ false - managed-schema + managed-schema.xml bogusValue 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 46ce9ad9a65d..34ee4f7d0385 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 @@ --> @@ -28,7 +28,7 @@ true - managed-schema + managed-schema.xml @@ -128,7 +128,7 @@ - + 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 d2f842611c9b..51079d19afde 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 @@ - + @@ -38,7 +38,7 @@ - + true @@ -70,7 +70,7 @@ EEE MMM ppd HH:mm:ss [z ]yyyy - + text 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 9ec69436b3ca..18b06a2e8f04 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 @@ ${managed.schema.mutable} - managed-schema + managed-schema.xml ${tests.luceneMatchVersion:LATEST} @@ -57,4 +57,4 @@ - \ No newline at end of file + 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 1beaf76877f8..e4ef7eb551c6 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 @@ ${managed.schema.mutable:true} - managed-schema + managed-schema.xml ${tests.luceneMatchVersion:LATEST} 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 aabfa2f9b666..fd91ee6178a6 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 @@ ${managed.schema.mutable} - managed-schema + managed-schema.xml ${tests.luceneMatchVersion:LATEST} 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 c674520b76dd..aab8d2787cd1 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 @@ true - managed-schema + managed-schema.xml 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 012e88a7476e..99a578672472 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 @@ true - managed-schema + managed-schema.xml When ManagedIndexSchemaFactory is specified, Solr will load the schema from From a41e69d2cd18bc3bec6c454902ced4c7ec1021e4 Mon Sep 17 00:00:00 2001 From: "epugh@opensourceconnections.com" Date: Tue, 9 Aug 2022 12:23:08 -0400 Subject: [PATCH 4/8] use default name for this file --- .../solr/collection1/conf/{managed-schema => managed-schema.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename solr/prometheus-exporter/src/test-files/solr/collection1/conf/{managed-schema => managed-schema.xml} (100%) 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 100% 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 From 66cac7a61cb01255833ac3da0a364303f20534db Mon Sep 17 00:00:00 2001 From: "epugh@opensourceconnections.com" Date: Tue, 9 Aug 2022 13:27:15 -0400 Subject: [PATCH 5/8] migrate file names --- .../conf/{managed-schema => managed-schema.xml} | 0 .../conf/{managed-schema => managed-schema.xml} | 0 .../cloud-managed/conf/{managed-schema => managed-schema.xml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/{managed-schema => managed-schema.xml} (100%) rename solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/{managed-schema => managed-schema.xml} (100%) rename solr/core/src/test-files/solr/configsets/cloud-managed/conf/{managed-schema => managed-schema.xml} (100%) 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-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/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 From 585c320b33ccf5c98fb1a123d300a1d508e183d3 Mon Sep 17 00:00:00 2001 From: "epugh@opensourceconnections.com" Date: Tue, 9 Aug 2022 13:44:13 -0400 Subject: [PATCH 6/8] someone has tabs instead of spaces! --- .../solr/collection1/conf/managed-schema.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml b/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml index 585a5c3ebd04..bbf35d42ec2b 100644 --- a/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml +++ b/solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml @@ -267,10 +267,10 @@ + removes stop words from case-insensitive "stopwords.txt" + (empty by default), and down cases. At query time only, it + also applies synonyms. + --> @@ -290,7 +290,7 @@ From b2124527c28519e21834d52f48451f3c82b2575a Mon Sep 17 00:00:00 2001 From: "epugh@opensourceconnections.com" Date: Tue, 9 Aug 2022 13:56:25 -0400 Subject: [PATCH 7/8] add comment why it is still named managed-schema --- .../configsets/upload/legacy-managed-schema/managed-schema | 3 +++ 1 file changed, 3 insertions(+) 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 9e2f94710265..c0cfa75bffef 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. --> + + From a1f5f285f80f7d8859924ba2ba0e62d43d6f2877 Mon Sep 17 00:00:00 2001 From: "epugh@opensourceconnections.com" Date: Wed, 10 Aug 2022 07:11:58 -0400 Subject: [PATCH 8/8] track change --- solr/CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index edc7e94119e5..1a78a4e812d6 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -147,6 +147,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)