[mb-commits] r13627 - in search_server/trunk: index index/src/main/java/org/musicbrainz/search/index index/src/test/java/org/musicbrainz/search/analysis index/src/test/java/org/musicbrainz/search/index servlet/src/main/java/org/musicbrainz/search/servlet servlet/src/test/java/org/musicbrainz/search/servlet updater/src/main/java/org/musicbrainz/search/update
[email protected] Tue, 26 Feb 2013 11:35:26 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1UAIog-0000ta-Fj@wiley> |
Author: ijabz
Date: 2013-02-26 11:35:14 +0000 (Tue, 26 Feb 2013)
New Revision: 13627
Added:
search_server/trunk/index/README
Modified:
search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/AccentFilterTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/AmpersandTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/ArtistBoostTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue1006Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue1446Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue24Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue3309Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue4775Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue4827Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue5523Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue5538Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch159Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch163Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch220Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch22Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch33Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch72Test.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/LabelBoostTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Lucene41CharFilterTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/StopWordsTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AnnotationIndexTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/CDStubIndexTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseGroupIndexTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/TagIndexTest.java
search_server/trunk/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java
search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/TestSearchOnly.java
search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch173Test.java
search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch174Test.java
search_server/trunk/updater/src/main/java/org/musicbrainz/search/update/LiveDataFeedIndexUpdater.java
Log:
#SEARCH-243:Remove some deprecations
Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/IndexBuilder.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -30,6 +30,7 @@
package org.musicbrainz.search.index;
import org.apache.commons.lang.time.StopWatch;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -353,7 +354,7 @@
// For debugging to check sql is not creating too few/many rows
if(true) {
int dbRows = index.getNoOfRows(maxId);
- reader = IndexReader.open(FSDirectory.open(new File(path)));
+ reader = DirectoryReader.open(FSDirectory.open(new File(path)));
System.out.println(index.getName()+":"+dbRows+" db rows:"+(reader.maxDoc() - 1)+" lucene docs");
}
System.out.println(index.getName()+":Finished Optimization:" + Utils.formatClock(clock));
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/AccentFilterTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/AccentFilterTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/AccentFilterTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -3,6 +3,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -64,7 +65,7 @@
@Test
public void testSearchUnaccented() throws Exception {
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("test");
TopDocs docs = searcher.search(q,10);
assertEquals(2, docs.totalHits);
@@ -75,7 +76,7 @@
@Test
public void testSearchAccented() throws Exception {
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("tést");
TopDocs docs = searcher.search(q,10);
assertEquals(2, docs.totalHits);
@@ -86,7 +87,7 @@
@Test
public void testSearchAccented2() throws Exception {
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("abcaef");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
@@ -96,14 +97,14 @@
/*
public void testSearchAccented3() throws Exception {
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser("name", analyzer).parse("NaJiAsn");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
assertEquals(1, docs.totalHits);
assertEquals("ŃåᴊıÚņ", searcher.doc(scoredocs[0].doc).getField("name").stringValue());
- searcher = new IndexSearcher(IndexReader.open(dir));
+ searcher = new IndexSearcher(DirectoryReader.open(dir));
q = new QueryParser("name", analyzer).parse("ŃåᴊıÚņ");
docs = searcher.search(q,10);
scoredocs = docs.scoreDocs;
@@ -118,7 +119,7 @@
*/
@Test
public void testSearchQe() throws Exception {
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("qwe");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
@@ -130,7 +131,7 @@
@Test
public void testSearchQe2() throws Exception {
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("qwee");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/AmpersandTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/AmpersandTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/AmpersandTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -82,7 +82,7 @@
}
ir.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"platinum & gold\"");
System.out.println(q);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/ArtistBoostTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/ArtistBoostTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/ArtistBoostTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -32,6 +32,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -83,7 +84,7 @@
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, ArtistIndexField.ALIAS.getName(), analyzer).parse("Bach");
TopDocs td = searcher.search(q,10);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue1006Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue1006Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue1006Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -9,6 +9,7 @@
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -175,7 +176,7 @@
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("ゲーム");
//System.out.println(q);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue1446Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue1446Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue1446Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -3,6 +3,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -35,7 +36,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("ア");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
@@ -55,7 +56,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("ョ");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
@@ -74,7 +75,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("え");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
@@ -93,7 +94,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("っ");
TopDocs docs = searcher.search(q,10);
ScoreDoc scoredocs[] = docs.scoreDocs;
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue24Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue24Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue24Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -32,6 +32,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -92,7 +93,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "artist", analyzer).parse("alias:rod");
@@ -144,7 +145,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
searcher.setSimilarity(new MusicbrainzSimilarity());
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "artist", analyzer).parse("alias:rod");
@@ -219,7 +220,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "artist", analyzer).parse("artist:queen OR alias:queen");
@@ -257,7 +258,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
searcher.setSimilarity(new MusicbrainzSimilarity());
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "artist", analyzer).parse("artist:queen OR alias:queen");
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue3309Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue3309Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue3309Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -7,6 +7,7 @@
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -84,7 +85,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("R.E.S");
TopDocs docs = searcher.search(q,10);
assertEquals(1, docs.totalHits);
@@ -102,7 +103,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("R.E.S.");
TopDocs docs = searcher.search(q,10);
assertEquals(1, docs.totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue4775Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue4775Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue4775Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -7,6 +7,7 @@
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -39,7 +40,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("Oreilly");
assertEquals(1, searcher.search(q,10).totalHits);
@@ -149,7 +150,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("1999-2000");
assertEquals(2, searcher.search(q,10).totalHits);
@@ -178,7 +179,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("res");
assertEquals(1, searcher.search(q,10).totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue4827Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue4827Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue4827Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -32,6 +32,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -62,7 +63,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("ארלס"+"\u05f3"+"צ");
@@ -90,7 +91,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("ארלס"+"\u05f3"+"צ");
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue5523Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue5523Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue5523Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -32,6 +32,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -61,7 +62,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("寧夏");
assertEquals(1, searcher.search(q,10).totalHits);
@@ -85,7 +86,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("寧夏");
assertEquals(1, searcher.search(q,10).totalHits);
@@ -109,7 +110,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("曲");
assertEquals(1, searcher.search(q,10).totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue5538Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue5538Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Issue5538Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -3,6 +3,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -33,7 +34,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"no. 11\"");
assertEquals(1, searcher.search(q,10).totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch159Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch159Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch159Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -32,6 +32,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -65,7 +66,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("sabbatum");
assertEquals(1, searcher.search(q,10).totalHits);
@@ -86,7 +87,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("sabbatum\\:");
assertEquals(1, searcher.search(q,10).totalHits);
@@ -106,7 +107,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("sabbatum");
assertEquals(1, searcher.search(q,10).totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch163Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch163Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch163Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -32,6 +32,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -64,13 +65,13 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("Európa");
assertEquals(1, searcher.search(q,10).totalHits);
}
- searcher = new IndexSearcher(IndexReader.open(dir));
+ searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("Europa");
assertEquals(0, searcher.search(q,10).totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch220Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch220Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch220Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -3,6 +3,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -30,14 +31,14 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"森山\u0020直太朗\"");
assertEquals(1, searcher.search(q,10).totalHits);
}
- searcher = new IndexSearcher(IndexReader.open(dir));
+ searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"森山\u3000直太朗\"");
assertEquals(1, searcher.search(q,10).totalHits);
@@ -57,14 +58,14 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"森山\u0020直太朗\"");
assertEquals(1, searcher.search(q,10).totalHits);
}
- searcher = new IndexSearcher(IndexReader.open(dir));
+ searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"森山\u3000直太朗\"");
assertEquals(1, searcher.search(q,10).totalHits);
@@ -84,14 +85,14 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"fred\u0020james\"");
assertEquals(1, searcher.search(q,10).totalHits);
}
- searcher = new IndexSearcher(IndexReader.open(dir));
+ searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"fred\u3000james\"");
assertEquals(1, searcher.search(q,10).totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch22Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch22Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch22Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -32,6 +32,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -64,7 +65,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"pay income tax return\"");
assertEquals(1, searcher.search(q,10).totalHits);
@@ -86,7 +87,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"pay income tax return\"");
assertEquals(0, searcher.search(q,10).totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch33Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch33Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch33Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -90,7 +90,7 @@
termsEnum.next();
assertEquals("!!!", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("!!!"));
assertEquals(1, searcher.search(q,10).totalHits);
@@ -149,7 +149,7 @@
assertEquals(1, termsEnum.docFreq());
assertEquals("!\"@*!%", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("!\"@*!%"));
System.out.println(q.toString());
@@ -193,7 +193,7 @@
termsEnum.next();
assertEquals(1, termsEnum.docFreq());
assertEquals("fred", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("fred"));
System.out.println(q.toString());
@@ -243,7 +243,7 @@
assertEquals("bdb24cb5-404b-4f60-bba4-7b730325ae47", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer)
.parse(QueryParser.escape("bdb24cb5-404b-4f60-bba4-7b730325ae47"));
@@ -281,7 +281,7 @@
writer.close();
//Show how it has been converted
- IndexReader ir = IndexReader.open(dir);
+ IndexReader ir = DirectoryReader.open(dir);
Fields fields = MultiFields.getFields(ir);
Terms terms = fields.terms("name");
@@ -290,7 +290,7 @@
assertEquals(1, termsEnum.docFreq());
assertEquals("กข", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("กข"));
System.out.println(q.toString());
@@ -332,7 +332,7 @@
writer.close();
//Show how it has been converted
- IndexReader ir = IndexReader.open(dir);
+ IndexReader ir = DirectoryReader.open(dir);
Fields fields = MultiFields.getFields(ir);
Terms terms = fields.terms("name");
@@ -344,7 +344,7 @@
assertEquals("!%", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("!\"@* !%"));
System.out.println(q.toString());
@@ -397,7 +397,7 @@
assertEquals("fred", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("!\"@* !%"));
System.out.println(q.toString());
@@ -445,7 +445,7 @@
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("This is"));
System.out.println(q.toString());
@@ -493,7 +493,7 @@
termsEnum.next();
assertEquals("this", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("This is"));
System.out.println(q.toString());
@@ -540,7 +540,7 @@
termsEnum.next();
assertEquals("this", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("This is"));
System.out.println(q.toString());
@@ -586,7 +586,7 @@
termsEnum.next();
assertEquals("j", termsEnum.term().utf8ToString());
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse(QueryParser.escape("j"));
System.out.println(q.toString());
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch72Test.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch72Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/IssueSearch72Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -32,6 +32,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -65,14 +66,14 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("aaaaahhh\\!");
assertEquals(1, searcher.search(q,10).totalHits);
}
/* TODO Should work
- searcher = new IndexSearcher(IndexReader.open(dir));
+ searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("aaaaahhh\\!*");
assertEquals(1, searcher.search(q,10).totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/LabelBoostTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/LabelBoostTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/LabelBoostTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -32,6 +32,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -84,7 +85,7 @@
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, LabelIndexField.ALIAS.getName(), analyzer).parse("Emi");
TopDocs td = searcher.search(q,10);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Lucene41CharFilterTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Lucene41CharFilterTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/Lucene41CharFilterTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -17,6 +17,8 @@
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.Version;
import org.junit.Test;
+import org.musicbrainz.search.LuceneVersion;
+
import java.io.Reader;
import static org.junit.Assert.assertEquals;
@@ -40,9 +42,9 @@
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
- Tokenizer source = new MusicbrainzTokenizer(Version.LUCENE_35,
+ Tokenizer source = new MusicbrainzTokenizer(LuceneVersion.LUCENE_VERSION,
reader);
- TokenStream filter = new LowerCaseFilter(Version.LUCENE_35,source);
+ TokenStream filter = new LowerCaseFilter(LuceneVersion.LUCENE_VERSION,source);
return new TokenStreamComponents(source, filter);
}
@@ -59,7 +61,7 @@
Analyzer analyzer = new SimpleAnalyzer();
RAMDirectory dir = new RAMDirectory();
- IndexWriterConfig writerConfig = new IndexWriterConfig(Version.LUCENE_35,analyzer);
+ IndexWriterConfig writerConfig = new IndexWriterConfig(LuceneVersion.LUCENE_VERSION,analyzer);
IndexWriter writer = new IndexWriter(dir, writerConfig);
{
Document doc = new Document();
@@ -78,18 +80,18 @@
}
ir.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
{
- Query q = new QueryParser(Version.LUCENE_35, "name", analyzer).parse("\"Platinum and Gold\"");
+ Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"Platinum and Gold\"");
System.out.println(q);
TopDocs td = searcher.search(q, 10);
System.out.println("Size"+td.scoreDocs.length);
assertEquals(1, searcher.search(q, 10).totalHits);
}
- searcher = new IndexSearcher(IndexReader.open(dir));
+ searcher = new IndexSearcher(DirectoryReader.open(dir));
{
- Query q = new QueryParser(Version.LUCENE_35, "name", analyzer).parse("\"Platinum & Gold\"");
+ Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("\"Platinum & Gold\"");
TopDocs td = searcher.search(q, 10);
System.out.println("Size"+td.scoreDocs.length);
assertEquals(1, searcher.search(q, 10).totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/StopWordsTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/StopWordsTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/StopWordsTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -5,6 +5,7 @@
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -38,7 +39,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("that");
TopDocs docs = searcher.search(q,null,100);
assertEquals(0, docs.totalHits);
@@ -57,7 +58,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("that");
TopDocs docs = searcher.search(q,null,100);
assertEquals(1, docs.totalHits);
@@ -75,7 +76,7 @@
writer.addDocument(doc);
writer.close();
- IndexSearcher searcher = new IndexSearcher(IndexReader.open(dir));
+ IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));
Query q = new QueryParser(LuceneVersion.LUCENE_VERSION, "name", analyzer).parse("that");
TopDocs docs = searcher.search(q,null,100);
assertEquals(1, docs.totalHits);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AnnotationIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AnnotationIndexTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AnnotationIndexTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -1,6 +1,7 @@
package org.musicbrainz.search.index;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
@@ -182,7 +183,7 @@
addReleaseAnnotation();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -210,7 +211,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -237,7 +238,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -268,7 +269,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(1, ir.numDocs());
Document doc = ir.document(0);
assertNotNull(doc);
@@ -287,7 +288,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(1, ir.numDocs());
Document doc = ir.document(0);
assertNotNull(doc);
@@ -306,7 +307,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -333,7 +334,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -1,6 +1,7 @@
package org.musicbrainz.search.index;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
@@ -117,7 +118,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -147,7 +148,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -164,7 +165,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -181,7 +182,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -199,7 +200,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -216,7 +217,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -233,7 +234,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -250,7 +251,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -267,7 +268,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -290,7 +291,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -325,7 +326,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -347,7 +348,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -370,7 +371,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -394,7 +395,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -416,7 +417,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -439,7 +440,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -462,7 +463,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -484,7 +485,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -512,7 +513,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -537,7 +538,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -562,7 +563,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -586,7 +587,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -607,7 +608,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(1, ir.numDocs());
{
Document doc = ir.document(0);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/CDStubIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/CDStubIndexTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/CDStubIndexTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -1,6 +1,7 @@
package org.musicbrainz.search.index;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
@@ -62,7 +63,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -91,7 +92,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -109,7 +110,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -126,7 +127,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -144,7 +145,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -161,7 +162,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -179,7 +180,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -1,6 +1,7 @@
package org.musicbrainz.search.index;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
@@ -104,7 +105,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -125,7 +126,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -143,7 +144,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -161,7 +162,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -179,7 +180,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -196,7 +197,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -214,7 +215,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -231,7 +232,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -248,7 +249,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -270,7 +271,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -291,7 +292,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -309,7 +310,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -327,7 +328,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -348,7 +349,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -369,7 +370,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -391,7 +392,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -408,7 +409,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -430,7 +431,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -455,7 +456,7 @@
// RAMDirectory ramDir = new RAMDirectory();
// createIndex(ramDir);
//
-// IndexReader ir = IndexReader.open(ramDir);
+// IndexReader ir = DirectoryReader.open(ramDir);
// assertEquals(2, ir.numDocs());
// {
// Document doc = ir.document(1);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -1,9 +1,11 @@
package org.musicbrainz.search.index;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.NumericUtils;
import org.junit.Test;
import org.musicbrainz.mmd2.ArtistCredit;
@@ -230,7 +232,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir, true);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -243,10 +245,10 @@
assertEquals("2f250ed2-6285-40f1-aa2a-14f1c05e9765", doc.getField(RecordingIndexField.RECORDING_ID.getName()).stringValue());
assertEquals("Crocodiles (bonus disc)", doc.getField(RecordingIndexField.RELEASE.getName()).stringValue());
assertEquals("c3b8dbc9-c1ff-4743-9015-8d762819134e", doc.getField(RecordingIndexField.RELEASE_ID.getName()).stringValue());
- //assertEquals(2, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.NUM_TRACKS.getName()).stringValue()));
- //assertEquals(4, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.TRACKNUM.getName()).stringValue()));
- //assertEquals(2, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.NUM_TRACKS_RELEASE.getName()).stringValue()));
- //assertEquals(33000, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.RECORDING_DURATION_OUTPUT.getName()).stringValue()));
+ assertEquals(2, NumericUtils.prefixCodedToInt(new BytesRef(doc.getField(RecordingIndexField.NUM_TRACKS.getName()).stringValue())));
+ assertEquals(4, NumericUtils.prefixCodedToInt(new BytesRef(doc.getField(RecordingIndexField.TRACKNUM.getName()).stringValue())));
+ assertEquals(2, NumericUtils.prefixCodedToInt(new BytesRef(doc.getField(RecordingIndexField.NUM_TRACKS_RELEASE.getName()).stringValue())));
+ assertEquals(33000, NumericUtils.prefixCodedToInt(new BytesRef(doc.getField(RecordingIndexField.RECORDING_DURATION_OUTPUT.getName()).stringValue())));
assertEquals("Compilation", doc.getField(RecordingIndexField.RELEASE_TYPE.getName()).stringValue());
assertEquals("Official", doc.getField(RecordingIndexField.RELEASE_STATUS.getName()).stringValue());
assertEquals("FRAAA9000038", doc.getField(RecordingIndexField.ISRC.getName()).stringValue());
@@ -267,7 +269,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir, false);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -280,10 +282,10 @@
assertEquals("2f250ed2-6285-40f1-aa2a-14f1c05e9765", doc.getField(RecordingIndexField.RECORDING_ID.getName()).stringValue());
assertEquals("Crocodiles (bonus disc)", doc.getField(RecordingIndexField.RELEASE.getName()).stringValue());
assertEquals("c3b8dbc9-c1ff-4743-9015-8d762819134e", doc.getField(RecordingIndexField.RELEASE_ID.getName()).stringValue());
- //assertEquals(2, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.NUM_TRACKS.getName()).stringValue()));
- //assertEquals(4, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.TRACKNUM.getName()).stringValue()));
- //assertEquals(2, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.NUM_TRACKS_RELEASE.getName()).stringValue()));
- //assertEquals(33000, NumericUtils.prefixCodedToInt(doc.getField(RecordingIndexField.RECORDING_DURATION_OUTPUT.getName()).stringValue()));
+ assertEquals(2, NumericUtils.prefixCodedToInt(new BytesRef(doc.getField(RecordingIndexField.NUM_TRACKS.getName()).stringValue())));
+ assertEquals(4, NumericUtils.prefixCodedToInt(new BytesRef(doc.getField(RecordingIndexField.TRACKNUM.getName()).stringValue())));
+ assertEquals(2, NumericUtils.prefixCodedToInt(new BytesRef(doc.getField(RecordingIndexField.NUM_TRACKS_RELEASE.getName()).stringValue())));
+ assertEquals(33000, NumericUtils.prefixCodedToInt(new BytesRef(doc.getField(RecordingIndexField.RECORDING_DURATION_OUTPUT.getName()).stringValue())));
assertEquals("Compilation", doc.getField(RecordingIndexField.RELEASE_TYPE.getName()).stringValue());
assertEquals("Official", doc.getField(RecordingIndexField.RELEASE_STATUS.getName()).stringValue());
assertEquals("FRAAA9000038", doc.getField(RecordingIndexField.ISRC.getName()).stringValue());
@@ -304,7 +306,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -331,7 +333,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -354,7 +356,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -377,7 +379,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -399,7 +401,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -422,7 +424,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -446,7 +448,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -470,7 +472,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -493,7 +495,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -514,7 +516,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -536,7 +538,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -558,7 +560,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -581,7 +583,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -608,7 +610,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -627,7 +629,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -652,7 +654,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -673,7 +675,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -694,7 +696,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -716,7 +718,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir, false);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -738,7 +740,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -760,7 +762,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -782,7 +784,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -803,7 +805,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -826,7 +828,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -847,7 +849,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseGroupIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseGroupIndexTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseGroupIndexTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -196,7 +196,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -226,7 +226,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -249,7 +249,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -270,7 +270,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -287,7 +287,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Fields fields = MultiFields.getFields(ir);
@@ -305,7 +305,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -332,7 +332,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -355,7 +355,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -376,7 +376,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -441,7 +441,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -459,7 +459,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -476,7 +476,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -230,7 +230,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -258,7 +258,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -280,7 +280,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -299,7 +299,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Fields fields = MultiFields.getFields(ir);
@@ -322,7 +322,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -343,7 +343,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -363,7 +363,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -384,7 +384,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -405,7 +405,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -426,7 +426,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -446,7 +446,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -466,7 +466,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -486,7 +486,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -508,7 +508,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -528,7 +528,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -549,7 +549,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -570,7 +570,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -591,7 +591,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -612,7 +612,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -633,7 +633,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -653,7 +653,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -673,7 +673,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -694,7 +694,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -715,7 +715,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -736,7 +736,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -769,7 +769,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -795,7 +795,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
Fields fields = MultiFields.getFields(ir);
Terms terms = fields.terms(ReleaseIndexField.PUID.getName());
TermsEnum termsEnum = terms.iterator(null);
@@ -814,7 +814,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir, false);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
Fields fields = MultiFields.getFields(ir);
Terms terms = fields.terms(ReleaseIndexField.PUID.getName());
TermsEnum termsEnum = terms.iterator(null);
@@ -831,7 +831,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -851,7 +851,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/TagIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/TagIndexTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/TagIndexTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -40,7 +40,7 @@
/* SEARCH-43
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -1,6 +1,7 @@
package org.musicbrainz.search.index;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
@@ -106,7 +107,7 @@
addWorkOne();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -127,7 +128,7 @@
addWorkOne();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -143,7 +144,7 @@
addWorkTwo();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -159,7 +160,7 @@
addWorkOne();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -175,7 +176,7 @@
addWorkOne();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -191,7 +192,7 @@
addWorkTwo();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -208,7 +209,7 @@
addWorkOne();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -229,7 +230,7 @@
addWorkTwo();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -251,7 +252,7 @@
addWorkOne();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -267,7 +268,7 @@
addWorkTwo();
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
@@ -288,7 +289,7 @@
RAMDirectory ramDir = new RAMDirectory();
createIndex(ramDir);
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
assertEquals(2, ir.numDocs());
{
Document doc = ir.document(1);
Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/TestSearchOnly.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/TestSearchOnly.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/TestSearchOnly.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -29,6 +29,7 @@
package org.musicbrainz.search.servlet;
import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.Directory;
@@ -109,7 +110,7 @@
try {
Directory directory = useMMapDirectory ? new MMapDirectory(indexFileDir) : new NIOFSDirectory(indexFileDir);
- IndexSearcher indexSearcher = new IndexSearcher(IndexReader.open(directory));
+ IndexSearcher indexSearcher = new IndexSearcher(DirectoryReader.open(directory));
searchServer = resourceType.getSearchServerClass().getConstructor(IndexSearcher.class).newInstance(indexSearcher);
} catch (CorruptIndexException e) {
Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindReleaseTest.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -10,6 +10,7 @@
import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -177,7 +178,7 @@
writer.close();
Map<ResourceType, IndexSearcher> searchers = new HashMap<ResourceType, IndexSearcher>();
- searchers.put(ResourceType.RELEASE, new IndexSearcher(IndexReader.open(ramDir)));
+ searchers.put(ResourceType.RELEASE, new IndexSearcher(DirectoryReader.open(ramDir)));
SearcherManager searcherManager = new SearcherManager(ramDir, new MusicBrainzSearcherFactory(ResourceType.RELEASE));
ss = new ReleaseSearch(searcherManager);
Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch173Test.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch173Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch173Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -55,7 +55,7 @@
writer.close();
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
Fields fields = MultiFields.getFields(ir);
Terms terms = fields.terms("catno");
TermsEnum termsEnum = terms.iterator(null);
Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch174Test.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch174Test.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/IssueSearch174Test.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -56,7 +56,7 @@
writer.close();
- IndexReader ir = IndexReader.open(ramDir);
+ IndexReader ir = DirectoryReader.open(ramDir);
Fields fields = MultiFields.getFields(ir);
Terms terms = fields.terms("catno");
TermsEnum termsEnum = terms.iterator(null);
Modified: search_server/trunk/updater/src/main/java/org/musicbrainz/search/update/LiveDataFeedIndexUpdater.java
===================================================================
--- search_server/trunk/updater/src/main/java/org/musicbrainz/search/update/LiveDataFeedIndexUpdater.java 2013-02-26 09:18:25 UTC (rev 13626)
+++ search_server/trunk/updater/src/main/java/org/musicbrainz/search/update/LiveDataFeedIndexUpdater.java 2013-02-26 11:35:14 UTC (rev 13627)
@@ -19,11 +19,7 @@
import java.util.logging.Logger;
import org.apache.commons.lang.time.StopWatch;
-import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.Term;
+import org.apache.lucene.index.*;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.FSDirectory;
import org.jdom.JDOMException;
@@ -113,7 +109,7 @@
indexWriters.put(index, indexWriter);
// Load replication information
- IndexReader indexReader = IndexReader.open(indexWriter, true);
+ IndexReader indexReader = DirectoryReader.open(indexWriter, true);
ReplicationInformation replicationInfo = index.readReplicationInformationFromIndex(indexReader);
indexReplicationInfos.put(index, replicationInfo);
@@ -289,7 +285,7 @@
// Check to we have as much Lucene documents as Database rows
int dbRows = index.getNoOfRows(Integer.MAX_VALUE);
- IndexReader indexReader = IndexReader.open(indexWriter, true);
+ IndexReader indexReader = DirectoryReader.open(indexWriter, true);
LOGGER.info(dbRows + " rows in database, " + (indexReader.maxDoc() - 1) + " lucene documents");
} else {
LOGGER.info("No changes found");
_______________________________________________
MusicBrainz-commits mailing list
[email protected]
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits