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 CD63017B93 for ; Fri, 6 Feb 2015 16:39:55 +0000 (UTC) Received: (qmail 60690 invoked by uid 500); 6 Feb 2015 16:39:55 -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 60156 invoked by uid 99); 6 Feb 2015 16:39:55 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2015 16:39:55 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id B0E63AC0309; Fri, 6 Feb 2015 16:39:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1657890 [6/10] - in /lucene/dev/branches/branch_5x: ./ dev-tools/ dev-tools/idea/lucene/highlighter/ lucene/ lucene/analysis/ lucene/analysis/common/src/test/org/apache/lucene/analysis/core/ lucene/analysis/common/src/test/org/apache/lucen... Date: Fri, 06 Feb 2015 16:39:49 -0000 To: commits@lucene.apache.org From: romseygeek@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150206163954.B0E63AC0309@hades.apache.org> Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java Fri Feb 6 16:39:45 2015 @@ -325,9 +325,9 @@ public class TestStressIndexing2 extends // make sure r1 is in fact empty (eg has only all // deleted docs): Bits liveDocs = MultiFields.getLiveDocs(r1); - DocsEnum docs = null; + PostingsEnum docs = null; while(termsEnum.next() != null) { - docs = TestUtil.docs(random(), termsEnum, liveDocs, docs, DocsEnum.FLAG_NONE); + docs = TestUtil.docs(random(), termsEnum, liveDocs, docs, PostingsEnum.FLAG_NONE); while(docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { fail("r1 is not empty but r2 is"); } @@ -336,8 +336,8 @@ public class TestStressIndexing2 extends } TermsEnum termsEnum2 = terms2.iterator(null); - DocsEnum termDocs1 = null; - DocsEnum termDocs2 = null; + PostingsEnum termDocs1 = null; + PostingsEnum termDocs2 = null; while(true) { BytesRef term = termsEnum.next(); @@ -346,9 +346,9 @@ public class TestStressIndexing2 extends break; } - termDocs1 = TestUtil.docs(random(), termsEnum, liveDocs1, termDocs1, DocsEnum.FLAG_NONE); + termDocs1 = TestUtil.docs(random(), termsEnum, liveDocs1, termDocs1, PostingsEnum.FLAG_NONE); if (termsEnum2.seekExact(term)) { - termDocs2 = TestUtil.docs(random(), termsEnum2, liveDocs2, termDocs2, DocsEnum.FLAG_NONE); + termDocs2 = TestUtil.docs(random(), termsEnum2, liveDocs2, termDocs2, PostingsEnum.FLAG_NONE); } else { termDocs2 = null; } @@ -386,8 +386,8 @@ public class TestStressIndexing2 extends Fields tv1 = r1.getTermVectors(id1); System.out.println(" d1=" + tv1); if (tv1 != null) { - DocsAndPositionsEnum dpEnum = null; - DocsEnum dEnum = null; + PostingsEnum dpEnum = null; + PostingsEnum dEnum = null; for (String field : tv1) { System.out.println(" " + field + ":"); Terms terms3 = tv1.terms(field); @@ -396,7 +396,7 @@ public class TestStressIndexing2 extends BytesRef term2; while((term2 = termsEnum3.next()) != null) { System.out.println(" " + term2.utf8ToString() + ": freq=" + termsEnum3.totalTermFreq()); - dpEnum = termsEnum3.docsAndPositions(null, dpEnum); + dpEnum = termsEnum3.postings(null, dpEnum, PostingsEnum.FLAG_ALL); if (dpEnum != null) { assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); final int freq = dpEnum.freq(); @@ -405,7 +405,7 @@ public class TestStressIndexing2 extends System.out.println(" pos=" + dpEnum.nextPosition()); } } else { - dEnum = TestUtil.docs(random(), termsEnum3, null, dEnum, DocsEnum.FLAG_FREQS); + dEnum = TestUtil.docs(random(), termsEnum3, null, dEnum, PostingsEnum.FLAG_FREQS); assertNotNull(dEnum); assertTrue(dEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); final int freq = dEnum.freq(); @@ -418,8 +418,8 @@ public class TestStressIndexing2 extends Fields tv2 = r2.getTermVectors(id2); System.out.println(" d2=" + tv2); if (tv2 != null) { - DocsAndPositionsEnum dpEnum = null; - DocsEnum dEnum = null; + PostingsEnum dpEnum = null; + PostingsEnum dEnum = null; for (String field : tv2) { System.out.println(" " + field + ":"); Terms terms3 = tv2.terms(field); @@ -428,7 +428,7 @@ public class TestStressIndexing2 extends BytesRef term2; while((term2 = termsEnum3.next()) != null) { System.out.println(" " + term2.utf8ToString() + ": freq=" + termsEnum3.totalTermFreq()); - dpEnum = termsEnum3.docsAndPositions(null, dpEnum); + dpEnum = termsEnum3.postings(null, dpEnum, PostingsEnum.FLAG_ALL); if (dpEnum != null) { assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); final int freq = dpEnum.freq(); @@ -437,7 +437,7 @@ public class TestStressIndexing2 extends System.out.println(" pos=" + dpEnum.nextPosition()); } } else { - dEnum = TestUtil.docs(random(), termsEnum3, null, dEnum, DocsEnum.FLAG_FREQS); + dEnum = TestUtil.docs(random(), termsEnum3, null, dEnum, PostingsEnum.FLAG_FREQS); assertNotNull(dEnum); assertTrue(dEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); final int freq = dEnum.freq(); @@ -464,7 +464,7 @@ public class TestStressIndexing2 extends String field1=null, field2=null; TermsEnum termsEnum1 = null; termsEnum2 = null; - DocsEnum docs1=null, docs2=null; + PostingsEnum docs1=null, docs2=null; // pack both doc and freq into single element for easy sorting long[] info1 = new long[r1.numDocs()]; @@ -496,7 +496,7 @@ public class TestStressIndexing2 extends } //System.out.println("TEST: term1=" + term1); - docs1 = TestUtil.docs(random(), termsEnum1, liveDocs1, docs1, DocsEnum.FLAG_FREQS); + docs1 = TestUtil.docs(random(), termsEnum1, liveDocs1, docs1, PostingsEnum.FLAG_FREQS); while (docs1.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { int d = docs1.docID(); int f = docs1.freq(); @@ -529,7 +529,7 @@ public class TestStressIndexing2 extends } //System.out.println("TEST: term1=" + term1); - docs2 = TestUtil.docs(random(), termsEnum2, liveDocs2, docs2, DocsEnum.FLAG_FREQS); + docs2 = TestUtil.docs(random(), termsEnum2, liveDocs2, docs2, PostingsEnum.FLAG_FREQS); while (docs2.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { int d = r2r1[docs2.docID()]; int f = docs2.freq(); @@ -606,10 +606,10 @@ public class TestStressIndexing2 extends assertNotNull(terms2); TermsEnum termsEnum2 = terms2.iterator(null); - DocsAndPositionsEnum dpEnum1 = null; - DocsAndPositionsEnum dpEnum2 = null; - DocsEnum dEnum1 = null; - DocsEnum dEnum2 = null; + PostingsEnum dpEnum1 = null; + PostingsEnum dpEnum2 = null; + PostingsEnum dEnum1 = null; + PostingsEnum dEnum2 = null; BytesRef term1; while ((term1 = termsEnum1.next()) != null) { @@ -618,8 +618,8 @@ public class TestStressIndexing2 extends assertEquals(termsEnum1.totalTermFreq(), termsEnum2.totalTermFreq()); - dpEnum1 = termsEnum1.docsAndPositions(null, dpEnum1); - dpEnum2 = termsEnum2.docsAndPositions(null, dpEnum2); + dpEnum1 = termsEnum1.postings(null, dpEnum1, PostingsEnum.FLAG_ALL); + dpEnum2 = termsEnum2.postings(null, dpEnum2, PostingsEnum.FLAG_ALL); if (dpEnum1 != null) { assertNotNull(dpEnum2); int docID1 = dpEnum1.nextDoc(); @@ -655,8 +655,8 @@ public class TestStressIndexing2 extends assertEquals(DocIdSetIterator.NO_MORE_DOCS, dpEnum1.nextDoc()); assertEquals(DocIdSetIterator.NO_MORE_DOCS, dpEnum2.nextDoc()); } else { - dEnum1 = TestUtil.docs(random(), termsEnum1, null, dEnum1, DocsEnum.FLAG_FREQS); - dEnum2 = TestUtil.docs(random(), termsEnum2, null, dEnum2, DocsEnum.FLAG_FREQS); + dEnum1 = TestUtil.docs(random(), termsEnum1, null, dEnum1, PostingsEnum.FLAG_FREQS); + dEnum2 = TestUtil.docs(random(), termsEnum2, null, dEnum2, PostingsEnum.FLAG_FREQS); assertNotNull(dEnum1); assertNotNull(dEnum2); int docID1 = dEnum1.nextDoc(); Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java Fri Feb 6 16:39:45 2015 @@ -17,8 +17,6 @@ package org.apache.lucene.index; * limitations under the License. */ -import java.io.IOException; - import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; @@ -37,6 +35,8 @@ import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; +import java.io.IOException; + public class TestTermVectors extends LuceneTestCase { private static IndexReader reader; private static Directory directory; Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Fri Feb 6 16:39:45 2015 @@ -220,7 +220,7 @@ public class TestTermVectorsReader exten assertNotNull(vector); assertEquals(testTerms.length, vector.size()); TermsEnum termsEnum = vector.iterator(null); - DocsEnum docsEnum = null; + PostingsEnum postingsEnum = null; for (int i = 0; i < testTerms.length; i++) { final BytesRef text = termsEnum.next(); assertNotNull(text); @@ -228,12 +228,12 @@ public class TestTermVectorsReader exten //System.out.println("Term: " + term); assertEquals(testTerms[i], term); - docsEnum = TestUtil.docs(random(), termsEnum, null, docsEnum, DocsEnum.FLAG_NONE); - assertNotNull(docsEnum); - int doc = docsEnum.docID(); + postingsEnum = TestUtil.docs(random(), termsEnum, null, postingsEnum, PostingsEnum.FLAG_NONE); + assertNotNull(postingsEnum); + int doc = postingsEnum.docID(); assertEquals(-1, doc); - assertTrue(docsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); - assertEquals(DocIdSetIterator.NO_MORE_DOCS, docsEnum.nextDoc()); + assertTrue(postingsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); + assertEquals(DocIdSetIterator.NO_MORE_DOCS, postingsEnum.nextDoc()); } assertNull(termsEnum.next()); } @@ -247,7 +247,7 @@ public class TestTermVectorsReader exten assertNotNull(vector); assertEquals(testTerms.length, vector.size()); TermsEnum termsEnum = vector.iterator(null); - DocsAndPositionsEnum dpEnum = null; + PostingsEnum dpEnum = null; for (int i = 0; i < testTerms.length; i++) { final BytesRef text = termsEnum.next(); assertNotNull(text); @@ -255,7 +255,7 @@ public class TestTermVectorsReader exten //System.out.println("Term: " + term); assertEquals(testTerms[i], term); - dpEnum = termsEnum.docsAndPositions(null, dpEnum); + dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL); assertNotNull(dpEnum); int doc = dpEnum.docID(); assertEquals(-1, doc); @@ -266,7 +266,7 @@ public class TestTermVectorsReader exten } assertEquals(DocIdSetIterator.NO_MORE_DOCS, dpEnum.nextDoc()); - dpEnum = termsEnum.docsAndPositions(null, dpEnum); + dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL); doc = dpEnum.docID(); assertEquals(-1, doc); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -291,8 +291,8 @@ public class TestTermVectorsReader exten String term = text.utf8ToString(); //System.out.println("Term: " + term); assertEquals(testTerms[i], term); - assertNotNull(termsEnum.docs(null, null)); - assertNull(termsEnum.docsAndPositions(null, null)); // no pos + assertNotNull(termsEnum.postings(null, null)); + assertNull(termsEnum.postings(null, null, PostingsEnum.FLAG_ALL)); // no pos } reader.close(); } @@ -304,14 +304,14 @@ public class TestTermVectorsReader exten TermsEnum termsEnum = vector.iterator(null); assertNotNull(termsEnum); assertEquals(testTerms.length, vector.size()); - DocsAndPositionsEnum dpEnum = null; + PostingsEnum dpEnum = null; for (int i = 0; i < testTerms.length; i++) { final BytesRef text = termsEnum.next(); assertNotNull(text); String term = text.utf8ToString(); assertEquals(testTerms[i], term); - dpEnum = termsEnum.docsAndPositions(null, dpEnum); + dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL); assertNotNull(dpEnum); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(dpEnum.freq(), positions[i].length); @@ -320,7 +320,7 @@ public class TestTermVectorsReader exten } assertEquals(DocIdSetIterator.NO_MORE_DOCS, dpEnum.nextDoc()); - dpEnum = termsEnum.docsAndPositions(null, dpEnum); + dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertNotNull(dpEnum); assertEquals(dpEnum.freq(), positions[i].length); Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java Fri Feb 6 16:39:45 2015 @@ -68,7 +68,7 @@ public class TestTermVectorsWriter exten // Token "" occurred once assertEquals(1, termsEnum.totalTermFreq()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.FLAG_ALL); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); dpEnum.nextPosition(); assertEquals(8, dpEnum.startOffset()); @@ -77,7 +77,7 @@ public class TestTermVectorsWriter exten // Token "abcd" occurred three times assertEquals(new BytesRef("abcd"), termsEnum.next()); - dpEnum = termsEnum.docsAndPositions(null, dpEnum); + dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL); assertEquals(3, termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -117,7 +117,7 @@ public class TestTermVectorsWriter exten IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.FLAG_ALL); assertEquals(2, termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -152,7 +152,7 @@ public class TestTermVectorsWriter exten IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.FLAG_ALL); assertEquals(2, termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -190,7 +190,7 @@ public class TestTermVectorsWriter exten IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.FLAG_ALL); assertEquals(2, termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -225,7 +225,7 @@ public class TestTermVectorsWriter exten IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.FLAG_ALL); assertEquals(2, termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -261,7 +261,7 @@ public class TestTermVectorsWriter exten IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.FLAG_ALL); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); dpEnum.nextPosition(); @@ -269,14 +269,14 @@ public class TestTermVectorsWriter exten assertEquals(4, dpEnum.endOffset()); assertNotNull(termsEnum.next()); - dpEnum = termsEnum.docsAndPositions(null, dpEnum); + dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); dpEnum.nextPosition(); assertEquals(11, dpEnum.startOffset()); assertEquals(17, dpEnum.endOffset()); assertNotNull(termsEnum.next()); - dpEnum = termsEnum.docsAndPositions(null, dpEnum); + dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); dpEnum.nextPosition(); assertEquals(18, dpEnum.startOffset()); @@ -305,7 +305,7 @@ public class TestTermVectorsWriter exten IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.FLAG_ALL); assertEquals(1, (int) termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -314,7 +314,7 @@ public class TestTermVectorsWriter exten assertEquals(7, dpEnum.endOffset()); assertNotNull(termsEnum.next()); - dpEnum = termsEnum.docsAndPositions(null, dpEnum); + dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); dpEnum.nextPosition(); assertEquals(8, dpEnum.startOffset()); @@ -347,7 +347,7 @@ public class TestTermVectorsWriter exten IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.FLAG_ALL); assertEquals(1, (int) termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -356,7 +356,7 @@ public class TestTermVectorsWriter exten assertEquals(4, dpEnum.endOffset()); assertNotNull(termsEnum.next()); - dpEnum = termsEnum.docsAndPositions(null, dpEnum); + dpEnum = termsEnum.postings(null, dpEnum, PostingsEnum.FLAG_ALL); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); dpEnum.nextPosition(); assertEquals(6, dpEnum.startOffset()); Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java Fri Feb 6 16:39:45 2015 @@ -119,11 +119,11 @@ public class TestTermdocPerf extends Luc start = System.currentTimeMillis(); int ret=0; - DocsEnum tdocs = null; + PostingsEnum tdocs = null; final Random random = new Random(random().nextLong()); for (int i=0; i getChildren() { - throw new UnsupportedOperationException(); - } - } - @Override public Explanation explain(IndexSearcher searcher, Explanation firstPassExplanation, int docID) throws IOException { Explanation result = super.explain(searcher, firstPassExplanation, docID); Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysQuery.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysQuery.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysQuery.java (original) +++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysQuery.java Fri Feb 6 16:39:45 2015 @@ -19,8 +19,9 @@ package org.apache.lucene.facet; import java.io.IOException; import java.util.Arrays; -import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.BulkScorer; import org.apache.lucene.search.Collector; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; @@ -29,10 +30,8 @@ import org.apache.lucene.search.Filter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.Scorer; -import org.apache.lucene.search.BulkScorer; import org.apache.lucene.search.Weight; import org.apache.lucene.util.Bits; - /** Only purpose is to punch through and return a * DrillSidewaysScorer */ Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java (original) +++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java Fri Feb 6 16:39:45 2015 @@ -21,15 +21,16 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; +import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.DocsEnum; -import org.apache.lucene.search.LeafCollector; +import org.apache.lucene.search.BulkScorer; import org.apache.lucene.search.Collector; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.LeafCollector; import org.apache.lucene.search.Scorer; -import org.apache.lucene.search.BulkScorer; import org.apache.lucene.search.Weight; import org.apache.lucene.util.Bits; +import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; class DrillSidewaysScorer extends BulkScorer { @@ -173,7 +174,7 @@ class DrillSidewaysScorer extends BulkSc //} int docID = baseScorer.docID(); - nextDoc: while (docID != DocsEnum.NO_MORE_DOCS) { + nextDoc: while (docID != PostingsEnum.NO_MORE_DOCS) { LeafCollector failedCollector = null; for (int i=0;i getChildren() { - throw new UnsupportedOperationException(); - } - } - private final void sumValues(List matchingDocs, boolean keepScores, ValueSource valueSource) throws IOException { final FakeScorer scorer = new FakeScorer(); Map context = new HashMap<>(); @@ -104,7 +80,7 @@ public class TaxonomyFacetSumValueSource while ((doc = docs.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { ords.get(doc, scratch); if (keepScores) { - scorer.docID = doc; + scorer.doc = doc; scorer.score = scores[scoresIdx++]; } float value = (float) functionValues.doubleVal(doc); Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java (original) +++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java Fri Feb 6 16:39:45 2015 @@ -13,7 +13,7 @@ import org.apache.lucene.facet.taxonomy. import org.apache.lucene.facet.taxonomy.TaxonomyReader; import org.apache.lucene.index.CorruptIndexException; // javadocs import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MultiFields; import org.apache.lucene.search.DocIdSetIterator; @@ -273,7 +273,7 @@ public class DirectoryTaxonomyReader ext // If we're still here, we have a cache miss. We need to fetch the // value from disk, and then also put it in the cache: int ret = TaxonomyReader.INVALID_ORDINAL; - DocsEnum docs = MultiFields.getTermDocsEnum(indexReader, null, Consts.FULL, new BytesRef(FacetsConfig.pathToString(cp.components, cp.length)), 0); + PostingsEnum docs = MultiFields.getTermDocsEnum(indexReader, null, Consts.FULL, new BytesRef(FacetsConfig.pathToString(cp.components, cp.length)), 0); if (docs != null && docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { ret = docs.docID(); Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original) +++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Fri Feb 6 16:39:45 2015 @@ -28,7 +28,7 @@ import org.apache.lucene.facet.taxonomy. import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache; import org.apache.lucene.index.CorruptIndexException; // javadocs import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -382,14 +382,14 @@ public class DirectoryTaxonomyWriter imp try { final BytesRef catTerm = new BytesRef(FacetsConfig.pathToString(categoryPath.components, categoryPath.length)); TermsEnum termsEnum = null; // reuse - DocsEnum docs = null; // reuse + PostingsEnum docs = null; // reuse for (LeafReaderContext ctx : reader.leaves()) { Terms terms = ctx.reader().terms(Consts.FULL); if (terms != null) { termsEnum = terms.iterator(termsEnum); if (termsEnum.seekExact(catTerm)) { // liveDocs=null because the taxonomy has no deletes - docs = termsEnum.docs(null, docs, 0 /* freqs not required */); + docs = termsEnum.postings(null, docs, 0 /* freqs not required */); // if the term was found, we know it has exactly one document. doc = docs.nextDoc() + ctx.docBase; break; @@ -675,7 +675,7 @@ public class DirectoryTaxonomyWriter imp DirectoryReader reader = readerManager.acquire(); try { TermsEnum termsEnum = null; - DocsEnum docsEnum = null; + PostingsEnum postingsEnum = null; for (LeafReaderContext ctx : reader.leaves()) { Terms terms = ctx.reader().terms(Consts.FULL); if (terms != null) { // cannot really happen, but be on the safe side @@ -689,8 +689,8 @@ public class DirectoryTaxonomyWriter imp // is sufficient to call next(), and then doc(), exactly once with no // 'validation' checks. FacetLabel cp = new FacetLabel(FacetsConfig.stringToPath(t.utf8ToString())); - docsEnum = termsEnum.docs(null, docsEnum, DocsEnum.FLAG_NONE); - boolean res = cache.put(cp, docsEnum.nextDoc() + ctx.docBase); + postingsEnum = termsEnum.postings(null, postingsEnum, PostingsEnum.FLAG_NONE); + boolean res = cache.put(cp, postingsEnum.nextDoc() + ctx.docBase); assert !res : "entries should not have been evicted from the cache"; } else { // the cache is full and the next put() will evict entries from it, therefore abort the iteration. @@ -771,7 +771,7 @@ public class DirectoryTaxonomyWriter imp ordinalMap.setSize(size); int base = 0; TermsEnum te = null; - DocsEnum docs = null; + PostingsEnum docs = null; for (final LeafReaderContext ctx : r.leaves()) { final LeafReader ar = ctx.reader(); final Terms terms = ar.terms(Consts.FULL); @@ -779,7 +779,7 @@ public class DirectoryTaxonomyWriter imp while (te.next() != null) { FacetLabel cp = new FacetLabel(FacetsConfig.stringToPath(te.term().utf8ToString())); final int ordinal = addCategory(cp); - docs = te.docs(null, docs, DocsEnum.FLAG_NONE); + docs = te.postings(null, docs, PostingsEnum.FLAG_NONE); ordinalMap.addMapping(docs.nextDoc() + base, ordinal); } base += ar.maxDoc(); // no deletions, so we're ok Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java?rev=1657890&r1=1657889&r2=1657890&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java (original) +++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java Fri Feb 6 16:39:45 2015 @@ -1,16 +1,16 @@ package org.apache.lucene.facet.taxonomy.directory; -import java.io.IOException; - import org.apache.lucene.facet.taxonomy.ParallelTaxonomyArrays; import org.apache.lucene.facet.taxonomy.TaxonomyReader; import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiFields; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.util.ArrayUtil; +import java.io.IOException; + /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -129,9 +129,9 @@ class TaxonomyIndexArrays extends Parall // it's ok to use MultiFields because we only iterate on one posting list. // breaking it to loop over the leaves() only complicates code for no // apparent gain. - DocsAndPositionsEnum positions = MultiFields.getTermPositionsEnum(reader, null, + PostingsEnum positions = MultiFields.getTermPositionsEnum(reader, null, Consts.FIELD_PAYLOADS, Consts.PAYLOAD_PARENT_BYTES_REF, - DocsAndPositionsEnum.FLAG_PAYLOADS); + PostingsEnum.FLAG_PAYLOADS); // shouldn't really happen, if it does, something's wrong if (positions == null || positions.advance(first) == DocIdSetIterator.NO_MORE_DOCS) {