Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12972: remove deprecated, unused SolrIndexConfig.luceneVersion

This commit is contained in:
Christine Poerschke 2018-11-19 14:51:13 +00:00
parent 7abb25eff5
commit eb8010405d
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
View File

@ -31,7 +31,6 @@ import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.MergeScheduler; import org.apache.lucene.index.MergeScheduler;
import org.apache.lucene.search.Sort; import org.apache.lucene.search.Sort;
import org.apache.lucene.util.InfoStream; import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.Version;
import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.Utils; import org.apache.solr.common.util.Utils;
import org.apache.solr.core.DirectoryFactory; import org.apache.solr.core.DirectoryFactory;
@ -63,9 +62,6 @@ public class SolrIndexConfig implements MapSerializable {
private static final String DEFAULT_MERGE_POLICY_FACTORY_CLASSNAME = DefaultMergePolicyFactory.class.getName(); private static final String DEFAULT_MERGE_POLICY_FACTORY_CLASSNAME = DefaultMergePolicyFactory.class.getName();
public static final String DEFAULT_MERGE_SCHEDULER_CLASSNAME = ConcurrentMergeScheduler.class.getName(); public static final String DEFAULT_MERGE_SCHEDULER_CLASSNAME = ConcurrentMergeScheduler.class.getName();
@Deprecated
public final Version luceneVersion;
public final boolean useCompoundFile; public final boolean useCompoundFile;
public final int maxBufferedDocs; public final int maxBufferedDocs;
@ -86,7 +82,6 @@ public class SolrIndexConfig implements MapSerializable {
* Internal constructor for setting defaults based on Lucene Version * Internal constructor for setting defaults based on Lucene Version
*/ */
private SolrIndexConfig(SolrConfig solrConfig) { private SolrIndexConfig(SolrConfig solrConfig) {
luceneVersion = solrConfig.luceneMatchVersion;
useCompoundFile = false; useCompoundFile = false;
maxBufferedDocs = -1; maxBufferedDocs = -1;
ramBufferSizeMB = 100; ramBufferSizeMB = 100;
@ -119,8 +114,6 @@ public class SolrIndexConfig implements MapSerializable {
// config section // config section
Object unused = solrConfig.getNode(prefix, false); Object unused = solrConfig.getNode(prefix, false);
luceneVersion = solrConfig.luceneMatchVersion;
// Assert that end-of-life parameters or syntax is not in our config. // Assert that end-of-life parameters or syntax is not in our config.
// Warn for luceneMatchVersion's before LUCENE_3_6, fail fast above // 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.", assertWarnOrFail("The <mergeScheduler>myclass</mergeScheduler> syntax is no longer supported in solrconfig.xml. Please use syntax <mergeScheduler class=\"myclass\"/> instead.",