You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/01/29 17:34:57 UTC
svn commit: r1237330 - in /lucene/dev/branches/lucene2858/modules/facet/src:
java/org/apache/lucene/facet/search/
java/org/apache/lucene/facet/taxonomy/directory/
test/org/apache/lucene/facet/ test/org/apache/lucene/facet/search/
test/org/apache/lucene...
Author: rmuir
Date: Sun Jan 29 16:34:57 2012
New Revision: 1237330
URL: http://svn.apache.org/viewvc?rev=1237330&view=rev
Log:
LUCENE-2858: fix modules facet (partially)
Modified:
lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java
lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java
lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
Modified: lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java?rev=1237330&r1=1237329&r2=1237330&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java Sun Jan 29 16:34:57 2012
@@ -4,7 +4,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
Modified: lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java?rev=1237330&r1=1237329&r2=1237330&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java Sun Jan 29 16:34:57 2012
@@ -3,7 +3,7 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
Modified: lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java?rev=1237330&r1=1237329&r2=1237330&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java (original)
+++ lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java Sun Jan 29 16:34:57 2012
@@ -15,6 +15,7 @@ import org.apache.lucene.facet.taxonomy.
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.Consts.LoadFullPathOnly;
import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
@@ -58,7 +59,7 @@ public class DirectoryTaxonomyReader imp
private static final Logger logger = Logger.getLogger(DirectoryTaxonomyReader.class.getName());
- private IndexReader indexReader;
+ private DirectoryReader indexReader;
// The following lock is used to allow multiple threads to read from the
// index concurrently, while having them block during the very short
@@ -126,7 +127,7 @@ public class DirectoryTaxonomyReader imp
parentArray.refresh(indexReader);
}
- protected IndexReader openIndexReader(Directory directory) throws CorruptIndexException, IOException {
+ protected DirectoryReader openIndexReader(Directory directory) throws CorruptIndexException, IOException {
return IndexReader.open(directory);
}
@@ -353,7 +354,7 @@ public class DirectoryTaxonomyReader imp
// safely read indexReader without holding the write lock, because
// no other thread can be writing at this time (this method is the
// only possible writer, and it is "synchronized" to avoid this case).
- IndexReader r2 = IndexReader.openIfChanged(indexReader);
+ DirectoryReader r2 = DirectoryReader.openIfChanged(indexReader);
if (r2 == null) {
return false; // no changes, nothing to do
}
Modified: lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1237330&r1=1237329&r2=1237330&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original)
+++ lucene/dev/branches/lucene2858/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Sun Jan 29 16:34:57 2012
@@ -22,6 +22,7 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -112,7 +113,7 @@ public class DirectoryTaxonomyWriter imp
* that some of the cached data was cleared).
*/
private boolean cacheIsComplete;
- private IndexReader reader;
+ private DirectoryReader reader;
private int cacheMisses;
/**
@@ -188,7 +189,7 @@ public class DirectoryTaxonomyWriter imp
throws CorruptIndexException, LockObtainFailedException,
IOException {
- if (!IndexReader.indexExists(directory) || openMode==OpenMode.CREATE) {
+ if (!DirectoryReader.indexExists(directory) || openMode==OpenMode.CREATE) {
taxoIndexCreateTime = Long.toString(System.nanoTime());
}
@@ -281,7 +282,7 @@ public class DirectoryTaxonomyWriter imp
* calling {@link IndexReader#open(IndexWriter, boolean)}. Extending classes can override
* this method to return their own {@link IndexReader}.
*/
- protected IndexReader openReader() throws IOException {
+ protected DirectoryReader openReader() throws IOException {
return IndexReader.open(indexWriter, true);
}
@@ -618,7 +619,7 @@ public class DirectoryTaxonomyWriter imp
private synchronized void refreshReader() throws IOException {
if (reader != null) {
- IndexReader r2 = IndexReader.openIfChanged(reader);
+ DirectoryReader r2 = DirectoryReader.openIfChanged(reader);
if (r2 != null) {
reader.close();
reader = r2;
Modified: lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java?rev=1237330&r1=1237329&r2=1237330&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (original)
+++ lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java Sun Jan 29 16:34:57 2012
@@ -9,6 +9,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -133,7 +134,7 @@ public class FacetTestUtils {
}
public static class IndexTaxonomyReaderPair {
- public IndexReader indexReader;
+ public DirectoryReader indexReader;
public TaxonomyReader taxReader;
public IndexSearcher indexSearcher;
Modified: lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java?rev=1237330&r1=1237329&r2=1237330&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java (original)
+++ lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java Sun Jan 29 16:34:57 2012
@@ -9,6 +9,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -299,7 +300,7 @@ public class TestTotalFacetCountsCache e
writers[0].taxWriter.close();
readers[0].taxReader.refresh();
- IndexReader r2 = IndexReader.openIfChanged(readers[0].indexReader);
+ DirectoryReader r2 = DirectoryReader.openIfChanged(readers[0].indexReader);
assertNotNull(r2);
// Hold on to the 'original' reader so we can do some checks with it
IndexReader origReader = null;
Modified: lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java?rev=1237330&r1=1237329&r2=1237330&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java (original)
+++ lucene/dev/branches/lucene2858/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java Sun Jan 29 16:34:57 2012
@@ -3,6 +3,7 @@ package org.apache.lucene.facet.taxonomy
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.AlreadyClosedException;
@@ -54,7 +55,7 @@ public class TestDirectoryTaxonomyWriter
// commit() wasn't called.
Directory dir = newDirectory();
DirectoryTaxonomyWriter ltw = new DirectoryTaxonomyWriter(dir, OpenMode.CREATE_OR_APPEND, new NoOpCache());
- assertFalse(IndexReader.indexExists(dir));
+ assertFalse(DirectoryReader.indexExists(dir));
ltw.commit(); // first commit, so that an index will be created
ltw.addCategory(new CategoryPath("a"));
@@ -70,7 +71,7 @@ public class TestDirectoryTaxonomyWriter
// Verifies that committed data is retrievable
Directory dir = newDirectory();
DirectoryTaxonomyWriter ltw = new DirectoryTaxonomyWriter(dir, OpenMode.CREATE_OR_APPEND, new NoOpCache());
- assertFalse(IndexReader.indexExists(dir));
+ assertFalse(DirectoryReader.indexExists(dir));
ltw.commit(); // first commit, so that an index will be created
ltw.addCategory(new CategoryPath("a"));
ltw.addCategory(new CategoryPath("b"));
@@ -78,7 +79,7 @@ public class TestDirectoryTaxonomyWriter
userCommitData.put("testing", "1 2 3");
ltw.commit(userCommitData);
ltw.close();
- IndexReader r = IndexReader.open(dir);
+ DirectoryReader r = IndexReader.open(dir);
assertEquals("2 categories plus root should have been committed to the underlying directory", 3, r.numDocs());
Map <String, String> readUserCommitData = r.getCommitUserData();
assertTrue("wrong value extracted from commit data",