You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/12 14:05:39 UTC
[2/4] lucene-solr:jira/solr-8668: Revert "SOLR-10572: Removed three
"no longer supported in solrconfig.xml" asserts."
Revert "SOLR-10572: Removed three "no longer supported in solrconfig.xml" asserts."
This reverts commit a96f39449b48c7c2b4f2a82c808a97fb0c60ffc5.
Resolved Conflicts:
solr/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6d74a9e8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6d74a9e8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6d74a9e8
Branch: refs/heads/jira/solr-8668
Commit: 6d74a9e858d464fbfa6fc9e0fc90abf437565c3b
Parents: e61b5b3
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri May 12 14:45:24 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri May 12 14:58:47 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 --
.../java/org/apache/solr/update/SolrIndexConfig.java | 12 ++++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d74a9e8/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 10edc52..5b0c8f7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -141,8 +141,6 @@ Other Changes
* SOLR-10310: By default, stop splitting on whitespace prior to analysis
in edismax and standard/"lucene" query parsers. (Steve Rowe)
-* SOLR-10572: Removed three "no longer supported in solrconfig.xml" asserts. (Christine Poerschke)
-
* SOLR-10647: Move the V1 <-> V2 API mapping to SolrJ (noble)
================== 6.7.0 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d74a9e8/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index d7635f2..d484e85 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -127,6 +127,18 @@ public class SolrIndexConfig implements MapSerializable {
luceneVersion = solrConfig.luceneMatchVersion;
+ // Assert that end-of-life parameters or syntax is not in our config.
+ // Warn for luceneMatchVersion's before LUCENE_3_6, fail fast above
+ assertWarnOrFail("The <mergeScheduler>myclass</mergeScheduler> syntax is no longer supported in solrconfig.xml. Please use syntax <mergeScheduler class=\"myclass\"/> instead.",
+ !((solrConfig.getNode(prefix + "/mergeScheduler", false) != null) && (solrConfig.get(prefix + "/mergeScheduler/@class", null) == null)),
+ true);
+ assertWarnOrFail("The <mergePolicy>myclass</mergePolicy> syntax is no longer supported in solrconfig.xml. Please use syntax <mergePolicy class=\"myclass\"/> instead.",
+ !((solrConfig.getNode(prefix + "/mergePolicy", false) != null) && (solrConfig.get(prefix + "/mergePolicy/@class", null) == null)),
+ true);
+ assertWarnOrFail("The <luceneAutoCommit>true|false</luceneAutoCommit> parameter is no longer valid in solrconfig.xml.",
+ solrConfig.get(prefix + "/luceneAutoCommit", null) == null,
+ true);
+
effectiveUseCompoundFileSetting = solrConfig.getBool(prefix+"/useCompoundFile", def.getUseCompoundFile());
maxBufferedDocs=solrConfig.getInt(prefix+"/maxBufferedDocs",def.maxBufferedDocs);
maxMergeDocs=solrConfig.getInt(prefix+"/maxMergeDocs",def.maxMergeDocs);