Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 519439294 for ; Sun, 4 Dec 2011 18:51:37 +0000 (UTC) Received: (qmail 89561 invoked by uid 500); 4 Dec 2011 18:51:37 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 89552 invoked by uid 99); 4 Dec 2011 18:51:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 18:51:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 18:51:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4BBAB23889DA; Sun, 4 Dec 2011 18:51:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1210176 [3/3] - in /lucene/dev/trunk: lucene/contrib/memory/src/java/org/apache/lucene/index/memory/ lucene/contrib/memory/src/test/org/apache/lucene/index/memory/ lucene/contrib/misc/src/java/org/apache/lucene/index/ lucene/contrib/misc/s... Date: Sun, 04 Dec 2011 18:51:02 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111204185107.4BBAB23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java?rev=1210176&r1=1210175&r2=1210176&view=diff ============================================================================== --- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (original) +++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java Sun Dec 4 18:50:58 2011 @@ -26,15 +26,16 @@ import org.apache.lucene.document.Docume import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.MultiFields; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util._TestUtil; public class TestKeywordAnalyzer extends BaseTokenStreamTestCase { @@ -95,15 +96,21 @@ public class TestKeywordAnalyzer extends writer.close(); IndexReader reader = IndexReader.open(dir, true); - DocsEnum td = MultiFields.getTermDocsEnum(reader, - MultiFields.getLiveDocs(reader), - "partnum", - new BytesRef("Q36")); + DocsEnum td = _TestUtil.docs(random, + reader, + "partnum", + new BytesRef("Q36"), + MultiFields.getLiveDocs(reader), + null, + false); assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS); - td = MultiFields.getTermDocsEnum(reader, - MultiFields.getLiveDocs(reader), - "partnum", - new BytesRef("Q37")); + td = _TestUtil.docs(random, + reader, + "partnum", + new BytesRef("Q37"), + MultiFields.getLiveDocs(reader), + null, + false); assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS); } Modified: lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1210176&r1=1210175&r2=1210176&view=diff ============================================================================== --- lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original) +++ lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Sun Dec 4 18:50:58 2011 @@ -57,6 +57,7 @@ import org.apache.lucene.search.FieldCac import org.apache.lucene.search.FieldCache; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util._TestUtil; /** * Test very simply that perf tasks - simple algorithms - are doing what they should. @@ -493,7 +494,7 @@ public class TestPerfTasksLogic extends TermsEnum termsEnum = terms.iterator(null); DocsEnum docs = null; while(termsEnum.next() != null) { - docs = termsEnum.docs(MultiFields.getLiveDocs(reader), docs); + docs = _TestUtil.docs(random, termsEnum, MultiFields.getLiveDocs(reader), docs, true); while(docs.nextDoc() != docs.NO_MORE_DOCS) { totalTokenCount2 += docs.freq(); } Modified: lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/search/sampling/TakmiSampleFixer.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/search/sampling/TakmiSampleFixer.java?rev=1210176&r1=1210175&r2=1210176&view=diff ============================================================================== --- lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/search/sampling/TakmiSampleFixer.java (original) +++ lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/search/sampling/TakmiSampleFixer.java Sun Dec 4 18:50:58 2011 @@ -106,8 +106,10 @@ class TakmiSampleFixer implements Sample Term drillDownTerm = DrillDown.term(searchParams, catPath); // TODO (Facet): avoid Multi*? Bits liveDocs = MultiFields.getLiveDocs(indexReader); - int updatedCount = countIntersection(MultiFields.getTermDocsEnum(indexReader, liveDocs, drillDownTerm.field(), drillDownTerm.bytes()), - docIds.iterator()); + int updatedCount = countIntersection(MultiFields.getTermDocsEnum(indexReader, liveDocs, + drillDownTerm.field(), drillDownTerm.bytes(), + false), + docIds.iterator()); fresNode.setValue(updatedCount); } Modified: lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java?rev=1210176&r1=1210175&r2=1210176&view=diff ============================================================================== --- lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java (original) +++ lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java Sun Dec 4 18:50:58 2011 @@ -191,7 +191,7 @@ public class DirectoryTaxonomyReader imp indexReaderLock.readLock().lock(); // TODO (Facet): avoid Multi*? Bits liveDocs = MultiFields.getLiveDocs(indexReader); - DocsEnum docs = MultiFields.getTermDocsEnum(indexReader, liveDocs, Consts.FULL, new BytesRef(path)); + DocsEnum docs = MultiFields.getTermDocsEnum(indexReader, liveDocs, Consts.FULL, new BytesRef(path), false); if (docs != null && docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { ret = docs.docID(); } Modified: lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1210176&r1=1210175&r2=1210176&view=diff ============================================================================== --- lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original) +++ lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Sun Dec 4 18:50:58 2011 @@ -405,7 +405,8 @@ public class DirectoryTaxonomyWriter imp // TODO (Facet): avoid Multi*? Bits liveDocs = MultiFields.getLiveDocs(reader); DocsEnum docs = MultiFields.getTermDocsEnum(reader, liveDocs, Consts.FULL, - new BytesRef(categoryPath.toString(delimiter))); + new BytesRef(categoryPath.toString(delimiter)), + false); if (docs == null || docs.nextDoc() == DocIdSetIterator.NO_MORE_DOCS) { return -1; // category does not exist in taxonomy } @@ -441,7 +442,8 @@ public class DirectoryTaxonomyWriter imp } Bits liveDocs = MultiFields.getLiveDocs(reader); DocsEnum docs = MultiFields.getTermDocsEnum(reader, liveDocs, Consts.FULL, - new BytesRef(categoryPath.toString(delimiter, prefixLen))); + new BytesRef(categoryPath.toString(delimiter, prefixLen)), + false); if (docs == null || docs.nextDoc() == DocIdSetIterator.NO_MORE_DOCS) { return -1; // category does not exist in taxonomy } @@ -788,7 +790,7 @@ public class DirectoryTaxonomyWriter imp // hence documents), there are no deletions in the index. Therefore, it // is sufficient to call next(), and then doc(), exactly once with no // 'validation' checks. - docsEnum = termsEnum.docs(liveDocs, docsEnum); + docsEnum = termsEnum.docs(liveDocs, docsEnum, false); docsEnum.nextDoc(); cp.clear(); // TODO (Facet): avoid String creation/use bytes? @@ -925,7 +927,7 @@ public class DirectoryTaxonomyWriter imp // like Lucene's merge works, we hope there are few seeks. // TODO (Facet): is there a quicker way? E.g., not specifying the // next term by name every time? - otherdocsEnum[i] = othertes[i].docs(MultiFields.getLiveDocs(otherreaders[i]), otherdocsEnum[i]); + otherdocsEnum[i] = othertes[i].docs(MultiFields.getLiveDocs(otherreaders[i]), otherdocsEnum[i], false); otherdocsEnum[i].nextDoc(); // TODO (Facet): check? int origordinal = otherdocsEnum[i].docID(); ordinalMaps[i].addMapping(origordinal, newordinal); @@ -942,7 +944,7 @@ public class DirectoryTaxonomyWriter imp // to be added because it already existed in the main taxonomy. // TODO (Facet): Again, is there a quicker way? - mainde = mainte.docs(MultiFields.getLiveDocs(mainreader), mainde); + mainde = mainte.docs(MultiFields.getLiveDocs(mainreader), mainde, false); mainde.nextDoc(); // TODO (Facet): check? int newordinal = mainde.docID(); @@ -950,7 +952,7 @@ public class DirectoryTaxonomyWriter imp for (int i=0; i