You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2011/10/05 23:34:55 UTC
svn commit: r1179453 [2/2] - in /lucene/dev/branches/solrcloud: ./
dev-tools/eclipse/ dev-tools/idea/lucene/contrib/
dev-tools/maven/solr/webapp/ lucene/ lucene/contrib/
lucene/contrib/misc/src/java/org/apache/lucene/index/
lucene/contrib/misc/src/java...
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Wed Oct 5 21:34:51 2011
@@ -92,7 +92,8 @@ public class TestIndexReader extends Luc
addDocumentWithFields(writer);
writer.close();
- IndexReader r3 = r2.reopen();
+ IndexReader r3 = IndexReader.openIfChanged(r2);
+ assertNotNull(r3);
assertFalse(c.equals(r3.getIndexCommit()));
assertFalse(r2.getIndexCommit().isOptimized());
r3.close();
@@ -103,7 +104,8 @@ public class TestIndexReader extends Luc
writer.optimize();
writer.close();
- r3 = r2.reopen();
+ r3 = IndexReader.openIfChanged(r2);
+ assertNotNull(r3);
assertTrue(r3.getIndexCommit().isOptimized());
r2.close();
r3.close();
@@ -965,7 +967,8 @@ public class TestIndexReader extends Luc
addDocumentWithFields(writer);
writer.close();
- IndexReader r2 = r.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ assertNotNull(r2);
assertFalse(c.equals(r2.getIndexCommit()));
assertFalse(r2.getIndexCommit().isOptimized());
r2.close();
@@ -976,7 +979,9 @@ public class TestIndexReader extends Luc
writer.optimize();
writer.close();
- r2 = r.reopen();
+ r2 = IndexReader.openIfChanged(r);
+ assertNotNull(r2);
+ assertNull(IndexReader.openIfChanged(r2));
assertTrue(r2.getIndexCommit().isOptimized());
r.close();
@@ -1011,7 +1016,8 @@ public class TestIndexReader extends Luc
writer.close();
// Make sure reopen is still readonly:
- IndexReader r2 = r.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ assertNotNull(r2);
r.close();
assertFalse(r == r2);
@@ -1030,7 +1036,8 @@ public class TestIndexReader extends Luc
writer.close();
// Make sure reopen to a single segment is still readonly:
- IndexReader r3 = r2.reopen();
+ IndexReader r3 = IndexReader.openIfChanged(r2);
+ assertNotNull(r3);
assertFalse(r3 == r2);
r2.close();
@@ -1179,7 +1186,8 @@ public class TestIndexReader extends Luc
writer.commit();
// Reopen reader1 --> reader2
- IndexReader r2 = r.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ assertNotNull(r2);
r.close();
IndexReader sub0 = r2.getSequentialSubReaders()[0];
final int[] ints2 = FieldCache.DEFAULT.getInts(sub0, "number");
@@ -1206,7 +1214,8 @@ public class TestIndexReader extends Luc
assertEquals(36, r1.getUniqueTermCount());
writer.addDocument(doc);
writer.commit();
- IndexReader r2 = r.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ assertNotNull(r2);
r.close();
try {
r2.getUniqueTermCount();
@@ -1253,7 +1262,9 @@ public class TestIndexReader extends Luc
writer.close();
// LUCENE-1718: ensure re-open carries over no terms index:
- IndexReader r2 = r.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ assertNotNull(r2);
+ assertNull(IndexReader.openIfChanged(r2));
r.close();
IndexReader[] subReaders = r2.getSequentialSubReaders();
assertEquals(2, subReaders.length);
@@ -1282,8 +1293,8 @@ public class TestIndexReader extends Luc
writer.addDocument(doc);
writer.prepareCommit();
assertTrue(r.isCurrent());
- IndexReader r2 = r.reopen();
- assertTrue(r == r2);
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ assertNull(r2);
writer.commit();
assertFalse(r.isCurrent());
writer.close();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java Wed Oct 5 21:34:51 2011
@@ -115,7 +115,8 @@ public class TestIndexReaderClone extend
TestIndexReaderReopen.modifyIndex(5, dir1);
- IndexReader reader2 = reader1.reopen();
+ IndexReader reader2 = IndexReader.openIfChanged(reader1);
+ assertNotNull(reader2);
assertTrue(reader1 != reader2);
assertTrue(deleteWorked(1, reader2));
@@ -156,7 +157,8 @@ public class TestIndexReaderClone extend
assertTrue(deleteWorked(1, reader));
assertEquals(docCount-1, reader.numDocs());
- IndexReader readOnlyReader = reader.reopen(true);
+ IndexReader readOnlyReader = IndexReader.openIfChanged(reader, true);
+ assertNotNull(readOnlyReader);
if (!isReadOnly(readOnlyReader)) {
fail("reader isn't read only");
}
@@ -394,7 +396,10 @@ public class TestIndexReaderClone extend
assertDelDocsRefCountEquals(1, clonedSegmentReader);
// test a reopened reader
- IndexReader reopenedReader = clonedReader.reopen();
+ IndexReader reopenedReader = IndexReader.openIfChanged(clonedReader);
+ if (reopenedReader == null) {
+ reopenedReader = clonedReader;
+ }
IndexReader cloneReader2 = (IndexReader) reopenedReader.clone();
SegmentReader cloneSegmentReader2 = getOnlySegmentReader(cloneReader2);
assertDelDocsRefCountEquals(2, cloneSegmentReader2);
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java Wed Oct 5 21:34:51 2011
@@ -192,8 +192,8 @@ public class TestIndexReaderReopen exten
iwriter.commit();
if (withReopen) {
// reopen
- IndexReader r2 = reader.reopen();
- if (reader != r2) {
+ IndexReader r2 = IndexReader.openIfChanged(reader);
+ if (r2 != null) {
reader.close();
reader = r2;
}
@@ -468,12 +468,15 @@ public class TestIndexReaderReopen exten
modifyIndex(0, dir2);
assertRefCountEquals(1 + mode, reader1);
- IndexReader multiReader2 = multiReader1.reopen();
+ IndexReader multiReader2 = IndexReader.openIfChanged(multiReader1);
+ assertNotNull(multiReader2);
// index1 hasn't changed, so multiReader2 should share reader1 now with multiReader1
assertRefCountEquals(2 + mode, reader1);
modifyIndex(0, dir1);
- IndexReader reader2 = reader1.reopen();
+ IndexReader reader2 = IndexReader.openIfChanged(reader1);
+ assertNotNull(reader2);
+ assertNull(IndexReader.openIfChanged(reader2));
assertRefCountEquals(2 + mode, reader1);
if (mode == 1) {
@@ -481,7 +484,8 @@ public class TestIndexReaderReopen exten
}
modifyIndex(1, dir1);
- IndexReader reader3 = reader2.reopen();
+ IndexReader reader3 = IndexReader.openIfChanged(reader2);
+ assertNotNull(reader3);
assertRefCountEquals(2 + mode, reader1);
assertRefCountEquals(1, reader2);
@@ -541,13 +545,16 @@ public class TestIndexReaderReopen exten
modifyIndex(1, dir2);
assertRefCountEquals(1 + mode, reader1);
- IndexReader parallelReader2 = parallelReader1.reopen();
+ IndexReader parallelReader2 = IndexReader.openIfChanged(parallelReader1);
+ assertNotNull(parallelReader2);
+ assertNull(IndexReader.openIfChanged(parallelReader2));
// index1 hasn't changed, so parallelReader2 should share reader1 now with multiReader1
assertRefCountEquals(2 + mode, reader1);
modifyIndex(0, dir1);
modifyIndex(0, dir2);
- IndexReader reader2 = reader1.reopen();
+ IndexReader reader2 = IndexReader.openIfChanged(reader1);
+ assertNotNull(reader2);
assertRefCountEquals(2 + mode, reader1);
if (mode == 1) {
@@ -555,7 +562,8 @@ public class TestIndexReaderReopen exten
}
modifyIndex(4, dir1);
- IndexReader reader3 = reader2.reopen();
+ IndexReader reader3 = IndexReader.openIfChanged(reader2);
+ assertNotNull(reader3);
assertRefCountEquals(2 + mode, reader1);
assertRefCountEquals(1, reader2);
@@ -609,25 +617,29 @@ public class TestIndexReaderReopen exten
modifier.deleteDocument(0);
modifier.close();
- IndexReader reader2 = reader1.reopen();
+ IndexReader reader2 = IndexReader.openIfChanged(reader1);
+ assertNotNull(reader2);
modifier = IndexReader.open(dir1, false);
DefaultSimilarity sim = new DefaultSimilarity();
modifier.setNorm(1, "field1", sim.encodeNormValue(50f));
modifier.setNorm(1, "field2", sim.encodeNormValue(50f));
modifier.close();
- IndexReader reader3 = reader2.reopen();
+ IndexReader reader3 = IndexReader.openIfChanged(reader2);
+ assertNotNull(reader3);
SegmentReader segmentReader3 = getOnlySegmentReader(reader3);
modifier = IndexReader.open(dir1, false);
modifier.deleteDocument(2);
modifier.close();
- IndexReader reader4 = reader3.reopen();
+ IndexReader reader4 = IndexReader.openIfChanged(reader3);
+ assertNotNull(reader4);
modifier = IndexReader.open(dir1, false);
modifier.deleteDocument(3);
modifier.close();
- IndexReader reader5 = reader3.reopen();
+ IndexReader reader5 = IndexReader.openIfChanged(reader3);
+ assertNotNull(reader5);
// Now reader2-reader5 references reader1. reader1 and reader2
// share the same norms. reader3, reader4, reader5 also share norms.
@@ -738,11 +750,11 @@ public class TestIndexReaderReopen exten
for (int i = 0; i < n; i++) {
if (i % 2 == 0) {
- IndexReader refreshed = reader.reopen();
- if (refreshed != reader) {
+ IndexReader refreshed = IndexReader.openIfChanged(reader);
+ if (refreshed != null) {
readersToClose.add(reader);
+ reader = refreshed;
}
- reader = refreshed;
}
final IndexReader r = reader;
@@ -766,7 +778,10 @@ public class TestIndexReaderReopen exten
break;
} else {
// not synchronized
- IndexReader refreshed = r.reopen();
+ IndexReader refreshed = IndexReader.openIfChanged(r);
+ if (refreshed == null) {
+ refreshed = r;
+ }
IndexSearcher searcher = newSearcher(refreshed);
ScoreDoc[] hits = searcher.search(
@@ -907,7 +922,10 @@ public class TestIndexReaderReopen exten
IndexReader refreshed = null;
try {
- refreshed = reader.reopen();
+ refreshed = IndexReader.openIfChanged(reader);
+ if (refreshed == null) {
+ refreshed = reader;
+ }
} finally {
if (refreshed == null && r != null) {
// Hit exception -- close opened reader
@@ -1094,7 +1112,8 @@ public class TestIndexReaderReopen exten
r2.deleteDocument(0);
r2.close();
- IndexReader r3 = r1.reopen();
+ IndexReader r3 = IndexReader.openIfChanged(r1);
+ assertNotNull(r3);
assertTrue(r1 != r3);
r1.close();
try {
@@ -1118,7 +1137,9 @@ public class TestIndexReaderReopen exten
modifyIndex(5, dir); // Add another doc (3 segments)
- IndexReader r2 = r1.reopen(); // MSR
+ IndexReader r2 = IndexReader.openIfChanged(r1); // MSR
+ assertNotNull(r2);
+ assertNull(IndexReader.openIfChanged(r2));
assertTrue(r1 != r2);
SegmentReader sr1 = (SegmentReader) r1.getSequentialSubReaders()[0]; // Get SRs for the first segment from original
@@ -1151,7 +1172,8 @@ public class TestIndexReaderReopen exten
// Add doc:
modifyIndex(5, dir);
- IndexReader r2 = r1.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r1);
+ assertNotNull(r2);
assertTrue(r1 != r2);
IndexReader[] rs2 = r2.getSequentialSubReaders();
@@ -1207,7 +1229,8 @@ public class TestIndexReaderReopen exten
Collection<IndexCommit> commits = IndexReader.listCommits(dir);
for (final IndexCommit commit : commits) {
- IndexReader r2 = r.reopen(commit);
+ IndexReader r2 = IndexReader.openIfChanged(r, commit);
+ assertNotNull(r2);
assertTrue(r2 != r);
// Reader should be readOnly
@@ -1262,7 +1285,8 @@ public class TestIndexReaderReopen exten
assertEquals(17, ints[0]);
// Reopen to readonly w/ no chnages
- IndexReader r3 = r.reopen(true);
+ IndexReader r3 = IndexReader.openIfChanged(r, true);
+ assertNotNull(r3);
assertTrue(((DirectoryReader) r3).readOnly);
r3.close();
@@ -1271,7 +1295,8 @@ public class TestIndexReaderReopen exten
writer.commit();
// Reopen reader1 --> reader2
- IndexReader r2 = r.reopen(true);
+ IndexReader r2 = IndexReader.openIfChanged(r, true);
+ assertNotNull(r2);
r.close();
assertTrue(((DirectoryReader) r2).readOnly);
IndexReader[] subs = r2.getSequentialSubReaders();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Wed Oct 5 21:34:51 2011
@@ -1402,7 +1402,8 @@ public class TestIndexWriter extends Luc
if (iter == 1) {
w.commit();
}
- IndexReader r2 = r.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ assertNotNull(r2);
assertTrue(r != r2);
files = Arrays.asList(dir.listAll());
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java Wed Oct 5 21:34:51 2011
@@ -348,7 +348,8 @@ public class TestIndexWriterCommit exten
f.setValue(s);
w.addDocument(doc);
w.commit();
- IndexReader r2 = r.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ assertNotNull(r2);
assertTrue(r2 != r);
r.close();
r = r2;
@@ -390,7 +391,8 @@ public class TestIndexWriterCommit exten
IndexReader reader = IndexReader.open(dir, true);
assertEquals(0, reader.numDocs());
writer.commit();
- IndexReader reader2 = reader.reopen();
+ IndexReader reader2 = IndexReader.openIfChanged(reader);
+ assertNotNull(reader2);
assertEquals(0, reader.numDocs());
assertEquals(23, reader2.numDocs());
reader.close();
@@ -530,7 +532,8 @@ public class TestIndexWriterCommit exten
writer.commit();
- IndexReader reader3 = reader.reopen();
+ IndexReader reader3 = IndexReader.openIfChanged(reader);
+ assertNotNull(reader3);
assertEquals(0, reader.numDocs());
assertEquals(0, reader2.numDocs());
assertEquals(23, reader3.numDocs());
@@ -586,10 +589,10 @@ public class TestIndexWriterCommit exten
writer.rollback();
- IndexReader reader3 = reader.reopen();
+ IndexReader reader3 = IndexReader.openIfChanged(reader);
+ assertNull(reader3);
assertEquals(0, reader.numDocs());
assertEquals(0, reader2.numDocs());
- assertEquals(0, reader3.numDocs());
reader.close();
reader2.close();
@@ -597,8 +600,6 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 17; i++)
TestIndexWriter.addDoc(writer);
- assertEquals(0, reader3.numDocs());
- reader3.close();
reader = IndexReader.open(dir, true);
assertEquals(0, reader.numDocs());
reader.close();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Wed Oct 5 21:34:51 2011
@@ -677,8 +677,8 @@ public class TestIndexWriterReader exten
}
((ConcurrentMergeScheduler) writer.getConfig().getMergeScheduler()).sync();
- IndexReader r2 = r1.reopen();
- if (r2 != r1) {
+ IndexReader r2 = IndexReader.openIfChanged(r1);
+ if (r2 != null) {
r1.close();
r1 = r2;
}
@@ -709,7 +709,7 @@ public class TestIndexWriterReader exten
assertEquals(100, searcher.search(q, 10).totalHits);
searcher.close();
try {
- r.reopen();
+ IndexReader.openIfChanged(r);
fail("failed to hit AlreadyClosedException");
} catch (AlreadyClosedException ace) {
// expected
@@ -766,8 +766,8 @@ public class TestIndexWriterReader exten
int lastCount = 0;
while(System.currentTimeMillis() < endTime) {
- IndexReader r2 = r.reopen();
- if (r2 != r) {
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ if (r2 != null) {
r.close();
r = r2;
}
@@ -783,7 +783,7 @@ public class TestIndexWriterReader exten
threads[i].join();
}
// final check
- IndexReader r2 = r.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r);
if (r2 != r) {
r.close();
r = r2;
@@ -856,7 +856,7 @@ public class TestIndexWriterReader exten
int sum = 0;
while(System.currentTimeMillis() < endTime) {
- IndexReader r2 = r.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(r);
if (r2 != r) {
r.close();
r = r2;
@@ -871,8 +871,8 @@ public class TestIndexWriterReader exten
threads[i].join();
}
// at least search once
- IndexReader r2 = r.reopen();
- if (r2 != r) {
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ if (r2 != null) {
r.close();
r = r2;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLongPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLongPostings.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLongPostings.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLongPostings.java Wed Oct 5 21:34:51 2011
@@ -33,9 +33,11 @@ import org.apache.lucene.index.codecs.Co
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.UseNoMemoryExpensiveCodec;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util._TestUtil;
+@UseNoMemoryExpensiveCodec
public class TestLongPostings extends LuceneTestCase {
// Produces a realistic unicode random string that
@@ -76,9 +78,6 @@ public class TestLongPostings extends Lu
}
public void testLongPostings() throws Exception {
- assumeFalse("Too slow with SimpleText codec at night", TEST_NIGHTLY && CodecProvider.getDefault().getFieldCodec("field").equals("SimpleText"));
- assumeFalse("Too slow with Memory codec at night", TEST_NIGHTLY && CodecProvider.getDefault().getFieldCodec("field").equals("Memory"));
-
// Don't use _TestUtil.getTempDir so that we own the
// randomness (ie same seed will point to same dir):
Directory dir = newFSDirectory(_TestUtil.getTempDir("longpostings" + "." + random.nextLong()));
@@ -271,8 +270,6 @@ public class TestLongPostings extends Lu
}
public void doTestLongPostingsNoPositions(IndexOptions options) throws Exception {
- assumeFalse("Too slow with SimpleText codec at night", TEST_NIGHTLY && CodecProvider.getDefault().getFieldCodec("field").equals("SimpleText"));
- assumeFalse("Too slow with Memory codec at night", TEST_NIGHTLY && CodecProvider.getDefault().getFieldCodec("field").equals("Memory"));
// Don't use _TestUtil.getTempDir so that we own the
// randomness (ie same seed will point to same dir):
Directory dir = newFSDirectory(_TestUtil.getTempDir("longpostings" + "." + random.nextLong()));
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java Wed Oct 5 21:34:51 2011
@@ -41,8 +41,8 @@ public class TestNRTThreads extends Thre
if (VERBOSE) {
System.out.println("TEST: now reopen r=" + r);
}
- final IndexReader r2 = r.reopen();
- if (r != r2) {
+ final IndexReader r2 = IndexReader.openIfChanged(r);
+ if (r2 != null) {
r.close();
r = r2;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNeverDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNeverDelete.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNeverDelete.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestNeverDelete.java Wed Oct 5 21:34:51 2011
@@ -92,8 +92,8 @@ public class TestNeverDelete extends Luc
for(String fileName : allFiles) {
assertTrue("file " + fileName + " does not exist", d.fileExists(fileName));
}
- IndexReader r2 = r.reopen();
- if (r2 != r) {
+ IndexReader r2 = IndexReader.openIfChanged(r);
+ if (r2 != null) {
r.close();
r = r2;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java Wed Oct 5 21:34:51 2011
@@ -135,8 +135,8 @@ public class TestRollingUpdates extends
if (open == null) {
open = IndexReader.open(writer, true);
}
- IndexReader reader = open.reopen();
- if (reader != open) {
+ IndexReader reader = IndexReader.openIfChanged(open);
+ if (reader != null) {
open.close();
open = reader;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressNRT.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressNRT.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressNRT.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestStressNRT.java Wed Oct 5 21:34:51 2011
@@ -147,7 +147,7 @@ public class TestStressNRT extends Lucen
if (VERBOSE) {
System.out.println("TEST: " + Thread.currentThread().getName() + ": reopen reader=" + oldReader + " version=" + version);
}
- newReader = oldReader.reopen(writer.w, true);
+ newReader = IndexReader.openIfChanged(oldReader, writer.w, true);
}
} else {
// assertU(commit());
@@ -158,13 +158,14 @@ public class TestStressNRT extends Lucen
if (VERBOSE) {
System.out.println("TEST: " + Thread.currentThread().getName() + ": now reopen after commit");
}
- newReader = oldReader.reopen();
+ newReader = IndexReader.openIfChanged(oldReader);
}
// Code below assumes newReader comes w/
// extra ref:
- if (newReader == oldReader) {
- newReader.incRef();
+ if (newReader == null) {
+ oldReader.incRef();
+ newReader = oldReader;
}
oldReader.decRef();
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java Wed Oct 5 21:34:51 2011
@@ -40,12 +40,14 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.UseNoMemoryExpensiveCodec;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.BasicAutomata;
import org.apache.lucene.util.automaton.CompiledAutomaton;
import org.apache.lucene.util.automaton.DaciukMihovAutomatonBuilder;
+@UseNoMemoryExpensiveCodec
public class TestTermsEnum extends LuceneTestCase {
public void test() throws Exception {
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java Wed Oct 5 21:34:51 2011
@@ -152,10 +152,12 @@ public class TestCachingSpanFilter exten
private static IndexReader refreshReader(IndexReader reader) throws IOException {
IndexReader oldReader = reader;
- reader = reader.reopen();
- if (reader != oldReader) {
+ reader = IndexReader.openIfChanged(reader);
+ if (reader != null) {
oldReader.close();
+ return reader;
+ } else {
+ return oldReader;
}
- return reader;
}
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Wed Oct 5 21:34:51 2011
@@ -304,10 +304,12 @@ public class TestCachingWrapperFilter ex
private static IndexReader refreshReader(IndexReader reader) throws IOException {
IndexReader oldReader = reader;
- reader = reader.reopen();
- if (reader != oldReader) {
+ reader = IndexReader.openIfChanged(reader);
+ if (reader != null) {
oldReader.close();
+ return reader;
+ } else {
+ return oldReader;
}
- return reader;
}
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java Wed Oct 5 21:34:51 2011
@@ -19,6 +19,7 @@ package org.apache.lucene.util.automaton
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -30,12 +31,12 @@ import org.apache.lucene.util._TestUtil;
public class TestCompiledAutomaton extends LuceneTestCase {
private CompiledAutomaton build(String... strings) {
- final List<Automaton> as = new ArrayList<Automaton>();
+ final List<BytesRef> terms = new ArrayList<BytesRef>();
for(String s : strings) {
- as.add(BasicAutomata.makeString(s));
+ terms.add(new BytesRef(s));
}
- Automaton a = BasicOperations.union(as);
- a.determinize();
+ Collections.sort(terms);
+ final Automaton a = DaciukMihovAutomatonBuilder.build(terms);
return new CompiledAutomaton(a, true, false);
}
@@ -93,7 +94,7 @@ public class TestCompiledAutomaton exten
}
public void testRandom() throws Exception {
- final int numTerms = atLeast(1000);
+ final int numTerms = atLeast(400);
final Set<String> terms = new HashSet<String>();
while(terms.size() != numTerms) {
terms.add(randomString());
@@ -107,7 +108,7 @@ public class TestCompiledAutomaton exten
}
public void testBasic() throws Exception {
- CompiledAutomaton c = build("foo", "fob", "goo");
+ CompiledAutomaton c = build("fob", "foo", "goo");
testFloor(c, "goo", "goo");
testFloor(c, "ga", "foo");
testFloor(c, "g", "foo");
Modified: lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java Wed Oct 5 21:34:51 2011
@@ -53,10 +53,12 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IntsRef;
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.UseNoMemoryExpensiveCodec;
import org.apache.lucene.util.UnicodeUtil;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.fst.FST.Arc;
+@UseNoMemoryExpensiveCodec
public class TestFSTs extends LuceneTestCase {
private MockDirectoryWrapper dir;
Modified: lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java (original)
+++ lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java Wed Oct 5 21:34:51 2011
@@ -77,8 +77,8 @@ public class NearRealtimeReaderTask exte
}
t = System.currentTimeMillis();
- final IndexReader newReader = r.reopen();
- if (r != newReader) {
+ final IndexReader newReader = IndexReader.openIfChanged(r);
+ if (newReader != null) {
final int delay = (int) (System.currentTimeMillis()-t);
if (reopenTimes.length == reopenCount) {
reopenTimes = ArrayUtil.grow(reopenTimes, 1+reopenCount);
Modified: lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java (original)
+++ lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java Wed Oct 5 21:34:51 2011
@@ -34,8 +34,8 @@ public class ReopenReaderTask extends Pe
@Override
public int doLogic() throws IOException {
IndexReader r = getRunData().getIndexReader();
- IndexReader nr = r.reopen();
- if (nr != r) {
+ IndexReader nr = IndexReader.openIfChanged(r);
+ if (nr != null) {
getRunData().setIndexReader(nr);
nr.decRef();
}
Modified: lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java (original)
+++ lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java Wed Oct 5 21:34:51 2011
@@ -1,6 +1,5 @@
package org.apache.lucene.facet.taxonomy.lucene;
-import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
@@ -10,17 +9,16 @@ import java.util.concurrent.locks.Reentr
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.lucene.facet.taxonomy.CategoryPath;
+import org.apache.lucene.facet.taxonomy.TaxonomyReader;
+import org.apache.lucene.facet.taxonomy.lucene.Consts.LoadFullPathOnly;
import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
-import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
-
-import org.apache.lucene.facet.taxonomy.CategoryPath;
-import org.apache.lucene.facet.taxonomy.TaxonomyReader;
-import org.apache.lucene.facet.taxonomy.lucene.Consts.LoadFullPathOnly;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.collections.LRUHashMap;
@@ -71,7 +69,7 @@ public class LuceneTaxonomyReader implem
private ReadWriteLock indexReaderLock = new ReentrantReadWriteLock();
// The following are the limited-size LRU caches used to cache the latest
- // results from getOrdinal() and getCategoryCache().
+ // results from getOrdinal() and getLabel().
// Because LRUHashMap is not thread-safe, we need to synchronize on this
// object when using it. Unfortunately, this is not optimal under heavy
// contention because it means that while one thread is using the cache
@@ -84,8 +82,8 @@ public class LuceneTaxonomyReader implem
// the mistake of locking out readers while waiting for disk in a cache
// miss - below, we do not hold cache lock while reading missing data from
// disk.
- private final LRUHashMap<String, Integer> getOrdinalCache;
- private final LRUHashMap<Integer, String> getCategoryCache;
+ private final LRUHashMap<String, Integer> ordinalCache;
+ private final LRUHashMap<Integer, String> categoryCache;
// getParent() needs to be extremely efficient, to the point that we need
// to fetch all the data in advance into memory, and answer these calls
@@ -102,6 +100,8 @@ public class LuceneTaxonomyReader implem
private char delimiter = Consts.DEFAULT_DELIMITER;
+ private volatile boolean closed = false;
+
/**
* Open for reading a taxonomy stored in a given {@link Directory}.
* @param directory
@@ -117,10 +117,10 @@ public class LuceneTaxonomyReader implem
// These are the default cache sizes; they can be configured after
// construction with the cache's setMaxSize() method
- getOrdinalCache = new LRUHashMap<String, Integer>(4000);
- getCategoryCache = new LRUHashMap<Integer, String>(4000);
+ ordinalCache = new LRUHashMap<String, Integer>(4000);
+ categoryCache = new LRUHashMap<Integer, String>(4000);
- // TODO (Facet): consider lazily create parent array it when asked, not in the constructor
+ // TODO (Facet): consider lazily create parent array when asked, not in the constructor
parentArray = new ParentArray();
parentArray.refresh(indexReader);
}
@@ -129,40 +129,15 @@ public class LuceneTaxonomyReader implem
return IndexReader.open(directory);
}
- // convenience constructors... deprecated because they cause confusion
- // because they use parent directory instead of the actual directory.
- private Directory ourDirectory = null; // remember directory to close later, but only if we opened it here
/**
- * Open for reading a taxonomy stored in a subdirectory of a given
- * directory on the file system.
- * @param parentDir The parent directory of the taxonomy's directory
- * (usually this would be the directory holding the index).
- * @param name The name of the taxonomy, and the subdirectory holding it.
- * @throws CorruptIndexException if the Taxonomy is corrupted.
- * @throws IOException if another error occurred.
- */
- @Deprecated
- public LuceneTaxonomyReader(File parentDir, String name)
- throws CorruptIndexException, IOException {
- this(FSDirectory.open(new File(parentDir, name)));
- ourDirectory = indexReader.directory(); // remember to close the directory we opened
- }
-
- /**
- * Open for reading a taxonomy stored in a subdirectory of a given
- * directory on the file system.
- * @param parentDir The parent directory of the taxonomy's directory.
- * @param name The name of the taxonomy, and the subdirectory holding it.
- * @throws CorruptIndexException if the Taxonomy is corrupted.
- * @throws IOException if another error occurred.
- */
- @Deprecated
- public LuceneTaxonomyReader(String parentDir, String name)
- throws CorruptIndexException, IOException {
- this(FSDirectory.open(new File(parentDir, name)));
- ourDirectory = indexReader.directory(); // rememebr to close the directory we opened
+ * @throws AlreadyClosedException if this IndexReader is closed
+ */
+ protected final void ensureOpen() throws AlreadyClosedException {
+ if (indexReader.getRefCount() <= 0) {
+ throw new AlreadyClosedException("this TaxonomyReader is closed");
+ }
}
-
+
/**
* setCacheSize controls the maximum allowed size of each of the caches
* used by {@link #getPath(int)} and {@link #getOrdinal(CategoryPath)}.
@@ -173,11 +148,12 @@ public class LuceneTaxonomyReader implem
* @param size the new maximum cache size, in number of entries.
*/
public void setCacheSize(int size) {
- synchronized(getCategoryCache) {
- getCategoryCache.setMaxSize(size);
+ ensureOpen();
+ synchronized(categoryCache) {
+ categoryCache.setMaxSize(size);
}
- synchronized(getOrdinalCache) {
- getOrdinalCache.setMaxSize(size);
+ synchronized(ordinalCache) {
+ ordinalCache.setMaxSize(size);
}
}
@@ -192,18 +168,20 @@ public class LuceneTaxonomyReader implem
* LuceneTaxonomyReader objects you create.
*/
public void setDelimiter(char delimiter) {
+ ensureOpen();
this.delimiter = delimiter;
}
public int getOrdinal(CategoryPath categoryPath) throws IOException {
+ ensureOpen();
if (categoryPath.length()==0) {
return ROOT_ORDINAL;
}
String path = categoryPath.toString(delimiter);
// First try to find the answer in the LRU cache:
- synchronized(getOrdinalCache) {
- Integer res = getOrdinalCache.get(path);
+ synchronized(ordinalCache) {
+ Integer res = ordinalCache.get(path);
if (res!=null) {
return res.intValue();
}
@@ -229,16 +207,17 @@ public class LuceneTaxonomyReader implem
// other thread already added the same category to the cache. We do
// not care about this possibilty, as LRUCache replaces previous values
// of the same keys (it doesn't store duplicates).
- synchronized(getOrdinalCache) {
+ synchronized(ordinalCache) {
// GB: new Integer(int); creates a new object each and every time.
// Integer.valueOf(int) might not (See JavaDoc).
- getOrdinalCache.put(path, Integer.valueOf(ret));
+ ordinalCache.put(path, Integer.valueOf(ret));
}
return ret;
}
public CategoryPath getPath(int ordinal) throws CorruptIndexException, IOException {
+ ensureOpen();
// TODO (Facet): Currently, the LRU cache we use (getCategoryCache) holds
// strings with delimiters, not CategoryPath objects, so even if
// we have a cache hit, we need to process the string and build a new
@@ -255,6 +234,7 @@ public class LuceneTaxonomyReader implem
}
public boolean getPath(int ordinal, CategoryPath result) throws CorruptIndexException, IOException {
+ ensureOpen();
String label = getLabel(ordinal);
if (label==null) {
return false;
@@ -265,6 +245,7 @@ public class LuceneTaxonomyReader implem
}
private String getLabel(int catID) throws CorruptIndexException, IOException {
+ ensureOpen();
// First try to find the answer in the LRU cache. It is very
// unfortunate that we need to allocate an Integer object here -
// it would have been better if we used a hash table specifically
@@ -273,8 +254,8 @@ public class LuceneTaxonomyReader implem
// Integer.valueOf(int) might not (See JavaDoc).
Integer catIDInteger = Integer.valueOf(catID);
- synchronized(getCategoryCache) {
- String res = getCategoryCache.get(catIDInteger);
+ synchronized(categoryCache) {
+ String res = categoryCache.get(catIDInteger);
if (res!=null) {
return res;
}
@@ -306,14 +287,15 @@ public class LuceneTaxonomyReader implem
// other thread already added the same category to the cache. We do
// not care about this possibility, as LRUCache replaces previous
// values of the same keys (it doesn't store duplicates).
- synchronized (getCategoryCache) {
- getCategoryCache.put(catIDInteger, ret);
+ synchronized (categoryCache) {
+ categoryCache.put(catIDInteger, ret);
}
return ret;
}
public int getParent(int ordinal) {
+ ensureOpen();
// Note how we don't need to hold the read lock to do the following,
// because the array reference is volatile, ensuring the correct
// visibility and ordering: if we get the new reference, the new
@@ -344,6 +326,7 @@ public class LuceneTaxonomyReader implem
*/
public int[] getParentArray() {
+ ensureOpen();
// Note how we don't need to hold the read lock to do the following,
// because the array reference is volatile, ensuring the correct
// visibility and ordering: if we get the new reference, the new
@@ -355,6 +338,7 @@ public class LuceneTaxonomyReader implem
// method in this class) to ensure that it never gets called concurrently
// with itself.
public synchronized void refresh() throws IOException {
+ ensureOpen();
/*
* Since refresh() can be a lengthy operation, it is very important that we
* avoid locking out all readers for its duration. This is why we don't hold
@@ -368,8 +352,8 @@ public class LuceneTaxonomyReader implem
// safely read indexReader without holding the write lock, because
// no other thread can be writing at this time (this method is the
// only possible writer, and it is "synchronized" to avoid this case).
- IndexReader r2 = indexReader.reopen();
- if (indexReader != r2) {
+ IndexReader r2 = IndexReader.openIfChanged(indexReader);
+ if (r2 != null) {
IndexReader oldreader = indexReader;
// we can close the old searcher, but need to synchronize this
// so that we don't close it in the middle that another routine
@@ -405,7 +389,7 @@ public class LuceneTaxonomyReader implem
// Remove any INVALID_ORDINAL values from the ordinal cache,
// because it is possible those are now answered by the new data!
- Iterator<Entry<String, Integer>> i = getOrdinalCache.entrySet().iterator();
+ Iterator<Entry<String, Integer>> i = ordinalCache.entrySet().iterator();
while (i.hasNext()) {
Entry<String, Integer> e = i.next();
if (e.getValue().intValue() == INVALID_ORDINAL) {
@@ -416,13 +400,25 @@ public class LuceneTaxonomyReader implem
}
public void close() throws IOException {
- indexReader.close();
- if (ourDirectory!=null) {
- ourDirectory.close();
+ if (!closed) {
+ decRef();
+ closed = true;
}
}
+
+ /** Do the actual closing, free up resources */
+ private void doClose() throws IOException {
+ indexReader.close();
+ closed = true;
+
+ parentArray = null;
+ childrenArrays = null;
+ categoryCache.clear();
+ ordinalCache.clear();
+ }
public int getSize() {
+ ensureOpen();
indexReaderLock.readLock().lock();
try {
return indexReader.numDocs();
@@ -432,6 +428,7 @@ public class LuceneTaxonomyReader implem
}
public Map<String, String> getCommitUserData() {
+ ensureOpen();
return indexReader.getCommitUserData();
}
@@ -439,6 +436,7 @@ public class LuceneTaxonomyReader implem
Object childrenArraysRebuild = new Object();
public ChildrenArrays getChildrenArrays() {
+ ensureOpen();
// Check if the taxonomy grew since we built the array, and if it
// did, create new (and larger) arrays and fill them as required.
// We do all this under a lock, two prevent to concurrent calls to
@@ -492,6 +490,7 @@ public class LuceneTaxonomyReader implem
}
public String toString(int max) {
+ ensureOpen();
StringBuilder sb = new StringBuilder();
int upperl = Math.min(max, this.indexReader.maxDoc());
for (int i = 0; i < upperl; i++) {
@@ -537,6 +536,7 @@ public class LuceneTaxonomyReader implem
* @return lucene indexReader
*/
IndexReader getInternalIndexReader() {
+ ensureOpen();
return this.indexReader;
}
@@ -547,13 +547,20 @@ public class LuceneTaxonomyReader implem
* @throws IOException
*/
public void decRef() throws IOException {
- this.indexReader.decRef();
+ ensureOpen();
+ if (indexReader.getRefCount() == 1) {
+ // Do not decRef the indexReader - doClose does it by calling reader.close()
+ doClose();
+ } else {
+ indexReader.decRef();
+ }
}
/**
* Expert: returns the current refCount for this taxonomy reader
*/
public int getRefCount() {
+ ensureOpen();
return this.indexReader.getRefCount();
}
@@ -565,6 +572,7 @@ public class LuceneTaxonomyReader implem
* otherwise the reader may never be closed.
*/
public void incRef() {
+ ensureOpen();
this.indexReader.incRef();
}
}
Modified: lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java (original)
+++ lucene/dev/branches/solrcloud/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java Wed Oct 5 21:34:51 2011
@@ -564,8 +564,8 @@ public class LuceneTaxonomyWriter implem
private synchronized void refreshReader() throws IOException {
if (reader != null) {
- IndexReader r2 = reader.reopen();
- if (reader != r2) {
+ IndexReader r2 = IndexReader.openIfChanged(reader);
+ if (r2 != null) {
reader.close();
reader = r2;
}
@@ -709,9 +709,8 @@ public class LuceneTaxonomyWriter implem
return true;
}
- // TODO (Facet): synchronization of some sort?
private ParentArray parentArray;
- private ParentArray getParentArray() throws IOException {
+ private synchronized ParentArray getParentArray() throws IOException {
if (parentArray==null) {
if (reader == null) {
reader = openReader();
Modified: lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java (original)
+++ lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java Wed Oct 5 21:34:51 2011
@@ -299,7 +299,8 @@ public class TestTotalFacetCountsCache e
writers[0].taxWriter.close();
readers[0].taxReader.refresh();
- IndexReader r2 = readers[0].indexReader.reopen();
+ IndexReader r2 = IndexReader.openIfChanged(readers[0].indexReader);
+ assertNotNull(r2);
// Hold on to the 'original' reader so we can do some checks with it
IndexReader origReader = null;
Modified: lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestIndexClose.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestIndexClose.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestIndexClose.java (original)
+++ lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestIndexClose.java Wed Oct 5 21:34:51 2011
@@ -160,10 +160,10 @@ public class TestIndexClose extends Luce
// System.err.println("opened "+mynum);
}
@Override
- public synchronized IndexReader reopen() throws CorruptIndexException, IOException {
- IndexReader n = in.reopen();
- if (n==in) {
- return this;
+ protected synchronized IndexReader doOpenIfChanged() throws CorruptIndexException, IOException {
+ IndexReader n = IndexReader.openIfChanged(in);
+ if (n == null) {
+ return null;
}
return new InstrumentedIndexReader(n);
}
Modified: lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Wed Oct 5 21:34:51 2011
@@ -384,6 +384,11 @@ public class TestGrouping extends Lucene
new MockAnalyzer(random)));
final List<List<Document>> updateDocs = new ArrayList<List<Document>>();
+
+ FieldType groupEndType = new FieldType(StringField.TYPE_UNSTORED);
+ groupEndType.setIndexOptions(IndexOptions.DOCS_ONLY);
+ groupEndType.setOmitNorms(true);
+
//System.out.println("TEST: index groups");
for(BytesRef group : groupValues) {
final List<Document> docs = new ArrayList<Document>();
@@ -401,10 +406,7 @@ public class TestGrouping extends Lucene
//System.out.println("TEST: doc content=" + groupValue.content + " group=" + (groupValue.group == null ? "null" : groupValue.group.utf8ToString()) + " sort1=" + groupValue.sort1.utf8ToString() + " id=" + groupValue.id);
}
// So we can pull filter marking last doc in block:
- FieldType ft = new FieldType(StringField.TYPE_UNSTORED);
- ft.setIndexOptions(IndexOptions.DOCS_ONLY);
- ft.setOmitNorms(true);
- final Field groupEnd = newField("groupend", "x", ft);
+ final Field groupEnd = newField("groupend", "x", groupEndType);
docs.get(docs.size()-1).add(groupEnd);
// Add as a doc block:
w.addDocuments(docs);
@@ -456,7 +458,7 @@ public class TestGrouping extends Lucene
}
}
}
-
+
public void testRandom() throws Exception {
for(int iter=0;iter<3;iter++) {
@@ -560,8 +562,8 @@ public class TestGrouping extends Lucene
// NOTE: intentional but temporary field cache insanity!
final int[] docIDToID = FieldCache.DEFAULT.getInts(r, "id");
- IndexReader r2 = null;
- Directory dir2 = null;
+ IndexReader rBlocks = null;
+ Directory dirBlocks = null;
try {
final IndexSearcher s = newSearcher(r);
@@ -584,15 +586,15 @@ public class TestGrouping extends Lucene
// Build 2nd index, where docs are added in blocks by
// group, so we can use single pass collector
- dir2 = newDirectory();
- r2 = getDocBlockReader(dir2, groupDocs);
+ dirBlocks = newDirectory();
+ rBlocks = getDocBlockReader(dirBlocks, groupDocs);
final Filter lastDocInBlock = new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("groupend", "x"))));
- final int[] docIDToID2 = FieldCache.DEFAULT.getInts(r2, "id");
+ final int[] docIDToIDBlocks = FieldCache.DEFAULT.getInts(rBlocks, "id");
- final IndexSearcher s2 = newSearcher(r2);
- final ShardState shards2 = new ShardState(s2);
+ final IndexSearcher sBlocks = newSearcher(rBlocks);
+ final ShardState shardsBlocks = new ShardState(sBlocks);
- // Reader2 only increases maxDoc() vs reader, which
+ // ReaderBlocks only increases maxDoc() vs reader, which
// means a monotonic shift in scores, so we can
// reliably remap them w/ Map:
final Map<String,Map<Float,Float>> scoreMap = new HashMap<String,Map<Float,Float>>();
@@ -605,14 +607,14 @@ public class TestGrouping extends Lucene
final Map<Float,Float> termScoreMap = new HashMap<Float,Float>();
scoreMap.put("real"+contentID, termScoreMap);
//System.out.println("term=real" + contentID + " dfold=" + s.docFreq(new Term("content", "real"+contentID)) +
- //" dfnew=" + s2.docFreq(new Term("content", "real"+contentID)));
- final ScoreDoc[] hits = s2.search(new TermQuery(new Term("content", "real"+contentID)), numDocs).scoreDocs;
+ //" dfnew=" + sBlocks.docFreq(new Term("content", "real"+contentID)));
+ final ScoreDoc[] hits = sBlocks.search(new TermQuery(new Term("content", "real"+contentID)), numDocs).scoreDocs;
for(ScoreDoc hit : hits) {
- final GroupDoc gd = groupDocsByID[docIDToID2[hit.doc]];
+ final GroupDoc gd = groupDocsByID[docIDToIDBlocks[hit.doc]];
assertTrue(gd.score2 == 0.0);
gd.score2 = hit.score;
- assertEquals(gd.id, docIDToID2[hit.doc]);
- //System.out.println(" score=" + gd.score + " score2=" + hit.score + " id=" + docIDToID2[hit.doc]);
+ assertEquals(gd.id, docIDToIDBlocks[hit.doc]);
+ //System.out.println(" score=" + gd.score + " score2=" + hit.score + " id=" + docIDToIDBlocks[hit.doc]);
termScoreMap.put(gd.score, gd.score2);
}
}
@@ -620,7 +622,7 @@ public class TestGrouping extends Lucene
for(int searchIter=0;searchIter<100;searchIter++) {
if (VERBOSE) {
- System.out.println("TEST: searchIter=" + searchIter);
+ System.out.println("\nTEST: searchIter=" + searchIter);
}
final String searchTerm = "real" + random.nextInt(3);
@@ -657,7 +659,7 @@ public class TestGrouping extends Lucene
final boolean doCache = random.nextBoolean();
final boolean doAllGroups = random.nextBoolean();
if (VERBOSE) {
- System.out.println("TEST: groupSort=" + groupSort + " docSort=" + docSort + " searchTerm=" + searchTerm + " topNGroups=" + topNGroups + " groupOffset=" + groupOffset + " docOffset=" + docOffset + " doCache=" + doCache + " docsPerGroup=" + docsPerGroup + " doAllGroups=" + doAllGroups + " getScores=" + getScores + " getMaxScores=" + getMaxScores);
+ System.out.println("TEST: groupSort=" + groupSort + " docSort=" + docSort + " searchTerm=" + searchTerm + " dF=" + r.docFreq("content", new BytesRef(searchTerm)) +" dFBlock=" + rBlocks.docFreq("content", new BytesRef(searchTerm)) + " topNGroups=" + topNGroups + " groupOffset=" + groupOffset + " docOffset=" + docOffset + " doCache=" + doCache + " docsPerGroup=" + docsPerGroup + " doAllGroups=" + doAllGroups + " getScores=" + getScores + " getMaxScores=" + getMaxScores);
}
final TermAllGroupsCollector allGroupsCollector;
@@ -700,8 +702,8 @@ public class TestGrouping extends Lucene
}
// Search top reader:
- final Query q = new TermQuery(new Term("content", searchTerm));
- s.search(q, c);
+ final Query query = new TermQuery(new Term("content", searchTerm));
+ s.search(query, c);
if (doCache && !useWrappingCollector) {
if (cCache.isCached()) {
@@ -713,37 +715,34 @@ public class TestGrouping extends Lucene
}
} else {
// Replay by re-running search:
- s.search(new TermQuery(new Term("content", searchTerm)), c1);
+ s.search(query, c1);
if (doAllGroups) {
- s.search(new TermQuery(new Term("content", searchTerm)), allGroupsCollector);
+ s.search(query, allGroupsCollector);
}
}
}
+ // Get 1st pass top groups
final Collection<SearchGroup<BytesRef>> topGroups = c1.getTopGroups(groupOffset, fillFields);
- final TopGroups groupsResult;
+
if (VERBOSE) {
- System.out.println("TEST: topGroups:");
+ System.out.println("TEST: first pass topGroups");
if (topGroups == null) {
System.out.println(" null");
} else {
- for(SearchGroup<BytesRef> groupx : topGroups) {
- System.out.println(" " + groupToString(groupx.groupValue) + " sort=" + Arrays.toString(groupx.sortValues));
+ for (SearchGroup<BytesRef> searchGroup : topGroups) {
+ System.out.println(" " + (searchGroup.groupValue == null ? "null" : searchGroup.groupValue) + ": " + Arrays.deepToString(searchGroup.sortValues));
}
}
}
- final TopGroups<BytesRef> topGroupsShards = searchShards(s, shards.subSearchers, q, groupSort, docSort, groupOffset, topNGroups, docOffset, docsPerGroup, getScores, getMaxScores);
+ // Get 1st pass top groups using shards
+ final TopGroups<BytesRef> topGroupsShards = searchShards(s, shards.subSearchers, query, groupSort, docSort, groupOffset, topNGroups, docOffset, docsPerGroup, getScores, getMaxScores);
+ final TopGroups<BytesRef> groupsResult;
if (topGroups != null) {
- if (VERBOSE) {
- System.out.println("TEST: topGroups");
- for (SearchGroup<BytesRef> searchGroup : topGroups) {
- System.out.println(" " + (searchGroup.groupValue == null ? "null" : searchGroup.groupValue.utf8ToString()) + ": " + Arrays.deepToString(searchGroup.sortValues));
- }
- }
-
+ // Get 2nd pass grouped result:
final TermSecondPassGroupingCollector c2 = new TermSecondPassGroupingCollector("group", topGroups, groupSort, docSort, docOffset+docsPerGroup, getScores, getMaxScores, fillFields);
if (doCache) {
if (cCache.isCached()) {
@@ -755,10 +754,10 @@ public class TestGrouping extends Lucene
if (VERBOSE) {
System.out.println("TEST: cache was too large");
}
- s.search(new TermQuery(new Term("content", searchTerm)), c2);
+ s.search(query, c2);
}
} else {
- s.search(new TermQuery(new Term("content", searchTerm)), c2);
+ s.search(query, c2);
}
if (doAllGroups) {
@@ -780,15 +779,34 @@ public class TestGrouping extends Lucene
if (expectedGroups == null) {
System.out.println("TEST: no expected groups");
} else {
- System.out.println("TEST: expected groups");
+ System.out.println("TEST: expected groups totalGroupedHitCount=" + expectedGroups.totalGroupedHitCount);
for(GroupDocs<BytesRef> gd : expectedGroups.groups) {
- System.out.println(" group=" + (gd.groupValue == null ? "null" : gd.groupValue.utf8ToString()));
+ System.out.println(" group=" + (gd.groupValue == null ? "null" : gd.groupValue) + " totalHits=" + gd.totalHits);
for(ScoreDoc sd : gd.scoreDocs) {
System.out.println(" id=" + sd.doc + " score=" + sd.score);
}
}
}
+
+ if (groupsResult == null) {
+ System.out.println("TEST: no matched groups");
+ } else {
+ System.out.println("TEST: matched groups totalGroupedHitCount=" + groupsResult.totalGroupedHitCount);
+ for(GroupDocs<BytesRef> gd : groupsResult.groups) {
+ System.out.println(" group=" + (gd.groupValue == null ? "null" : gd.groupValue) + " totalHits=" + gd.totalHits);
+ for(ScoreDoc sd : gd.scoreDocs) {
+ System.out.println(" id=" + docIDToID[sd.doc] + " score=" + sd.score);
+ }
+ }
+
+ if (searchIter == 14) {
+ for(int docIDX=0;docIDX<s.maxDoc();docIDX++) {
+ System.out.println("ID=" + docIDToID[docIDX] + " explain=" + s.explain(query, docIDX));
+ }
+ }
+ }
}
+
assertEquals(docIDToID, expectedGroups, groupsResult, true, true, true, getScores);
// Confirm merged shards match:
@@ -808,18 +826,39 @@ public class TestGrouping extends Lucene
allGroupsCollector2 = null;
c4 = c3;
}
- s2.search(new TermQuery(new Term("content", searchTerm)), c4);
+ // Get block grouping result:
+ sBlocks.search(query, c4);
@SuppressWarnings("unchecked")
- final TopGroups<BytesRef> tempTopGroups2 = c3.getTopGroups(docSort, groupOffset, docOffset, docOffset+docsPerGroup, fillFields);
- final TopGroups groupsResult2;
- if (doAllGroups && tempTopGroups2 != null) {
- assertEquals((int) tempTopGroups2.totalGroupCount, allGroupsCollector2.getGroupCount());
- groupsResult2 = new TopGroups<BytesRef>(tempTopGroups2, allGroupsCollector2.getGroupCount());
+ final TopGroups<BytesRef> tempTopGroupsBlocks = c3.getTopGroups(docSort, groupOffset, docOffset, docOffset+docsPerGroup, fillFields);
+ final TopGroups<BytesRef> groupsResultBlocks;
+ if (doAllGroups && tempTopGroupsBlocks != null) {
+ assertEquals((int) tempTopGroupsBlocks.totalGroupCount, allGroupsCollector2.getGroupCount());
+ groupsResultBlocks = new TopGroups<BytesRef>(tempTopGroupsBlocks, allGroupsCollector2.getGroupCount());
} else {
- groupsResult2 = tempTopGroups2;
+ groupsResultBlocks = tempTopGroupsBlocks;
+ }
+
+ if (VERBOSE) {
+ if (groupsResultBlocks == null) {
+ System.out.println("TEST: no block groups");
+ } else {
+ System.out.println("TEST: block groups totalGroupedHitCount=" + groupsResultBlocks.totalGroupedHitCount);
+ boolean first = true;
+ for(GroupDocs<BytesRef> gd : groupsResultBlocks.groups) {
+ System.out.println(" group=" + (gd.groupValue == null ? "null" : gd.groupValue.utf8ToString()) + " totalHits=" + gd.totalHits);
+ for(ScoreDoc sd : gd.scoreDocs) {
+ System.out.println(" id=" + docIDToIDBlocks[sd.doc] + " score=" + sd.score);
+ if (first) {
+ System.out.println("explain: " + sBlocks.explain(query, sd.doc));
+ first = false;
+ }
+ }
+ }
+ }
}
- final TopGroups<BytesRef> topGroupsBlockShards = searchShards(s2, shards2.subSearchers, q, groupSort, docSort, groupOffset, topNGroups, docOffset, docsPerGroup, getScores, getMaxScores);
+ // Get shard'd block grouping result:
+ final TopGroups<BytesRef> topGroupsBlockShards = searchShards(sBlocks, shardsBlocks.subSearchers, query, groupSort, docSort, groupOffset, topNGroups, docOffset, docsPerGroup, getScores, getMaxScores);
if (expectedGroups != null) {
// Fixup scores for reader2
@@ -862,23 +901,23 @@ public class TestGrouping extends Lucene
}
}
- assertEquals(docIDToID2, expectedGroups, groupsResult2, false, true, true, getScores);
- assertEquals(docIDToID2, expectedGroups, topGroupsBlockShards, false, false, fillFields, getScores);
+ assertEquals(docIDToIDBlocks, expectedGroups, groupsResultBlocks, false, true, true, getScores);
+ assertEquals(docIDToIDBlocks, expectedGroups, topGroupsBlockShards, false, false, fillFields, getScores);
}
s.close();
- s2.close();
+ sBlocks.close();
} finally {
FieldCache.DEFAULT.purge(r);
- if (r2 != null) {
- FieldCache.DEFAULT.purge(r2);
+ if (rBlocks != null) {
+ FieldCache.DEFAULT.purge(rBlocks);
}
}
r.close();
dir.close();
- r2.close();
- dir2.close();
+ rBlocks.close();
+ dirBlocks.close();
}
}
@@ -931,7 +970,7 @@ public class TestGrouping extends Lucene
if (VERBOSE) {
System.out.println(" shard " + shardIDX + " s=" + subSearchers[shardIDX] + " " + topGroups.size() + " groups:");
for(SearchGroup<BytesRef> group : topGroups) {
- System.out.println(" " + groupToString(group.groupValue) + " sort=" + Arrays.toString(group.sortValues));
+ System.out.println(" " + groupToString(group.groupValue) + " groupSort=" + Arrays.toString(group.sortValues));
}
}
shardGroups.add(topGroups);
@@ -945,7 +984,7 @@ public class TestGrouping extends Lucene
System.out.println(" null");
} else {
for(SearchGroup<BytesRef> group : mergedTopGroups) {
- System.out.println(" " + groupToString(group.groupValue) + " sort=" + Arrays.toString(group.sortValues));
+ System.out.println(" " + groupToString(group.groupValue) + " groupSort=" + Arrays.toString(group.sortValues));
}
}
}
@@ -1039,7 +1078,7 @@ public class TestGrouping extends Lucene
@Override
public String toString() {
- return "ShardSearcher(" + ctx[0] + ")";
+ return "ShardSearcher(" + ctx[0].reader + ")";
}
}
}
Modified: lucene/dev/branches/solrcloud/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/CHANGES.txt?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/solr/CHANGES.txt Wed Oct 5 21:34:51 2011
@@ -24,7 +24,7 @@ $Id$
================== 4.0.0-dev ==================
Versions of Major Components
---------------------
-Apache Tika 0.8
+Apache Tika 0.10
Carrot2 3.5.0
Velocity 1.6.4 and Velocity Tools 2.0
Apache UIMA 2.3.1
@@ -354,6 +354,9 @@ New Features
* SOLR-2769: Added factory for the new Hunspell stemmer capable of doing stemming
for 99 languages (janhoy, cmale)
+* SOLR-1979: New contrib "langid". Adds language identification capabilities as an
+ Update Processor, using Tika's LanguageIdentifier (janhoy, Tommaso Teofili, gsingers)
+
Bug Fixes
----------------------
* SOLR-2748: The CommitTracker used for commitWith or autoCommit by maxTime
@@ -403,6 +406,8 @@ Bug Fixes
* SOLR-2757: min() and max() functions now support an arbitrary number of
ValueSources (Bill Bell via hossman)
+* SOLR-2372: Upgrade Solr to Tika 0.10 (janhoy)
+
================== 3.4.0 ==================
Upgrading from Solr 3.3
Modified: lucene/dev/branches/solrcloud/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/NOTICE.txt?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/NOTICE.txt (original)
+++ lucene/dev/branches/solrcloud/solr/NOTICE.txt Wed Oct 5 21:34:51 2011
@@ -12,7 +12,6 @@ including, but not limited to:
- Apache Tomcat (lib/servlet-api-2.4.jar)
- Apache Commons
- Apache Geronimo (stax API jar)
- - Apache Log4j (contrib/clustering)
This product includes tests written with EasyMock Copyright 2001-2007
Tammo Freese (http://www.easymock.org/)
Modified: lucene/dev/branches/solrcloud/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/build.xml?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/build.xml (original)
+++ lucene/dev/branches/solrcloud/solr/build.xml Wed Oct 5 21:34:51 2011
@@ -456,12 +456,14 @@
<packageset dir="contrib/dataimporthandler/src/java"/>
<packageset dir="contrib/dataimporthandler-extras/src/java"/>
<packageset dir="contrib/extraction/src/java"/>
+ <packageset dir="contrib/langid/src/java"/>
<packageset dir="contrib/uima/src/java"/>
<group title="Core" packages="org.apache.*" />
<group title="SolrJ" packages="org.apache.solr.common.*,org.apache.solr.client.solrj.*,org.apache.zookeeper.*" />
<group title="contrib: Clustering" packages="org.apache.solr.handler.clustering*" />
<group title="contrib: DataImportHandler" packages="org.apache.solr.handler.dataimport*" />
<group title="contrib: Solr Cell" packages="org.apache.solr.handler.extraction*" />
+ <group title="contrib: Solr LangId" packages="org.apache.solr.update.processor.LanguageIdentifier*,org.apache.solr.update.processor.LangIdParams*,org.apache.solr.update.processor.DetectedLanguage*" />
<group title="contrib: Solr UIMA" packages="org.apache.solr.uima*" />
</sources>
</invoke-javadoc>
Modified: lucene/dev/branches/solrcloud/solr/contrib/extraction/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/contrib/extraction/CHANGES.txt?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/contrib/extraction/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/solr/contrib/extraction/CHANGES.txt Wed Oct 5 21:34:51 2011
@@ -17,10 +17,10 @@ You will need Solr up and running. Then
to your Solr Home lib directory. See http://wiki.apache.org/solr/ExtractingRequestHandler for more details on hooking it in
and configuring.
- Tika Dependency
- ---------------
+Tika Dependency
+---------------
-Current Version: Tika 0.8 (released 11/07/2010)
+Current Version: Tika 0.10 (released 2011-09-30)
$Id$
@@ -30,7 +30,7 @@ $Id$
================== Release 3.5.0 ==================
-(No Changes)
+* SOLR-2372: Upgrade Solr to Tika 0.10 (janhoy)
================== Release 3.4.0 ==================
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.java Wed Oct 5 21:34:51 2011
@@ -1115,10 +1115,11 @@ public final class SolrCore implements S
IndexReader currentReader = newestSearcher.get().getIndexReader();
IndexReader newReader;
- newReader = currentReader.reopen();
+ newReader = IndexReader.openIfChanged(currentReader);
- if (newReader == currentReader) {
+ if (newReader == null) {
currentReader.incRef();
+ newReader = currentReader;
}
tmp = new SolrIndexSearcher(this, schema, "main", newReader, true, true, true, directoryFactory);
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Wed Oct 5 21:34:51 2011
@@ -385,11 +385,12 @@ public class DirectUpdateHandler2 extend
IndexReader currentReader = previousSearcher.getIndexReader();
IndexReader newReader;
- newReader = currentReader.reopen(indexWriterProvider.getIndexWriter(core), true);
+ newReader = IndexReader.openIfChanged(currentReader, indexWriterProvider.getIndexWriter(core), true);
- if (newReader == currentReader) {
+ if (newReader == null) {
currentReader.incRef();
+ newReader = currentReader;
}
return new SolrIndexSearcher(core, schema, "main", newReader, true, true, true, core.getDirectoryFactory());
@@ -490,15 +491,15 @@ public class DirectUpdateHandler2 extend
public NamedList getStatistics() {
NamedList lst = new SimpleOrderedMap();
lst.add("commits", commitCommands.get());
- if (commitTracker.getTimeUpperBound() > 0) {
+ if (commitTracker.getDocsUpperBound() > 0) {
lst.add("autocommit maxDocs", commitTracker.getDocsUpperBound());
}
if (commitTracker.getTimeUpperBound() > 0) {
lst.add("autocommit maxTime", "" + commitTracker.getTimeUpperBound() + "ms");
}
lst.add("autocommits", commitTracker.getCommitCount());
- if (softCommitTracker.getTimeUpperBound() > 0) {
- lst.add("soft autocommit maxDocs", softCommitTracker.getTimeUpperBound());
+ if (softCommitTracker.getDocsUpperBound() > 0) {
+ lst.add("soft autocommit maxDocs", softCommitTracker.getDocsUpperBound());
}
if (softCommitTracker.getTimeUpperBound() > 0) {
lst.add("soft autocommit maxTime", "" + softCommitTracker.getTimeUpperBound() + "ms");
Modified: lucene/dev/branches/solrcloud/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/example/solr/conf/solrconfig.xml?rev=1179453&r1=1179452&r2=1179453&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/solrcloud/solr/example/solr/conf/solrconfig.xml Wed Oct 5 21:34:51 2011
@@ -62,6 +62,7 @@
-->
<lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />
<lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
+ <lib dir="../../dist/" regex="apache-solr-langid-\d.*\.jar" />
<!-- If a dir option (with or without a regex) is used and nothing
is found that matches, it will be ignored
-->
@@ -1527,7 +1528,29 @@
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
-->
+
+ <!-- Language identification
+ This example update chain identifies the language of the incoming
+ documents using the langid contrib. The detected language is
+ written to field language_s. No field name mapping is done.
+ The fields used for detection are text, title, subject and description,
+ making this example suitable for detecting languages form full-text
+ rich documents injected via ExtractingRequestHandler.
+ See more about langId at http://wiki.apache.org/solr/LanguageDetection
+ -->
+ <!--
+ <updateRequestProcessorChain name="langid">
+ <processor class="org.apache.solr.update.processor.LanguageIdentifierUpdateProcessorFactory">
+ <str name="langid.fl">text,title,subject,description</str>
+ <str name="langid.langField">language_s</str>
+ <str name="langid.fallback">en</str>
+ </processor>
+ <processor class="solr.LogUpdateProcessorFactory" />
+ <processor class="solr.RunUpdateProcessorFactory" />
+ </updateRequestProcessorChain>
+ -->
+
<!-- Response Writers
http://wiki.apache.org/solr/QueryResponseWriter