You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@solr.apache.org by GitBox <gi...@apache.org> on 2021/09/01 12:20:05 UTC
[GitHub] [solr] epugh opened a new pull request #279: SOLR-10887: Append .xml to managed-schema file VERSION 2
epugh opened a new pull request #279:
URL: https://github.com/apache/solr/pull/279
### THIS IS A DUPLICATE OF https://github.com/apache/solr/pull/264 BECAUSE I AM GETTING TEST FAILURES AND CAN'T FIGURE IT OUT SO I STARTED OVER. SIGH.
https://issues.apache.org/jira/browse/SOLR-10887
<!--
_(If you are a project committer then you may remove some/all of the following template.)_
Before creating a pull request, please file an issue in the ASF Jira system for Solr:
* https://issues.apache.org/jira/projects/SOLR
You will need to create an account in Jira in order to create an issue.
The title of the PR should reference the Jira issue number in the form:
* SOLR-####: <short description of problem or changes>
SOLR must be fully capitalized. A short description helps people scanning pull requests for items they can work on.
Properly referencing the issue in the title ensures that Jira is correctly updated with code review comments and commits. -->
# Description
Migrate any `managed-schema` file found in ZK to `managed-schema.xml`, and make the default be `managed-schema.xml`.
# Solution
I basically checked where we load the managed schema, and if the name matches that of the legacy schema, `managed-schema`, then rename it.
I am NOT very confident that this was the right way to do this, and would love feedback/suggestions.
For example maybe I should have tagged onto the logic in ManageSchemaIndexFactory where it decides `shouldUpgrade` and then maybe used the method `zkUgradeToManagedSchema` to handle the `managed-schema` to `managed-schema.xml` change?
# Tests
Please describe the tests you've developed or run to confirm this patch implements the feature or solves the problem.
# Checklist
Please review the following and check all that apply:
- [x] I have reviewed the guidelines for [How to Contribute](https://wiki.apache.org/solr/HowToContribute) and my code conforms to the standards described there to the best of my ability.
- [x] I have created a Jira issue and added the issue ID to my pull request title.
- [x] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended)
- [x] I have developed this patch against the `main` branch.
- [X] I have run `./gradlew check`.
- [x] I have added tests for my changes.
- [x] I have added documentation for the [Reference Guide](https://github.com/apache/solr/tree/main/solr/solr-ref-guide)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] epugh commented on a change in pull request #279: SOLR-10887: Append .xml to managed-schema file VERSION 2
Posted by GitBox <gi...@apache.org>.
epugh commented on a change in pull request #279:
URL: https://github.com/apache/solr/pull/279#discussion_r710055148
##########
File path: solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java
##########
@@ -28,34 +28,34 @@
import org.locationtech.spatial4j.shape.Shape;
public class SpatialRPTFieldTypeTest extends AbstractBadConfigTestBase {
-
+
private static File tmpSolrHome;
private static File tmpConfDir;
-
+
private static final String collection = "collection1";
private static final String confDir = collection + "/conf";
-
+
@Before
private void initManagedSchemaCore() throws Exception {
tmpSolrHome = createTempDir().toFile();
tmpConfDir = new File(tmpSolrHome, confDir);
File testHomeConfDir = new File(TEST_HOME(), confDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-managed-schema.xml"), tmpConfDir);
- FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-basic.xml"), tmpConfDir);
+ //FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-basic.xml"), tmpConfDir);
Review comment:
so, these config files aren't used by this test.
However, maybe I should open a new JIRA about auditing config files in tests....
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] epugh merged pull request #279: SOLR-10887: Append .xml to managed-schema file VERSION 2
Posted by GitBox <gi...@apache.org>.
epugh merged pull request #279:
URL: https://github.com/apache/solr/pull/279
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] dsmiley commented on a change in pull request #279: SOLR-10887: Append .xml to managed-schema file VERSION 2
Posted by GitBox <gi...@apache.org>.
dsmiley commented on a change in pull request #279:
URL: https://github.com/apache/solr/pull/279#discussion_r707816515
##########
File path: solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java
##########
@@ -28,34 +28,34 @@
import org.locationtech.spatial4j.shape.Shape;
public class SpatialRPTFieldTypeTest extends AbstractBadConfigTestBase {
-
+
private static File tmpSolrHome;
private static File tmpConfDir;
-
+
private static final String collection = "collection1";
private static final String confDir = collection + "/conf";
-
+
@Before
private void initManagedSchemaCore() throws Exception {
tmpSolrHome = createTempDir().toFile();
tmpConfDir = new File(tmpSolrHome, confDir);
File testHomeConfDir = new File(TEST_HOME(), confDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-managed-schema.xml"), tmpConfDir);
- FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-basic.xml"), tmpConfDir);
+ //FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-basic.xml"), tmpConfDir);
Review comment:
Why the added commented lines?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org