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

SOLR-6597: Removed SolrIndexConfig parameter from one of the SolrIndexSearcher constructor, where it was never really used 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1629772 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Anshum Gupta 2014-10-06 21:54:58 +00:00
parent a922e89191
commit c3c3f29a7d
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -275,6 +275,9 @@ Other Changes
* SOLR-6550: Provide simple mechanism for passing additional metadata / context about a server-side * SOLR-6550: Provide simple mechanism for passing additional metadata / context about a server-side
SolrException back to the client-side (Timothy Potter) SolrException back to the client-side (Timothy Potter)
* SOLR-6597: SolrIndexConfig parameter in one of the SolrIndexSearcher constructor has been removed.
It was just passed and never used via that constructor. (Anshum Gupta)
================== 4.10.1 ================== ================== 4.10.1 ==================
Bug Fixes Bug Fixes

7
solr/core/src/java/org/apache/solr/core/SolrCore.java
View File

@ -1527,8 +1527,7 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
// (caches take a little while to instantiate) // (caches take a little while to instantiate)
final boolean useCaches = !realtime; final boolean useCaches = !realtime;
final String newName = realtime ? "realtime" : "main"; final String newName = realtime ? "realtime" : "main";
tmp = new SolrIndexSearcher(this, newIndexDir, getLatestSchema(), tmp = new SolrIndexSearcher(this, newIndexDir, getLatestSchema(), newName,
getSolrConfig().indexConfig, newName,
newReader, true, useCaches, true, directoryFactory); newReader, true, useCaches, true, directoryFactory);
} else { } else {
@ -1539,7 +1538,7 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
// so that we pick up any uncommitted changes and so we don't go backwards // so that we pick up any uncommitted changes and so we don't go backwards
// in time on a core reload // in time on a core reload
DirectoryReader newReader = newReaderCreator.call(); DirectoryReader newReader = newReaderCreator.call();
tmp = new SolrIndexSearcher(this, newIndexDir, getLatestSchema(), getSolrConfig().indexConfig, tmp = new SolrIndexSearcher(this, newIndexDir, getLatestSchema(),
(realtime ? "realtime":"main"), newReader, true, !realtime, true, directoryFactory); (realtime ? "realtime":"main"), newReader, true, !realtime, true, directoryFactory);
} else if (solrConfig.nrtMode) { } else if (solrConfig.nrtMode) {
RefCounted<IndexWriter> writer = getUpdateHandler().getSolrCoreState().getIndexWriter(this); RefCounted<IndexWriter> writer = getUpdateHandler().getSolrCoreState().getIndexWriter(this);
@ -1549,7 +1548,7 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
} finally { } finally {
writer.decref(); writer.decref();
} }
tmp = new SolrIndexSearcher(this, newIndexDir, getLatestSchema(), getSolrConfig().indexConfig, tmp = new SolrIndexSearcher(this, newIndexDir, getLatestSchema(),
(realtime ? "realtime":"main"), newReader, true, !realtime, true, directoryFactory); (realtime ? "realtime":"main"), newReader, true, !realtime, true, directoryFactory);
} else { } else {
// normal open that happens at startup // normal open that happens at startup

9
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
View File

@ -235,13 +235,16 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn
} }
} }
public SolrIndexSearcher(SolrCore core, String path, IndexSchema schema, SolrIndexConfig config, String name, boolean enableCache, DirectoryFactory directoryFactory) throws IOException { public SolrIndexSearcher(SolrCore core, String path, IndexSchema schema, SolrIndexConfig config, String name,
boolean enableCache, DirectoryFactory directoryFactory) throws IOException {
// we don't need to reserve the directory because we get it from the factory // we don't need to reserve the directory because we get it from the factory
this(core, path, schema, config, name, getReader(core, config, directoryFactory, path), true, enableCache, false, directoryFactory); this(core, path, schema, name, getReader(core, config, directoryFactory, path), true, enableCache, false, directoryFactory);
this.createdDirectory = true; this.createdDirectory = true;
} }
public SolrIndexSearcher(SolrCore core, String path, IndexSchema schema, SolrIndexConfig config, String name, DirectoryReader r, boolean closeReader, boolean enableCache, boolean reserveDirectory, DirectoryFactory directoryFactory) throws IOException { public SolrIndexSearcher(SolrCore core, String path, IndexSchema schema, String name, DirectoryReader r,
boolean closeReader, boolean enableCache, boolean reserveDirectory,
DirectoryFactory directoryFactory) throws IOException {
super(wrapReader(core, r)); super(wrapReader(core, r));
this.path = path; this.path = path;