Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-2574: maybe 3rd time's a charm 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@982073 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2010-08-03 23:22:09 +00:00
parent 4d03fda0f9
commit 9c5498e0e7
3 changed files with 62 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lucene/src/java/org/apache/lucene/store/FSDirectory.java
View File

@ -460,19 +460,19 @@ public abstract class FSDirectory extends Directory {
// buffer size, and the given IndexInput supports FileChannel copying.
// NOTE: the below check relies on NIOIndexInput extending Simple. If that
// changes in the future, we should change the check as well.
if (true || numBytes <= BUFFER_SIZE || !(input instanceof SimpleFSIndexInput)) {
if (numBytes <= BUFFER_SIZE || !(input instanceof SimpleFSIndexInput)) {
super.copyBytes(input, numBytes);
return;
}
SimpleFSIndexInput fsInput = (SimpleFSIndexInput) input;
// flush any bytes in the buffer
flush();
// flush any bytes in the input's buffer.
numBytes -= fsInput.flushBuffer(this, numBytes);
// flush any bytes in the buffer
flush();
// do the optimized copy
FileChannel in = fsInput.file.getChannel();

92
lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
View File

@ -54,6 +54,7 @@ import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
@ -5072,59 +5073,76 @@ public class TestIndexWriter extends LuceneTestCase {
public void testRandomStoredFields() throws IOException {
File index = _TestUtil.getTempDir("lucenerandfields");
Directory dir = FSDirectory.open(index);
try {
Random rand = newRandom();
RandomIndexWriter w = new RandomIndexWriter(rand, dir, newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(_TestUtil.nextInt(rand, 5, 20)));
final int docCount = 200*RANDOM_MULTIPLIER;
final int fieldCount = _TestUtil.nextInt(rand, 1, 5);
String[][] fields = new String[fieldCount][];
for(int i=0;i<fieldCount;i++) {
fields[i] = new String[docCount];
}
// nocommit seed
//Random rand = newRandom(1864464794067677128L);
Random rand = newRandom();
RandomIndexWriter w = new RandomIndexWriter(rand, dir, newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(_TestUtil.nextInt(rand, 5, 20)));
//w.w.setInfoStream(System.out);
//w.w.setUseCompoundFile(false);
final int docCount = 200*RANDOM_MULTIPLIER;
final int fieldCount = _TestUtil.nextInt(rand, 1, 5);
final List<Integer> fieldIDs = new ArrayList<Integer>();
final List<Integer> fieldIDs = new ArrayList<Integer>();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
for(int i=0;i<fieldCount;i++) {
fieldIDs.add(i);
}
for(int i=0;i<fieldCount;i++) {
fieldIDs.add(i);
}
final Map<String,Document> docs = new HashMap<String,Document>();
for(int i=0;i<docCount;i++) {
Document doc = new Document();
for(int field: fieldIDs) {
final String s;
if (rand.nextInt(4) != 3) {
s = _TestUtil.randomUnicodeString(rand, 1000);
doc.add(new Field("f"+field, s, Field.Store.YES, Field.Index.NO));
} else {
s = null;
}
fields[field][i] = s;
}
w.addDocument(doc);
if (rand.nextInt(50) == 17) {
// mixup binding of field name -> Number every so often
Collections.shuffle(fieldIDs);
for(int i=0;i<docCount;i++) {
Document doc = new Document();
doc.add(idField);
final String id = ""+i;
idField.setValue(id);
docs.put(id, doc);
for(int field: fieldIDs) {
final String s;
if (rand.nextInt(4) != 3) {
s = _TestUtil.randomUnicodeString(rand, 1000);
doc.add(new Field("f"+field, s, Field.Store.YES, Field.Index.NO));
} else {
s = null;
}
}
w.addDocument(doc);
if (rand.nextInt(50) == 17) {
// mixup binding of field name -> Number every so often
Collections.shuffle(fieldIDs);
}
if (rand.nextInt(5) == 3 && i > 0) {
final String delID = ""+rand.nextInt(i);
w.deleteDocuments(new Term("id", delID));
docs.remove(delID);
}
}
if (docs.size() > 0) {
String[] idsList = docs.keySet().toArray(new String[docs.size()]);
for(int x=0;x<2;x++) {
IndexReader r = w.getReader();
IndexSearcher s = new IndexSearcher(r);
for(int iter=0;iter<1000*RANDOM_MULTIPLIER;iter++) {
int docID = rand.nextInt(docCount);
Document doc = r.document(docID);
String testID = idsList[rand.nextInt(idsList.length)];
TopDocs hits = s.search(new TermQuery(new Term("id", testID)), 1);
assertEquals(1, hits.totalHits);
Document doc = r.document(hits.scoreDocs[0].doc);
Document docExp = docs.get(testID);
for(int i=0;i<fieldCount;i++) {
assertEquals(fields[i][docID], doc.get("f"+i));
assertEquals("doc " + testID + ", field f" + fieldCount + " is wrong", docExp.get("f"+i), doc.get("f"+i));
}
}
r.close();
w.optimize();
}
w.close();
} finally {
dir.close();
_TestUtil.rmDir(index);
}
w.close();
dir.close();
_TestUtil.rmDir(index);
}
}

3
lucene/src/test/org/apache/lucene/util/_TestUtil.java
View File

@ -102,6 +102,9 @@ public class _TestUtil {
for (int i = 0; i < end; i++) {
int t = r.nextInt(5);
// nocommit
//buffer[i] = (char) nextInt(r, 0x41, 0x61);
if (0 == t && i < end - 1) {
// Make a surrogate pair
// High surrogate