You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2012/04/10 18:06:33 UTC
svn commit: r1311812 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/search/
core/src/test/org/apache/solr/core/
Author: ab
Date: Tue Apr 10 16:06:33 2012
New Revision: 1311812
URL: http://svn.apache.org/viewvc?rev=1311812&view=rev
Log:
SOLR-3322 Add more context to IndexReaderFactory.newReader.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1311812&r1=1311811&r2=1311812&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Apr 10 16:06:33 2012
@@ -484,6 +484,8 @@ Other Changes
* SOLR-3302: Upgraded SLF4j to version 1.6.4 (hossman)
+* SOLR-3322: Add more context to IndexReaderFactory.newReader (ab)
+
Documentation
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java?rev=1311812&r1=1311811&r2=1311812&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java Tue Apr 10 16:06:33 2012
@@ -58,9 +58,13 @@ public abstract class IndexReaderFactory
* Creates a new IndexReader instance using the given Directory.
*
* @param indexDir indexDir index location
+ * @param core {@link SolrCore} instance where this reader will be used. NOTE:
+ * this SolrCore instance may not be fully configured yet, but basic things like
+ * {@link SolrCore#getCoreDescriptor()}, {@link SolrCore#getSchema()} and
+ * {@link SolrCore#getSolrConfig()} are valid.
* @return An IndexReader instance
* @throws IOException
*/
- public abstract DirectoryReader newReader(Directory indexDir)
+ public abstract DirectoryReader newReader(Directory indexDir, SolrCore core)
throws IOException;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java?rev=1311812&r1=1311811&r2=1311812&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java Tue Apr 10 16:06:33 2012
@@ -30,7 +30,7 @@ import org.apache.lucene.store.Directory
public class StandardIndexReaderFactory extends IndexReaderFactory {
@Override
- public DirectoryReader newReader(Directory indexDir) throws IOException {
+ public DirectoryReader newReader(Directory indexDir, SolrCore core) throws IOException {
return DirectoryReader.open(indexDir, termInfosIndexDivisor);
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1311812&r1=1311811&r2=1311812&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Tue Apr 10 16:06:33 2012
@@ -117,7 +117,7 @@ public class SolrIndexSearcher extends I
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
- this(core, schema,name, core.getIndexReaderFactory().newReader(directoryFactory.get(path, config.lockType)), true, enableCache, false, directoryFactory);
+ this(core, schema,name, core.getIndexReaderFactory().newReader(directoryFactory.get(path, config.lockType), core), true, enableCache, false, directoryFactory);
}
public SolrIndexSearcher(SolrCore core, IndexSchema schema, String name, DirectoryReader r, boolean closeReader, boolean enableCache, boolean reserveDirectory, DirectoryFactory directoryFactory) throws IOException {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java?rev=1311812&r1=1311811&r2=1311812&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java Tue Apr 10 16:06:33 2012
@@ -61,7 +61,7 @@ public class AlternateDirectoryTest exte
static volatile boolean newReaderCalled = false;
@Override
- public DirectoryReader newReader(Directory indexDir) throws IOException {
+ public DirectoryReader newReader(Directory indexDir, SolrCore core) throws IOException {
TestIndexReaderFactory.newReaderCalled = true;
return DirectoryReader.open(indexDir);
}