Index: modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java =================================================================== --- modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (revision 1135779) +++ modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (working copy) @@ -136,9 +136,6 @@ final String printHitsField = getRunData().getConfig().get("print.hits.field", null); if (hits != null && printHitsField != null && printHitsField.length() > 0) { - if (q instanceof MultiTermQuery) { - System.out.println("MultiTermQuery term count = " + ((MultiTermQuery) q).getTotalNumberOfTerms()); - } System.out.println("totalHits = " + hits.totalHits); System.out.println("maxDoc() = " + reader.maxDoc()); System.out.println("numDocs() = " + reader.numDocs()); Index: lucene/contrib/queries/src/java/org/apache/lucene/search/FieldCacheRewriteMethod.java =================================================================== --- lucene/contrib/queries/src/java/org/apache/lucene/search/FieldCacheRewriteMethod.java (revision 1135779) +++ lucene/contrib/queries/src/java/org/apache/lucene/search/FieldCacheRewriteMethod.java (working copy) @@ -82,29 +82,6 @@ public final String getField() { return query.getField(); } /** - * Expert: Return the number of unique terms visited during execution of the filter. - * If there are many of them, you may consider using another filter type - * or optimize your total term count in index. - *

This method is not thread safe, be sure to only call it when no filter is running! - * If you re-use the same filter instance for another - * search, be sure to first reset the term counter - * with {@link #clearTotalNumberOfTerms}. - * @see #clearTotalNumberOfTerms - */ - public int getTotalNumberOfTerms() { - return query.getTotalNumberOfTerms(); - } - - /** - * Expert: Resets the counting of unique terms. - * Do this before executing the filter. - * @see #getTotalNumberOfTerms - */ - public void clearTotalNumberOfTerms() { - query.clearTotalNumberOfTerms(); - } - - /** * Returns a DocIdSet with documents that should be permitted in search * results. */ @@ -141,8 +118,6 @@ termCount++; } } while (termsEnum.next() != null); - - query.incTotalNumberOfTerms(termCount); } else { return DocIdSet.EMPTY_DOCIDSET; } Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (revision 1135779) +++ lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (working copy) @@ -118,35 +118,27 @@ int lower=(distance*3/2)+startOffset, upper=lower + count*distance + (distance/3); NumericRangeQuery q = NumericRangeQuery.newIntRange(field, precisionStep, lower, upper, true, true); NumericRangeFilter f = NumericRangeFilter.newIntRange(field, precisionStep, lower, upper, true, true); - int lastTerms = 0; for (byte i=0; i<3; i++) { TopDocs topDocs; - int terms; String type; - q.clearTotalNumberOfTerms(); - f.clearTotalNumberOfTerms(); switch (i) { case 0: type = " (constant score filter rewrite)"; q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE); topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); - terms = q.getTotalNumberOfTerms(); break; case 1: type = " (constant score boolean rewrite)"; q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE); topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); - terms = q.getTotalNumberOfTerms(); break; case 2: type = " (filter)"; topDocs = searcher.search(new MatchAllDocsQuery(), f, noDocs, Sort.INDEXORDER); - terms = f.getTotalNumberOfTerms(); break; default: return; } - if (VERBOSE) System.out.println("Found "+terms+" distinct terms in range for field '"+field+"'"+type+"."); ScoreDoc[] sd = topDocs.scoreDocs; assertNotNull(sd); assertEquals("Score doc count"+type, count, sd.length ); @@ -154,12 +146,6 @@ assertEquals("First doc"+type, 2*distance+startOffset, Integer.parseInt(doc.get(field)) ); doc=searcher.doc(sd[sd.length-1].doc); assertEquals("Last doc"+type, (1+count)*distance+startOffset, Integer.parseInt(doc.get(field)) ); - if (i>0 && - (searcher.getIndexReader().getSequentialSubReaders() == null || - searcher.getIndexReader().getSequentialSubReaders().length == 1)) { - assertEquals("Distinct term number is equal for all query types", lastTerms, terms); - } - lastTerms = terms; } } @@ -207,7 +193,6 @@ int upper=(count-1)*distance + (distance/3) + startOffset; NumericRangeQuery q=NumericRangeQuery.newIntRange(field, precisionStep, null, upper, true, true); TopDocs topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); - if (VERBOSE) System.out.println("Found "+q.getTotalNumberOfTerms()+" distinct terms in left open range for field '"+field+"'."); ScoreDoc[] sd = topDocs.scoreDocs; assertNotNull(sd); assertEquals("Score doc count", count, sd.length ); @@ -248,7 +233,6 @@ int lower=(count-1)*distance + (distance/3) +startOffset; NumericRangeQuery q=NumericRangeQuery.newIntRange(field, precisionStep, lower, null, true, true); TopDocs topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); - if (VERBOSE) System.out.println("Found "+q.getTotalNumberOfTerms()+" distinct terms in right open range for field '"+field+"'."); ScoreDoc[] sd = topDocs.scoreDocs; assertNotNull(sd); assertEquals("Score doc count", noDocs-count, sd.length ); @@ -335,7 +319,6 @@ private void testRandomTrieAndClassicRangeQuery(int precisionStep) throws Exception { String field="field"+precisionStep; - int termCountT=0,termCountC=0; int num = atLeast(10); for (int i = 0; i < num; i++) { int lower=(int)(random.nextDouble()*noDocs*distance)+startOffset; @@ -353,42 +336,25 @@ TopDocs tTopDocs = searcher.search(tq, 1); TopDocs cTopDocs = searcher.search(cq, 1); assertEquals("Returned count for NumericRangeQuery and TermRangeQuery must be equal", cTopDocs.totalHits, tTopDocs.totalHits ); - termCountT += tq.getTotalNumberOfTerms(); - termCountC += cq.getTotalNumberOfTerms(); // test exclusive range tq=NumericRangeQuery.newIntRange(field, precisionStep, lower, upper, false, false); cq=new TermRangeQuery(field, lowerBytes, upperBytes, false, false); tTopDocs = searcher.search(tq, 1); cTopDocs = searcher.search(cq, 1); assertEquals("Returned count for NumericRangeQuery and TermRangeQuery must be equal", cTopDocs.totalHits, tTopDocs.totalHits ); - termCountT += tq.getTotalNumberOfTerms(); - termCountC += cq.getTotalNumberOfTerms(); // test left exclusive range tq=NumericRangeQuery.newIntRange(field, precisionStep, lower, upper, false, true); cq=new TermRangeQuery(field, lowerBytes, upperBytes, false, true); tTopDocs = searcher.search(tq, 1); cTopDocs = searcher.search(cq, 1); assertEquals("Returned count for NumericRangeQuery and TermRangeQuery must be equal", cTopDocs.totalHits, tTopDocs.totalHits ); - termCountT += tq.getTotalNumberOfTerms(); - termCountC += cq.getTotalNumberOfTerms(); // test right exclusive range tq=NumericRangeQuery.newIntRange(field, precisionStep, lower, upper, true, false); cq=new TermRangeQuery(field, lowerBytes, upperBytes, true, false); tTopDocs = searcher.search(tq, 1); cTopDocs = searcher.search(cq, 1); assertEquals("Returned count for NumericRangeQuery and TermRangeQuery must be equal", cTopDocs.totalHits, tTopDocs.totalHits ); - termCountT += tq.getTotalNumberOfTerms(); - termCountC += cq.getTotalNumberOfTerms(); } - if (precisionStep == Integer.MAX_VALUE && - (searcher.getIndexReader().getSequentialSubReaders() == null || - searcher.getIndexReader().getSequentialSubReaders().length == 1)) { - assertEquals("Total number of terms should be equal for unlimited precStep", termCountT, termCountC); - } else if (VERBOSE) { - System.out.println("Average number of terms during random search on '" + field + "':"); - System.out.println(" Trie query: " + (((double)termCountT)/(num * 4))); - System.out.println(" Classical query: " + (((double)termCountC)/(num * 4))); - } } @Test Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (revision 1135779) +++ lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (working copy) @@ -118,35 +118,27 @@ long lower=(distance*3/2)+startOffset, upper=lower + count*distance + (distance/3); NumericRangeQuery q = NumericRangeQuery.newLongRange(field, precisionStep, lower, upper, true, true); NumericRangeFilter f = NumericRangeFilter.newLongRange(field, precisionStep, lower, upper, true, true); - int lastTerms = 0; for (byte i=0; i<3; i++) { TopDocs topDocs; - int terms; String type; - q.clearTotalNumberOfTerms(); - f.clearTotalNumberOfTerms(); switch (i) { case 0: type = " (constant score filter rewrite)"; q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE); topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); - terms = q.getTotalNumberOfTerms(); break; case 1: type = " (constant score boolean rewrite)"; q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE); topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); - terms = q.getTotalNumberOfTerms(); break; case 2: type = " (filter)"; topDocs = searcher.search(new MatchAllDocsQuery(), f, noDocs, Sort.INDEXORDER); - terms = f.getTotalNumberOfTerms(); break; default: return; } - if (VERBOSE) System.out.println("Found "+terms+" distinct terms in range for field '"+field+"'"+type+"."); ScoreDoc[] sd = topDocs.scoreDocs; assertNotNull(sd); assertEquals("Score doc count"+type, count, sd.length ); @@ -154,12 +146,6 @@ assertEquals("First doc"+type, 2*distance+startOffset, Long.parseLong(doc.get(field)) ); doc=searcher.doc(sd[sd.length-1].doc); assertEquals("Last doc"+type, (1+count)*distance+startOffset, Long.parseLong(doc.get(field)) ); - if (i>0 && - (searcher.getIndexReader().getSequentialSubReaders() == null || - searcher.getIndexReader().getSequentialSubReaders().length == 1)) { - assertEquals("Distinct term number is equal for all query types", lastTerms, terms); - } - lastTerms = terms; } } @@ -213,7 +199,6 @@ long upper=(count-1)*distance + (distance/3) + startOffset; NumericRangeQuery q=NumericRangeQuery.newLongRange(field, precisionStep, null, upper, true, true); TopDocs topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); - if (VERBOSE) System.out.println("Found "+q.getTotalNumberOfTerms()+" distinct terms in left open range for field '"+field+"'."); ScoreDoc[] sd = topDocs.scoreDocs; assertNotNull(sd); assertEquals("Score doc count", count, sd.length ); @@ -259,7 +244,6 @@ long lower=(count-1)*distance + (distance/3) +startOffset; NumericRangeQuery q=NumericRangeQuery.newLongRange(field, precisionStep, lower, null, true, true); TopDocs topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); - if (VERBOSE) System.out.println("Found "+q.getTotalNumberOfTerms()+" distinct terms in right open range for field '"+field+"'."); ScoreDoc[] sd = topDocs.scoreDocs; assertNotNull(sd); assertEquals("Score doc count", noDocs-count, sd.length ); @@ -352,7 +336,6 @@ private void testRandomTrieAndClassicRangeQuery(int precisionStep) throws Exception { String field="field"+precisionStep; - int termCountT=0,termCountC=0; int num = atLeast(10); for (int i = 0; i < num; i++) { long lower=(long)(random.nextDouble()*noDocs*distance)+startOffset; @@ -370,42 +353,25 @@ TopDocs tTopDocs = searcher.search(tq, 1); TopDocs cTopDocs = searcher.search(cq, 1); assertEquals("Returned count for NumericRangeQuery and TermRangeQuery must be equal", cTopDocs.totalHits, tTopDocs.totalHits ); - termCountT += tq.getTotalNumberOfTerms(); - termCountC += cq.getTotalNumberOfTerms(); // test exclusive range tq=NumericRangeQuery.newLongRange(field, precisionStep, lower, upper, false, false); cq=new TermRangeQuery(field, lowerBytes, upperBytes, false, false); tTopDocs = searcher.search(tq, 1); cTopDocs = searcher.search(cq, 1); assertEquals("Returned count for NumericRangeQuery and TermRangeQuery must be equal", cTopDocs.totalHits, tTopDocs.totalHits ); - termCountT += tq.getTotalNumberOfTerms(); - termCountC += cq.getTotalNumberOfTerms(); // test left exclusive range tq=NumericRangeQuery.newLongRange(field, precisionStep, lower, upper, false, true); cq=new TermRangeQuery(field, lowerBytes, upperBytes, false, true); tTopDocs = searcher.search(tq, 1); cTopDocs = searcher.search(cq, 1); assertEquals("Returned count for NumericRangeQuery and TermRangeQuery must be equal", cTopDocs.totalHits, tTopDocs.totalHits ); - termCountT += tq.getTotalNumberOfTerms(); - termCountC += cq.getTotalNumberOfTerms(); // test right exclusive range tq=NumericRangeQuery.newLongRange(field, precisionStep, lower, upper, true, false); cq=new TermRangeQuery(field, lowerBytes, upperBytes, true, false); tTopDocs = searcher.search(tq, 1); cTopDocs = searcher.search(cq, 1); assertEquals("Returned count for NumericRangeQuery and TermRangeQuery must be equal", cTopDocs.totalHits, tTopDocs.totalHits ); - termCountT += tq.getTotalNumberOfTerms(); - termCountC += cq.getTotalNumberOfTerms(); } - if (precisionStep == Integer.MAX_VALUE && - (searcher.getIndexReader().getSequentialSubReaders() == null || - searcher.getIndexReader().getSequentialSubReaders().length == 1)) { - assertEquals("Total number of terms should be equal for unlimited precStep", termCountT, termCountC); - } else if (VERBOSE) { - System.out.println("Average number of terms during random search on '" + field + "':"); - System.out.println(" Trie query: " + (((double)termCountT)/(num * 4))); - System.out.println(" Classical query: " + (((double)termCountC)/(num * 4))); - } } @Test Index: lucene/src/java/org/apache/lucene/search/ScoringRewrite.java =================================================================== --- lucene/src/java/org/apache/lucene/search/ScoringRewrite.java (revision 1135779) +++ lucene/src/java/org/apache/lucene/search/ScoringRewrite.java (working copy) @@ -126,7 +126,6 @@ addClause(result, term, termStates[pos].docFreq(), query.getBoost() * boost[pos], termStates[pos]); } } - query.incTotalNumberOfTerms(size); return result; } Index: lucene/src/java/org/apache/lucene/search/MultiTermQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/MultiTermQuery.java (revision 1135779) +++ lucene/src/java/org/apache/lucene/search/MultiTermQuery.java (working copy) @@ -269,38 +269,6 @@ return getTermsEnum(terms, new AttributeSource()); } - /** - * Expert: Return the number of unique terms visited during execution of the query. - * If there are many of them, you may consider using another query type - * or optimize your total term count in index. - *

This method is not thread safe, be sure to only call it when no query is running! - * If you re-use the same query instance for another - * search, be sure to first reset the term counter - * with {@link #clearTotalNumberOfTerms}. - *

On optimized indexes / no MultiReaders, you get the correct number of - * unique terms for the whole index. Use this number to compare different queries. - * For non-optimized indexes this number can also be achieved in - * non-constant-score mode. In constant-score mode you get the total number of - * terms seeked for all segments / sub-readers. - * @see #clearTotalNumberOfTerms - */ - public int getTotalNumberOfTerms() { - return numberOfTerms; - } - - /** - * Expert: Resets the counting of unique terms. - * Do this before executing the query/filter. - * @see #getTotalNumberOfTerms - */ - public void clearTotalNumberOfTerms() { - numberOfTerms = 0; - } - - protected void incTotalNumberOfTerms(int inc) { - numberOfTerms += inc; - } - @Override public Query rewrite(IndexReader reader) throws IOException { return rewriteMethod.rewrite(reader, this); Index: lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (revision 1135779) +++ lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (working copy) @@ -78,29 +78,6 @@ public final String getField() { return query.getField(); } /** - * Expert: Return the number of unique terms visited during execution of the filter. - * If there are many of them, you may consider using another filter type - * or optimize your total term count in index. - *

This method is not thread safe, be sure to only call it when no filter is running! - * If you re-use the same filter instance for another - * search, be sure to first reset the term counter - * with {@link #clearTotalNumberOfTerms}. - * @see #clearTotalNumberOfTerms - */ - public int getTotalNumberOfTerms() { - return query.getTotalNumberOfTerms(); - } - - /** - * Expert: Resets the counting of unique terms. - * Do this before executing the filter. - * @see #getTotalNumberOfTerms - */ - public void clearTotalNumberOfTerms() { - query.clearTotalNumberOfTerms(); - } - - /** * Returns a DocIdSet with documents that should be permitted in search * results. */ @@ -147,7 +124,6 @@ } while (termsEnum.next() != null); // System.out.println(" done termCount=" + termCount); - query.incTotalNumberOfTerms(termCount); return bitSet; } else { return DocIdSet.EMPTY_DOCIDSET; Index: lucene/src/java/org/apache/lucene/search/TopTermsRewrite.java =================================================================== --- lucene/src/java/org/apache/lucene/search/TopTermsRewrite.java (revision 1135779) +++ lucene/src/java/org/apache/lucene/search/TopTermsRewrite.java (working copy) @@ -140,7 +140,6 @@ assert reader.docFreq(term) == st.termState.docFreq() : "reader DF is " + reader.docFreq(term) + " vs " + st.termState.docFreq(); addClause(q, term, st.termState.docFreq(), query.getBoost() * st.boost, st.termState); // add to query } - query.incTotalNumberOfTerms(scoreTerms.length); return q; } Index: lucene/src/java/org/apache/lucene/search/ConstantScoreAutoRewrite.java =================================================================== --- lucene/src/java/org/apache/lucene/search/ConstantScoreAutoRewrite.java (revision 1135779) +++ lucene/src/java/org/apache/lucene/search/ConstantScoreAutoRewrite.java (working copy) @@ -112,7 +112,6 @@ // Strip scores final Query result = new ConstantScoreQuery(bq); result.setBoost(query.getBoost()); - query.incTotalNumberOfTerms(size); return result; } }