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

merge trunk (1097442:1097764) 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1097767 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2011-04-29 11:03:16 +00:00
parent b33ec26192 9f2affb665
commit b8bec47630
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/CHANGES.txt
View File

@ -141,6 +141,10 @@ Changes in backwards compatibility policy
* LUCENE-2315: AttributeSource's methods for accessing attributes are now final, * LUCENE-2315: AttributeSource's methods for accessing attributes are now final,
else its easy to corrupt the internal states. (Uwe Schindler) else its easy to corrupt the internal states. (Uwe Schindler)
* LUCENE-2814: The IndexWriter.flush method no longer takes "boolean
flushDocStores" argument, as we now always flush doc stores (index
files holding stored fields and term vectors) while flushing a
segment. (Mike McCandless)
Changes in Runtime Behavior Changes in Runtime Behavior

3
lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
View File

@ -635,12 +635,13 @@ public class TestDeletionPolicy extends LuceneTestCase {
} }
conf = newIndexWriterConfig( conf = newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)) TEST_VERSION_CURRENT, new MockAnalyzer(random))
.setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy); .setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy).setMergePolicy(newLogMergePolicy());
mp = conf.getMergePolicy(); mp = conf.getMergePolicy();
if (mp instanceof LogMergePolicy) { if (mp instanceof LogMergePolicy) {
((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile); ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile);
} }
writer = new IndexWriter(dir, conf); writer = new IndexWriter(dir, conf);
writer.setInfoStream(VERBOSE ? System.out : null);
for(int j=0;j<17;j++) { for(int j=0;j<17;j++) {
addDoc(writer); addDoc(writer);
} }