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 2011/12/09 14:30:44 UTC
svn commit: r1212405 [6/6] - in /lucene/dev/branches/lucene3622: ./ lucene/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/highlighter...
Modified: lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Fri Dec 9 13:30:38 2011
@@ -491,7 +491,7 @@ public class TestSpans extends LuceneTes
writer.close();
// Get searcher
- final IndexReader reader = IndexReader.open(dir, true);
+ final IndexReader reader = IndexReader.open(dir);
final IndexSearcher searcher = newSearcher(reader);
// Control (make sure docs indexed)
Modified: lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java Fri Dec 9 13:30:38 2011
@@ -76,7 +76,7 @@ public class TestSpansAdvanced2 extends
* @throws Exception
*/
public void testVerifyIndex() throws Exception {
- final IndexReader reader = IndexReader.open(mDirectory, true);
+ final IndexReader reader = IndexReader.open(mDirectory);
assertEquals(8, reader.numDocs());
reader.close();
}
Modified: lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java Fri Dec 9 13:30:38 2011
@@ -256,25 +256,33 @@ public class TestBufferedIndexInput exte
doc.add(newField("id", "" + i, TextField.TYPE_STORED));
writer.addDocument(doc);
}
- writer.close();
dir.allIndexInputs.clear();
- IndexReader reader = IndexReader.open(dir, false);
+ IndexReader reader = IndexReader.open(writer, true);
Term aaa = new Term("content", "aaa");
Term bbb = new Term("content", "bbb");
- Term ccc = new Term("content", "ccc");
- assertEquals(37, reader.docFreq(ccc));
- reader.deleteDocument(0);
- assertEquals(37, reader.docFreq(aaa));
- dir.tweakBufferSizes();
- reader.deleteDocument(4);
- assertEquals(reader.docFreq(bbb), 37);
+
+ reader.close();
+
dir.tweakBufferSizes();
-
+ writer.deleteDocuments(new Term("id", "0"));
+ reader = IndexReader.open(writer, true);
IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(bbb), null, 1000).scoreDocs;
dir.tweakBufferSizes();
+ assertEquals(36, hits.length);
+
+ reader.close();
+ searcher.close();
+
+ dir.tweakBufferSizes();
+ writer.deleteDocuments(new Term("id", "4"));
+ reader = IndexReader.open(writer, true);
+ searcher = newSearcher(reader);
+
+ hits = searcher.search(new TermQuery(bbb), null, 1000).scoreDocs;
+ dir.tweakBufferSizes();
assertEquals(35, hits.length);
dir.tweakBufferSizes();
hits = searcher.search(new TermQuery(new Term("id", "33")), null, 1000).scoreDocs;
@@ -283,6 +291,7 @@ public class TestBufferedIndexInput exte
hits = searcher.search(new TermQuery(aaa), null, 1000).scoreDocs;
dir.tweakBufferSizes();
assertEquals(35, hits.length);
+ writer.close();
searcher.close();
reader.close();
} finally {
Modified: lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java Fri Dec 9 13:30:38 2011
@@ -94,7 +94,7 @@ public class TestFileSwitchDirectory ext
public void testNoDir() throws Throwable {
Directory dir = newFSSwitchDirectory(Collections.<String>emptySet());
try {
- IndexReader.open(dir, true);
+ IndexReader.open(dir);
fail("did not hit expected exception");
} catch (NoSuchDirectoryException nsde) {
// expected
Modified: lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestLockFactory.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestLockFactory.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestLockFactory.java Fri Dec 9 13:30:38 2011
@@ -345,7 +345,7 @@ public class TestLockFactory extends Luc
Query query = new TermQuery(new Term("content", "aaa"));
for(int i=0;i<this.numIteration;i++) {
try{
- reader = IndexReader.open(dir, false);
+ reader = IndexReader.open(dir);
searcher = new IndexSearcher(reader);
} catch (Exception e) {
hitException = true;
Modified: lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java Fri Dec 9 13:30:38 2011
@@ -123,7 +123,7 @@ public class TestNRTCachingDirectory ext
public void testNoDir() throws Throwable {
Directory dir = new NRTCachingDirectory(newFSDirectory(_TestUtil.getTempDir("doesnotexist")), 2.0, 25.0);
try {
- IndexReader.open(dir, true);
+ IndexReader.open(dir);
fail("did not hit expected exception");
} catch (NoSuchDirectoryException nsde) {
// expected
Modified: lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java Fri Dec 9 13:30:38 2011
@@ -76,7 +76,7 @@ public class TestRAMDirectory extends Lu
assertEquals(ramDir.sizeInBytes(), ramDir.getRecomputedSizeInBytes());
// open reader to test document count
- IndexReader reader = IndexReader.open(ramDir, true);
+ IndexReader reader = IndexReader.open(ramDir);
assertEquals(docsToAdd, reader.numDocs());
// open search zo check if all doc's are there
Modified: lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (original)
+++ lucene/dev/branches/lucene3622/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java Fri Dec 9 13:30:38 2011
@@ -68,8 +68,8 @@ public class TestFieldCacheSanityChecker
}
wA.close();
wB.close();
- readerA = IndexReader.open(dirA, true);
- readerB = IndexReader.open(dirB, true);
+ readerA = IndexReader.open(dirA);
+ readerB = IndexReader.open(dirB);
readerX = new MultiReader(readerA, readerB);
}
Modified: lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java (original)
+++ lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java Fri Dec 9 13:30:38 2011
@@ -270,7 +270,7 @@ public class TestClassicAnalyzer extends
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
// Make sure all terms < max size were indexed
assertEquals(2, reader.docFreq(new Term("content", "abc")));
@@ -303,7 +303,7 @@ public class TestClassicAnalyzer extends
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, sa));
writer.addDocument(doc);
writer.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(1, reader.docFreq(new Term("content", bigTerm)));
reader.close();
Modified: lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (original)
+++ lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java Fri Dec 9 13:30:38 2011
@@ -95,7 +95,7 @@ public class TestKeywordAnalyzer extends
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
DocsEnum td = _TestUtil.docs(random,
reader,
"partnum",
Modified: lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (original)
+++ lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java Fri Dec 9 13:30:38 2011
@@ -61,7 +61,7 @@ public class TestLimitTokenCountAnalyzer
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
Term t = new Term("field", "x");
assertEquals(1, reader.docFreq(t));
reader.close();
Modified: lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (original)
+++ lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java Fri Dec 9 13:30:38 2011
@@ -53,7 +53,7 @@ public class QueryAutoStopWordAnalyzerTe
writer.addDocument(doc);
}
writer.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
}
@Override
Modified: lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Fri Dec 9 13:30:38 2011
@@ -104,7 +104,7 @@ public class TestTeeSinkTokenFilter exte
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
Terms vector = r.getTermVectors(0).terms("field");
assertEquals(1, vector.getUniqueTermCount());
TermsEnum termsEnum = vector.iterator(null);
Modified: lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java (original)
+++ lucene/dev/branches/lucene3622/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java Fri Dec 9 13:30:38 2011
@@ -31,11 +31,15 @@ import org.apache.lucene.util.Version;
public class TestThaiAnalyzer extends BaseTokenStreamTestCase {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE);
+ }
/*
* testcase for offsets
*/
public void testOffsets() throws Exception {
- assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE);
assertAnalyzesTo(new ThaiAnalyzer(TEST_VERSION_CURRENT), "à¸à¸²à¸£à¸à¸µà¹à¹à¸à¹à¸à¹à¸à¸à¹à¸ªà¸à¸à¸§à¹à¸²à¸à¸²à¸à¸à¸µ",
new String[] { "à¸à¸²à¸£", "à¸à¸µà¹", "à¹à¸à¹", "à¸à¹à¸à¸", "à¹à¸ªà¸à¸", "วà¹à¸²", "à¸à¸²à¸", "à¸à¸µ" },
new int[] { 0, 3, 6, 9, 13, 17, 20, 23 },
@@ -43,7 +47,6 @@ public class TestThaiAnalyzer extends Ba
}
public void testTokenType() throws Exception {
- assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE);
assertAnalyzesTo(new ThaiAnalyzer(TEST_VERSION_CURRENT), "à¸à¸²à¸£à¸à¸µà¹à¹à¸à¹à¸à¹à¸à¸à¹à¸ªà¸à¸à¸§à¹à¸²à¸à¸²à¸à¸à¸µ à¹à¹à¹",
new String[] { "à¸à¸²à¸£", "à¸à¸µà¹", "à¹à¸à¹", "à¸à¹à¸à¸", "à¹à¸ªà¸à¸", "วà¹à¸²", "à¸à¸²à¸", "à¸à¸µ", "à¹à¹à¹" },
new String[] { "<SOUTHEAST_ASIAN>", "<SOUTHEAST_ASIAN>",
@@ -59,7 +62,6 @@ public class TestThaiAnalyzer extends Ba
*/
@Deprecated
public void testBuggyTokenType30() throws Exception {
- assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE);
assertAnalyzesTo(new ThaiAnalyzer(Version.LUCENE_30), "à¸à¸²à¸£à¸à¸µà¹à¹à¸à¹à¸à¹à¸à¸à¹à¸ªà¸à¸à¸§à¹à¸²à¸à¸²à¸à¸à¸µ à¹à¹à¹",
new String[] { "à¸à¸²à¸£", "à¸à¸µà¹", "à¹à¸à¹", "à¸à¹à¸à¸", "à¹à¸ªà¸à¸", "วà¹à¸²", "à¸à¸²à¸", "à¸à¸µ", "à¹à¹à¹" },
new String[] { "<ALPHANUM>", "<ALPHANUM>", "<ALPHANUM>",
@@ -70,7 +72,6 @@ public class TestThaiAnalyzer extends Ba
/** @deprecated (3.1) testing backwards behavior */
@Deprecated
public void testAnalyzer30() throws Exception {
- assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE);
ThaiAnalyzer analyzer = new ThaiAnalyzer(Version.LUCENE_30);
assertAnalyzesTo(analyzer, "", new String[] {});
@@ -96,7 +97,6 @@ public class TestThaiAnalyzer extends Ba
* Test that position increments are adjusted correctly for stopwords.
*/
public void testPositionIncrements() throws Exception {
- assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE);
final ThaiAnalyzer analyzer = new ThaiAnalyzer(TEST_VERSION_CURRENT);
assertAnalyzesTo(analyzer, "à¸à¸²à¸£à¸à¸µà¹à¹à¸à¹à¸à¹à¸à¸ the à¹à¸ªà¸à¸à¸§à¹à¸²à¸à¸²à¸à¸à¸µ",
new String[] { "à¸à¸²à¸£", "à¸à¸µà¹", "à¹à¸à¹", "à¸à¹à¸à¸", "à¹à¸ªà¸à¸", "วà¹à¸²", "à¸à¸²à¸", "à¸à¸µ" },
@@ -113,7 +113,6 @@ public class TestThaiAnalyzer extends Ba
}
public void testReusableTokenStream() throws Exception {
- assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE);
ThaiAnalyzer analyzer = new ThaiAnalyzer(TEST_VERSION_CURRENT);
assertAnalyzesToReuse(analyzer, "", new String[] {});
@@ -131,7 +130,6 @@ public class TestThaiAnalyzer extends Ba
/** @deprecated (3.1) for version back compat */
@Deprecated
public void testReusableTokenStream30() throws Exception {
- assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE);
ThaiAnalyzer analyzer = new ThaiAnalyzer(Version.LUCENE_30);
assertAnalyzesToReuse(analyzer, "", new String[] {});
@@ -153,7 +151,6 @@ public class TestThaiAnalyzer extends Ba
// LUCENE-3044
public void testAttributeReuse() throws Exception {
- assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE);
ThaiAnalyzer analyzer = new ThaiAnalyzer(Version.LUCENE_30);
// just consume
TokenStream ts = analyzer.tokenStream("dummy", new StringReader("ภาษาà¹à¸à¸¢"));
Modified: lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java (original)
+++ lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java Fri Dec 9 13:30:38 2011
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexReader;
/**
* Commits the IndexWriter.
@@ -51,14 +50,6 @@ public class CommitIndexTask extends Per
IndexWriter iw = getRunData().getIndexWriter();
if (iw != null) {
iw.commit(commitUserData);
- } else {
- IndexReader r = getRunData().getIndexReader();
- if (r != null) {
- r.commit(commitUserData);
- r.decRef();
- } else {
- throw new IllegalStateException("neither IndexWriter nor IndexReader is currently open");
- }
}
return 1;
Modified: lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java (original)
+++ lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java Fri Dec 9 13:30:38 2011
@@ -22,20 +22,17 @@ import java.util.Collection;
import java.util.Map;
import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.index.IndexCommit;
-import org.apache.lucene.index.IndexDeletionPolicy;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.store.Directory;
/**
* Open an index reader.
* <br>Other side effects: index reader object in perfRunData is set.
- * <br> Optional params readOnly,commitUserData eg. OpenReader(false,commit1)
+ * <br> Optional params commitUserData eg. OpenReader(false,commit1)
*/
public class OpenReaderTask extends PerfTask {
public static final String USER_DATA = "userData";
- private boolean readOnly = true;
private String commitUserData = null;
public OpenReaderTask(PerfRunData runData) {
@@ -45,22 +42,11 @@ public class OpenReaderTask extends Perf
@Override
public int doLogic() throws IOException {
Directory dir = getRunData().getDirectory();
- Config config = getRunData().getConfig();
IndexReader r = null;
- final IndexDeletionPolicy deletionPolicy;
- if (readOnly) {
- deletionPolicy = null;
- } else {
- deletionPolicy = CreateIndexTask.getIndexDeletionPolicy(config);
- }
if (commitUserData != null) {
- r = IndexReader.open(OpenReaderTask.findIndexCommit(dir, commitUserData),
- deletionPolicy,
- readOnly);
+ r = IndexReader.open(OpenReaderTask.findIndexCommit(dir, commitUserData));
} else {
- r = IndexReader.open(dir,
- deletionPolicy,
- readOnly);
+ r = IndexReader.open(dir);
}
getRunData().setIndexReader(r);
// We transfer reference to the run data
@@ -74,10 +60,7 @@ public class OpenReaderTask extends Perf
if (params != null) {
String[] split = params.split(",");
if (split.length > 0) {
- readOnly = Boolean.valueOf(split[0]).booleanValue();
- }
- if (split.length > 1) {
- commitUserData = split[1];
+ commitUserData = split[0];
}
}
}
Modified: lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java (original)
+++ lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java Fri Dec 9 13:30:38 2011
@@ -36,7 +36,7 @@ import org.apache.lucene.benchmark.byTas
* logging.
* <li>log.step.[class Task Name] - specifies the same as 'log.step', only for a
* particular task name. For example, log.step.AddDoc will be applied only for
- * {@link AddDocTask}, but not for {@link DeleteDocTask}. It's a way to control
+ * {@link AddDocTask}. It's a way to control
* per task logging settings. If you want to omit logging for any other task,
* include log.step=-1. The syntax is "log.step." together with the Task's
* 'short' name (i.e., without the 'Task' part).
Modified: lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java (original)
+++ lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java Fri Dec 9 13:30:38 2011
@@ -44,11 +44,9 @@ public class PrintReaderTask extends Per
Directory dir = getRunData().getDirectory();
IndexReader r = null;
if (userData == null)
- r = IndexReader.open(dir, true);
+ r = IndexReader.open(dir);
else
- r = IndexReader.open(OpenReaderTask.findIndexCommit(dir, userData),
- null,
- true);
+ r = IndexReader.open(OpenReaderTask.findIndexCommit(dir, userData));
System.out.println("--> numDocs:"+r.numDocs()+" dels:"+r.numDeletedDocs());
r.close();
return 1;
Modified: lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Fri Dec 9 13:30:38 2011
@@ -84,7 +84,7 @@ public abstract class ReadTask extends P
if (searcher == null) {
// open our own reader
Directory dir = getRunData().getDirectory();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
searcher = new IndexSearcher(reader);
closeSearcher = true;
} else {
Modified: lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java (original)
+++ lucene/dev/branches/lucene3622/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java Fri Dec 9 13:30:38 2011
@@ -86,7 +86,7 @@ public class QualityQueriesFinder {
private String [] bestTerms(String field,int numTerms) throws IOException {
PriorityQueue<TermDf> pq = new TermsDfQueue(numTerms);
- IndexReader ir = IndexReader.open(dir, true);
+ IndexReader ir = IndexReader.open(dir);
try {
int threshold = ir.maxDoc() / 10; // ignore words too common.
Terms terms = MultiFields.getTerms(ir, field);
Modified: lucene/dev/branches/lucene3622/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/dev/branches/lucene3622/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Fri Dec 9 13:30:38 2011
@@ -102,7 +102,7 @@ public class TestPerfTasksLogic extends
new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
.setOpenMode(OpenMode.APPEND));
iw.close();
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
assertEquals("1000 docs were added to the index, this is what we expect to find!",1000,ir.numDocs());
ir.close();
}
@@ -167,7 +167,7 @@ public class TestPerfTasksLogic extends
"{ AddDoc } : 100",
"ForceMerge(1)",
"CloseIndex",
- "OpenReader(true)",
+ "OpenReader",
"{ CountingHighlighterTest(size[1],highlight[1],mergeContiguous[true],maxFrags[1],fields[body]) } : 200",
"CloseReader",
};
@@ -188,7 +188,7 @@ public class TestPerfTasksLogic extends
// now we should be able to open the index for write.
IndexWriter iw = new IndexWriter(benchmark.getRunData().getDirectory(), new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND));
iw.close();
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
assertEquals("100 docs were added to the index, this is what we expect to find!",100,ir.numDocs());
ir.close();
}
@@ -206,7 +206,7 @@ public class TestPerfTasksLogic extends
"{ AddDoc } : 1000",
"ForceMerge(1)",
"CloseIndex",
- "OpenReader(false)",
+ "OpenReader",
"{ CountingHighlighterTest(size[1],highlight[1],mergeContiguous[true],maxFrags[1],fields[body]) } : 200",
"CloseReader",
};
@@ -227,7 +227,7 @@ public class TestPerfTasksLogic extends
// now we should be able to open the index for write.
IndexWriter iw = new IndexWriter(benchmark.getRunData().getDirectory(), new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND));
iw.close();
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
assertEquals("1000 docs were added to the index, this is what we expect to find!",1000,ir.numDocs());
ir.close();
}
@@ -300,7 +300,7 @@ public class TestPerfTasksLogic extends
// now we should be able to open the index for write.
IndexWriter iw = new IndexWriter(benchmark.getRunData().getDirectory(), new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND));
iw.close();
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
assertEquals("1 docs were added to the index, this is what we expect to find!",1,ir.numDocs());
ir.close();
}
@@ -331,7 +331,7 @@ public class TestPerfTasksLogic extends
// 3. execute the algorithm (required in every "logic" test)
Benchmark benchmark = execBenchmark(algLines);
- IndexReader r = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader r = IndexReader.open(benchmark.getRunData().getDirectory());
DocTermsIndex idx = FieldCache.DEFAULT.getTermsIndex(r, "country");
final int maxDoc = r.maxDoc();
assertEquals(1000, maxDoc);
@@ -367,7 +367,7 @@ public class TestPerfTasksLogic extends
Benchmark benchmark = execBenchmark(algLines);
// 3. test number of docs in the index
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
int ndocsExpected = 20; // first 20 reuters docs.
assertEquals("wrong number of docs in the index!", ndocsExpected, ir.numDocs());
ir.close();
@@ -432,7 +432,7 @@ public class TestPerfTasksLogic extends
.setOpenMode(OpenMode.APPEND));
iw.close();
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
assertEquals(numLines + " lines were created but " + ir.numDocs() + " docs are in the index", numLines, ir.numDocs());
ir.close();
@@ -476,7 +476,7 @@ public class TestPerfTasksLogic extends
}
// Separately count how many tokens are actually in the index:
- IndexReader reader = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader reader = IndexReader.open(benchmark.getRunData().getDirectory());
assertEquals(NUM_DOCS, reader.numDocs());
int totalTokenCount2 = 0;
@@ -535,7 +535,7 @@ public class TestPerfTasksLogic extends
Benchmark benchmark = execBenchmark(algLines);
// 3. test number of docs in the index
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
int ndocsExpected = 2 * 20; // first 20 reuters docs.
assertEquals("wrong number of docs in the index!", ndocsExpected, ir.numDocs());
ir.close();
@@ -572,7 +572,7 @@ public class TestPerfTasksLogic extends
Benchmark benchmark = execBenchmark(algLines);
// 3. test number of docs in the index
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
int ndocsExpected = 20; // first 20 reuters docs.
assertEquals("wrong number of docs in the index!", ndocsExpected, ir.numDocs());
ir.close();
@@ -609,7 +609,7 @@ public class TestPerfTasksLogic extends
Benchmark benchmark = execBenchmark(algLines);
// 3. test number of docs in the index
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
int ndocsExpected = 20; // first 20 reuters docs.
assertEquals("wrong number of docs in the index!", ndocsExpected, ir.numDocs());
ir.close();
@@ -623,40 +623,6 @@ public class TestPerfTasksLogic extends
}
}
- public void testDeleteByPercent() throws Exception {
- // 1. alg definition (required in every "logic" test)
- String algLines[] = {
- "# ----- properties ",
- "content.source=org.apache.lucene.benchmark.byTask.feeds.LineDocSource",
- "docs.file=" + getReuters20LinesFile(),
- "ram.flush.mb=-1",
- "max.buffered=2",
- "content.source.log.step=3",
- "doc.term.vector=false",
- "content.source.forever=false",
- "directory=RAMDirectory",
- "doc.stored=false",
- "doc.tokenized=false",
- "debug.level=1",
- "# ----- alg ",
- "CreateIndex",
- "{ \"AddDocs\" AddDoc > : * ",
- "CloseIndex()",
- "OpenReader(false)",
- "DeleteByPercent(20)",
- "CloseReader"
- };
-
- // 2. execute the algorithm (required in every "logic" test)
- Benchmark benchmark = execBenchmark(algLines);
-
- // 3. test number of docs in the index
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
- int ndocsExpected = 16; // first 20 reuters docs, minus 20%
- assertEquals("wrong number of docs in the index!", ndocsExpected, ir.numDocs());
- ir.close();
- }
-
/**
* Test that we can set merge scheduler".
*/
@@ -690,7 +656,7 @@ public class TestPerfTasksLogic extends
benchmark.getRunData().getIndexWriter().close();
// 3. test number of docs in the index
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
int ndocsExpected = 20; // first 20 reuters docs.
assertEquals("wrong number of docs in the index!", ndocsExpected, ir.numDocs());
ir.close();
@@ -736,7 +702,7 @@ public class TestPerfTasksLogic extends
benchmark.getRunData().getIndexWriter().close();
// 3. test number of docs in the index
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
int ndocsExpected = 20; // first 20 reuters docs.
assertEquals("wrong number of docs in the index!", ndocsExpected, ir.numDocs());
ir.close();
@@ -780,7 +746,7 @@ public class TestPerfTasksLogic extends
assertFalse(((LogMergePolicy) writer.getConfig().getMergePolicy()).getUseCompoundFile());
writer.close();
Directory dir = benchmark.getRunData().getDirectory();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
Fields tfv = reader.getTermVectors(0);
assertNotNull(tfv);
assertTrue(tfv.getUniqueFieldCount() > 0);
@@ -856,7 +822,7 @@ public class TestPerfTasksLogic extends
Benchmark benchmark = execBenchmark(algLines);
// 3. test number of docs in the index
- IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+ IndexReader ir = IndexReader.open(benchmark.getRunData().getDirectory());
int ndocsExpected = 20; // first 20 reuters docs.
assertEquals("wrong number of docs in the index!", ndocsExpected, ir.numDocs());
ir.close();
Modified: lucene/dev/branches/lucene3622/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleMain.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleMain.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleMain.java (original)
+++ lucene/dev/branches/lucene3622/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleMain.java Fri Dec 9 13:30:38 2011
@@ -57,7 +57,7 @@ public class SimpleMain {
// open readers
TaxonomyReader taxo = new DirectoryTaxonomyReader(taxoDir);
- IndexReader indexReader = IndexReader.open(indexDir, true);
+ IndexReader indexReader = IndexReader.open(indexDir);
ExampleUtils.log("search the sample documents...");
List<FacetResult> facetRes = SimpleSearcher.searchWithFacets(indexReader, taxo);
@@ -82,7 +82,7 @@ public class SimpleMain {
// open readers
TaxonomyReader taxo = new DirectoryTaxonomyReader(taxoDir);
- IndexReader indexReader = IndexReader.open(indexDir, true);
+ IndexReader indexReader = IndexReader.open(indexDir);
ExampleUtils.log("search the sample documents...");
List<FacetResult> facetRes = SimpleSearcher.searchWithDrillDown(indexReader, taxo);
Modified: lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java (original)
+++ lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java Fri Dec 9 13:30:38 2011
@@ -323,19 +323,6 @@ public class TestTotalFacetCountsCache e
assertTrue("Should be obtained from cache at 8th attempt",totalCounts ==
TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams, null));
- // delete a doc from the reader and commit - should recompute
- origReader.close();
- origReader = readers[0].indexReader;
- readers[0].indexReader = IndexReader.open(origReader.directory(),false);
- initCache();
- totalCounts = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams, null);
- prevGen = assertRecomputed(totalCounts, prevGen, "after opening a writable reader - 9th attempt!");
- // now do the delete
- readers[0].indexReader.deleteDocument(1);
- readers[0].indexReader.commit(null);
- totalCounts = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams, null);
- prevGen = assertRecomputed(totalCounts, prevGen, "after deleting docs the index - 10th attempt!");
-
origReader.close();
readers[0].close();
r2.close();
Modified: lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestIndexClose.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestIndexClose.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestIndexClose.java (original)
+++ lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestIndexClose.java Fri Dec 9 13:30:38 2011
@@ -147,7 +147,7 @@ public class TestIndexClose extends Luce
}
@Override
protected IndexReader openIndexReader(Directory dir) throws CorruptIndexException, IOException {
- return new InstrumentedIndexReader(IndexReader.open(dir,true));
+ return new InstrumentedIndexReader(IndexReader.open(dir));
}
}
Modified: lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java (original)
+++ lucene/dev/branches/lucene3622/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java Fri Dec 9 13:30:38 2011
@@ -231,14 +231,11 @@ public class TestScoredDocIDsUtils exten
for (int docNum = 0; docNum < nDocs; docNum++) {
writer.addDocument(docFactory.getDoc(docNum));
}
- writer.close();
-
// Delete documents marked for deletion
- IndexReader reader = IndexReader.open(dir, false);
- reader.deleteDocuments(new Term(DocumentFactory.field, DocumentFactory.delTxt));
- reader.close();
+ writer.deleteDocuments(new Term(DocumentFactory.field, DocumentFactory.delTxt));
+ writer.close();
// Open a fresh read-only reader with the deletions in place
- return IndexReader.open(dir, true);
+ return IndexReader.open(dir);
}
}
Modified: lucene/dev/branches/lucene3622/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/branches/lucene3622/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Fri Dec 9 13:30:38 2011
@@ -672,8 +672,7 @@ public class TestGrouping extends Lucene
do {
// B/c of DV based impl we can't see the difference between an empty string and a null value.
// For that reason we don't generate empty string groups.
-// randomValue = _TestUtil.randomRealisticUnicodeString(random);
- randomValue = _TestUtil.randomSimpleString(random);
+ randomValue = _TestUtil.randomRealisticUnicodeString(random);
} while ("".equals(randomValue));
groups.add(new BytesRef(randomValue));
Modified: lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (original)
+++ lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java Fri Dec 9 13:30:38 2011
@@ -76,7 +76,7 @@ public class TestParser extends LuceneTe
}
d.close();
writer.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
searcher = newSearcher(reader);
}
Modified: lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java (original)
+++ lucene/dev/branches/lucene3622/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java Fri Dec 9 13:30:38 2011
@@ -63,7 +63,7 @@ public class TestNumericRangeFilterBuild
IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, null));
writer.commit();
try {
- IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(ramDir, true));
+ IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(ramDir));
try {
assertNull(filter.getDocIdSet((AtomicReaderContext) reader.getTopReaderContext(), reader.getLiveDocs()));
}
Modified: lucene/dev/branches/lucene3622/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (original)
+++ lucene/dev/branches/lucene3622/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java Fri Dec 9 13:30:38 2011
@@ -84,7 +84,7 @@ public class TestLuceneDictionary extend
public void testFieldNonExistent() throws IOException {
try {
- indexReader = IndexReader.open(store, true);
+ indexReader = IndexReader.open(store);
ld = new LuceneDictionary(indexReader, "nonexistent_field");
it = ld.getWordsIterator();
@@ -98,7 +98,7 @@ public class TestLuceneDictionary extend
public void testFieldAaa() throws IOException {
try {
- indexReader = IndexReader.open(store, true);
+ indexReader = IndexReader.open(store);
ld = new LuceneDictionary(indexReader, "aaa");
it = ld.getWordsIterator();
@@ -114,7 +114,7 @@ public class TestLuceneDictionary extend
public void testFieldContents_1() throws IOException {
try {
- indexReader = IndexReader.open(store, true);
+ indexReader = IndexReader.open(store);
ld = new LuceneDictionary(indexReader, "contents");
it = ld.getWordsIterator();
@@ -144,7 +144,7 @@ public class TestLuceneDictionary extend
public void testFieldContents_2() throws IOException {
try {
- indexReader = IndexReader.open(store, true);
+ indexReader = IndexReader.open(store);
ld = new LuceneDictionary(indexReader, "contents");
it = ld.getWordsIterator();
@@ -176,7 +176,7 @@ public class TestLuceneDictionary extend
public void testFieldZzz() throws IOException {
try {
- indexReader = IndexReader.open(store, true);
+ indexReader = IndexReader.open(store);
ld = new LuceneDictionary(indexReader, "zzz");
it = ld.getWordsIterator();
@@ -194,7 +194,7 @@ public class TestLuceneDictionary extend
public void testSpellchecker() throws IOException {
Directory dir = newDirectory();
SpellChecker sc = new SpellChecker(dir);
- indexReader = IndexReader.open(store, true);
+ indexReader = IndexReader.open(store);
sc.indexDictionary(new LuceneDictionary(indexReader, "contents"), newIndexWriterConfig(TEST_VERSION_CURRENT, null), false);
String[] suggestions = sc.suggestSimilar("Tam", 1);
assertEquals(1, suggestions.length);
Modified: lucene/dev/branches/lucene3622/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (original)
+++ lucene/dev/branches/lucene3622/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java Fri Dec 9 13:30:38 2011
@@ -104,7 +104,7 @@ public class TestSpellChecker extends Lu
public void testBuild() throws CorruptIndexException, IOException {
- IndexReader r = IndexReader.open(userindex, true);
+ IndexReader r = IndexReader.open(userindex);
spellChecker.clearIndex();
@@ -144,7 +144,7 @@ public class TestSpellChecker extends Lu
}
public void testComparator() throws Exception {
- IndexReader r = IndexReader.open(userindex, true);
+ IndexReader r = IndexReader.open(userindex);
Directory compIdx = newDirectory();
SpellChecker compareSP = new SpellCheckerMock(compIdx, new LevensteinDistance(), new SuggestWordFrequencyComparator());
addwords(r, compareSP, "field3");
@@ -162,7 +162,7 @@ public class TestSpellChecker extends Lu
}
public void testBogusField() throws Exception {
- IndexReader r = IndexReader.open(userindex, true);
+ IndexReader r = IndexReader.open(userindex);
Directory compIdx = newDirectory();
SpellChecker compareSP = new SpellCheckerMock(compIdx, new LevensteinDistance(), new SuggestWordFrequencyComparator());
addwords(r, compareSP, "field3");
@@ -177,7 +177,7 @@ public class TestSpellChecker extends Lu
}
public void testSuggestModes() throws Exception {
- IndexReader r = IndexReader.open(userindex, true);
+ IndexReader r = IndexReader.open(userindex);
spellChecker.clearIndex();
addwords(r, spellChecker, "field1");
@@ -337,7 +337,7 @@ public class TestSpellChecker extends Lu
}
private int numdoc() throws IOException {
- IndexReader rs = IndexReader.open(spellindex, true);
+ IndexReader rs = IndexReader.open(spellindex);
int num = rs.numDocs();
assertTrue(num != 0);
//System.out.println("num docs: " + num);
@@ -346,7 +346,7 @@ public class TestSpellChecker extends Lu
}
public void testClose() throws IOException {
- IndexReader r = IndexReader.open(userindex, true);
+ IndexReader r = IndexReader.open(userindex);
spellChecker.clearIndex();
String field = "field1";
addwords(r, spellChecker, "field1");
@@ -402,7 +402,7 @@ public class TestSpellChecker extends Lu
*/
public void testConcurrentAccess() throws IOException, InterruptedException {
assertEquals(1, searchers.size());
- final IndexReader r = IndexReader.open(userindex, true);
+ final IndexReader r = IndexReader.open(userindex);
spellChecker.clearIndex();
assertEquals(2, searchers.size());
addwords(r, spellChecker, "field1");
Modified: lucene/dev/branches/lucene3622/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/CHANGES.txt?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3622/solr/CHANGES.txt Fri Dec 9 13:30:38 2011
@@ -286,6 +286,12 @@ Bug Fixes
and added a merge() method to SolrSpellChecker instead. Previously if you extended SolrSpellChecker
your spellchecker would not work in distributed fashion. (James Dyer via rmuir)
+* SOLR-2509: StringIndexOutOfBoundsException in the spellchecker collate when the term contains
+ a hyphen. (Thomas Gambier caught the bug, Steffen Godskesen did the patch, via Erick Erickson)
+
+* SOLR-1730: Made it clearer when a core failed to load as well as better logging when the
+ QueryElevationComponent fails to properly initialize (gsingers)
+
Other Changes
----------------------
@@ -410,6 +416,9 @@ Bug Fixes
* SOLR-2819: Improved speed of parsing hex entities in HTMLStripCharFilter
(Bernhard Berger, hossman)
+* SOLR-2509: StringIndexOutOfBoundsException in the spellchecker collate when the term contains
+ a hyphen. (Thomas Gambier caught the bug, Steffen Godskesen did the patch, via Erick Erickson)
+
Other Changes
----------------------
* SOLR-2922: Upgrade commons-io and commons-lang to 2.1 and 2.6, respectively. (koji)
Modified: lucene/dev/branches/lucene3622/solr/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/contrib/dataimporthandler/CHANGES.txt?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3622/solr/contrib/dataimporthandler/CHANGES.txt Fri Dec 9 13:30:38 2011
@@ -12,6 +12,13 @@ $Id$
(No Changes)
+================== 3.6.0 ==================
+
+New Features
+----------------------
+* SOLR-1499: Added SolrEntityProcessor that imports data from another Solr core or instance based on a specified query.
+ (Lance Norskog, Erik Hatcher, Pulkit Singhal, Ahmet Arslan, Luca Cavanna, Martijn van Groningen)
+
================== 3.5.0 ==================
Bug Fixes
Modified: lucene/dev/branches/lucene3622/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java (original)
+++ lucene/dev/branches/lucene3622/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java Fri Dec 9 13:30:38 2011
@@ -90,7 +90,7 @@ public class TestSqlEntityProcessor2 ext
@Test
@SuppressWarnings("unchecked")
- public void testCompositePk_FullImportNoCommit() throws Exception {
+ public void testCompositePk_FullImportWithoutCommit() throws Exception {
List parentRow = new ArrayList();
parentRow.add(createMap("id", "10"));
MockDataSource.setIterator("select * from x", parentRow.iterator());
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/CoreContainer.java Fri Dec 9 13:30:38 2011
@@ -215,7 +215,6 @@ public class CoreContainer
}
/**
- * @exception generates an error if you attempt to set this value to false
* @deprecated all cores now abort on configuration error regardless of configuration
*/
@Deprecated
@@ -246,6 +245,9 @@ public class CoreContainer
}
solrConfigFilename = cores.getConfigFile().getName();
+ if (cores.cores.isEmpty()){
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "No cores were created, please check the logs for errors");
+ }
return cores;
}
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java Fri Dec 9 13:30:38 2011
@@ -57,10 +57,9 @@ public abstract class IndexReaderFactory
* Creates a new IndexReader instance using the given Directory.
*
* @param indexDir indexDir index location
- * @param readOnly return readOnly IndexReader
* @return An IndexReader instance
* @throws IOException
*/
- public abstract IndexReader newReader(Directory indexDir, boolean readOnly)
+ public abstract IndexReader newReader(Directory indexDir)
throws IOException;
}
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/SolrCore.java Fri Dec 9 13:30:38 2011
@@ -314,12 +314,7 @@ public final class SolrCore implements S
// gets a non-caching searcher
public SolrIndexSearcher newSearcher(String name) throws IOException {
- return newSearcher(name, false);
- }
-
- // gets a non-caching searcher
- public SolrIndexSearcher newSearcher(String name, boolean readOnly) throws IOException {
- return new SolrIndexSearcher(this, getNewIndexDir(), schema, getSolrConfig().mainIndexConfig, name, readOnly, false, directoryFactory);
+ return new SolrIndexSearcher(this, getNewIndexDir(), schema, getSolrConfig().mainIndexConfig, name, false, directoryFactory);
}
@@ -617,11 +612,14 @@ public final class SolrCore implements S
// Finally tell anyone who wants to know
resourceLoader.inform( resourceLoader );
resourceLoader.inform( this ); // last call before the latch is released.
- } catch (IOException e) {
- log.error("", e);
+ } catch (Throwable e) {
+ log.error("Error in constructing the core", e);
+ latch.countDown();//release the latch, otherwise we block trying to do the close. This should be fine, since counting down on a latch of 0 is still fine
+ //close down the searcher and any other resources, if it exists, as this is not recoverable
+ close();
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, null, e, false);
} finally {
- // allow firstSearcher events to fire
+ // allow firstSearcher events to fire and make sure it is released
latch.countDown();
}
@@ -1146,7 +1144,7 @@ public final class SolrCore implements S
} else {
// verbose("non-reopen START:");
- tmp = new SolrIndexSearcher(this, newIndexDir, schema, getSolrConfig().mainIndexConfig, "main", true, true, directoryFactory);
+ tmp = new SolrIndexSearcher(this, newIndexDir, schema, getSolrConfig().mainIndexConfig, "main", true, directoryFactory);
// verbose("non-reopen DONE: searcher=",tmp);
}
} catch (Throwable th) {
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java Fri Dec 9 13:30:38 2011
@@ -29,12 +29,8 @@ import org.apache.lucene.store.Directory
*/
public class StandardIndexReaderFactory extends IndexReaderFactory {
- /* (non-Javadoc)
- * @see org.apache.solr.core.IndexReaderFactory#newReader(org.apache.lucene.store.Directory, boolean)
- */
@Override
- public IndexReader newReader(Directory indexDir, boolean readOnly)
- throws IOException {
- return IndexReader.open(indexDir, null, readOnly, termInfosIndexDivisor);
+ public IndexReader newReader(Directory indexDir) throws IOException {
+ return IndexReader.open(indexDir, termInfosIndexDivisor);
}
}
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Fri Dec 9 13:30:38 2011
@@ -214,7 +214,7 @@ public class CoreAdminHandler extends Re
Directory dir = dirFactory.get(dirNames[i], core.getSolrConfig().mainIndexConfig.lockType);
dirsToBeReleased[i] = dir;
// TODO: why doesn't this use the IR factory? what is going on here?
- readersToBeClosed[i] = IndexReader.open(dir, true);
+ readersToBeClosed[i] = IndexReader.open(dir);
}
}
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Fri Dec 9 13:30:38 2011
@@ -199,7 +199,7 @@ public class QueryElevationComponent ext
elevationCache.put(null, loadElevationMap( cfg ));
}
}
-
+ //in other words, we think this is in the data dir, not the conf dir
if (!exists){
// preload the first data
RefCounted<SolrIndexSearcher> searchHolder = null;
@@ -215,10 +215,10 @@ public class QueryElevationComponent ext
}
catch( Exception ex ) {
throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,
- "Error initializing QueryElevationComponent.", ex );
+ "Error initializing QueryElevationComponent.", ex, false );
}
}
-
+ //get the elevation map from the data dir
Map<String, ElevationObj> getElevationMap( IndexReader reader, SolrCore core ) throws Exception
{
synchronized( elevationCache ) {
@@ -242,7 +242,7 @@ public class QueryElevationComponent ext
return map;
}
}
-
+ //load up the elevation map
private Map<String, ElevationObj> loadElevationMap( Config cfg ) throws IOException
{
XPath xpath = XPathFactory.newInstance().newXPath();
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Fri Dec 9 13:30:38 2011
@@ -107,9 +107,9 @@ public class SolrIndexSearcher extends I
private Collection<String> storedHighlightFieldNames;
private DirectoryFactory directoryFactory;
- public SolrIndexSearcher(SolrCore core, String path, IndexSchema schema, SolrIndexConfig config, String name, boolean readOnly, 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
- this(core, schema,name, core.getIndexReaderFactory().newReader(directoryFactory.get(path, config.lockType), readOnly), true, enableCache, false, directoryFactory);
+ this(core, schema,name, core.getIndexReaderFactory().newReader(directoryFactory.get(path, config.lockType)), true, enableCache, false, directoryFactory);
}
public SolrIndexSearcher(SolrCore core, IndexSchema schema, String name, IndexReader r, boolean closeReader, boolean enableCache, boolean reserveDirectory, DirectoryFactory directoryFactory) {
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Fri Dec 9 13:30:38 2011
@@ -96,7 +96,7 @@ public class SolrDispatchFilter implemen
}
catch( Throwable t ) {
// catch this so our filter still works
- log.error( "Could not start Solr. Check solr/home property", t);
+ log.error( "Could not start Solr. Check solr/home property and the logs", t);
SolrConfig.severeErrors.add( t );
SolrCore.log( t );
}
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java Fri Dec 9 13:30:38 2011
@@ -111,7 +111,7 @@ public class FileBasedSpellChecker exten
writer.forceMerge(1);
writer.close();
- dictionary = new HighFrequencyDictionary(IndexReader.open(ramDir, true),
+ dictionary = new HighFrequencyDictionary(IndexReader.open(ramDir),
WORD_FIELD_NAME, 0.0f);
} else {
// check if character encoding is defined
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java Fri Dec 9 13:30:38 2011
@@ -64,7 +64,7 @@ public class IndexBasedSpellChecker exte
if (sourceLocation != null) {
try {
FSDirectory luceneIndexDir = FSDirectory.open(new File(sourceLocation));
- this.reader = IndexReader.open(luceneIndexDir, true);
+ this.reader = IndexReader.open(luceneIndexDir);
} catch (IOException e) {
throw new RuntimeException(e);
}
Modified: lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java Fri Dec 9 13:30:38 2011
@@ -28,6 +28,7 @@ import java.util.regex.Pattern;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.FlagsAttribute;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -111,12 +112,13 @@ public class SpellingQueryConverter exte
TypeAttribute typeAtt = stream.addAttribute(TypeAttribute.class);
PayloadAttribute payloadAtt = stream.addAttribute(PayloadAttribute.class);
PositionIncrementAttribute posIncAtt = stream.addAttribute(PositionIncrementAttribute.class);
+ OffsetAttribute offsetAtt = stream.addAttribute(OffsetAttribute.class);
stream.reset();
while (stream.incrementToken()) {
Token token = new Token();
token.copyBuffer(termAtt.buffer(), 0, termAtt.length());
- token.setStartOffset(matcher.start());
- token.setEndOffset(matcher.end());
+ token.setStartOffset(matcher.start() + offsetAtt.startOffset());
+ token.setEndOffset(matcher.start() + offsetAtt.endOffset());
token.setFlags(flagsAtt.getFlags());
token.setType(typeAtt.type());
token.setPayload(payloadAtt.getPayload());
Modified: lucene/dev/branches/lucene3622/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml Fri Dec 9 13:30:38 2011
@@ -185,7 +185,17 @@
<!-- test elevation -->
<searchComponent name="elevate" class="org.apache.solr.handler.component.QueryElevationComponent" >
<str name="queryFieldType">string</str>
- <str name="config-file">elevate.xml</str>
+ <str name="config-file">${elevate.file:elevate.xml}</str>
+ </searchComponent>
+
+ <!-- SOLR-1730 -->
+ <!--<searchComponent name="badElevate" class="org.apache.solr.handler.component.QueryElevationComponent" >
+ <str name="queryFieldType">string</str>
+ <str name="config-file">foo.xml</str>
+ </searchComponent>-->
+ <searchComponent name="dataElevate" class="org.apache.solr.handler.component.QueryElevationComponent" >
+ <str name="queryFieldType">string</str>
+ <str name="config-file">${elevate.data.file:elevate-data.xml}</str>
</searchComponent>
<requestHandler name="/elevate" class="org.apache.solr.handler.component.SearchHandler">
@@ -197,6 +207,24 @@
</arr>
</requestHandler>
+ <requestHandler name="/dataElevate" class="org.apache.solr.handler.component.SearchHandler">
+ <lst name="defaults">
+ <str name="echoParams">explicit</str>
+ </lst>
+ <arr name="last-components">
+ <str>dataElevate</str>
+ </arr>
+ </requestHandler>
+
+ <!--<requestHandler name="/badElevate" class="org.apache.solr.handler.component.SearchHandler">
+ <lst name="defaults">
+ <str name="echoParams">explicit</str>
+ </lst>
+ <arr name="last-components">
+ <str>badElevate</str>
+ </arr>
+ </requestHandler>-->
+
<!-- enable streaming for testing... -->
<requestDispatcher handleSelect="true" >
<requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
Modified: lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java Fri Dec 9 13:30:38 2011
@@ -61,10 +61,9 @@ public class AlternateDirectoryTest exte
static volatile boolean newReaderCalled = false;
@Override
- public IndexReader newReader(Directory indexDir, boolean readOnly)
- throws IOException {
+ public IndexReader newReader(Directory indexDir) throws IOException {
TestIndexReaderFactory.newReaderCalled = true;
- return IndexReader.open(indexDir, readOnly);
+ return IndexReader.open(indexDir);
}
}
Modified: lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java Fri Dec 9 13:30:38 2011
@@ -75,7 +75,7 @@ public class TestQuerySenderListener ext
assertNotNull("Event is null", evt);
assertTrue(evt + " is not equal to " + EventParams.FIRST_SEARCHER, evt.equals(EventParams.FIRST_SEARCHER) == true);
- SolrIndexSearcher newSearcher = new SolrIndexSearcher(core, core.getNewIndexDir(), core.getSchema(), core.getSolrConfig().mainIndexConfig, "testQuerySenderListener", true, false, core.getDirectoryFactory());
+ SolrIndexSearcher newSearcher = new SolrIndexSearcher(core, core.getNewIndexDir(), core.getSchema(), core.getSolrConfig().mainIndexConfig, "testQuerySenderListener", false, core.getDirectoryFactory());
qsl.newSearcher(newSearcher, currentSearcher);
evt = mock.req.getParams().get(EventParams.EVENT);
Modified: lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java Fri Dec 9 13:30:38 2011
@@ -75,7 +75,7 @@ public class TestQuerySenderNoQuery exte
assertNotNull("Mock is null", mock);
assertNull("Req (firstsearcher) is not null", mock.req);
- SolrIndexSearcher newSearcher = new SolrIndexSearcher(core, core.getNewIndexDir(), core.getSchema(), core.getSolrConfig().mainIndexConfig, "testQuerySenderNoQuery", true, false, core.getDirectoryFactory());
+ SolrIndexSearcher newSearcher = new SolrIndexSearcher(core, core.getNewIndexDir(), core.getSchema(), core.getSolrConfig().mainIndexConfig, "testQuerySenderNoQuery", false, core.getDirectoryFactory());
qsl.newSearcher(newSearcher, currentSearcher); // get newSearcher.
assertNull("Req (newsearcher) is not null", mock.req);
Modified: lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Fri Dec 9 13:30:38 2011
@@ -30,6 +30,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.QueryElevationParams;
+import org.apache.solr.common.util.FileUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.component.QueryElevationComponent.ElevationObj;
@@ -45,7 +46,13 @@ public class QueryElevationComponentTest
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig-elevate.xml","schema12.xml");
+ //write out elevate-data.xml to the Data dir first by copying it from conf, which we know exists, this way we can test both conf and data configurations
+ createTempDir();
+ File parent = new File(TEST_HOME(), "conf");
+ File elevateFile = new File(parent, "elevate.xml");
+ File elevateDataFile = new File(dataDir, "elevate-data.xml");
+ FileUtils.copyFile(elevateFile, elevateDataFile);
+ initCore("solrconfig-elevate.xml", "schema12.xml");
}
@Before
Modified: lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java Fri Dec 9 13:30:38 2011
@@ -114,7 +114,7 @@ public class SpellCheckComponentTest ext
assertJQ(req("json.nl","map", "qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", "q","documemtsss broens", SpellCheckComponent.SPELLCHECK_COLLATE, "true")
,"/spellcheck/suggestions/collation=='document brown'"
);
- assertJQ(req("json.nl","map", "qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", "q","pixma-a-b-c-d-e-f-g", SpellCheckComponent.SPELLCHECK_COLLATE, "true")
+ assertJQ(req("json.nl","map", "qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", "q","pixma", SpellCheckComponent.SPELLCHECK_COLLATE, "true")
,"/spellcheck/suggestions/collation=='pixmaa'"
);
}
Modified: lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java (original)
+++ lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java Fri Dec 9 13:30:38 2011
@@ -46,9 +46,62 @@ public class SpellCheckCollatorTest exte
assertNull(h.validateUpdate(adoc("id", "3", "lowerfilt", "faith of homer")));
assertNull(h.validateUpdate(adoc("id", "4", "lowerfilt", "fat of homer")));
assertNull(h.validateUpdate(adoc("id", "5", "lowerfilt1", "peace")));
+ assertNull(h.validateUpdate(adoc("id", "6", "lowerfilt", "hyphenated word")));
assertNull(h.validateUpdate(commit()));
}
-
+
+ @Test
+ public void testCollationWithHypens() throws Exception
+ {
+ SolrCore core = h.getCore();
+ SearchComponent speller = core.getSearchComponent("spellcheck");
+ assertTrue("speller is null and it shouldn't be", speller != null);
+
+ ModifiableSolrParams params = new ModifiableSolrParams();
+ params.add(SpellCheckComponent.COMPONENT_NAME, "true");
+ params.add(SpellCheckComponent.SPELLCHECK_BUILD, "true");
+ params.add(SpellCheckComponent.SPELLCHECK_COUNT, "10");
+ params.add(SpellCheckComponent.SPELLCHECK_COLLATE, "true");
+
+ params.add(CommonParams.Q, "lowerfilt:(hypenated-wotd)");
+ {
+ SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrQueryResponse rsp = new SolrQueryResponse();
+ rsp.add("responseHeader", new SimpleOrderedMap());
+ SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
+ handler.handleRequest(req, rsp);
+ req.close();
+ NamedList values = rsp.getValues();
+ NamedList spellCheck = (NamedList) values.get("spellcheck");
+ NamedList suggestions = (NamedList) spellCheck.get("suggestions");
+ List<String> collations = suggestions.getAll("collation");
+ assertTrue(collations.size()==1);
+ String collation = collations.iterator().next();
+ assertTrue("Incorrect collation: " + collation,"lowerfilt:(hyphenated-word)".equals(collation));
+ }
+
+ params.remove(CommonParams.Q);
+ params.add("defType", "dismax");
+ params.add("qf", "lowerfilt");
+ params.add(CommonParams.Q, "hypenated-wotd");
+ {
+ SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrQueryResponse rsp = new SolrQueryResponse();
+ rsp.add("responseHeader", new SimpleOrderedMap());
+ SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
+ handler.handleRequest(req, rsp);
+ req.close();
+ NamedList values = rsp.getValues();
+ NamedList spellCheck = (NamedList) values.get("spellcheck");
+ NamedList suggestions = (NamedList) spellCheck.get("suggestions");
+ List<String> collations = suggestions.getAll("collation");
+ assertTrue(collations.size()==1);
+ String collation = collations.iterator().next();
+ assertTrue("Incorrect collation: " + collation,"hyphenated-word".equals(collation));
+ }
+
+ }
+
@Test
public void testCollateWithFilter() throws Exception
{
Modified: lucene/dev/branches/lucene3622/solr/example/example-DIH/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/example/example-DIH/README.txt?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/example/example-DIH/README.txt (original)
+++ lucene/dev/branches/lucene3622/solr/example/example-DIH/README.txt Fri Dec 9 13:30:38 2011
@@ -38,6 +38,10 @@ To import data from your imap server
1. Edit the example-DIH/solr/mail/conf/data-config.xml and add details about username, password, imap server
2. Connect to http://localhost:8983/solr/mail/dataimport?command=full-import
+To copy data from db Solr core, connect to
+
+ http://localhost:8983/solr/solr/dataimport?command=full-import
+
See also README.txt in the solr subdirectory, and check
http://wiki.apache.org/solr/DataImportHandler for detailed
usage guide and tutorial.
Modified: lucene/dev/branches/lucene3622/solr/example/example-DIH/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/solr/example/example-DIH/solr/solr.xml?rev=1212405&r1=1212404&r2=1212405&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/solr/example/example-DIH/solr/solr.xml (original)
+++ lucene/dev/branches/lucene3622/solr/example/example-DIH/solr/solr.xml Fri Dec 9 13:30:38 2011
@@ -5,5 +5,6 @@
<core default="false" instanceDir="rss" name="rss"/>
<core default="false" instanceDir="mail" name="mail"/>
<core default="false" instanceDir="tika" name="tika"/>
+ <core default="false" instanceDir="solr" name="solr"/>
</cores>
</solr>