Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-07 02:28:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

LUCENE-2086: add assert to verify we flush deleted terms in term sort order

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@883685 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2009-11-24 13:17:45 +00:00
parent c5a7989993
commit 55046c8d74
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/apache/lucene/index/DocumentsWriter.java
View File

@ -962,6 +962,18 @@ final class DocumentsWriter {
return any; return any;
} }
// used only by assert
private Term lastDeleteTerm;
// used only by assert
private boolean checkDeleteTerm(Term term) {
if (term != null) {
assert lastDeleteTerm == null || term.compareTo(lastDeleteTerm) > 0: "lastTerm=" + lastDeleteTerm + " vs term=" + term;
}
lastDeleteTerm = term;
return true;
}
// Apply buffered delete terms, queries and docIDs to the // Apply buffered delete terms, queries and docIDs to the
// provided reader // provided reader
private final synchronized boolean applyDeletes(IndexReader reader, int docIDStart) private final synchronized boolean applyDeletes(IndexReader reader, int docIDStart)
@ -970,11 +982,16 @@ final class DocumentsWriter {
final int docEnd = docIDStart + reader.maxDoc(); final int docEnd = docIDStart + reader.maxDoc();
boolean any = false; boolean any = false;
assert checkDeleteTerm(null);
// Delete by term // Delete by term
TermDocs docs = reader.termDocs(); TermDocs docs = reader.termDocs();
try { try {
for (Entry<Term, BufferedDeletes.Num> entry: deletesFlushed.terms.entrySet()) { for (Entry<Term, BufferedDeletes.Num> entry: deletesFlushed.terms.entrySet()) {
Term term = entry.getKey(); Term term = entry.getKey();
// LUCENE-2086: we should be iterating a TreeMap,
// here, so terms better be in order:
assert checkDeleteTerm(term);
docs.seek(term); docs.seek(term);
int limit = entry.getValue().getNum(); int limit = entry.getValue().getNum();
while (docs.next()) { while (docs.next()) {