You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/01/30 18:29:24 UTC
svn commit: r1237812 [2/2] - in
/lucene/dev/branches/lucene2858/solr/core/src: java/org/apache/solr/core/
java/org/apache/solr/handler/ java/org/apache/solr/handler/admin/
java/org/apache/solr/handler/component/ java/org/apache/solr/request/
java/org/a...
Modified: lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java Mon Jan 30 17:29:22 2012
@@ -16,7 +16,7 @@ package org.apache.solr.search.function.
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
Modified: lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java Mon Jan 30 17:29:22 2012
@@ -16,7 +16,7 @@ package org.apache.solr.search.function.
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
Modified: lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java Mon Jan 30 17:29:22 2012
@@ -17,7 +17,7 @@ package org.apache.solr.search.function.
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
Modified: lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java Mon Jan 30 17:29:22 2012
@@ -16,7 +16,7 @@ package org.apache.solr.search.function.
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
Modified: lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java Mon Jan 30 17:29:22 2012
@@ -1,76 +1,76 @@
-package org.apache.solr.search.grouping.collector;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.Collector;
-import org.apache.lucene.search.Scorer;
-import org.apache.solr.search.DocSet;
-
-import java.io.IOException;
-
-/**
- * A collector that filters incoming doc ids that are not in the filter.
- *
- * @lucene.experimental
- */
-public class FilterCollector extends Collector {
-
- private final DocSet filter;
- private final Collector delegate;
- private int docBase;
- private int matches;
-
- public FilterCollector(DocSet filter, Collector delegate) throws IOException {
- this.filter = filter;
- this.delegate = delegate;
- }
-
- public void setScorer(Scorer scorer) throws IOException {
- delegate.setScorer(scorer);
- }
-
- public void collect(int doc) throws IOException {
- matches++;
- if (filter.exists(doc + docBase)) {
- delegate.collect(doc);
- }
- }
-
- public void setNextReader(IndexReader.AtomicReaderContext context) throws IOException {
- this.docBase = context.docBase;
- delegate.setNextReader(context);
- }
-
- public boolean acceptsDocsOutOfOrder() {
- return delegate.acceptsDocsOutOfOrder();
- }
-
- public int getMatches() {
- return matches;
- }
-
- /**
- * Returns the delegate collector
- *
- * @return the delegate collector
- */
- public Collector getDelegate() {
- return delegate;
- }
-}
+package org.apache.solr.search.grouping.collector;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.search.Collector;
+import org.apache.lucene.search.Scorer;
+import org.apache.solr.search.DocSet;
+
+import java.io.IOException;
+
+/**
+ * A collector that filters incoming doc ids that are not in the filter.
+ *
+ * @lucene.experimental
+ */
+public class FilterCollector extends Collector {
+
+ private final DocSet filter;
+ private final Collector delegate;
+ private int docBase;
+ private int matches;
+
+ public FilterCollector(DocSet filter, Collector delegate) throws IOException {
+ this.filter = filter;
+ this.delegate = delegate;
+ }
+
+ public void setScorer(Scorer scorer) throws IOException {
+ delegate.setScorer(scorer);
+ }
+
+ public void collect(int doc) throws IOException {
+ matches++;
+ if (filter.exists(doc + docBase)) {
+ delegate.collect(doc);
+ }
+ }
+
+ public void setNextReader(AtomicReaderContext context) throws IOException {
+ this.docBase = context.docBase;
+ delegate.setNextReader(context);
+ }
+
+ public boolean acceptsDocsOutOfOrder() {
+ return delegate.acceptsDocsOutOfOrder();
+ }
+
+ public int getMatches() {
+ return matches;
+ }
+
+ /**
+ * Returns the delegate collector
+ *
+ * @return the delegate collector
+ */
+ public Collector getDelegate() {
+ return delegate;
+ }
+}
Modified: lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java Mon Jan 30 17:29:22 2012
@@ -17,8 +17,7 @@
package org.apache.solr.update;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.store.Directory;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.solr.request.SolrQueryRequest;
/**
@@ -28,9 +27,9 @@ import org.apache.solr.request.SolrQuery
*
*/
public class MergeIndexesCommand extends UpdateCommand {
- public IndexReader[] readers;
+ public DirectoryReader[] readers;
- public MergeIndexesCommand(IndexReader[] readers, SolrQueryRequest req) {
+ public MergeIndexesCommand(DirectoryReader[] readers, SolrQueryRequest req) {
super(req);
this.readers = readers;
}
Modified: lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java Mon Jan 30 17:29:22 2012
@@ -19,7 +19,7 @@ package org.apache.solr.core;
import java.io.File;
import java.io.IOException;
-import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.store.Directory;
import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
@@ -61,9 +61,9 @@ public class AlternateDirectoryTest exte
static volatile boolean newReaderCalled = false;
@Override
- public IndexReader newReader(Directory indexDir) throws IOException {
+ public DirectoryReader newReader(Directory indexDir) throws IOException {
TestIndexReaderFactory.newReaderCalled = true;
- return IndexReader.open(indexDir);
+ return DirectoryReader.open(indexDir);
}
}
Modified: lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/request/TestFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/request/TestFaceting.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/request/TestFaceting.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/request/TestFaceting.java Mon Jan 30 17:29:22 2012
@@ -21,7 +21,6 @@ import java.util.Locale;
import java.util.Random;
import org.apache.lucene.index.DocTermOrds;
-import org.apache.lucene.index.SlowMultiReaderWrapper;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BytesRef;
@@ -81,7 +80,7 @@ public class TestFaceting extends SolrTe
assertEquals(size, uif.getNumTerms());
- TermsEnum te = uif.getOrdTermsEnum(new SlowMultiReaderWrapper(req.getSearcher().getIndexReader()));
+ TermsEnum te = uif.getOrdTermsEnum(req.getSearcher().getAtomicReader());
assertEquals(size == 0, te == null);
Random r = new Random(size);
Modified: lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestDocSet.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestDocSet.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestDocSet.java Mon Jan 30 17:29:22 2012
@@ -25,7 +25,7 @@ import org.apache.lucene.index.FieldInfo
import org.apache.lucene.index.FilterIndexReader;
import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.search.DocIdSet;
@@ -356,11 +356,6 @@ public class TestDocSet extends LuceneTe
}
@Override
- public IndexReader[] getSequentialSubReaders() {
- return null;
- }
-
- @Override
public FieldInfos getFieldInfos() {
return new FieldInfos();
}
Modified: lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java Mon Jan 30 17:29:22 2012
@@ -16,7 +16,7 @@
*/
package org.apache.solr.search;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -78,7 +78,7 @@ public class TestIndexSearcher extends S
// make sure the readers share the first segment
// Didn't work w/ older versions of lucene2.9 going from segment -> multi
- assertEquals(ReaderUtil.leaves(rCtx1)[0].reader, ReaderUtil.leaves(rCtx2)[0].reader);
+ assertEquals(ReaderUtil.leaves(rCtx1)[0].reader(), ReaderUtil.leaves(rCtx2)[0].reader());
assertU(adoc("id","5", "v_f","3.14159"));
assertU(adoc("id","6", "v_f","8983", "v_s1","string6"));
@@ -88,14 +88,14 @@ public class TestIndexSearcher extends S
IndexReaderContext rCtx3 = sr3.getSearcher().getTopReaderContext();
// make sure the readers share segments
// assertEquals(r1.getLeafReaders()[0], r3.getLeafReaders()[0]);
- assertEquals(ReaderUtil.leaves(rCtx2)[0].reader, ReaderUtil.leaves(rCtx3)[0].reader);
- assertEquals(ReaderUtil.leaves(rCtx2)[1].reader, ReaderUtil.leaves(rCtx3)[1].reader);
+ assertEquals(ReaderUtil.leaves(rCtx2)[0].reader(), ReaderUtil.leaves(rCtx3)[0].reader());
+ assertEquals(ReaderUtil.leaves(rCtx2)[1].reader(), ReaderUtil.leaves(rCtx3)[1].reader());
sr1.close();
sr2.close();
// should currently be 1, but this could change depending on future index management
- int baseRefCount = rCtx3.reader.getRefCount();
+ int baseRefCount = rCtx3.reader().getRefCount();
assertEquals(1, baseRefCount);
assertU(commit());
@@ -108,12 +108,12 @@ public class TestIndexSearcher extends S
assertU(commit());
// test that reader didn't change (according to equals at least... which uses the wrapped reader)
- assertEquals(rCtx3.reader, rCtx4.reader);
- assertEquals(baseRefCount+1, rCtx4.reader.getRefCount());
+ assertEquals(rCtx3.reader(), rCtx4.reader());
+ assertEquals(baseRefCount+1, rCtx4.reader().getRefCount());
sr3.close();
- assertEquals(baseRefCount, rCtx4.reader.getRefCount());
+ assertEquals(baseRefCount, rCtx4.reader().getRefCount());
sr4.close();
- assertEquals(baseRefCount-1, rCtx4.reader.getRefCount());
+ assertEquals(baseRefCount-1, rCtx4.reader().getRefCount());
SolrQueryRequest sr5 = req("q","foo");
@@ -123,8 +123,8 @@ public class TestIndexSearcher extends S
assertU(commit());
SolrQueryRequest sr6 = req("q","foo");
IndexReaderContext rCtx6 = sr6.getSearcher().getTopReaderContext();
- assertEquals(1, ReaderUtil.leaves(rCtx6)[0].reader.numDocs()); // only a single doc left in the first segment
- assertTrue( !ReaderUtil.leaves(rCtx5)[0].reader.equals(ReaderUtil.leaves(rCtx6)[0].reader) ); // readers now different
+ assertEquals(1, ReaderUtil.leaves(rCtx6)[0].reader().numDocs()); // only a single doc left in the first segment
+ assertTrue( !ReaderUtil.leaves(rCtx5)[0].reader().equals(ReaderUtil.leaves(rCtx6)[0].reader()) ); // readers now different
sr5.close();
sr6.close();
Modified: lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java Mon Jan 30 17:29:22 2012
@@ -1342,7 +1342,7 @@ public class TestRealTimeGet extends Sol
// The purpose of this test is to roughly model how solr uses lucene
- IndexReader reader;
+ DirectoryReader reader;
@Test
public void testStressLuceneNRT() throws Exception {
final int commitPercent = 5 + random.nextInt(20);
@@ -1408,7 +1408,7 @@ public class TestRealTimeGet extends Sol
// reader = IndexReader.open(dir);
// make this reader an NRT reader from the start to avoid the first non-writer openIfChanged
// to only opening at the last commit point.
- reader = IndexReader.open(writer.w, true);
+ reader = DirectoryReader.open(writer.w, true);
for (int i=0; i<nWriteThreads; i++) {
Thread thread = new Thread("WRITER"+i) {
@@ -1424,7 +1424,7 @@ public class TestRealTimeGet extends Sol
if (numCommitting.incrementAndGet() <= maxConcurrentCommits) {
Map<Integer,DocInfo> newCommittedModel;
long version;
- IndexReader oldReader;
+ DirectoryReader oldReader;
boolean softCommit = rand.nextInt(100) < softCommitPercent;
@@ -1452,12 +1452,12 @@ public class TestRealTimeGet extends Sol
verbose("reopen start using", oldReader);
- IndexReader newReader;
+ DirectoryReader newReader;
if (softCommit) {
- newReader = IndexReader.openIfChanged(oldReader, writer.w, true);
+ newReader = DirectoryReader.openIfChanged(oldReader, writer.w, true);
} else {
// will only open to last commit
- newReader = IndexReader.openIfChanged(oldReader);
+ newReader = DirectoryReader.openIfChanged(oldReader);
}
Modified: lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestSort.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/search/TestSort.java Mon Jan 30 17:29:22 2012
@@ -24,8 +24,8 @@ import org.apache.lucene.analysis.core.S
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.search.*;
@@ -194,7 +194,7 @@ public class TestSort extends SolrTestCa
iw.close();
- IndexReader reader = IndexReader.open(dir);
+ DirectoryReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
// System.out.println("segments="+searcher.getIndexReader().getSequentialSubReaders().length);
assertTrue(reader.getSequentialSubReaders().length > 1);
@@ -203,7 +203,7 @@ public class TestSort extends SolrTestCa
Filter filt = new Filter() {
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
- return BitsFilteredDocIdSet.wrap(randSet(context.reader.maxDoc()), acceptDocs);
+ return BitsFilteredDocIdSet.wrap(randSet(context.reader().maxDoc()), acceptDocs);
}
};
Modified: lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java?rev=1237812&r1=1237811&r2=1237812&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (original)
+++ lucene/dev/branches/lucene2858/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java Mon Jan 30 17:29:22 2012
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.store.Directory;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
@@ -256,18 +256,16 @@ public class DirectUpdateHandlerTest ext
assertU(commit());
SolrQueryRequest sr = req("q","foo");
- IndexReader r = sr.getSearcher().getTopReaderContext().reader;
+ DirectoryReader r = sr.getSearcher().getIndexReader();
assertTrue(r.maxDoc() > r.numDocs()); // should have deletions
- assertFalse(r.getTopReaderContext().isAtomic); // more than 1 segment
sr.close();
assertU(commit("expungeDeletes","true"));
sr = req("q","foo");
- r = sr.getSearcher().getTopReaderContext().reader;
+ r = r = sr.getSearcher().getIndexReader();
assertEquals(r.maxDoc(), r.numDocs()); // no deletions
assertEquals(4,r.maxDoc()); // no dups
- assertFalse(r.getTopReaderContext().isAtomic); //still more than 1 segment
sr.close();
}
@@ -278,7 +276,7 @@ public class DirectUpdateHandlerTest ext
assertU(commit()); // commit a second time to make sure index files aren't still referenced by the old searcher
SolrQueryRequest sr = req();
- IndexReader r = sr.getSearcher().getTopReaderContext().reader;
+ DirectoryReader r = sr.getSearcher().getIndexReader();
Directory d = r.directory();
log.info("FILES before addDoc="+ Arrays.asList(d.listAll()));