Return-Path: Delivered-To: apmail-lucene-java-dev-archive@www.apache.org Received: (qmail 80782 invoked from network); 10 Mar 2010 18:39:29 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Mar 2010 18:39:29 -0000 Received: (qmail 56013 invoked by uid 500); 10 Mar 2010 18:38:58 -0000 Delivered-To: apmail-lucene-java-dev-archive@lucene.apache.org Received: (qmail 55975 invoked by uid 500); 10 Mar 2010 18:38:58 -0000 Mailing-List: contact java-dev-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-dev@lucene.apache.org Received: (qmail 55968 invoked by uid 99); 10 Mar 2010 18:38:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Mar 2010 18:38:58 +0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of rcmuir@gmail.com designates 74.125.92.24 as permitted sender) Received: from [74.125.92.24] (HELO qw-out-2122.google.com) (74.125.92.24) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Mar 2010 18:38:48 +0000 Received: by qw-out-2122.google.com with SMTP id 5so2291350qwd.53 for ; Wed, 10 Mar 2010 10:38:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:content-type :content-transfer-encoding; bh=xqr8IZvVUqTZHo7XjZWUu2Y82zZ9/+ZZ2FXtE1LO74s=; b=tlh8yg+HnJnthr+a78HzxAxxnvPu26+g1GFrRWmeFT7kJNgcWdqD4w5zMQv8RmPkq2 akC6S9TiSueuLacKj2NluT71V/4HJnTMdiLxZ4CDNAsTzKCasz+uFs9TgTGKI+OOOAdC zz+Hm2lUceo7UIll5bIOaeBXZNIPBIfxV6Wmg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type:content-transfer-encoding; b=Xl5Hgna1LrbK0833g0MKSFOvEN9JAQuZaIfiSz0H7Es25XLtjs9pZw/PuXV5uKKX11 3yVK49oWnMqeff0vTht4IOB5t9TBTLEZz01exxqP1v6UHibpuqM5uSfw1hN7noSkWQpO nis/+1F/LIlRZDMrHnPN47zptTfdkSpOSbCxc= MIME-Version: 1.0 Received: by 10.220.122.74 with SMTP id k10mr155612vcr.163.1268246307140; Wed, 10 Mar 2010 10:38:27 -0800 (PST) In-Reply-To: <9ac0c6aa1003101037x3aed4f58s36dcf5d415cf4361@mail.gmail.com> References: <8f0ad1f31003101031w39eb1ec4ma81c94149293dc75@mail.gmail.com> <9ac0c6aa1003101037x3aed4f58s36dcf5d415cf4361@mail.gmail.com> From: Robert Muir Date: Wed, 10 Mar 2010 13:38:07 -0500 Message-ID: <8f0ad1f31003101038wa2ca529l11f1950f6ab0fa0a@mail.gmail.com> Subject: Re: svn commit: r921480 [1/8] - in /lucene/java/trunk: ./ contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/ contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ contrib/ant/src/java/org/apache/lucene/ant/ contrib/be To: java-dev@lucene.apache.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org I'm really sorry i wasn't paying attention and didn't notice earlier, you did give adequate warning... On Wed, Mar 10, 2010 at 1:37 PM, Michael McCandless wrote: > Good question =C2=A0-- I'll reopen the issue. =C2=A0Let's discuss there..= . > > Mike > > On Wed, Mar 10, 2010 at 1:31 PM, Robert Muir wrote: >> I think it would be good to discuss further about 'defaulting to >> WhitespaceAnalyzer' here. >> >> in my opinion the user should have to turn on their brain and decide >> how to index their text. >> >> On Wed, Mar 10, 2010 at 12:53 PM, =C2=A0 wrote: >>> Author: mikemccand >>> Date: Wed Mar 10 17:53:46 2010 >>> New Revision: 921480 >>> >>> URL: http://svn.apache.org/viewvc?rev=3D921480&view=3Drev >>> Log: >>> LUCENE-2294: cutover to IndexWriterConfig object for settings to IW >>> >>> Modified: >>> =C2=A0 =C2=A0lucene/java/trunk/CHANGES.txt >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/analyzers/common/src/test/org/ap= ache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/analyzers/common/src/test/org/ap= ache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/a= nt/IndexTask.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/benchmark/src/java/org/apache/lu= cene/benchmark/byTask/tasks/CreateIndexTask.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/benchmark/src/java/org/apache/lu= cene/benchmark/byTask/tasks/OpenIndexTask.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/benchmark/src/test/org/apache/lu= cene/benchmark/byTask/TestPerfTasksLogic.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/fast-vector-highlighter/src/java= /org/apache/lucene/search/vectorhighlight/FieldTermStack.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/fast-vector-highlighter/src/test= /org/apache/lucene/search/vectorhighlight/AbstractTestCase.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/fast-vector-highlighter/src/test= /org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/highlighter/src/test/org/apache/= lucene/search/highlight/HighlighterPhraseTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/highlighter/src/test/org/apache/= lucene/search/highlight/HighlighterTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/instantiated/src/test/org/apache= /lucene/store/instantiated/TestEmptyIndex.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/instantiated/src/test/org/apache= /lucene/store/instantiated/TestIndicesEquals.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/instantiated/src/test/org/apache= /lucene/store/instantiated/TestSerialization.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/instantiated/src/test/org/apache= /lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/lucli/src/java/lucli/LuceneMetho= ds.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/memory/src/test/org/apache/lucen= e/index/memory/MemoryIndexTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/= index/MultiPassIndexSplitter.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/= misc/IndexMergeTool.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/= index/TestFieldNormModifier.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/= index/TestIndexSplitter.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/= index/TestMultiPassIndexSplitter.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/= index/TestTermVectorAccessor.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/= misc/ChainedFilterTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/= misc/TestLengthNormModifier.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/= queryParser/complexPhrase/TestComplexPhraseQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/queries/src/test/org/apache/luce= ne/search/BooleanFilterTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/queries/src/test/org/apache/luce= ne/search/DuplicateFilterTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/queries/src/test/org/apache/luce= ne/search/FuzzyLikeThisQueryTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/queries/src/test/org/apache/luce= ne/search/TermsFilterTest.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/queries/src/test/org/apache/luce= ne/search/similar/TestMoreLikeThis.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/queryparser/src/test/org/apache/= lucene/queryParser/standard/TestMultiFieldQPHelper.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/queryparser/src/test/org/apache/= lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/queryparser/src/test/org/apache/= lucene/queryParser/standard/TestQPHelper.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/queryparser/src/test/org/apache/= lucene/queryParser/standard/TestQueryParserWrapper.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/regex/src/test/org/apache/lucene= /search/regex/TestRegexQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/regex/src/test/org/apache/lucene= /search/regex/TestSpanRegexQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/remote/src/test/org/apache/lucen= e/search/TestRemoteCachingWrapperFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/remote/src/test/org/apache/lucen= e/search/TestRemoteSearchable.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/remote/src/test/org/apache/lucen= e/search/TestRemoteSort.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/spatial/src/test/org/apache/luce= ne/spatial/tier/TestCartesian.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/spatial/src/test/org/apache/luce= ne/spatial/tier/TestDistance.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/spellchecker/src/java/org/apache= /lucene/search/spell/SpellChecker.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/spellchecker/src/test/org/apache= /lucene/search/spell/TestLuceneDictionary.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/spellchecker/src/test/org/apache= /lucene/search/spell/TestSpellChecker.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/surround/src/test/org/apache/luc= ene/queryParser/surround/query/SingleFieldTestDb.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/swing/src/java/org/apache/lucene= /swing/models/ListSearcher.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/swing/src/java/org/apache/lucene= /swing/models/TableSearcher.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/wordnet/src/java/org/apache/luce= ne/wordnet/Syns2Index.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/xml-query-parser/src/test/org/ap= ache/lucene/xmlparser/TestParser.java >>> =C2=A0 =C2=A0lucene/java/trunk/contrib/xml-query-parser/src/test/org/ap= ache/lucene/xmlparser/TestQueryTemplateManager.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexFil= es.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTM= L.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/java/org/apache/lucene/index/Directo= ryReader.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/java/org/apache/lucene/index/Documen= tsWriter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/java/org/apache/lucene/index/IndexWr= iter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/java/org/apache/lucene/index/Segment= Merger.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/TestDemo.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/TestMergeSche= dulerExternal.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/TestSearch.ja= va >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/TestSearchFor= Duplicates.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/TestSnapshotD= eletionPolicy.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/analysis/Test= CachingTokenFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/analysis/Test= KeywordAnalyzer.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/collation/Col= lationTestBase.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/document/Test= BinaryDocument.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/document/Test= Document.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/DocHelp= er.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestAdd= IndexesNoOptimize.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestAto= micUpdate.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestBac= kwardsCompatibility.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestChe= ckIndex.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestCon= currentMergeScheduler.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestCra= sh.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestDel= etionPolicy.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestDir= ectoryReader.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestDoc= .java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestDoc= umentWriter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestFie= ldsReader.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestFil= terIndexReader.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exFileDeleter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exReader.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exReaderClone.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exReaderCloneNorms.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exReaderReopen.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exWriter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exWriterDelete.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exWriterExceptions.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exWriterLockRelease.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exWriterMergePolicy.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exWriterMerging.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestInd= exWriterReader.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestLaz= yBug.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestLaz= yProxSkipping.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestMul= tiLevelSkipList.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestNRT= ReaderWithThreads.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestNor= ms.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestOmi= tTf.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestPar= allelReader.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestPar= allelReaderEmptyIndex.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestPar= allelTermEnum.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestPay= loads.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestSeg= mentTermDocs.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestSeg= mentTermEnum.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestStr= essIndexing.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestStr= essIndexing2.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestTer= mVectorsReader.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestTer= mdocPerf.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestThr= eadedOptimize.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestTra= nsactionRollback.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/index/TestTra= nsactions.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/queryParser/T= estMultiFieldQueryParser.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/queryParser/T= estQueryParser.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/BaseTe= stRangeFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/QueryU= tils.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBo= olean2.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBo= oleanMinShouldMatch.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBo= oleanOr.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBo= oleanPrefixQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBo= oleanQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBo= oleanScorer.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestCa= chingWrapperFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestCu= stomSearcherSort.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDa= teFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDa= teSort.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDi= sjunctionMaxQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDo= cBoost.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDo= cIdSet.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestEl= evationComparator.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestEx= planations.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFi= eldCache.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFi= eldCacheRangeFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFi= eldCacheTermsFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFi= lteredQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFi= lteredSearch.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFu= zzyQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMa= tchAllDocsQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMu= ltiPhraseQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMu= ltiSearcher.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMu= ltiSearcherRanking.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMu= ltiTermConstantScore.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMu= ltiThreadTermVectors.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMu= ltiValuedNumericRangeQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestNo= t.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestNu= mericRangeQuery32.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestNu= mericRangeQuery64.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPh= rasePrefixQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPh= raseQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPo= sitionIncrement.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPr= efixFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPr= efixInBooleanQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPr= efixQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestQu= eryWrapperFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSc= orerPerf.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSe= tNorm.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSi= milarity.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSi= mpleExplanations.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSl= oppyPhraseQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSo= rt.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSp= anQueryFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTe= rmRangeFilter.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTe= rmRangeQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTe= rmScorer.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTe= rmVectors.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTh= readSafe.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTi= meLimitingCollector.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTo= pDocsCollector.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTo= pScoreDocCollector.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/TestWi= ldcard.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/functi= on/FunctionTestSetup.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/payloa= ds/PayloadHelper.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/payloa= ds/TestPayloadNearQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/payloa= ds/TestPayloadTermQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/= TestBasics.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/= TestFieldMaskingSpanQuery.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/= TestNearSpansOrdered.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/= TestPayloadSpans.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/= TestSpans.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/= TestSpansAdvanced.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/= TestSpansAdvanced2.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/store/TestBuf= feredIndexInput.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/store/TestFil= eSwitchDirectory.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/store/TestLoc= kFactory.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/store/TestRAM= Directory.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/store/TestWin= dowsMMap.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/util/TestFiel= dCacheSanityChecker.java >>> =C2=A0 =C2=A0lucene/java/trunk/src/test/org/apache/lucene/util/_TestUti= l.java >>> >>> Modified: lucene/java/trunk/CHANGES.txt >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=3D9= 21480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/CHANGES.txt (original) >>> +++ lucene/java/trunk/CHANGES.txt Wed Mar 10 17:53:46 2010 >>> @@ -76,6 +76,15 @@ API Changes >>> =C2=A0 use by external code. In addition it offers a matchExtension met= hod which >>> =C2=A0 callers can use to query whether a certain file matches a certai= n extension. >>> =C2=A0 (Shai Erera via Mike McCandless) >>> + >>> +* LUCENE-2294: IndexWriter constructors have been deprecated in favor = of a >>> + =C2=A0single ctor which accepts IndexWriterConfig and a Directory. Yo= u can set all >>> + =C2=A0the parameters related to IndexWriter on IndexWriterConfig. The= different >>> + =C2=A0setter/getter methods were deprecated as well. One should call >>> + =C2=A0writer.getConfig().getXYZ() to query for a parameter XYZ. >>> + =C2=A0Additionally, the setter/getter related to MergePolicy were dep= recated as >>> + =C2=A0well. One should interact with the MergePolicy directly. >>> + =C2=A0(Shai Erera via Mike McCandless) >>> >>> =C2=A0* LUCENE-124: Add a TopTermsBoostOnlyBooleanQueryRewrite to Multi= TermQuery. >>> =C2=A0 This rewrite method is similar to TopTermsScoringBooleanQueryRew= rite, but >>> >>> Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apach= e/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/c= ommon/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTe= st.java?rev=3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/luce= ne/analysis/query/QueryAutoStopWordAnalyzerTest.java (original) >>> +++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/luce= ne/analysis/query/QueryAutoStopWordAnalyzerTest.java Wed Mar 10 17:53:46 20= 10 >>> @@ -31,6 +31,7 @@ import org.apache.lucene.document.Docume >>> =C2=A0import org.apache.lucene.document.Field; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Term; >>> =C2=A0import org.apache.lucene.queryParser.ParseException; >>> =C2=A0import org.apache.lucene.queryParser.QueryParser; >>> @@ -51,7 +52,7 @@ public class QueryAutoStopWordAnalyzerTe >>> =C2=A0 =C2=A0 super.setUp(); >>> =C2=A0 =C2=A0 dir =3D new RAMDirectory(); >>> =C2=A0 =C2=A0 appAnalyzer =3D new WhitespaceAnalyzer(TEST_VERSION_CURRE= NT); >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, appAnalyzer,= true, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new IndexWri= terConfig(TEST_VERSION_CURRENT).setAnalyzer(appAnalyzer)); >>> =C2=A0 =C2=A0 int numDocs =3D 200; >>> =C2=A0 =C2=A0 for (int i =3D 0; i < numDocs; i++) { >>> =C2=A0 =C2=A0 =C2=A0 Document doc =3D new Document(); >>> >>> Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apach= e/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/c= ommon/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTes= t.java?rev=3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/luce= ne/analysis/shingle/ShingleAnalyzerWrapperTest.java (original) >>> +++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/luce= ne/analysis/shingle/ShingleAnalyzerWrapperTest.java Wed Mar 10 17:53:46 201= 0 >>> @@ -31,6 +31,7 @@ import org.apache.lucene.analysis.tokena >>> =C2=A0import org.apache.lucene.document.Document; >>> =C2=A0import org.apache.lucene.document.Field; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Term; >>> =C2=A0import org.apache.lucene.queryParser.QueryParser; >>> =C2=A0import org.apache.lucene.search.BooleanClause; >>> @@ -59,7 +60,7 @@ public class ShingleAnalyzerWrapperTest >>> =C2=A0 =C2=A0*/ >>> =C2=A0 public IndexSearcher setUpSearcher(Analyzer analyzer) throws Exc= eption { >>> =C2=A0 =C2=A0 Directory dir =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, analyzer, tr= ue, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new IndexWri= terConfig(TEST_VERSION_CURRENT).setAnalyzer(analyzer)); >>> >>> =C2=A0 =C2=A0 Document doc; >>> =C2=A0 =C2=A0 doc =3D new Document(); >>> >>> Modified: lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/= IndexTask.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/ant/src/jav= a/org/apache/lucene/ant/IndexTask.java?rev=3D921480&r1=3D921479&r2=3D921480= &view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexT= ask.java (original) >>> +++ lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/IndexT= ask.java Wed Mar 10 17:53:46 2010 >>> @@ -38,7 +38,10 @@ import org.apache.lucene.document.DateTo >>> =C2=A0import org.apache.lucene.document.Document; >>> =C2=A0import org.apache.lucene.document.Field; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> +import org.apache.lucene.index.LogMergePolicy; >>> =C2=A0import org.apache.lucene.index.Term; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.search.IndexSearcher; >>> =C2=A0import org.apache.lucene.search.ScoreDoc; >>> =C2=A0import org.apache.lucene.search.Searcher; >>> @@ -280,15 +283,17 @@ public class IndexTask extends Task { >>> >>> =C2=A0 =C2=A0 =C2=A0 log("checkLastModified =3D " + checkLastModified, = Project.MSG_VERBOSE); >>> >>> - =C2=A0 =C2=A0 =C2=A0IndexWriter writer =3D >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriter(dir, analyzer, create, Ind= exWriter.MaxFieldLength.LIMITED); >>> - >>> - =C2=A0 =C2=A0 =C2=A0writer.setUseCompoundFile(useCompoundIndex); >>> + =C2=A0 =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new I= ndexWriterConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Version.LUCENE_CURRENT).setAnalyzer= (analyzer).setOpenMode( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0create ? OpenMode.CREATE : OpenMode= .APPEND)); >>> + =C2=A0 =C2=A0 =C2=A0LogMergePolicy lmp =3D (LogMergePolicy) writer.ge= tMergePolicy(); >>> + =C2=A0 =C2=A0 =C2=A0lmp.setUseCompoundFile(useCompoundIndex); >>> + =C2=A0 =C2=A0 =C2=A0lmp.setUseCompoundDocStore(useCompoundIndex); >>> + =C2=A0 =C2=A0 =C2=A0lmp.setMergeFactor(mergeFactor); >>> =C2=A0 =C2=A0 =C2=A0 int totalFiles =3D 0; >>> =C2=A0 =C2=A0 =C2=A0 int totalIndexed =3D 0; >>> =C2=A0 =C2=A0 =C2=A0 int totalIgnored =3D 0; >>> =C2=A0 =C2=A0 =C2=A0 try { >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0writer.setMergeFactor(mergeFactor); >>> >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 for (int i =3D 0; i < rcs.size(); i++) { >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ResourceCollection rc =3D rcs.elemen= tAt(i); >>> >>> Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucen= e/benchmark/byTask/tasks/CreateIndexTask.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/s= rc/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java?rev= =3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benc= hmark/byTask/tasks/CreateIndexTask.java (original) >>> +++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benc= hmark/byTask/tasks/CreateIndexTask.java Wed Mar 10 17:53:46 2010 >>> @@ -21,9 +21,12 @@ import org.apache.lucene.benchmark.byTas >>> =C2=A0import org.apache.lucene.benchmark.byTask.utils.Config; >>> =C2=A0import org.apache.lucene.index.IndexDeletionPolicy; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.MergeScheduler; >>> =C2=A0import org.apache.lucene.index.ConcurrentMergeScheduler; >>> =C2=A0import org.apache.lucene.index.MergePolicy; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> +import org.apache.lucene.util.Version; >>> >>> =C2=A0import java.io.BufferedOutputStream; >>> =C2=A0import java.io.File; >>> @@ -99,7 +102,7 @@ public class CreateIndexTask extends Per >>> >>> =C2=A0 =C2=A0 final double ramBuffer =3D config.get("ram.flush.mb",Open= IndexTask.DEFAULT_RAM_FLUSH_MB); >>> =C2=A0 =C2=A0 final int maxBuffered =3D config.get("max.buffered",OpenI= ndexTask.DEFAULT_MAX_BUFFERED); >>> - =C2=A0 =C2=A0if (maxBuffered =3D=3D IndexWriter.DISABLE_AUTO_FLUSH) { >>> + =C2=A0 =C2=A0if (maxBuffered =3D=3D IndexWriterConfig.DISABLE_AUTO_FL= USH) { >>> =C2=A0 =C2=A0 =C2=A0 writer.setRAMBufferSizeMB(ramBuffer); >>> =C2=A0 =C2=A0 =C2=A0 writer.setMaxBufferedDocs(maxBuffered); >>> =C2=A0 =C2=A0 } else { >>> @@ -147,10 +150,9 @@ public class CreateIndexTask extends Per >>> =C2=A0 =C2=A0 Config config =3D runData.getConfig(); >>> >>> =C2=A0 =C2=A0 IndexWriter writer =3D new IndexWriter(runData.getDirecto= ry(), >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 runD= ata.getAnalyzer(), >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 true= , >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 getI= ndexDeletionPolicy(config), >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Inde= xWriter.MaxFieldLength.LIMITED); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriterConfig(Version.LUCENE_31).s= etAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0runData.getAnalyzer()).setOp= enMode(OpenMode.CREATE) >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.setIndexDeletionPolicy(getI= ndexDeletionPolicy(config))); >>> =C2=A0 =C2=A0 setIndexWriterConfig(writer, config); >>> =C2=A0 =C2=A0 runData.setIndexWriter(writer); >>> =C2=A0 =C2=A0 return 1; >>> >>> Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucen= e/benchmark/byTask/tasks/OpenIndexTask.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/s= rc/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java?rev=3D9= 21480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benc= hmark/byTask/tasks/OpenIndexTask.java (original) >>> +++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/benc= hmark/byTask/tasks/OpenIndexTask.java Wed Mar 10 17:53:46 2010 >>> @@ -21,7 +21,9 @@ import org.apache.lucene.benchmark.byTas >>> =C2=A0import org.apache.lucene.benchmark.byTask.utils.Config; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> =C2=A0import org.apache.lucene.index.IndexCommit; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.LogMergePolicy; >>> +import org.apache.lucene.util.Version; >>> >>> =C2=A0import java.io.IOException; >>> >>> @@ -39,10 +41,10 @@ import java.io.IOException; >>> =C2=A0*/ >>> =C2=A0public class OpenIndexTask extends PerfTask { >>> >>> - =C2=A0public static final int DEFAULT_MAX_BUFFERED =3D IndexWriter.DE= FAULT_MAX_BUFFERED_DOCS; >>> - =C2=A0public static final int DEFAULT_MAX_FIELD_LENGTH =3D IndexWrite= r.DEFAULT_MAX_FIELD_LENGTH; >>> + =C2=A0public static final int DEFAULT_MAX_BUFFERED =3D IndexWriterCon= fig.DEFAULT_MAX_BUFFERED_DOCS; >>> + =C2=A0public static final int DEFAULT_MAX_FIELD_LENGTH =3D IndexWrite= rConfig.UNLIMITED_FIELD_LENGTH; >>> =C2=A0 public static final int DEFAULT_MERGE_PFACTOR =3D LogMergePolicy= .DEFAULT_MERGE_FACTOR; >>> - =C2=A0public static final double DEFAULT_RAM_FLUSH_MB =3D (int) Index= Writer.DEFAULT_RAM_BUFFER_SIZE_MB; >>> + =C2=A0public static final double DEFAULT_RAM_FLUSH_MB =3D (int) Index= WriterConfig.DEFAULT_RAM_BUFFER_SIZE_MB; >>> =C2=A0 private String commitUserData; >>> >>> =C2=A0 public OpenIndexTask(PerfRunData runData) { >>> @@ -61,10 +63,9 @@ public class OpenIndexTask extends PerfT >>> =C2=A0 =C2=A0 } >>> >>> =C2=A0 =C2=A0 IndexWriter writer =3D new IndexWriter(runData.getDirecto= ry(), >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 runD= ata.getAnalyzer(), >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Crea= teIndexTask.getIndexDeletionPolicy(config), >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Inde= xWriter.MaxFieldLength.UNLIMITED, >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ic); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriterConfig(Version.LUCENE_CURRE= NT).setAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0runData.getAnalyzer()).setIn= dexDeletionPolicy( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0CreateIndexTask.getIndexDele= tionPolicy(config)).setIndexCommit(ic)); >>> =C2=A0 =C2=A0 CreateIndexTask.setIndexWriterConfig(writer, config); >>> =C2=A0 =C2=A0 runData.setIndexWriter(writer); >>> =C2=A0 =C2=A0 return 1; >>> >>> Modified: lucene/java/trunk/contrib/benchmark/src/test/org/apache/lucen= e/benchmark/byTask/TestPerfTasksLogic.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/s= rc/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=3D92= 1480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/benchmark/src/test/org/apache/lucene/benc= hmark/byTask/TestPerfTasksLogic.java (original) >>> +++ lucene/java/trunk/contrib/benchmark/src/test/org/apache/lucene/benc= hmark/byTask/TestPerfTasksLogic.java Wed Mar 10 17:53:46 2010 >>> @@ -36,12 +36,15 @@ import org.apache.lucene.benchmark.byTas >>> =C2=A0import org.apache.lucene.collation.CollationKeyAnalyzer; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> +import org.apache.lucene.index.LogMergePolicy; >>> =C2=A0import org.apache.lucene.index.Term; >>> =C2=A0import org.apache.lucene.index.TermEnum; >>> =C2=A0import org.apache.lucene.index.TermDocs; >>> =C2=A0import org.apache.lucene.index.SerialMergeScheduler; >>> =C2=A0import org.apache.lucene.index.LogDocMergePolicy; >>> =C2=A0import org.apache.lucene.index.TermFreqVector; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.store.Directory; >>> =C2=A0import org.apache.lucene.search.FieldCache.StringIndex; >>> =C2=A0import org.apache.lucene.search.FieldCache; >>> @@ -96,7 +99,9 @@ public class TestPerfTasksLogic extends >>> =C2=A0 =C2=A0 assertEquals("TestSearchTask was supposed to be called!",= 279,CountingSearchTestTask.numSearches); >>> =C2=A0 =C2=A0 assertTrue("Index does not exist?...!", IndexReader.index= Exists(benchmark.getRunData().getDirectory())); >>> =C2=A0 =C2=A0 // now we should be able to open the index for write. >>> - =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(),null,false, IndexWriter.MaxFieldLength.LIMITED); >>> + =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(), >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriterConfig(TEST_VERSION_CURRENT= ) >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.setOpenMode(OpenMode.APPEND= )); >>> =C2=A0 =C2=A0 iw.close(); >>> =C2=A0 =C2=A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData(= ).getDirectory(), true); >>> =C2=A0 =C2=A0 assertEquals("1000 docs were added to the index, this is = what we expect to find!",1000,ir.numDocs()); >>> @@ -182,7 +187,7 @@ public class TestPerfTasksLogic extends >>> >>> =C2=A0 =C2=A0 assertTrue("Index does not exist?...!", IndexReader.index= Exists(benchmark.getRunData().getDirectory())); >>> =C2=A0 =C2=A0 // now we should be able to open the index for write. >>> - =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(),null,false, IndexWriter.MaxFieldLength.LIMITED); >>> + =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(), new IndexWriterConfig(TEST_VERSION_CURRENT).setOpenMode(O= penMode.APPEND)); >>> =C2=A0 =C2=A0 iw.close(); >>> =C2=A0 =C2=A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData(= ).getDirectory(), true); >>> =C2=A0 =C2=A0 assertEquals("100 docs were added to the index, this is w= hat we expect to find!",100,ir.numDocs()); >>> @@ -221,7 +226,7 @@ public class TestPerfTasksLogic extends >>> >>> =C2=A0 =C2=A0 assertTrue("Index does not exist?...!", IndexReader.index= Exists(benchmark.getRunData().getDirectory())); >>> =C2=A0 =C2=A0 // now we should be able to open the index for write. >>> - =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(),null,false,IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(), new IndexWriterConfig(TEST_VERSION_CURRENT).setOpenMode(O= penMode.APPEND)); >>> =C2=A0 =C2=A0 iw.close(); >>> =C2=A0 =C2=A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData(= ).getDirectory(), true); >>> =C2=A0 =C2=A0 assertEquals("1000 docs were added to the index, this is = what we expect to find!",1000,ir.numDocs()); >>> @@ -294,7 +299,7 @@ public class TestPerfTasksLogic extends >>> =C2=A0 =C2=A0 assertEquals("TestSearchTask was supposed to be called!",= 139,CountingSearchTestTask.numSearches); >>> =C2=A0 =C2=A0 assertTrue("Index does not exist?...!", IndexReader.index= Exists(benchmark.getRunData().getDirectory())); >>> =C2=A0 =C2=A0 // now we should be able to open the index for write. >>> - =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(),null,false,IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(), new IndexWriterConfig(TEST_VERSION_CURRENT).setOpenMode(O= penMode.APPEND)); >>> =C2=A0 =C2=A0 iw.close(); >>> =C2=A0 =C2=A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData(= ).getDirectory(), true); >>> =C2=A0 =C2=A0 assertEquals("1 docs were added to the index, this is wha= t we expect to find!",1,ir.numDocs()); >>> @@ -417,7 +422,9 @@ public class TestPerfTasksLogic extends >>> =C2=A0 =C2=A0 benchmark =3D execBenchmark(algLines2); >>> >>> =C2=A0 =C2=A0 // now we should be able to open the index for write. >>> - =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(),null,false,IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData(= ).getDirectory(), >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriterConfig(TEST_VERSION_CURRENT= ) >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.setOpenMode(OpenMode.APPEND= )); >>> =C2=A0 =C2=A0 iw.close(); >>> >>> =C2=A0 =C2=A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData(= ).getDirectory(), true); >>> @@ -655,7 +662,9 @@ public class TestPerfTasksLogic extends >>> =C2=A0 =C2=A0 // 2. execute the algorithm =C2=A0(required in every "log= ic" test) >>> =C2=A0 =C2=A0 Benchmark benchmark =3D execBenchmark(algLines); >>> >>> - =C2=A0 =C2=A0assertTrue("did not use the specified MergeScheduler", (= (MyMergeScheduler) benchmark.getRunData().getIndexWriter().getMergeSchedule= r()).called); >>> + =C2=A0 =C2=A0assertTrue("did not use the specified MergeScheduler", >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0((MyMergeScheduler) benchmark.getRunData()= .getIndexWriter().getConfig() >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.getMergeScheduler()).called= ); >>> =C2=A0 =C2=A0 benchmark.getRunData().getIndexWriter().close(); >>> >>> =C2=A0 =C2=A0 // 3. test number of docs in the index >>> @@ -743,10 +752,10 @@ public class TestPerfTasksLogic extends >>> =C2=A0 =C2=A0 // 2. execute the algorithm =C2=A0(required in every "log= ic" test) >>> =C2=A0 =C2=A0 Benchmark benchmark =3D execBenchmark(algLines); >>> =C2=A0 =C2=A0 final IndexWriter writer =3D benchmark.getRunData().getIn= dexWriter(); >>> - =C2=A0 =C2=A0assertEquals(2, writer.getMaxBufferedDocs()); >>> - =C2=A0 =C2=A0assertEquals(IndexWriter.DISABLE_AUTO_FLUSH, (int) write= r.getRAMBufferSizeMB()); >>> - =C2=A0 =C2=A0assertEquals(3, writer.getMergeFactor()); >>> - =C2=A0 =C2=A0assertFalse(writer.getUseCompoundFile()); >>> + =C2=A0 =C2=A0assertEquals(2, writer.getConfig().getMaxBufferedDocs())= ; >>> + =C2=A0 =C2=A0assertEquals(IndexWriterConfig.DISABLE_AUTO_FLUSH, (int)= writer.getConfig().getRAMBufferSizeMB()); >>> + =C2=A0 =C2=A0assertEquals(3, ((LogMergePolicy) writer.getMergePolicy(= )).getMergeFactor()); >>> + =C2=A0 =C2=A0assertFalse(((LogMergePolicy) writer.getMergePolicy()).g= etUseCompoundFile()); >>> =C2=A0 =C2=A0 writer.close(); >>> =C2=A0 =C2=A0 Directory dir =3D benchmark.getRunData().getDirectory(); >>> =C2=A0 =C2=A0 IndexReader reader =3D IndexReader.open(dir, true); >>> >>> Modified: lucene/java/trunk/contrib/fast-vector-highlighter/src/java/or= g/apache/lucene/search/vectorhighlight/FieldTermStack.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/fast-vector= -highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermSta= ck.java?rev=3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/fast-vector-highlighter/src/java/org/apac= he/lucene/search/vectorhighlight/FieldTermStack.java (original) >>> +++ lucene/java/trunk/contrib/fast-vector-highlighter/src/java/org/apac= he/lucene/search/vectorhighlight/FieldTermStack.java Wed Mar 10 17:53:46 20= 10 >>> @@ -30,10 +30,10 @@ import org.apache.lucene.document.Field. >>> =C2=A0import org.apache.lucene.document.Field.TermVector; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.TermFreqVector; >>> =C2=A0import org.apache.lucene.index.TermPositionVector; >>> =C2=A0import org.apache.lucene.index.TermVectorOffsetInfo; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> =C2=A0import org.apache.lucene.queryParser.QueryParser; >>> =C2=A0import org.apache.lucene.search.Query; >>> =C2=A0import org.apache.lucene.store.Directory; >>> @@ -50,13 +50,13 @@ public class FieldTermStack { >>> =C2=A0 LinkedList termList =3D new LinkedList(); >>> >>> =C2=A0 public static void main( String[] args ) throws Exception { >>> - =C2=A0 =C2=A0Analyzer analyzer =3D new WhitespaceAnalyzer(); >>> + =C2=A0 =C2=A0Analyzer analyzer =3D new WhitespaceAnalyzer(Version.LUC= ENE_CURRENT); >>> =C2=A0 =C2=A0 QueryParser parser =3D new QueryParser(Version.LUCENE_CUR= RENT, =C2=A0"f", analyzer ); >>> =C2=A0 =C2=A0 Query query =3D parser.parse( "a x:b" ); >>> =C2=A0 =C2=A0 FieldQuery fieldQuery =3D new FieldQuery( query, true, fa= lse ); >>> >>> =C2=A0 =C2=A0 Directory dir =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter( dir, analyzer, M= axFieldLength.LIMITED ); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new IndexWri= terConfig(Version.LUCENE_CURRENT).setAnalyzer(analyzer)); >>> =C2=A0 =C2=A0 Document doc =3D new Document(); >>> =C2=A0 =C2=A0 doc.add( new Field( "f", "a a a b b c a b b c d e f", Sto= re.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) ); >>> =C2=A0 =C2=A0 doc.add( new Field( "f", "b a b a f", Store.YES, Index.AN= ALYZED, TermVector.WITH_POSITIONS_OFFSETS ) ); >>> >>> Modified: lucene/java/trunk/contrib/fast-vector-highlighter/src/test/or= g/apache/lucene/search/vectorhighlight/AbstractTestCase.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/fast-vector= -highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTest= Case.java?rev=3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/apac= he/lucene/search/vectorhighlight/AbstractTestCase.java (original) >>> +++ lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/apac= he/lucene/search/vectorhighlight/AbstractTestCase.java Wed Mar 10 17:53:46 = 2010 >>> @@ -35,8 +35,9 @@ import org.apache.lucene.document.Field. >>> =C2=A0import org.apache.lucene.document.Field.TermVector; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Term; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.queryParser.QueryParser; >>> =C2=A0import org.apache.lucene.search.DisjunctionMaxQuery; >>> =C2=A0import org.apache.lucene.search.PhraseQuery; >>> @@ -326,7 +327,9 @@ public abstract class AbstractTestCase e >>> >>> =C2=A0 // make 1 doc with multi valued field >>> =C2=A0 protected void make1dmfIndex( Analyzer analyzer, String... value= s ) throws Exception { >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter( dir, analyzer, t= rue, MaxFieldLength.LIMITED ); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new IndexWri= terConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT).setAnalyzer(analyzer= ) >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0.setOpenMode(OpenMode.CREATE)); >>> =C2=A0 =C2=A0 Document doc =3D new Document(); >>> =C2=A0 =C2=A0 for( String value: values ) >>> =C2=A0 =C2=A0 =C2=A0 doc.add( new Field( F, value, Store.YES, Index.ANA= LYZED, TermVector.WITH_POSITIONS_OFFSETS ) ); >>> @@ -338,7 +341,9 @@ public abstract class AbstractTestCase e >>> >>> =C2=A0 // make 1 doc with multi valued & not analyzed field >>> =C2=A0 protected void make1dmfIndexNA( String... values ) throws Except= ion { >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter( dir, analyzerK, = true, MaxFieldLength.LIMITED ); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new IndexWri= terConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT).setOpenMode(OpenMode= .CREATE).setAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0analyzerK)); >>> =C2=A0 =C2=A0 Document doc =3D new Document(); >>> =C2=A0 =C2=A0 for( String value: values ) >>> =C2=A0 =C2=A0 =C2=A0 doc.add( new Field( F, value, Store.YES, Index.NOT= _ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) ); >>> >>> Modified: lucene/java/trunk/contrib/fast-vector-highlighter/src/test/or= g/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/fast-vector= -highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragme= ntsBuilderTest.java?rev=3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/apac= he/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (original) >>> +++ lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/apac= he/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java Wed Mar 10= 17:53:46 2010 >>> @@ -24,7 +24,8 @@ import org.apache.lucene.document.Field. >>> =C2=A0import org.apache.lucene.document.Field.TermVector; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.search.Query; >>> >>> =C2=A0public class SimpleFragmentsBuilderTest extends AbstractTestCase = { >>> @@ -118,7 +119,9 @@ public class SimpleFragmentsBuilderTest >>> =C2=A0 } >>> >>> =C2=A0 protected void makeUnstoredIndex() throws Exception { >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter( dir, analyzerW, = true, MaxFieldLength.LIMITED ); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new IndexWri= terConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT).setOpenMode(OpenMode= .CREATE).setAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0analyzerW)); >>> =C2=A0 =C2=A0 Document doc =3D new Document(); >>> =C2=A0 =C2=A0 doc.add( new Field( F, "aaa", Store.NO, Index.ANALYZED, T= ermVector.WITH_POSITIONS_OFFSETS ) ); >>> =C2=A0 =C2=A0 writer.addDocument( doc ); >>> >>> Modified: lucene/java/trunk/contrib/highlighter/src/test/org/apache/luc= ene/search/highlight/HighlighterPhraseTest.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/highlighter= /src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev= =3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/se= arch/highlight/HighlighterPhraseTest.java (original) >>> +++ lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/se= arch/highlight/HighlighterPhraseTest.java Wed Mar 10 17:53:46 2010 >>> @@ -21,7 +21,6 @@ import java.io.IOException; >>> >>> =C2=A0import org.apache.lucene.analysis.Token; >>> =C2=A0import org.apache.lucene.analysis.TokenStream; >>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>> =C2=A0import org.apache.lucene.analysis.tokenattributes.OffsetAttribute= ; >>> =C2=A0import org.apache.lucene.analysis.tokenattributes.PositionIncreme= ntAttribute; >>> =C2=A0import org.apache.lucene.analysis.tokenattributes.TermAttribute; >>> @@ -33,9 +32,9 @@ import org.apache.lucene.document.Field. >>> =C2=A0import org.apache.lucene.index.CorruptIndexException; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Term; >>> =C2=A0import org.apache.lucene.index.TermPositionVector; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> =C2=A0import org.apache.lucene.search.Collector; >>> =C2=A0import org.apache.lucene.search.IndexSearcher; >>> =C2=A0import org.apache.lucene.search.PhraseQuery; >>> @@ -59,7 +58,7 @@ public class HighlighterPhraseTest exten >>> =C2=A0 =C2=A0 final String TEXT =3D "the fox jumped"; >>> =C2=A0 =C2=A0 final Directory directory =3D new RAMDirectory(); >>> =C2=A0 =C2=A0 final IndexWriter indexWriter =3D new IndexWriter(directo= ry, >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0new WhitespaceAnalyzer(TEST_VERSION_CURREN= T), MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriterConfig(TEST_VERSION_CURRENT= )); >>> =C2=A0 =C2=A0 try { >>> =C2=A0 =C2=A0 =C2=A0 final Document document =3D new Document(); >>> =C2=A0 =C2=A0 =C2=A0 document.add(new Field(FIELD, new TokenStreamConcu= rrent(), >>> @@ -102,7 +101,7 @@ public class HighlighterPhraseTest exten >>> =C2=A0 =C2=A0 final String TEXT =3D "the fox jumped"; >>> =C2=A0 =C2=A0 final Directory directory =3D new RAMDirectory(); >>> =C2=A0 =C2=A0 final IndexWriter indexWriter =3D new IndexWriter(directo= ry, >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0new WhitespaceAnalyzer(TEST_VERSION_CURREN= T), MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriterConfig(TEST_VERSION_CURRENT= )); >>> =C2=A0 =C2=A0 try { >>> =C2=A0 =C2=A0 =C2=A0 final Document document =3D new Document(); >>> =C2=A0 =C2=A0 =C2=A0 document.add(new Field(FIELD, new TokenStreamConcu= rrent(), >>> @@ -171,7 +170,7 @@ public class HighlighterPhraseTest exten >>> =C2=A0 =C2=A0 final String TEXT =3D "the fox did not jump"; >>> =C2=A0 =C2=A0 final Directory directory =3D new RAMDirectory(); >>> =C2=A0 =C2=A0 final IndexWriter indexWriter =3D new IndexWriter(directo= ry, >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0new WhitespaceAnalyzer(TEST_VERSION_CURREN= T), MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriterConfig(TEST_VERSION_CURRENT= )); >>> =C2=A0 =C2=A0 try { >>> =C2=A0 =C2=A0 =C2=A0 final Document document =3D new Document(); >>> =C2=A0 =C2=A0 =C2=A0 document.add(new Field(FIELD, new TokenStreamSpars= e(), >>> @@ -213,7 +212,7 @@ public class HighlighterPhraseTest exten >>> =C2=A0 =C2=A0 final String TEXT =3D "the fox did not jump"; >>> =C2=A0 =C2=A0 final Directory directory =3D new RAMDirectory(); >>> =C2=A0 =C2=A0 final IndexWriter indexWriter =3D new IndexWriter(directo= ry, >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0new WhitespaceAnalyzer(TEST_VERSION_CURREN= T), MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriterConfig(TEST_VERSION_CURRENT= )); >>> =C2=A0 =C2=A0 try { >>> =C2=A0 =C2=A0 =C2=A0 final Document document =3D new Document(); >>> =C2=A0 =C2=A0 =C2=A0 document.add(new Field(FIELD, TEXT, Store.YES, Ind= ex.ANALYZED, >>> @@ -253,7 +252,7 @@ public class HighlighterPhraseTest exten >>> =C2=A0 =C2=A0 final String TEXT =3D "the fox did not jump"; >>> =C2=A0 =C2=A0 final Directory directory =3D new RAMDirectory(); >>> =C2=A0 =C2=A0 final IndexWriter indexWriter =3D new IndexWriter(directo= ry, >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0new WhitespaceAnalyzer(TEST_VERSION_CURREN= T), MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0new IndexWriterConfig(TEST_VERSION_CURRENT= )); >>> =C2=A0 =C2=A0 try { >>> =C2=A0 =C2=A0 =C2=A0 final Document document =3D new Document(); >>> =C2=A0 =C2=A0 =C2=A0 document.add(new Field(FIELD, new TokenStreamSpars= e(), >>> >>> Modified: lucene/java/trunk/contrib/highlighter/src/test/org/apache/luc= ene/search/highlight/HighlighterTest.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/highlighter= /src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=3D921= 480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/se= arch/highlight/HighlighterTest.java (original) >>> +++ lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/se= arch/highlight/HighlighterTest.java Wed Mar 10 17:53:46 2010 >>> @@ -51,8 +51,9 @@ import org.apache.lucene.document.Field. >>> =C2=A0import org.apache.lucene.document.Field.Store; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Term; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.queryParser.ParseException; >>> =C2=A0import org.apache.lucene.queryParser.QueryParser; >>> =C2=A0import org.apache.lucene.search.BooleanQuery; >>> @@ -80,7 +81,6 @@ import org.apache.lucene.search.spans.Sp >>> =C2=A0import org.apache.lucene.store.Directory; >>> =C2=A0import org.apache.lucene.store.RAMDirectory; >>> =C2=A0import org.apache.lucene.util.LuceneTestCase; >>> -import org.apache.lucene.util.Version; >>> =C2=A0import org.w3c.dom.Element; >>> =C2=A0import org.w3c.dom.NodeList; >>> >>> @@ -89,8 +89,6 @@ import org.w3c.dom.NodeList; >>> =C2=A0* >>> =C2=A0*/ >>> =C2=A0public class HighlighterTest extends BaseTokenStreamTestCase impl= ements Formatter { >>> - =C2=A0// TODO: change to CURRENT, does not work because posIncr: >>> - =C2=A0static final Version TEST_VERSION =3D TEST_VERSION_CURRENT; >>> >>> =C2=A0 private IndexReader reader; >>> =C2=A0 static final String FIELD_NAME =3D "contents"; >>> @@ -99,7 +97,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 RAMDirectory ramDir; >>> =C2=A0 public IndexSearcher searcher =3D null; >>> =C2=A0 int numHighlights =3D 0; >>> - =C2=A0final Analyzer analyzer =3D new StandardAnalyzer(TEST_VERSION); >>> + =C2=A0final Analyzer analyzer =3D new StandardAnalyzer(TEST_VERSION_C= URRENT); >>> =C2=A0 TopDocs hits; >>> >>> =C2=A0 String[] texts =3D { >>> @@ -120,7 +118,7 @@ public class HighlighterTest extends Bas >>> >>> =C2=A0 public void testQueryScorerHits() throws Exception { >>> =C2=A0 =C2=A0 Analyzer analyzer =3D new SimpleAnalyzer(TEST_VERSION_CUR= RENT); >>> - =C2=A0 =C2=A0QueryParser qp =3D new QueryParser(TEST_VERSION, FIELD_N= AME, analyzer); >>> + =C2=A0 =C2=A0QueryParser qp =3D new QueryParser(TEST_VERSION_CURRENT,= FIELD_NAME, analyzer); >>> =C2=A0 =C2=A0 query =3D qp.parse("\"very long\""); >>> =C2=A0 =C2=A0 searcher =3D new IndexSearcher(ramDir, true); >>> =C2=A0 =C2=A0 TopDocs hits =3D searcher.search(query, 10); >>> @@ -150,7 +148,7 @@ public class HighlighterTest extends Bas >>> >>> =C2=A0 =C2=A0 String s1 =3D "I call our world Flatland, not because we = call it so,"; >>> >>> - =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TEST_VERSION, FIE= LD_NAME, new StandardAnalyzer(TEST_VERSION)); >>> + =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TEST_VERSION_CURR= ENT, FIELD_NAME, new StandardAnalyzer(TEST_VERSION_CURRENT)); >>> >>> =C2=A0 =C2=A0 // Verify that a query against the default field results = in text being >>> =C2=A0 =C2=A0 // highlighted >>> @@ -182,7 +180,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0*/ >>> =C2=A0 private static String highlightField(Query query, String fieldNa= me, String text) >>> =C2=A0 =C2=A0 =C2=A0 throws IOException, InvalidTokenOffsetsException { >>> - =C2=A0 =C2=A0TokenStream tokenStream =3D new StandardAnalyzer(TEST_VE= RSION).tokenStream(fieldName, new StringReader(text)); >>> + =C2=A0 =C2=A0TokenStream tokenStream =3D new StandardAnalyzer(TEST_VE= RSION_CURRENT).tokenStream(fieldName, new StringReader(text)); >>> =C2=A0 =C2=A0 // Assuming "", "" used to highlight >>> =C2=A0 =C2=A0 SimpleHTMLFormatter formatter =3D new SimpleHTMLFormatter= (); >>> =C2=A0 =C2=A0 QueryScorer scorer =3D new QueryScorer(query, fieldName, = FIELD_NAME); >>> @@ -228,7 +226,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0 String q =3D "(" + f1c + ph1 + " OR " + f2c + ph1 + ") AN= D (" + f1c + ph2 >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 + " OR " + f2c + ph2 + ")"; >>> =C2=A0 =C2=A0 Analyzer analyzer =3D new WhitespaceAnalyzer(TEST_VERSION= _CURRENT); >>> - =C2=A0 =C2=A0QueryParser qp =3D new QueryParser(TEST_VERSION, f1, ana= lyzer); >>> + =C2=A0 =C2=A0QueryParser qp =3D new QueryParser(TEST_VERSION_CURRENT,= f1, analyzer); >>> =C2=A0 =C2=A0 Query query =3D qp.parse(q); >>> >>> =C2=A0 =C2=A0 QueryScorer scorer =3D new QueryScorer(query, f1); >>> @@ -678,7 +676,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // Need to explicitly set the QueryParser p= roperty to use TermRangeQuery >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // rather >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // than RangeFilters >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TES= T_VERSION, FIELD_NAME, analyzer); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TES= T_VERSION_CURRENT, FIELD_NAME, analyzer); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 parser.setMultiTermRewriteMethod(MultiTermQ= uery.SCORING_BOOLEAN_QUERY_REWRITE); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 query =3D parser.parse(queryString); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 doSearching(query); >>> @@ -1028,7 +1026,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 String srchkey =3D "football"; >>> >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 String s =3D "football-soccer in the euro 2= 004 footie competition"; >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TES= T_VERSION, "bookid", analyzer); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TES= T_VERSION_CURRENT, "bookid", analyzer); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 Query query =3D parser.parse(srchkey); >>> >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 TokenStream tokenStream =3D analyzer.tokenS= tream(null, new StringReader(s)); >>> @@ -1154,13 +1152,13 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sb.append(stopWords.iterator().next(= )); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 } >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 SimpleHTMLFormatter fm =3D new SimpleHTMLFo= rmatter(); >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0Highlighter hg =3D getHighlighter(query, "= data", new StandardAnalyzer(TEST_VERSION, stopWords).tokenStream( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0Highlighter hg =3D getHighlighter(query, "= data", new StandardAnalyzer(TEST_VERSION_CURRENT, stopWords).tokenStream( >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "data", new StringReader(sb.t= oString())), fm);// new Highlighter(fm, >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // new >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // QueryTermScorer(query)); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 hg.setTextFragmenter(new NullFragmenter()); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 hg.setMaxDocCharsToAnalyze(100); >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0match =3D hg.getBestFragment(new StandardA= nalyzer(TEST_VERSION, stopWords), "data", sb.toString()); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0match =3D hg.getBestFragment(new StandardA= nalyzer(TEST_VERSION_CURRENT, stopWords), "data", sb.toString()); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertTrue("Matched text should be no more = than 100 chars in length ", match.length() < hg >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 .getMaxDocCharsToAnalyze()); >>> >>> @@ -1171,7 +1169,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // + whitespace) >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 sb.append(" "); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 sb.append(goodWord); >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0match =3D hg.getBestFragment(new StandardA= nalyzer(TEST_VERSION, stopWords), "data", sb.toString()); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0match =3D hg.getBestFragment(new StandardA= nalyzer(TEST_VERSION_CURRENT, stopWords), "data", sb.toString()); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertTrue("Matched text should be no more = than 100 chars in length ", match.length() < hg >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 .getMaxDocCharsToAnalyze()); >>> =C2=A0 =C2=A0 =C2=A0 } >>> @@ -1192,11 +1190,11 @@ public class HighlighterTest extends Bas >>> >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 String text =3D "this is a text with search= term in it"; >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 SimpleHTMLFormatter fm =3D new SimpleHTMLFo= rmatter(); >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0Highlighter hg =3D getHighlighter(query, "= text", new StandardAnalyzer(TEST_VERSION, >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0Highlighter hg =3D getHighlighter(query, "= text", new StandardAnalyzer(TEST_VERSION_CURRENT, >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 stopWords).tokenStream("text"= , new StringReader(text)), fm); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 hg.setTextFragmenter(new NullFragmenter()); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 hg.setMaxDocCharsToAnalyze(36); >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0String match =3D hg.getBestFragment(new St= andardAnalyzer(TEST_VERSION, stopWords), "text", text); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0String match =3D hg.getBestFragment(new St= andardAnalyzer(TEST_VERSION_CURRENT, stopWords), "text", text); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertTrue( >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "Matched text should contain = remainder of text after highlighted query ", >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 match.endsWith("in it")); >>> @@ -1213,9 +1211,9 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 numHighlights =3D 0; >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // test to show how rewritten query can sti= ll be used >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 searcher =3D new IndexSearcher(ramDir, true= ); >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0Analyzer analyzer =3D new StandardAnalyzer= (TEST_VERSION); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0Analyzer analyzer =3D new StandardAnalyzer= (TEST_VERSION_CURRENT); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TES= T_VERSION, FIELD_NAME, analyzer); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TES= T_VERSION_CURRENT, FIELD_NAME, analyzer); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 Query query =3D parser.parse("JF? or Kenned= *"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 System.out.println("Searching with primitiv= e query"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // forget to set this and... >>> @@ -1326,7 +1324,9 @@ public class HighlighterTest extends Bas >>> =C2=A0 public void testMultiSearcher() throws Exception { >>> =C2=A0 =C2=A0 // setup index 1 >>> =C2=A0 =C2=A0 RAMDirectory ramDir1 =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter writer1 =3D new IndexWriter(ramDir1, new Sta= ndardAnalyzer(TEST_VERSION), true, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter writer1 =3D new IndexWriter(ramDir1, new Ind= exWriterConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT).setAnalyzer(new Stan= dardAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT))); >>> =C2=A0 =C2=A0 Document d =3D new Document(); >>> =C2=A0 =C2=A0 Field f =3D new Field(FIELD_NAME, "multiOne", Field.Store= .YES, Field.Index.ANALYZED); >>> =C2=A0 =C2=A0 d.add(f); >>> @@ -1337,7 +1337,9 @@ public class HighlighterTest extends Bas >>> >>> =C2=A0 =C2=A0 // setup index 2 >>> =C2=A0 =C2=A0 RAMDirectory ramDir2 =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter writer2 =3D new IndexWriter(ramDir2, new Sta= ndardAnalyzer(TEST_VERSION), true, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter writer2 =3D new IndexWriter(ramDir2, new Ind= exWriterConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT).setAnalyzer(new Stan= dardAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT))); >>> =C2=A0 =C2=A0 d =3D new Document(); >>> =C2=A0 =C2=A0 f =3D new Field(FIELD_NAME, "multiTwo", Field.Store.YES, = Field.Index.ANALYZED); >>> =C2=A0 =C2=A0 d.add(f); >>> @@ -1350,7 +1352,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0 searchers[0] =3D new IndexSearcher(ramDir1, true); >>> =C2=A0 =C2=A0 searchers[1] =3D new IndexSearcher(ramDir2, true); >>> =C2=A0 =C2=A0 MultiSearcher multiSearcher =3D new MultiSearcher(searche= rs); >>> - =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TEST_VERSION, FIE= LD_NAME, new StandardAnalyzer(TEST_VERSION)); >>> + =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TEST_VERSION_CURR= ENT, FIELD_NAME, new StandardAnalyzer(TEST_VERSION_CURRENT)); >>> =C2=A0 =C2=A0 parser.setMultiTermRewriteMethod(MultiTermQuery.SCORING_B= OOLEAN_QUERY_REWRITE); >>> =C2=A0 =C2=A0 query =3D parser.parse("multi*"); >>> =C2=A0 =C2=A0 System.out.println("Searching for: " + query.toString(FIE= LD_NAME)); >>> @@ -1384,7 +1386,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0 =C2=A0 @Override >>> =C2=A0 =C2=A0 =C2=A0 public void run() throws Exception { >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 String docMainText =3D "fred is one of the = people"; >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TES= T_VERSION, FIELD_NAME, analyzer); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TES= T_VERSION_CURRENT, FIELD_NAME, analyzer); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 Query query =3D parser.parse("fred category= :people"); >>> >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // highlighting respects fieldnames used in= query >>> @@ -1530,64 +1532,64 @@ public class HighlighterTest extends Bas >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 Highlighter highlighter; >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 String result; >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("foo"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("foo"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("10"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("10"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("speed"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("speed"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hispeed"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hispeed"= ); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi speed"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi speed= "); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // ///////////////// same tests, just put t= he bigger overlapping token >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 // first >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("foo"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("foo"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2a(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2a(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("10"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("10"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2a(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2a(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2a(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2a(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("speed"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("speed"); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2a(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2a(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hispeed"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hispeed"= ); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2a(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2a(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION, "t= ext", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi speed"); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0query =3D new QueryParser(TEST_VERSION_CUR= RENT, "text", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi speed= "); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 highlighter =3D getHighlighter(query, "text= ", getTS2a(), HighlighterTest.this); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 result =3D highlighter.getBestFragments(get= TS2a(), s, 3, "..."); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 assertEquals("Hi-Speed10 foo", resul= t); >>> @@ -1613,7 +1615,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 } >>> >>> =C2=A0 private void makeIndex() throws IOException { >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter( dir, a, MaxField= Length.LIMITED ); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new IndexWri= terConfig(TEST_VERSION_CURRENT)); >>> =C2=A0 =C2=A0 writer.addDocument( doc( "t_text1", "random words for hig= hlighting tests del" ) ); >>> =C2=A0 =C2=A0 writer.addDocument( doc( "t_text1", "more random words fo= r second field del" ) ); >>> =C2=A0 =C2=A0 writer.addDocument( doc( "t_text1", "random words for hig= hlighting tests del" ) ); >>> @@ -1623,7 +1625,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 } >>> >>> =C2=A0 private void deleteDocument() throws IOException { >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter( dir, a, false, M= axFieldLength.LIMITED ); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new IndexWri= terConfig(TEST_VERSION_CURRENT).setOpenMode(OpenMode.APPEND)); >>> =C2=A0 =C2=A0 writer.deleteDocuments( new Term( "t_text1", "del" ) ); >>> =C2=A0 =C2=A0 // To see negative idf, keep comment the following line >>> =C2=A0 =C2=A0 //writer.optimize(); >>> @@ -1632,7 +1634,7 @@ public class HighlighterTest extends Bas >>> >>> =C2=A0 private void searchIndex() throws IOException, ParseException, I= nvalidTokenOffsetsException { >>> =C2=A0 =C2=A0 String q =3D "t_text1:random"; >>> - =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TEST_VERSION, =C2= =A0"t_text1", a ); >>> + =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TEST_VERSION_CURR= ENT, =C2=A0"t_text1", a ); >>> =C2=A0 =C2=A0 Query query =3D parser.parse( q ); >>> =C2=A0 =C2=A0 IndexSearcher searcher =3D new IndexSearcher( dir, true )= ; >>> =C2=A0 =C2=A0 // This scorer can return negative idf -> null fragment >>> @@ -1686,7 +1688,7 @@ public class HighlighterTest extends Bas >>> =C2=A0 } >>> >>> =C2=A0 public void doSearching(String queryString) throws Exception { >>> - =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TEST_VERSION, FIE= LD_NAME, analyzer); >>> + =C2=A0 =C2=A0QueryParser parser =3D new QueryParser(TEST_VERSION_CURR= ENT, FIELD_NAME, analyzer); >>> =C2=A0 =C2=A0 parser.setEnablePositionIncrements(true); >>> =C2=A0 =C2=A0 parser.setMultiTermRewriteMethod(MultiTermQuery.SCORING_B= OOLEAN_QUERY_REWRITE); >>> =C2=A0 =C2=A0 query =3D parser.parse(queryString); >>> @@ -1725,7 +1727,9 @@ public class HighlighterTest extends Bas >>> =C2=A0 protected void setUp() throws Exception { >>> =C2=A0 =C2=A0 super.setUp(); >>> =C2=A0 =C2=A0 ramDir =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(ramDir, new Stand= ardAnalyzer(TEST_VERSION), true, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(ramDir, new Index= WriterConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT).setAnalyzer(new Stan= dardAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT))); >>> =C2=A0 =C2=A0 for (int i =3D 0; i < texts.length; i++) { >>> =C2=A0 =C2=A0 =C2=A0 addDoc(writer, texts[i]); >>> =C2=A0 =C2=A0 } >>> >>> Modified: lucene/java/trunk/contrib/instantiated/src/test/org/apache/lu= cene/store/instantiated/TestEmptyIndex.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiate= d/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java?rev=3D9= 21480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/s= tore/instantiated/TestEmptyIndex.java (original) >>> +++ lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/s= tore/instantiated/TestEmptyIndex.java Wed Mar 10 17:53:46 2010 >>> @@ -16,9 +16,12 @@ >>> >>> =C2=A0package org.apache.lucene.store.instantiated; >>> >>> -import junit.framework.TestCase; >>> +import java.io.IOException; >>> +import java.util.Arrays; >>> + >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Term; >>> =C2=A0import org.apache.lucene.index.TermEnum; >>> =C2=A0import org.apache.lucene.search.IndexSearcher; >>> @@ -26,11 +29,9 @@ import org.apache.lucene.search.TermQuer >>> =C2=A0import org.apache.lucene.search.TopDocs; >>> =C2=A0import org.apache.lucene.store.Directory; >>> =C2=A0import org.apache.lucene.store.RAMDirectory; >>> +import org.apache.lucene.util.LuceneTestCase; >>> >>> -import java.util.Arrays; >>> -import java.io.IOException; >>> - >>> -public class TestEmptyIndex extends TestCase { >>> +public class TestEmptyIndex extends LuceneTestCase { >>> >>> =C2=A0 public void testSearch() throws Exception { >>> >>> @@ -60,7 +61,7 @@ public class TestEmptyIndex extends Test >>> =C2=A0 =C2=A0 // make sure a Directory acts the same >>> >>> =C2=A0 =C2=A0 Directory d =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0new IndexWriter(d, null, true, IndexWriter.MaxFieldLengt= h.UNLIMITED).close(); >>> + =C2=A0 =C2=A0new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CU= RRENT)).close(); >>> =C2=A0 =C2=A0 r =3D IndexReader.open(d, false); >>> =C2=A0 =C2=A0 testNorms(r); >>> =C2=A0 =C2=A0 r.close(); >>> @@ -93,7 +94,7 @@ public class TestEmptyIndex extends Test >>> =C2=A0 =C2=A0 // make sure a Directory acts the same >>> >>> =C2=A0 =C2=A0 Directory d =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0new IndexWriter(d, null, true, IndexWriter.MaxFieldLengt= h.UNLIMITED).close(); >>> + =C2=A0 =C2=A0new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CU= RRENT)).close(); >>> =C2=A0 =C2=A0 r =3D IndexReader.open(d, false); >>> =C2=A0 =C2=A0 termEnumTest(r); >>> =C2=A0 =C2=A0 r.close(); >>> >>> Modified: lucene/java/trunk/contrib/instantiated/src/test/org/apache/lu= cene/store/instantiated/TestIndicesEquals.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiate= d/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java?rev= =3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/s= tore/instantiated/TestIndicesEquals.java (original) >>> +++ lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/s= tore/instantiated/TestIndicesEquals.java Wed Mar 10 17:53:46 2010 >>> @@ -30,6 +30,7 @@ import org.apache.lucene.document.Docume >>> =C2=A0import org.apache.lucene.document.Field; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Payload; >>> =C2=A0import org.apache.lucene.index.Term; >>> =C2=A0import org.apache.lucene.index.TermDocs; >>> @@ -60,7 +61,9 @@ public class TestIndicesEquals extends L >>> =C2=A0 =C2=A0 RAMDirectory dir =3D new RAMDirectory(); >>> >>> =C2=A0 =C2=A0 // create dir data >>> - =C2=A0 =C2=A0IndexWriter indexWriter =3D new IndexWriter(dir, new Sta= ndardAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIM= ITED); >>> + =C2=A0 =C2=A0IndexWriter indexWriter =3D new IndexWriter(dir, new Ind= exWriterConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT).setAnalyzer(new Stan= dardAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT))); >>> =C2=A0 =C2=A0 for (int i =3D 0; i < 20; i++) { >>> =C2=A0 =C2=A0 =C2=A0 Document document =3D new Document(); >>> =C2=A0 =C2=A0 =C2=A0 assembleDocument(document, i); >>> @@ -84,7 +87,9 @@ public class TestIndicesEquals extends L >>> =C2=A0 =C2=A0 InstantiatedIndex ii =3D new InstantiatedIndex(); >>> >>> =C2=A0 =C2=A0 // create dir data >>> - =C2=A0 =C2=A0IndexWriter indexWriter =3D new IndexWriter(dir, new Sta= ndardAnalyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIM= ITED); >>> + =C2=A0 =C2=A0IndexWriter indexWriter =3D new IndexWriter(dir, new Ind= exWriterConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT).setAnalyzer(new Stan= dardAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT))); >>> =C2=A0 =C2=A0 for (int i =3D 0; i < 500; i++) { >>> =C2=A0 =C2=A0 =C2=A0 Document document =3D new Document(); >>> =C2=A0 =C2=A0 =C2=A0 assembleDocument(document, i); >>> >>> Modified: lucene/java/trunk/contrib/instantiated/src/test/org/apache/lu= cene/store/instantiated/TestSerialization.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiate= d/src/test/org/apache/lucene/store/instantiated/TestSerialization.java?rev= =3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/s= tore/instantiated/TestSerialization.java (original) >>> +++ lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/s= tore/instantiated/TestSerialization.java Wed Mar 10 17:53:46 2010 >>> @@ -22,7 +22,7 @@ import org.apache.lucene.store.Directory >>> =C2=A0import org.apache.lucene.util.LuceneTestCase; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.document.Document; >>> =C2=A0import org.apache.lucene.document.Field; >>> >>> @@ -35,7 +35,7 @@ public class TestSerialization extends L >>> >>> =C2=A0 =C2=A0 Directory dir =3D new RAMDirectory(); >>> >>> - =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(dir, new WhitespaceAn= alyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(dir, new IndexWriterC= onfig(TEST_VERSION_CURRENT)); >>> =C2=A0 =C2=A0 Document doc =3D new Document(); >>> =C2=A0 =C2=A0 doc.add(new Field("foo", "bar rab abr bra rba", Field.Sto= re.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); >>> =C2=A0 =C2=A0 doc.add(new Field("moo", "bar rab abr bra rba", Field.Sto= re.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); >>> >>> Modified: lucene/java/trunk/contrib/instantiated/src/test/org/apache/lu= cene/store/instantiated/TestUnoptimizedReaderOnConstructor.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiate= d/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnCons= tructor.java?rev=3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/s= tore/instantiated/TestUnoptimizedReaderOnConstructor.java (original) >>> +++ lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/s= tore/instantiated/TestUnoptimizedReaderOnConstructor.java Wed Mar 10 17:53:= 46 2010 >>> @@ -18,10 +18,11 @@ package org.apache.lucene.store.instanti >>> =C2=A0import java.io.IOException; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.store.RAMDirectory; >>> =C2=A0import org.apache.lucene.store.Directory; >>> =C2=A0import org.apache.lucene.util.LuceneTestCase; >>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>> =C2=A0import org.apache.lucene.document.Document; >>> =C2=A0import org.apache.lucene.document.Field; >>> >>> @@ -32,17 +33,17 @@ public class TestUnoptimizedReaderOnCons >>> >>> =C2=A0 public void test() throws Exception { >>> =C2=A0 =C2=A0 Directory dir =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(dir, new WhitespaceAn= alyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(dir, new IndexWriterC= onfig(TEST_VERSION_CURRENT)); >>> =C2=A0 =C2=A0 addDocument(iw, "Hello, world!"); >>> =C2=A0 =C2=A0 addDocument(iw, "All work and no play makes jack a dull b= oy"); >>> =C2=A0 =C2=A0 iw.close(); >>> >>> - =C2=A0 =C2=A0iw =3D new IndexWriter(dir, new WhitespaceAnalyzer(TEST_= VERSION_CURRENT), false, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0iw =3D new IndexWriter(dir, new IndexWriterConfig(TEST_V= ERSION_CURRENT).setOpenMode(OpenMode.APPEND)); >>> =C2=A0 =C2=A0 addDocument(iw, "Hello, tellus!"); >>> =C2=A0 =C2=A0 addDocument(iw, "All work and no play makes danny a dull = boy"); >>> =C2=A0 =C2=A0 iw.close(); >>> >>> - =C2=A0 =C2=A0iw =3D new IndexWriter(dir, new WhitespaceAnalyzer(TEST_= VERSION_CURRENT), false, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0iw =3D new IndexWriter(dir, new IndexWriterConfig(TEST_V= ERSION_CURRENT).setOpenMode(OpenMode.APPEND)); >>> =C2=A0 =C2=A0 addDocument(iw, "Hello, earth!"); >>> =C2=A0 =C2=A0 addDocument(iw, "All work and no play makes wendy a dull = girl"); >>> =C2=A0 =C2=A0 iw.close(); >>> >>> Modified: lucene/java/trunk/contrib/lucli/src/java/lucli/LuceneMethods.= java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/lucli/src/j= ava/lucli/LuceneMethods.java?rev=3D921480&r1=3D921479&r2=3D921480&view=3Ddi= ff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/lucli/src/java/lucli/LuceneMethods.java (= original) >>> +++ lucene/java/trunk/contrib/lucli/src/java/lucli/LuceneMethods.java W= ed Mar 10 17:53:46 2010 >>> @@ -42,9 +42,11 @@ import org.apache.lucene.document.Docume >>> =C2=A0import org.apache.lucene.document.Fieldable; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Term; >>> =C2=A0import org.apache.lucene.index.TermEnum; >>> =C2=A0import org.apache.lucene.index.IndexReader.FieldOption; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.queryParser.MultiFieldQueryParser; >>> =C2=A0import org.apache.lucene.queryParser.ParseException; >>> =C2=A0import org.apache.lucene.search.Collector; >>> @@ -169,7 +171,9 @@ class LuceneMethods { >>> >>> =C2=A0 =C2=A0 public void optimize() throws IOException { >>> =C2=A0 =C2=A0 //open the index writer. False: don't create a new one >>> - =C2=A0 =C2=A0IndexWriter indexWriter =3D new IndexWriter(indexName, c= reateAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter indexWriter =3D new IndexWriter(indexName, n= ew IndexWriterConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0Version.LUCENE_CURRENT).setAnalyzer(create= Analyzer()).setOpenMode( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0OpenMode.APPEND)); >>> =C2=A0 =C2=A0 message("Starting to optimize index."); >>> =C2=A0 =C2=A0 long start =3D System.currentTimeMillis(); >>> =C2=A0 =C2=A0 indexWriter.optimize(); >>> >>> Modified: lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/i= ndex/memory/MemoryIndexTest.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/memory/src/= test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=3D921480&r1=3D= 921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/index/m= emory/MemoryIndexTest.java (original) >>> +++ lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/index/m= emory/MemoryIndexTest.java Wed Mar 10 17:53:46 2010 >>> @@ -42,6 +42,7 @@ import org.apache.lucene.document.Field; >>> =C2=A0import org.apache.lucene.document.Fieldable; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.queryParser.ParseException; >>> =C2=A0import org.apache.lucene.queryParser.QueryParser; >>> =C2=A0import org.apache.lucene.search.Collector; >>> @@ -410,7 +411,7 @@ public class MemoryIndexTest extends Bas >>> =C2=A0 =C2=A0 RAMDirectory dir =3D new RAMDirectory(); >>> =C2=A0 =C2=A0 IndexWriter writer =3D null; >>> =C2=A0 =C2=A0 try { >>> - =C2=A0 =C2=A0 =C2=A0writer =3D new IndexWriter(dir, analyzer, true, I= ndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0 =C2=A0writer =3D new IndexWriter(dir, new IndexWriterCo= nfig(TEST_VERSION_CURRENT).setAnalyzer(analyzer)); >>> =C2=A0 =C2=A0 =C2=A0 writer.addDocument(doc); >>> =C2=A0 =C2=A0 =C2=A0 writer.optimize(); >>> =C2=A0 =C2=A0 =C2=A0 return dir; >>> >>> Modified: lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/ind= ex/MultiPassIndexSplitter.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/ja= va/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=3D921480&r1=3D92= 1479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/index/Mul= tiPassIndexSplitter.java (original) >>> +++ lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/index/Mul= tiPassIndexSplitter.java Wed Mar 10 17:53:46 2010 >>> @@ -21,11 +21,11 @@ import java.io.File; >>> =C2=A0import java.io.IOException; >>> =C2=A0import java.util.ArrayList; >>> >>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.store.Directory; >>> =C2=A0import org.apache.lucene.store.FSDirectory; >>> =C2=A0import org.apache.lucene.util.OpenBitSet; >>> +import org.apache.lucene.util.Version; >>> >>> =C2=A0/** >>> =C2=A0* This tool splits input index into multiple equal parts. The met= hod employed >>> @@ -88,8 +88,7 @@ public class MultiPassIndexSplitter { >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 } >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 } >>> =C2=A0 =C2=A0 =C2=A0 } >>> - =C2=A0 =C2=A0 =C2=A0IndexWriter w =3D new IndexWriter(outputs[i], new= WhitespaceAnalyzer(), >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0true, MaxFieldLength.= UNLIMITED); >>> + =C2=A0 =C2=A0 =C2=A0IndexWriter w =3D new IndexWriter(outputs[i], new= IndexWriterConfig(Version.LUCENE_CURRENT).setOpenMode(OpenMode.CREATE)); >>> =C2=A0 =C2=A0 =C2=A0 System.err.println("Writing part " + (i + 1) + " .= .."); >>> =C2=A0 =C2=A0 =C2=A0 w.addIndexes(new IndexReader[]{input}); >>> =C2=A0 =C2=A0 =C2=A0 w.close(); >>> >>> Modified: lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/mis= c/IndexMergeTool.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/ja= va/org/apache/lucene/misc/IndexMergeTool.java?rev=3D921480&r1=3D921479&r2= =3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/misc/Inde= xMergeTool.java (original) >>> +++ lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/misc/Inde= xMergeTool.java Wed Mar 10 17:53:46 2010 >>> @@ -17,9 +17,11 @@ package org.apache.lucene.misc; >>> =C2=A0 */ >>> >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> -import org.apache.lucene.analysis.SimpleAnalyzer; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.store.Directory; >>> =C2=A0import org.apache.lucene.store.FSDirectory; >>> +import org.apache.lucene.util.Version; >>> >>> =C2=A0import java.io.File; >>> =C2=A0import java.io.IOException; >>> @@ -36,7 +38,8 @@ public class IndexMergeTool { >>> =C2=A0 =C2=A0 } >>> =C2=A0 =C2=A0 FSDirectory mergedIndex =3D FSDirectory.open(new File(arg= s[0])); >>> >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(mergedIndex, new = =C2=A0SimpleAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(mergedIndex, new = IndexWriterConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0Version.LUCENE_CURRENT).setOpenMode(OpenMo= de.CREATE)); >>> >>> =C2=A0 =C2=A0 Directory[] indexes =3D new Directory[args.length - 1]; >>> =C2=A0 =C2=A0 for (int i =3D 1; i < args.length; i++) { >>> >>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/ind= ex/TestFieldNormModifier.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/te= st/org/apache/lucene/index/TestFieldNormModifier.java?rev=3D921480&r1=3D921= 479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Tes= tFieldNormModifier.java (original) >>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Tes= tFieldNormModifier.java Wed Mar 10 17:53:46 2010 >>> @@ -23,7 +23,6 @@ import java.util.Arrays; >>> =C2=A0import org.apache.lucene.analysis.SimpleAnalyzer; >>> =C2=A0import org.apache.lucene.document.Document; >>> =C2=A0import org.apache.lucene.document.Field; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> =C2=A0import org.apache.lucene.search.Collector; >>> =C2=A0import org.apache.lucene.search.DefaultSimilarity; >>> =C2=A0import org.apache.lucene.search.IndexSearcher; >>> @@ -58,7 +57,9 @@ public class TestFieldNormModifier exten >>> =C2=A0 @Override >>> =C2=A0 protected void setUp() throws Exception { >>> =C2=A0 =C2=A0 super.setUp(); >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(store, new Simple= Analyzer(TEST_VERSION_CURRENT), true, MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(store, new IndexW= riterConfig( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT).setAnalyzer(new Simp= leAnalyzer( >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0TEST_VERSION_CURRENT))); >>> >>> =C2=A0 =C2=A0 for (int i =3D 0; i < NUM_DOCS; i++) { >>> =C2=A0 =C2=A0 =C2=A0 Document d =3D new Document(); >>> >>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/ind= ex/TestIndexSplitter.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/te= st/org/apache/lucene/index/TestIndexSplitter.java?rev=3D921480&r1=3D921479&= r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Tes= tIndexSplitter.java (original) >>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Tes= tIndexSplitter.java Wed Mar 10 17:53:46 2010 >>> @@ -18,9 +18,8 @@ package org.apache.lucene.index; >>> >>> =C2=A0import java.io.File; >>> >>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>> =C2=A0import org.apache.lucene.document.Document; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>> =C2=A0import org.apache.lucene.store.FSDirectory; >>> =C2=A0import org.apache.lucene.util.LuceneTestCase; >>> =C2=A0import org.apache.lucene.util._TestUtil; >>> @@ -35,7 +34,7 @@ public class TestIndexSplitter extends L >>> =C2=A0 =C2=A0 _TestUtil.rmDir(destDir); >>> =C2=A0 =C2=A0 destDir.mkdirs(); >>> =C2=A0 =C2=A0 FSDirectory fsDir =3D FSDirectory.open(dir); >>> - =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(fsDir, new Whitespace= Analyzer(TEST_VERSION_CURRENT), true, MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(fsDir, new IndexWrite= rConfig(TEST_VERSION_CURRENT).setOpenMode(OpenMode.CREATE)); >>> =C2=A0 =C2=A0 for (int x=3D0; x < 100; x++) { >>> =C2=A0 =C2=A0 =C2=A0 Document doc =3D TestIndexWriterReader.createDocum= ent(x, "index", 5); >>> =C2=A0 =C2=A0 =C2=A0 iw.addDocument(doc); >>> >>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/ind= ex/TestMultiPassIndexSplitter.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/te= st/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=3D921480&r1= =3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Tes= tMultiPassIndexSplitter.java (original) >>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Tes= tMultiPassIndexSplitter.java Wed Mar 10 17:53:46 2010 >>> @@ -16,10 +16,8 @@ package org.apache.lucene.index; >>> =C2=A0* limitations under the License. >>> =C2=A0*/ >>> >>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>> =C2=A0import org.apache.lucene.document.Document; >>> =C2=A0import org.apache.lucene.document.Field; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> =C2=A0import org.apache.lucene.store.Directory; >>> =C2=A0import org.apache.lucene.store.RAMDirectory; >>> =C2=A0import org.apache.lucene.util.LuceneTestCase; >>> @@ -32,8 +30,7 @@ public class TestMultiPassIndexSplitter >>> =C2=A0 protected void setUp() throws Exception { >>> =C2=A0 =C2=A0 super.setUp(); >>> =C2=A0 =C2=A0 RAMDirectory dir =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter w =3D new IndexWriter(dir, new WhitespaceAna= lyzer(TEST_VERSION_CURRENT), true, >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0MaxFieldLength.LIMITED); >>> + =C2=A0 =C2=A0IndexWriter w =3D new IndexWriter(dir, new IndexWriterCo= nfig(TEST_VERSION_CURRENT)); >>> =C2=A0 =C2=A0 Document doc; >>> =C2=A0 =C2=A0 for (int i =3D 0; i < NUM_DOCS; i++) { >>> =C2=A0 =C2=A0 =C2=A0 doc =3D new Document(); >>> >>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/ind= ex/TestTermVectorAccessor.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/te= st/org/apache/lucene/index/TestTermVectorAccessor.java?rev=3D921480&r1=3D92= 1479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Tes= tTermVectorAccessor.java (original) >>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Tes= tTermVectorAccessor.java Wed Mar 10 17:53:46 2010 >>> @@ -28,7 +28,7 @@ public class TestTermVectorAccessor exte >>> =C2=A0 public void test() throws Exception { >>> >>> =C2=A0 =C2=A0 Directory dir =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(dir, new StandardAnal= yzer(TEST_VERSION_CURRENT, Collections.emptySet()), true, IndexWriter.MaxFi= eldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter iw =3D new IndexWriter(dir, new IndexWriterC= onfig(TEST_VERSION_CURRENT).setAnalyzer(new StandardAnalyzer(TEST_VERSION_C= URRENT, Collections.emptySet()))); >>> >>> =C2=A0 =C2=A0 Document doc; >>> >>> >>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/mis= c/ChainedFilterTest.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/te= st/org/apache/lucene/misc/ChainedFilterTest.java?rev=3D921480&r1=3D921479&r= 2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/misc/Chai= nedFilterTest.java (original) >>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/misc/Chai= nedFilterTest.java Wed Mar 10 17:53:46 2010 >>> @@ -20,13 +20,11 @@ package org.apache.lucene.misc; >>> =C2=A0import java.util.Calendar; >>> =C2=A0import java.util.GregorianCalendar; >>> >>> -import org.apache.lucene.analysis.Analyzer; >>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>> =C2=A0import org.apache.lucene.document.Document; >>> =C2=A0import org.apache.lucene.document.Field; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Term; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> =C2=A0import org.apache.lucene.search.BooleanClause; >>> =C2=A0import org.apache.lucene.search.BooleanQuery; >>> =C2=A0import org.apache.lucene.search.CachingWrapperFilter; >>> @@ -58,8 +56,7 @@ public class ChainedFilterTest extends L >>> =C2=A0 protected void setUp() throws Exception { >>> =C2=A0 =C2=A0 super.setUp(); >>> =C2=A0 =C2=A0 directory =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter writer =3D >>> - =C2=A0 =C2=A0 =C2=A0 new IndexWriter(directory, new WhitespaceAnalyze= r(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(directory, new In= dexWriterConfig(TEST_VERSION_CURRENT)); >>> >>> =C2=A0 =C2=A0 Calendar cal =3D new GregorianCalendar(); >>> =C2=A0 =C2=A0 cal.clear(); >>> @@ -187,9 +184,7 @@ public class ChainedFilterTest extends L >>> >>> =C2=A0 public void testWithCachingFilter() throws Exception { >>> =C2=A0 =C2=A0 Directory dir =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0Analyzer analyzer =3D new WhitespaceAnalyzer(TEST_VERSIO= N_CURRENT); >>> - >>> - =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, analyzer, tr= ue, MaxFieldLength.LIMITED); >>> + =C2=A0 =C2=A0IndexWriter writer =3D new IndexWriter(dir, new IndexWri= terConfig(TEST_VERSION_CURRENT)); >>> =C2=A0 =C2=A0 writer.close(); >>> >>> =C2=A0 =C2=A0 Searcher searcher =3D new IndexSearcher(dir, true); >>> >>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/mis= c/TestLengthNormModifier.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/te= st/org/apache/lucene/misc/TestLengthNormModifier.java?rev=3D921480&r1=3D921= 479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/misc/Test= LengthNormModifier.java (original) >>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/misc/Test= LengthNormModifier.java Wed Mar 10 17:53:46 2010 >>> @@ -19,14 +19,13 @@ package org.apache.lucene.misc; >>> >>> =C2=A0import java.io.IOException; >>> >>> -import org.apache.lucene.analysis.SimpleAnalyzer; >>> =C2=A0import org.apache.lucene.document.Document; >>> =C2=A0import org.apache.lucene.document.Field; >>> =C2=A0import org.apache.lucene.index.FieldNormModifier; >>> =C2=A0import org.apache.lucene.index.IndexReader; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.index.Term; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> =C2=A0import org.apache.lucene.search.Collector; >>> =C2=A0import org.apache.lucene.search.DefaultSimilarity; >>> =C2=A0import org.apache.lucene.search.IndexSearcher; >>> @@ -61,7 +60,7 @@ public class TestLengthNormModifier exte >>> =C2=A0 =C2=A0 @Override >>> =C2=A0 =C2=A0 protected void setUp() throws Exception { >>> =C2=A0 =C2=A0 =C2=A0 super.setUp(); >>> - =C2=A0 =C2=A0 =C2=A0 IndexWriter writer =3D new IndexWriter(store, ne= w SimpleAnalyzer(TEST_VERSION_CURRENT), true, MaxFieldLength.UNLIMITED); >>> + =C2=A0 =C2=A0 =C2=A0 IndexWriter writer =3D new IndexWriter(store, ne= w IndexWriterConfig(TEST_VERSION_CURRENT)); >>> >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0for (int i =3D 0; i < NUM_DOCS; i++) { >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Document d =3D new Document(); >>> >>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/que= ryParser/complexPhrase/TestComplexPhraseQuery.java >>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/te= st/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java?= rev=3D921480&r1=3D921479&r2=3D921480&view=3Ddiff >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/queryPars= er/complexPhrase/TestComplexPhraseQuery.java (original) >>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/queryPars= er/complexPhrase/TestComplexPhraseQuery.java Wed Mar 10 17:53:46 2010 >>> @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.standa >>> =C2=A0import org.apache.lucene.document.Document; >>> =C2=A0import org.apache.lucene.document.Field; >>> =C2=A0import org.apache.lucene.index.IndexWriter; >>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>> +import org.apache.lucene.index.IndexWriterConfig; >>> =C2=A0import org.apache.lucene.queryParser.QueryParser; >>> =C2=A0import org.apache.lucene.search.IndexSearcher; >>> =C2=A0import org.apache.lucene.search.Query; >>> @@ -113,7 +113,7 @@ public class TestComplexPhraseQuery exte >>> =C2=A0 protected void setUp() throws Exception { >>> =C2=A0 =C2=A0 super.setUp(); >>> =C2=A0 =C2=A0 RAMDirectory rd =3D new RAMDirectory(); >>> - =C2=A0 =C2=A0IndexWriter w =3D new IndexWriter(rd, analyzer, MaxField= Length.UNLIMITED); >>> + =C2=A0 =C2=A0IndexWriter w =3D new IndexWriter(rd, new IndexWriterCon= fig(TEST_VERSION_CURRENT).setAnalyzer(analyzer)); >>> =C2=A0 =C2=A0 for (int i =3D 0; i < docsContent.length; i++) { >>> =C2=A0 =C2=A0 =C2=A0 Document doc =3D new Document(); >>> =C2=A0 =C2=A0 =C2=A0 doc.add(new Field("name", docsContent[i].name, Fie= ld.Store.YES, >>> >>> >>> >> >> >> >> -- >> Robert Muir >> rcmuir@gmail.com >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org >> For additional commands, e-mail: java-dev-help@lucene.apache.org >> >> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org > For additional commands, e-mail: java-dev-help@lucene.apache.org > > --=20 Robert Muir rcmuir@gmail.com --------------------------------------------------------------------- To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org For additional commands, e-mail: java-dev-help@lucene.apache.org