Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 77597 invoked from network); 24 May 2008 01:17:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 May 2008 01:17:07 -0000 Received: (qmail 91400 invoked by uid 500); 24 May 2008 01:17:08 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 91375 invoked by uid 500); 24 May 2008 01:17:08 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 91366 invoked by uid 99); 24 May 2008 01:17:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2008 18:17:08 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 24 May 2008 01:16:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BDDE523889FF; Fri, 23 May 2008 18:16:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r659740 - in /lucene/java/trunk: contrib/miscellaneous/src/test/org/apache/lucene/misc/ contrib/queries/src/test/org/apache/lucene/search/ src/test/org/apache/lucene/search/ Date: Sat, 24 May 2008 01:16:33 -0000 To: java-commits@lucene.apache.org From: buschmi@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080524011634.BDDE523889FF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: buschmi Date: Fri May 23 18:16:30 2008 New Revision: 659740 URL: http://svn.apache.org/viewvc?rev=659740&view=rev Log: LUCENE-1187: Fix ChainedFilterTest.java and BooleanFilterTest.java to not reference class from test/org/apache/lucene/search/, which is not in the contrib classpath. Removed: lucene/java/trunk/src/test/org/apache/lucene/search/OldBitSetFilterWrapper.java Modified: lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java (contents, props changed) lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (contents, props changed) Modified: lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java?rev=659740&r1=659739&r2=659740&view=diff ============================================================================== --- lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java (original) +++ lucene/java/trunk/contrib/miscellaneous/src/test/org/apache/lucene/misc/ChainedFilterTest.java Fri May 23 18:16:30 2008 @@ -22,6 +22,8 @@ import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; + +import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexWriter.MaxFieldLength; @@ -89,7 +91,18 @@ private Filter[] getChainWithOldFilters(Filter[] chain) { Filter[] oldFilters = new Filter[chain.length]; for (int i = 0; i < chain.length; i++) { - oldFilters[i] = new OldBitSetFilterWrapper(chain[i]); + final Filter f = chain[i]; + // create old BitSet-based Filter as wrapper + oldFilters[i] = new Filter() { + public BitSet bits(IndexReader reader) throws IOException { + BitSet bits = new BitSet(reader.maxDoc()); + DocIdSetIterator it = f.getDocIdSet(reader).iterator(); + while(it.next()) { + bits.set(it.doc()); + } + return bits; + } + }; } return oldFilters; } Modified: lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java?rev=659740&r1=659739&r2=659740&view=diff ============================================================================== --- lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (original) +++ lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java Fri May 23 18:16:30 2008 @@ -67,11 +67,26 @@ writer.addDocument(doc); } + private Filter getOldBitSetFilter(final Filter filter) { + + return new Filter() { + public BitSet bits(IndexReader reader) throws IOException { + BitSet bits = new BitSet(reader.maxDoc()); + DocIdSetIterator it = filter.getDocIdSet(reader).iterator(); + while(it.next()) { + bits.set(it.doc()); + } + return bits; + } + }; + } + + private Filter getRangeFilter(String field,String lowerPrice, String upperPrice, boolean old) { Filter f = new RangeFilter(field,lowerPrice,upperPrice,true,true); if (old) { - return new OldBitSetFilterWrapper(f); + return getOldBitSetFilter(f); } return f; @@ -81,7 +96,7 @@ TermsFilter tf=new TermsFilter(); tf.addTerm(new Term(field,text)); if (old) { - return new OldBitSetFilterWrapper(tf); + return getOldBitSetFilter(tf); } return tf; Modified: lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java?rev=659740&r1=659739&r2=659740&view=diff ============================================================================== --- lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java (original) +++ lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java Fri May 23 18:16:30 2008 @@ -1,165 +1,165 @@ -package org.apache.lucene.search; - -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.IOException; -import java.util.HashSet; - -import junit.framework.TestCase; - -import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermDocs; -import org.apache.lucene.store.RAMDirectory; - -public class DuplicateFilterTest extends TestCase -{ - private static final String KEY_FIELD = "url"; - private RAMDirectory directory; - private IndexReader reader; - TermQuery tq=new TermQuery(new Term("text","lucene")); - private IndexSearcher searcher; - - protected void setUp() throws Exception - { - directory = new RAMDirectory(); - IndexWriter writer = new IndexWriter(directory, new StandardAnalyzer(), true); - - //Add series of docs with filterable fields : url, text and dates flags - addDoc(writer, "http://lucene.apache.org", "lucene 1.4.3 available", "20040101"); - addDoc(writer, "http://lucene.apache.org", "New release pending", "20040102"); - addDoc(writer, "http://lucene.apache.org", "Lucene 1.9 out now", "20050101"); - addDoc(writer, "http://www.bar.com", "Local man bites dog", "20040101"); - addDoc(writer, "http://www.bar.com", "Dog bites local man", "20040102"); - addDoc(writer, "http://www.bar.com", "Dog uses Lucene", "20050101"); - addDoc(writer, "http://lucene.apache.org", "Lucene 2.0 out", "20050101"); - addDoc(writer, "http://lucene.apache.org", "Oops. Lucene 2.1 out", "20050102"); - - writer.close(); - reader=IndexReader.open(directory); - searcher =new IndexSearcher(reader); - - } - - protected void tearDown() throws Exception - { - reader.close(); - searcher.close(); - directory.close(); - } - - private void addDoc(IndexWriter writer, String url, String text, String date) throws IOException - { - Document doc=new Document(); - doc.add(new Field(KEY_FIELD,url,Field.Store.YES,Field.Index.UN_TOKENIZED)); - doc.add(new Field("text",text,Field.Store.YES,Field.Index.TOKENIZED)); - doc.add(new Field("date",date,Field.Store.YES,Field.Index.TOKENIZED)); - writer.addDocument(doc); - } - - public void testDefaultFilter() throws Throwable - { - DuplicateFilter df=new DuplicateFilter(KEY_FIELD); - HashSet results=new HashSet(); - Hits h = searcher.search(tq,df); - for(int i=0;i0); - boolean dupsFound=false; - for(int i=0;i0); - for(int i=0;i0); - for(int i=0;i0); - for(int i=0;i0); + boolean dupsFound=false; + for(int i=0;i0); + for(int i=0;i0); + for(int i=0;i0); + for(int i=0;i