Return-Path: Delivered-To: apmail-lucene-java-dev-archive@www.apache.org Received: (qmail 81269 invoked from network); 10 Mar 2010 18:40:55 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Mar 2010 18:40:55 -0000 Received: (qmail 59178 invoked by uid 500); 10 Mar 2010 18:40:24 -0000 Delivered-To: apmail-lucene-java-dev-archive@lucene.apache.org Received: (qmail 59128 invoked by uid 500); 10 Mar 2010 18:40:23 -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 59120 invoked by uid 99); 10 Mar 2010 18:40:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Mar 2010 18:40:23 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=RCVD_IN_DNSWL_NONE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [209.85.210.184] (HELO mail-yx0-f184.google.com) (209.85.210.184) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Mar 2010 18:40:16 +0000 Received: by yxe14 with SMTP id 14so334373yxe.5 for ; Wed, 10 Mar 2010 10:39:55 -0800 (PST) MIME-Version: 1.0 Received: by 10.151.89.35 with SMTP id r35mr2004628ybl.183.1268246394930; Wed, 10 Mar 2010 10:39:54 -0800 (PST) In-Reply-To: <8f0ad1f31003101038wa2ca529l11f1950f6ab0fa0a@mail.gmail.com> References: <8f0ad1f31003101031w39eb1ec4ma81c94149293dc75@mail.gmail.com> <9ac0c6aa1003101037x3aed4f58s36dcf5d415cf4361@mail.gmail.com> <8f0ad1f31003101038wa2ca529l11f1950f6ab0fa0a@mail.gmail.com> Date: Wed, 10 Mar 2010 13:39:54 -0500 Message-ID: <9ac0c6aa1003101039t385dd151g23338662bad12d@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 From: Michael McCandless To: java-dev@lucene.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Not a problem -- this is how the iterations work! -- par for the course... Mike On Wed, Mar 10, 2010 at 1:38 PM, Robert Muir wrote: > 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 =A0-- I'll reopen the issue. =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, =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: >>>> =A0 =A0lucene/java/trunk/CHANGES.txt >>>> =A0 =A0lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/= lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java >>>> =A0 =A0lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/= lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java >>>> =A0 =A0lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/In= dexTask.java >>>> =A0 =A0lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/= benchmark/byTask/tasks/CreateIndexTask.java >>>> =A0 =A0lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/= benchmark/byTask/tasks/OpenIndexTask.java >>>> =A0 =A0lucene/java/trunk/contrib/benchmark/src/test/org/apache/lucene/= benchmark/byTask/TestPerfTasksLogic.java >>>> =A0 =A0lucene/java/trunk/contrib/fast-vector-highlighter/src/java/org/= apache/lucene/search/vectorhighlight/FieldTermStack.java >>>> =A0 =A0lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/= apache/lucene/search/vectorhighlight/AbstractTestCase.java >>>> =A0 =A0lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/= apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java >>>> =A0 =A0lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucen= e/search/highlight/HighlighterPhraseTest.java >>>> =A0 =A0lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucen= e/search/highlight/HighlighterTest.java >>>> =A0 =A0lucene/java/trunk/contrib/instantiated/src/test/org/apache/luce= ne/store/instantiated/TestEmptyIndex.java >>>> =A0 =A0lucene/java/trunk/contrib/instantiated/src/test/org/apache/luce= ne/store/instantiated/TestIndicesEquals.java >>>> =A0 =A0lucene/java/trunk/contrib/instantiated/src/test/org/apache/luce= ne/store/instantiated/TestSerialization.java >>>> =A0 =A0lucene/java/trunk/contrib/instantiated/src/test/org/apache/luce= ne/store/instantiated/TestUnoptimizedReaderOnConstructor.java >>>> =A0 =A0lucene/java/trunk/contrib/lucli/src/java/lucli/LuceneMethods.ja= va >>>> =A0 =A0lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/ind= ex/memory/MemoryIndexTest.java >>>> =A0 =A0lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/index= /MultiPassIndexSplitter.java >>>> =A0 =A0lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/misc/= IndexMergeTool.java >>>> =A0 =A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index= /TestFieldNormModifier.java >>>> =A0 =A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index= /TestIndexSplitter.java >>>> =A0 =A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index= /TestMultiPassIndexSplitter.java >>>> =A0 =A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index= /TestTermVectorAccessor.java >>>> =A0 =A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/misc/= ChainedFilterTest.java >>>> =A0 =A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/misc/= TestLengthNormModifier.java >>>> =A0 =A0lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/query= Parser/complexPhrase/TestComplexPhraseQuery.java >>>> =A0 =A0lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/se= arch/BooleanFilterTest.java >>>> =A0 =A0lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/se= arch/DuplicateFilterTest.java >>>> =A0 =A0lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/se= arch/FuzzyLikeThisQueryTest.java >>>> =A0 =A0lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/se= arch/TermsFilterTest.java >>>> =A0 =A0lucene/java/trunk/contrib/queries/src/test/org/apache/lucene/se= arch/similar/TestMoreLikeThis.java >>>> =A0 =A0lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucen= e/queryParser/standard/TestMultiFieldQPHelper.java >>>> =A0 =A0lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucen= e/queryParser/standard/TestMultiFieldQueryParserWrapper.java >>>> =A0 =A0lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucen= e/queryParser/standard/TestQPHelper.java >>>> =A0 =A0lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucen= e/queryParser/standard/TestQueryParserWrapper.java >>>> =A0 =A0lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/sear= ch/regex/TestRegexQuery.java >>>> =A0 =A0lucene/java/trunk/contrib/regex/src/test/org/apache/lucene/sear= ch/regex/TestSpanRegexQuery.java >>>> =A0 =A0lucene/java/trunk/contrib/remote/src/test/org/apache/lucene/sea= rch/TestRemoteCachingWrapperFilter.java >>>> =A0 =A0lucene/java/trunk/contrib/remote/src/test/org/apache/lucene/sea= rch/TestRemoteSearchable.java >>>> =A0 =A0lucene/java/trunk/contrib/remote/src/test/org/apache/lucene/sea= rch/TestRemoteSort.java >>>> =A0 =A0lucene/java/trunk/contrib/spatial/src/test/org/apache/lucene/sp= atial/tier/TestCartesian.java >>>> =A0 =A0lucene/java/trunk/contrib/spatial/src/test/org/apache/lucene/sp= atial/tier/TestDistance.java >>>> =A0 =A0lucene/java/trunk/contrib/spellchecker/src/java/org/apache/luce= ne/search/spell/SpellChecker.java >>>> =A0 =A0lucene/java/trunk/contrib/spellchecker/src/test/org/apache/luce= ne/search/spell/TestLuceneDictionary.java >>>> =A0 =A0lucene/java/trunk/contrib/spellchecker/src/test/org/apache/luce= ne/search/spell/TestSpellChecker.java >>>> =A0 =A0lucene/java/trunk/contrib/surround/src/test/org/apache/lucene/q= ueryParser/surround/query/SingleFieldTestDb.java >>>> =A0 =A0lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swin= g/models/ListSearcher.java >>>> =A0 =A0lucene/java/trunk/contrib/swing/src/java/org/apache/lucene/swin= g/models/TableSearcher.java >>>> =A0 =A0lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wo= rdnet/Syns2Index.java >>>> =A0 =A0lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/= lucene/xmlparser/TestParser.java >>>> =A0 =A0lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/= lucene/xmlparser/TestQueryTemplateManager.java >>>> =A0 =A0lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexFiles.ja= va >>>> =A0 =A0lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.jav= a >>>> =A0 =A0lucene/java/trunk/src/java/org/apache/lucene/index/DirectoryRea= der.java >>>> =A0 =A0lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWri= ter.java >>>> =A0 =A0lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.= java >>>> =A0 =A0lucene/java/trunk/src/java/org/apache/lucene/index/SegmentMerge= r.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/TestDemo.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/TestMergeScheduler= External.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/TestSearch.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/TestSearchForDupli= cates.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/TestSnapshotDeleti= onPolicy.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/analysis/TestCachi= ngTokenFilter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/analysis/TestKeywo= rdAnalyzer.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/collation/Collatio= nTestBase.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/document/TestBinar= yDocument.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/document/TestDocum= ent.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/DocHelper.ja= va >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestAddIndex= esNoOptimize.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestAtomicUp= date.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestBackward= sCompatibility.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestCheckInd= ex.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestConcurre= ntMergeScheduler.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestCrash.ja= va >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestDeletion= Policy.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestDirector= yReader.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestDoc.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestDocument= Writer.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestFieldsRe= ader.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestFilterIn= dexReader.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexFil= eDeleter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexRea= der.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexRea= derClone.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexRea= derCloneNorms.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexRea= derReopen.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWri= ter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWri= terDelete.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWri= terExceptions.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWri= terLockRelease.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWri= terMergePolicy.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWri= terMerging.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestIndexWri= terReader.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestLazyBug.= java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestLazyProx= Skipping.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestMultiLev= elSkipList.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestNRTReade= rWithThreads.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestNorms.ja= va >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestOmitTf.j= ava >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestParallel= Reader.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestParallel= ReaderEmptyIndex.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestParallel= TermEnum.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestPayloads= .java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestSegmentT= ermDocs.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestSegmentT= ermEnum.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestStressIn= dexing.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestStressIn= dexing2.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestTermVect= orsReader.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestTermdocP= erf.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestThreaded= Optimize.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestTransact= ionRollback.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/index/TestTransact= ions.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/queryParser/TestMu= ltiFieldQueryParser.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/queryParser/TestQu= eryParser.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/BaseTestRan= geFilter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/QueryUtils.= java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBoolean= 2.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBoolean= MinShouldMatch.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBoolean= Or.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBoolean= PrefixQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBoolean= Query.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestBoolean= Scorer.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestCaching= WrapperFilter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestCustomS= earcherSort.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDateFil= ter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDateSor= t.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDisjunc= tionMaxQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDocBoos= t.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestDocIdSe= t.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestElevati= onComparator.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestExplana= tions.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCa= che.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCa= cheRangeFilter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFieldCa= cheTermsFilter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFiltere= dQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFiltere= dSearch.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestFuzzyQu= ery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMatchAl= lDocsQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiPh= raseQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSe= archer.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiSe= archerRanking.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiTe= rmConstantScore.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiTh= readTermVectors.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestMultiVa= luedNumericRangeQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestNot.jav= a >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestNumeric= RangeQuery32.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestNumeric= RangeQuery64.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseP= refixQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPhraseQ= uery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPositio= nIncrement.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixF= ilter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixI= nBooleanQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestPrefixQ= uery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestQueryWr= apperFilter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestScorerP= erf.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSetNorm= .java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSimilar= ity.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSimpleE= xplanations.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSloppyP= hraseQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSort.ja= va >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestSpanQue= ryFilter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTermRan= geFilter.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTermRan= geQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTermSco= rer.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTermVec= tors.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestThreadS= afe.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTimeLim= itingCollector.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTopDocs= Collector.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestTopScor= eDocCollector.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/TestWildcar= d.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/function/Fu= nctionTestSetup.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/payloads/Pa= yloadHelper.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/payloads/Te= stPayloadNearQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/payloads/Te= stPayloadTermQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestB= asics.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestF= ieldMaskingSpanQuery.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestN= earSpansOrdered.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestP= ayloadSpans.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestS= pans.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestS= pansAdvanced.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestS= pansAdvanced2.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/store/TestBuffered= IndexInput.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/store/TestFileSwit= chDirectory.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/store/TestLockFact= ory.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/store/TestRAMDirec= tory.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/store/TestWindowsM= Map.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/util/TestFieldCach= eSanityChecker.java >>>> =A0 =A0lucene/java/trunk/src/test/org/apache/lucene/util/_TestUtil.jav= a >>>> >>>> Modified: lucene/java/trunk/CHANGES.txt >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=3D= 921480&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 >>>> =A0 use by external code. In addition it offers a matchExtension metho= d which >>>> =A0 callers can use to query whether a certain file matches a certain = extension. >>>> =A0 (Shai Erera via Mike McCandless) >>>> + >>>> +* LUCENE-2294: IndexWriter constructors have been deprecated in favor= of a >>>> + =A0single ctor which accepts IndexWriterConfig and a Directory. You = can set all >>>> + =A0the parameters related to IndexWriter on IndexWriterConfig. The d= ifferent >>>> + =A0setter/getter methods were deprecated as well. One should call >>>> + =A0writer.getConfig().getXYZ() to query for a parameter XYZ. >>>> + =A0Additionally, the setter/getter related to MergePolicy were depre= cated as >>>> + =A0well. One should interact with the MergePolicy directly. >>>> + =A0(Shai Erera via Mike McCandless) >>>> >>>> =A0* LUCENE-124: Add a TopTermsBoostOnlyBooleanQueryRewrite to MultiTe= rmQuery. >>>> =A0 This rewrite method is similar to TopTermsScoringBooleanQueryRewri= te, but >>>> >>>> Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apac= he/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/= common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerT= est.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/luc= ene/analysis/query/QueryAutoStopWordAnalyzerTest.java (original) >>>> +++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/luc= ene/analysis/query/QueryAutoStopWordAnalyzerTest.java Wed Mar 10 17:53:46 2= 010 >>>> @@ -31,6 +31,7 @@ import org.apache.lucene.document.Docume >>>> =A0import org.apache.lucene.document.Field; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Term; >>>> =A0import org.apache.lucene.queryParser.ParseException; >>>> =A0import org.apache.lucene.queryParser.QueryParser; >>>> @@ -51,7 +52,7 @@ public class QueryAutoStopWordAnalyzerTe >>>> =A0 =A0 super.setUp(); >>>> =A0 =A0 dir =3D new RAMDirectory(); >>>> =A0 =A0 appAnalyzer =3D new WhitespaceAnalyzer(TEST_VERSION_CURRENT); >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter(dir, appAnalyzer, true= , IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWriterCo= nfig(TEST_VERSION_CURRENT).setAnalyzer(appAnalyzer)); >>>> =A0 =A0 int numDocs =3D 200; >>>> =A0 =A0 for (int i =3D 0; i < numDocs; i++) { >>>> =A0 =A0 =A0 Document doc =3D new Document(); >>>> >>>> Modified: lucene/java/trunk/contrib/analyzers/common/src/test/org/apac= he/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/= common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTe= 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/luc= ene/analysis/shingle/ShingleAnalyzerWrapperTest.java (original) >>>> +++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/luc= ene/analysis/shingle/ShingleAnalyzerWrapperTest.java Wed Mar 10 17:53:46 20= 10 >>>> @@ -31,6 +31,7 @@ import org.apache.lucene.analysis.tokena >>>> =A0import org.apache.lucene.document.Document; >>>> =A0import org.apache.lucene.document.Field; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Term; >>>> =A0import org.apache.lucene.queryParser.QueryParser; >>>> =A0import org.apache.lucene.search.BooleanClause; >>>> @@ -59,7 +60,7 @@ public class ShingleAnalyzerWrapperTest >>>> =A0 =A0*/ >>>> =A0 public IndexSearcher setUpSearcher(Analyzer analyzer) throws Excep= tion { >>>> =A0 =A0 Directory dir =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter(dir, analyzer, true, I= ndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWriterCo= nfig(TEST_VERSION_CURRENT).setAnalyzer(analyzer)); >>>> >>>> =A0 =A0 Document doc; >>>> =A0 =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/ja= va/org/apache/lucene/ant/IndexTask.java?rev=3D921480&r1=3D921479&r2=3D92148= 0&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/Index= Task.java (original) >>>> +++ lucene/java/trunk/contrib/ant/src/java/org/apache/lucene/ant/Index= Task.java Wed Mar 10 17:53:46 2010 >>>> @@ -38,7 +38,10 @@ import org.apache.lucene.document.DateTo >>>> =A0import org.apache.lucene.document.Document; >>>> =A0import org.apache.lucene.document.Field; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> +import org.apache.lucene.index.LogMergePolicy; >>>> =A0import org.apache.lucene.index.Term; >>>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>>> =A0import org.apache.lucene.search.IndexSearcher; >>>> =A0import org.apache.lucene.search.ScoreDoc; >>>> =A0import org.apache.lucene.search.Searcher; >>>> @@ -280,15 +283,17 @@ public class IndexTask extends Task { >>>> >>>> =A0 =A0 =A0 log("checkLastModified =3D " + checkLastModified, Project.= MSG_VERBOSE); >>>> >>>> - =A0 =A0 =A0IndexWriter writer =3D >>>> - =A0 =A0 =A0 =A0new IndexWriter(dir, analyzer, create, IndexWriter.Ma= xFieldLength.LIMITED); >>>> - >>>> - =A0 =A0 =A0writer.setUseCompoundFile(useCompoundIndex); >>>> + =A0 =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWrit= erConfig( >>>> + =A0 =A0 =A0 =A0 =A0Version.LUCENE_CURRENT).setAnalyzer(analyzer).set= OpenMode( >>>> + =A0 =A0 =A0 =A0 =A0create ? OpenMode.CREATE : OpenMode.APPEND)); >>>> + =A0 =A0 =A0LogMergePolicy lmp =3D (LogMergePolicy) writer.getMergePo= licy(); >>>> + =A0 =A0 =A0lmp.setUseCompoundFile(useCompoundIndex); >>>> + =A0 =A0 =A0lmp.setUseCompoundDocStore(useCompoundIndex); >>>> + =A0 =A0 =A0lmp.setMergeFactor(mergeFactor); >>>> =A0 =A0 =A0 int totalFiles =3D 0; >>>> =A0 =A0 =A0 int totalIndexed =3D 0; >>>> =A0 =A0 =A0 int totalIgnored =3D 0; >>>> =A0 =A0 =A0 try { >>>> - =A0 =A0 =A0 =A0writer.setMergeFactor(mergeFactor); >>>> >>>> =A0 =A0 =A0 =A0 for (int i =3D 0; i < rcs.size(); i++) { >>>> =A0 =A0 =A0 =A0 =A0 ResourceCollection rc =3D rcs.elementAt(i); >>>> >>>> Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/luce= ne/benchmark/byTask/tasks/CreateIndexTask.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/= src/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/ben= chmark/byTask/tasks/CreateIndexTask.java (original) >>>> +++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/ben= chmark/byTask/tasks/CreateIndexTask.java Wed Mar 10 17:53:46 2010 >>>> @@ -21,9 +21,12 @@ import org.apache.lucene.benchmark.byTas >>>> =A0import org.apache.lucene.benchmark.byTask.utils.Config; >>>> =A0import org.apache.lucene.index.IndexDeletionPolicy; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.MergeScheduler; >>>> =A0import org.apache.lucene.index.ConcurrentMergeScheduler; >>>> =A0import org.apache.lucene.index.MergePolicy; >>>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>>> +import org.apache.lucene.util.Version; >>>> >>>> =A0import java.io.BufferedOutputStream; >>>> =A0import java.io.File; >>>> @@ -99,7 +102,7 @@ public class CreateIndexTask extends Per >>>> >>>> =A0 =A0 final double ramBuffer =3D config.get("ram.flush.mb",OpenIndex= Task.DEFAULT_RAM_FLUSH_MB); >>>> =A0 =A0 final int maxBuffered =3D config.get("max.buffered",OpenIndexT= ask.DEFAULT_MAX_BUFFERED); >>>> - =A0 =A0if (maxBuffered =3D=3D IndexWriter.DISABLE_AUTO_FLUSH) { >>>> + =A0 =A0if (maxBuffered =3D=3D IndexWriterConfig.DISABLE_AUTO_FLUSH) = { >>>> =A0 =A0 =A0 writer.setRAMBufferSizeMB(ramBuffer); >>>> =A0 =A0 =A0 writer.setMaxBufferedDocs(maxBuffered); >>>> =A0 =A0 } else { >>>> @@ -147,10 +150,9 @@ public class CreateIndexTask extends Per >>>> =A0 =A0 Config config =3D runData.getConfig(); >>>> >>>> =A0 =A0 IndexWriter writer =3D new IndexWriter(runData.getDirectory(), >>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 runData.getAnalyzer(), >>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 true, >>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 getIndexDeletionPolicy(config), >>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 IndexWriter.MaxFieldLength.LIMITED); >>>> + =A0 =A0 =A0 =A0new IndexWriterConfig(Version.LUCENE_31).setAnalyzer( >>>> + =A0 =A0 =A0 =A0 =A0 =A0runData.getAnalyzer()).setOpenMode(OpenMode.C= REATE) >>>> + =A0 =A0 =A0 =A0 =A0 =A0.setIndexDeletionPolicy(getIndexDeletionPolic= y(config))); >>>> =A0 =A0 setIndexWriterConfig(writer, config); >>>> =A0 =A0 runData.setIndexWriter(writer); >>>> =A0 =A0 return 1; >>>> >>>> Modified: lucene/java/trunk/contrib/benchmark/src/java/org/apache/luce= ne/benchmark/byTask/tasks/OpenIndexTask.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/= src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java?rev=3D= 921480&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/ben= chmark/byTask/tasks/OpenIndexTask.java (original) >>>> +++ lucene/java/trunk/contrib/benchmark/src/java/org/apache/lucene/ben= chmark/byTask/tasks/OpenIndexTask.java Wed Mar 10 17:53:46 2010 >>>> @@ -21,7 +21,9 @@ import org.apache.lucene.benchmark.byTas >>>> =A0import org.apache.lucene.benchmark.byTask.utils.Config; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> =A0import org.apache.lucene.index.IndexCommit; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.LogMergePolicy; >>>> +import org.apache.lucene.util.Version; >>>> >>>> =A0import java.io.IOException; >>>> >>>> @@ -39,10 +41,10 @@ import java.io.IOException; >>>> =A0*/ >>>> =A0public class OpenIndexTask extends PerfTask { >>>> >>>> - =A0public static final int DEFAULT_MAX_BUFFERED =3D IndexWriter.DEFA= ULT_MAX_BUFFERED_DOCS; >>>> - =A0public static final int DEFAULT_MAX_FIELD_LENGTH =3D IndexWriter.= DEFAULT_MAX_FIELD_LENGTH; >>>> + =A0public static final int DEFAULT_MAX_BUFFERED =3D IndexWriterConfi= g.DEFAULT_MAX_BUFFERED_DOCS; >>>> + =A0public static final int DEFAULT_MAX_FIELD_LENGTH =3D IndexWriterC= onfig.UNLIMITED_FIELD_LENGTH; >>>> =A0 public static final int DEFAULT_MERGE_PFACTOR =3D LogMergePolicy.D= EFAULT_MERGE_FACTOR; >>>> - =A0public static final double DEFAULT_RAM_FLUSH_MB =3D (int) IndexWr= iter.DEFAULT_RAM_BUFFER_SIZE_MB; >>>> + =A0public static final double DEFAULT_RAM_FLUSH_MB =3D (int) IndexWr= iterConfig.DEFAULT_RAM_BUFFER_SIZE_MB; >>>> =A0 private String commitUserData; >>>> >>>> =A0 public OpenIndexTask(PerfRunData runData) { >>>> @@ -61,10 +63,9 @@ public class OpenIndexTask extends PerfT >>>> =A0 =A0 } >>>> >>>> =A0 =A0 IndexWriter writer =3D new IndexWriter(runData.getDirectory(), >>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 runData.getAnalyzer(), >>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 CreateIndexTask.getIndexDeletionPolicy(config), >>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 IndexWriter.MaxFieldLength.UNLIMITED, >>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 ic); >>>> + =A0 =A0 =A0 =A0new IndexWriterConfig(Version.LUCENE_CURRENT).setAnal= yzer( >>>> + =A0 =A0 =A0 =A0 =A0 =A0runData.getAnalyzer()).setIndexDeletionPolicy= ( >>>> + =A0 =A0 =A0 =A0 =A0 =A0CreateIndexTask.getIndexDeletionPolicy(config= )).setIndexCommit(ic)); >>>> =A0 =A0 CreateIndexTask.setIndexWriterConfig(writer, config); >>>> =A0 =A0 runData.setIndexWriter(writer); >>>> =A0 =A0 return 1; >>>> >>>> Modified: lucene/java/trunk/contrib/benchmark/src/test/org/apache/luce= ne/benchmark/byTask/TestPerfTasksLogic.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/= src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.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/test/org/apache/lucene/ben= chmark/byTask/TestPerfTasksLogic.java (original) >>>> +++ lucene/java/trunk/contrib/benchmark/src/test/org/apache/lucene/ben= chmark/byTask/TestPerfTasksLogic.java Wed Mar 10 17:53:46 2010 >>>> @@ -36,12 +36,15 @@ import org.apache.lucene.benchmark.byTas >>>> =A0import org.apache.lucene.collation.CollationKeyAnalyzer; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> +import org.apache.lucene.index.LogMergePolicy; >>>> =A0import org.apache.lucene.index.Term; >>>> =A0import org.apache.lucene.index.TermEnum; >>>> =A0import org.apache.lucene.index.TermDocs; >>>> =A0import org.apache.lucene.index.SerialMergeScheduler; >>>> =A0import org.apache.lucene.index.LogDocMergePolicy; >>>> =A0import org.apache.lucene.index.TermFreqVector; >>>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>>> =A0import org.apache.lucene.store.Directory; >>>> =A0import org.apache.lucene.search.FieldCache.StringIndex; >>>> =A0import org.apache.lucene.search.FieldCache; >>>> @@ -96,7 +99,9 @@ public class TestPerfTasksLogic extends >>>> =A0 =A0 assertEquals("TestSearchTask was supposed to be called!",279,C= ountingSearchTestTask.numSearches); >>>> =A0 =A0 assertTrue("Index does not exist?...!", IndexReader.indexExist= s(benchmark.getRunData().getDirectory())); >>>> =A0 =A0 // now we should be able to open the index for write. >>>> - =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(),null,false, IndexWriter.MaxFieldLength.LIMITED); >>>> + =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(), >>>> + =A0 =A0 =A0 =A0new IndexWriterConfig(TEST_VERSION_CURRENT) >>>> + =A0 =A0 =A0 =A0 =A0 =A0.setOpenMode(OpenMode.APPEND)); >>>> =A0 =A0 iw.close(); >>>> =A0 =A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData().get= Directory(), true); >>>> =A0 =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 >>>> >>>> =A0 =A0 assertTrue("Index does not exist?...!", IndexReader.indexExist= s(benchmark.getRunData().getDirectory())); >>>> =A0 =A0 // now we should be able to open the index for write. >>>> - =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(),null,false, IndexWriter.MaxFieldLength.LIMITED); >>>> + =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(), new IndexWriterConfig(TEST_VERSION_CURRENT).setOpenMode(OpenMo= de.APPEND)); >>>> =A0 =A0 iw.close(); >>>> =A0 =A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData().get= Directory(), true); >>>> =A0 =A0 assertEquals("100 docs were added to the index, this is what w= e expect to find!",100,ir.numDocs()); >>>> @@ -221,7 +226,7 @@ public class TestPerfTasksLogic extends >>>> >>>> =A0 =A0 assertTrue("Index does not exist?...!", IndexReader.indexExist= s(benchmark.getRunData().getDirectory())); >>>> =A0 =A0 // now we should be able to open the index for write. >>>> - =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(),null,false,IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(), new IndexWriterConfig(TEST_VERSION_CURRENT).setOpenMode(OpenMo= de.APPEND)); >>>> =A0 =A0 iw.close(); >>>> =A0 =A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData().get= Directory(), true); >>>> =A0 =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 >>>> =A0 =A0 assertEquals("TestSearchTask was supposed to be called!",139,C= ountingSearchTestTask.numSearches); >>>> =A0 =A0 assertTrue("Index does not exist?...!", IndexReader.indexExist= s(benchmark.getRunData().getDirectory())); >>>> =A0 =A0 // now we should be able to open the index for write. >>>> - =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(),null,false,IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(), new IndexWriterConfig(TEST_VERSION_CURRENT).setOpenMode(OpenMo= de.APPEND)); >>>> =A0 =A0 iw.close(); >>>> =A0 =A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData().get= Directory(), true); >>>> =A0 =A0 assertEquals("1 docs were added to the index, this is what we = expect to find!",1,ir.numDocs()); >>>> @@ -417,7 +422,9 @@ public class TestPerfTasksLogic extends >>>> =A0 =A0 benchmark =3D execBenchmark(algLines2); >>>> >>>> =A0 =A0 // now we should be able to open the index for write. >>>> - =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(),null,false,IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter iw =3D new IndexWriter(benchmark.getRunData().get= Directory(), >>>> + =A0 =A0 =A0 =A0new IndexWriterConfig(TEST_VERSION_CURRENT) >>>> + =A0 =A0 =A0 =A0 =A0 =A0.setOpenMode(OpenMode.APPEND)); >>>> =A0 =A0 iw.close(); >>>> >>>> =A0 =A0 IndexReader ir =3D IndexReader.open(benchmark.getRunData().get= Directory(), true); >>>> @@ -655,7 +662,9 @@ public class TestPerfTasksLogic extends >>>> =A0 =A0 // 2. execute the algorithm =A0(required in every "logic" test= ) >>>> =A0 =A0 Benchmark benchmark =3D execBenchmark(algLines); >>>> >>>> - =A0 =A0assertTrue("did not use the specified MergeScheduler", ((MyMe= rgeScheduler) benchmark.getRunData().getIndexWriter().getMergeScheduler()).= called); >>>> + =A0 =A0assertTrue("did not use the specified MergeScheduler", >>>> + =A0 =A0 =A0 =A0((MyMergeScheduler) benchmark.getRunData().getIndexWr= iter().getConfig() >>>> + =A0 =A0 =A0 =A0 =A0 =A0.getMergeScheduler()).called); >>>> =A0 =A0 benchmark.getRunData().getIndexWriter().close(); >>>> >>>> =A0 =A0 // 3. test number of docs in the index >>>> @@ -743,10 +752,10 @@ public class TestPerfTasksLogic extends >>>> =A0 =A0 // 2. execute the algorithm =A0(required in every "logic" test= ) >>>> =A0 =A0 Benchmark benchmark =3D execBenchmark(algLines); >>>> =A0 =A0 final IndexWriter writer =3D benchmark.getRunData().getIndexWr= iter(); >>>> - =A0 =A0assertEquals(2, writer.getMaxBufferedDocs()); >>>> - =A0 =A0assertEquals(IndexWriter.DISABLE_AUTO_FLUSH, (int) writer.get= RAMBufferSizeMB()); >>>> - =A0 =A0assertEquals(3, writer.getMergeFactor()); >>>> - =A0 =A0assertFalse(writer.getUseCompoundFile()); >>>> + =A0 =A0assertEquals(2, writer.getConfig().getMaxBufferedDocs()); >>>> + =A0 =A0assertEquals(IndexWriterConfig.DISABLE_AUTO_FLUSH, (int) writ= er.getConfig().getRAMBufferSizeMB()); >>>> + =A0 =A0assertEquals(3, ((LogMergePolicy) writer.getMergePolicy()).ge= tMergeFactor()); >>>> + =A0 =A0assertFalse(((LogMergePolicy) writer.getMergePolicy()).getUse= CompoundFile()); >>>> =A0 =A0 writer.close(); >>>> =A0 =A0 Directory dir =3D benchmark.getRunData().getDirectory(); >>>> =A0 =A0 IndexReader reader =3D IndexReader.open(dir, true); >>>> >>>> Modified: lucene/java/trunk/contrib/fast-vector-highlighter/src/java/o= rg/apache/lucene/search/vectorhighlight/FieldTermStack.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/fast-vecto= r-highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermSt= ack.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/apa= che/lucene/search/vectorhighlight/FieldTermStack.java (original) >>>> +++ lucene/java/trunk/contrib/fast-vector-highlighter/src/java/org/apa= che/lucene/search/vectorhighlight/FieldTermStack.java Wed Mar 10 17:53:46 2= 010 >>>> @@ -30,10 +30,10 @@ import org.apache.lucene.document.Field. >>>> =A0import org.apache.lucene.document.Field.TermVector; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.TermFreqVector; >>>> =A0import org.apache.lucene.index.TermPositionVector; >>>> =A0import org.apache.lucene.index.TermVectorOffsetInfo; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> =A0import org.apache.lucene.queryParser.QueryParser; >>>> =A0import org.apache.lucene.search.Query; >>>> =A0import org.apache.lucene.store.Directory; >>>> @@ -50,13 +50,13 @@ public class FieldTermStack { >>>> =A0 LinkedList termList =3D new LinkedList(); >>>> >>>> =A0 public static void main( String[] args ) throws Exception { >>>> - =A0 =A0Analyzer analyzer =3D new WhitespaceAnalyzer(); >>>> + =A0 =A0Analyzer analyzer =3D new WhitespaceAnalyzer(Version.LUCENE_C= URRENT); >>>> =A0 =A0 QueryParser parser =3D new QueryParser(Version.LUCENE_CURRENT,= =A0"f", analyzer ); >>>> =A0 =A0 Query query =3D parser.parse( "a x:b" ); >>>> =A0 =A0 FieldQuery fieldQuery =3D new FieldQuery( query, true, false )= ; >>>> >>>> =A0 =A0 Directory dir =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter( dir, analyzer, MaxFie= ldLength.LIMITED ); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWriterCo= nfig(Version.LUCENE_CURRENT).setAnalyzer(analyzer)); >>>> =A0 =A0 Document doc =3D new Document(); >>>> =A0 =A0 doc.add( new Field( "f", "a a a b b c a b b c d e f", Store.YE= S, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) ); >>>> =A0 =A0 doc.add( new Field( "f", "b a b a f", Store.YES, Index.ANALYZE= D, TermVector.WITH_POSITIONS_OFFSETS ) ); >>>> >>>> Modified: lucene/java/trunk/contrib/fast-vector-highlighter/src/test/o= rg/apache/lucene/search/vectorhighlight/AbstractTestCase.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/fast-vecto= r-highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTes= tCase.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/apa= che/lucene/search/vectorhighlight/AbstractTestCase.java (original) >>>> +++ lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/apa= che/lucene/search/vectorhighlight/AbstractTestCase.java Wed Mar 10 17:53:46= 2010 >>>> @@ -35,8 +35,9 @@ import org.apache.lucene.document.Field. >>>> =A0import org.apache.lucene.document.Field.TermVector; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Term; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>>> =A0import org.apache.lucene.queryParser.QueryParser; >>>> =A0import org.apache.lucene.search.DisjunctionMaxQuery; >>>> =A0import org.apache.lucene.search.PhraseQuery; >>>> @@ -326,7 +327,9 @@ public abstract class AbstractTestCase e >>>> >>>> =A0 // make 1 doc with multi valued field >>>> =A0 protected void make1dmfIndex( Analyzer analyzer, String... values = ) throws Exception { >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter( dir, analyzer, true, = MaxFieldLength.LIMITED ); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWriterCo= nfig( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT).setAnalyzer(analyzer) >>>> + =A0 =A0 =A0 =A0.setOpenMode(OpenMode.CREATE)); >>>> =A0 =A0 Document doc =3D new Document(); >>>> =A0 =A0 for( String value: values ) >>>> =A0 =A0 =A0 doc.add( new Field( F, value, Store.YES, Index.ANALYZED, T= ermVector.WITH_POSITIONS_OFFSETS ) ); >>>> @@ -338,7 +341,9 @@ public abstract class AbstractTestCase e >>>> >>>> =A0 // make 1 doc with multi valued & not analyzed field >>>> =A0 protected void make1dmfIndexNA( String... values ) throws Exceptio= n { >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter( dir, analyzerK, true,= MaxFieldLength.LIMITED ); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWriterCo= nfig( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT).setOpenMode(OpenMode.CREATE).se= tAnalyzer( >>>> + =A0 =A0 =A0 =A0analyzerK)); >>>> =A0 =A0 Document doc =3D new Document(); >>>> =A0 =A0 for( String value: values ) >>>> =A0 =A0 =A0 doc.add( new Field( F, value, Store.YES, Index.NOT_ANALYZE= D, TermVector.WITH_POSITIONS_OFFSETS ) ); >>>> >>>> Modified: lucene/java/trunk/contrib/fast-vector-highlighter/src/test/o= rg/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/fast-vecto= r-highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragm= entsBuilderTest.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/apa= che/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (original= ) >>>> +++ lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/apa= che/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java Wed Mar 1= 0 17:53:46 2010 >>>> @@ -24,7 +24,8 @@ import org.apache.lucene.document.Field. >>>> =A0import org.apache.lucene.document.Field.TermVector; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =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; >>>> =A0import org.apache.lucene.search.Query; >>>> >>>> =A0public class SimpleFragmentsBuilderTest extends AbstractTestCase { >>>> @@ -118,7 +119,9 @@ public class SimpleFragmentsBuilderTest >>>> =A0 } >>>> >>>> =A0 protected void makeUnstoredIndex() throws Exception { >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter( dir, analyzerW, true,= MaxFieldLength.LIMITED ); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWriterCo= nfig( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT).setOpenMode(OpenMode.CREATE).se= tAnalyzer( >>>> + =A0 =A0 =A0 =A0analyzerW)); >>>> =A0 =A0 Document doc =3D new Document(); >>>> =A0 =A0 doc.add( new Field( F, "aaa", Store.NO, Index.ANALYZED, TermVe= ctor.WITH_POSITIONS_OFFSETS ) ); >>>> =A0 =A0 writer.addDocument( doc ); >>>> >>>> Modified: lucene/java/trunk/contrib/highlighter/src/test/org/apache/lu= cene/search/highlight/HighlighterPhraseTest.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/highlighte= r/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?re= v=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/s= earch/highlight/HighlighterPhraseTest.java (original) >>>> +++ lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/s= earch/highlight/HighlighterPhraseTest.java Wed Mar 10 17:53:46 2010 >>>> @@ -21,7 +21,6 @@ import java.io.IOException; >>>> >>>> =A0import org.apache.lucene.analysis.Token; >>>> =A0import org.apache.lucene.analysis.TokenStream; >>>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>>> =A0import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; >>>> =A0import org.apache.lucene.analysis.tokenattributes.PositionIncrement= Attribute; >>>> =A0import org.apache.lucene.analysis.tokenattributes.TermAttribute; >>>> @@ -33,9 +32,9 @@ import org.apache.lucene.document.Field. >>>> =A0import org.apache.lucene.index.CorruptIndexException; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Term; >>>> =A0import org.apache.lucene.index.TermPositionVector; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> =A0import org.apache.lucene.search.Collector; >>>> =A0import org.apache.lucene.search.IndexSearcher; >>>> =A0import org.apache.lucene.search.PhraseQuery; >>>> @@ -59,7 +58,7 @@ public class HighlighterPhraseTest exten >>>> =A0 =A0 final String TEXT =3D "the fox jumped"; >>>> =A0 =A0 final Directory directory =3D new RAMDirectory(); >>>> =A0 =A0 final IndexWriter indexWriter =3D new IndexWriter(directory, >>>> - =A0 =A0 =A0 =A0new WhitespaceAnalyzer(TEST_VERSION_CURRENT), MaxFiel= dLength.UNLIMITED); >>>> + =A0 =A0 =A0 =A0new IndexWriterConfig(TEST_VERSION_CURRENT)); >>>> =A0 =A0 try { >>>> =A0 =A0 =A0 final Document document =3D new Document(); >>>> =A0 =A0 =A0 document.add(new Field(FIELD, new TokenStreamConcurrent(), >>>> @@ -102,7 +101,7 @@ public class HighlighterPhraseTest exten >>>> =A0 =A0 final String TEXT =3D "the fox jumped"; >>>> =A0 =A0 final Directory directory =3D new RAMDirectory(); >>>> =A0 =A0 final IndexWriter indexWriter =3D new IndexWriter(directory, >>>> - =A0 =A0 =A0 =A0new WhitespaceAnalyzer(TEST_VERSION_CURRENT), MaxFiel= dLength.UNLIMITED); >>>> + =A0 =A0 =A0 =A0new IndexWriterConfig(TEST_VERSION_CURRENT)); >>>> =A0 =A0 try { >>>> =A0 =A0 =A0 final Document document =3D new Document(); >>>> =A0 =A0 =A0 document.add(new Field(FIELD, new TokenStreamConcurrent(), >>>> @@ -171,7 +170,7 @@ public class HighlighterPhraseTest exten >>>> =A0 =A0 final String TEXT =3D "the fox did not jump"; >>>> =A0 =A0 final Directory directory =3D new RAMDirectory(); >>>> =A0 =A0 final IndexWriter indexWriter =3D new IndexWriter(directory, >>>> - =A0 =A0 =A0 =A0new WhitespaceAnalyzer(TEST_VERSION_CURRENT), MaxFiel= dLength.UNLIMITED); >>>> + =A0 =A0 =A0 =A0new IndexWriterConfig(TEST_VERSION_CURRENT)); >>>> =A0 =A0 try { >>>> =A0 =A0 =A0 final Document document =3D new Document(); >>>> =A0 =A0 =A0 document.add(new Field(FIELD, new TokenStreamSparse(), >>>> @@ -213,7 +212,7 @@ public class HighlighterPhraseTest exten >>>> =A0 =A0 final String TEXT =3D "the fox did not jump"; >>>> =A0 =A0 final Directory directory =3D new RAMDirectory(); >>>> =A0 =A0 final IndexWriter indexWriter =3D new IndexWriter(directory, >>>> - =A0 =A0 =A0 =A0new WhitespaceAnalyzer(TEST_VERSION_CURRENT), MaxFiel= dLength.UNLIMITED); >>>> + =A0 =A0 =A0 =A0new IndexWriterConfig(TEST_VERSION_CURRENT)); >>>> =A0 =A0 try { >>>> =A0 =A0 =A0 final Document document =3D new Document(); >>>> =A0 =A0 =A0 document.add(new Field(FIELD, TEXT, Store.YES, Index.ANALY= ZED, >>>> @@ -253,7 +252,7 @@ public class HighlighterPhraseTest exten >>>> =A0 =A0 final String TEXT =3D "the fox did not jump"; >>>> =A0 =A0 final Directory directory =3D new RAMDirectory(); >>>> =A0 =A0 final IndexWriter indexWriter =3D new IndexWriter(directory, >>>> - =A0 =A0 =A0 =A0new WhitespaceAnalyzer(TEST_VERSION_CURRENT), MaxFiel= dLength.UNLIMITED); >>>> + =A0 =A0 =A0 =A0new IndexWriterConfig(TEST_VERSION_CURRENT)); >>>> =A0 =A0 try { >>>> =A0 =A0 =A0 final Document document =3D new Document(); >>>> =A0 =A0 =A0 document.add(new Field(FIELD, new TokenStreamSparse(), >>>> >>>> Modified: lucene/java/trunk/contrib/highlighter/src/test/org/apache/lu= cene/search/highlight/HighlighterTest.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/highlighte= r/src/test/org/apache/lucene/search/highlight/HighlighterTest.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/highlighter/src/test/org/apache/lucene/s= earch/highlight/HighlighterTest.java (original) >>>> +++ lucene/java/trunk/contrib/highlighter/src/test/org/apache/lucene/s= earch/highlight/HighlighterTest.java Wed Mar 10 17:53:46 2010 >>>> @@ -51,8 +51,9 @@ import org.apache.lucene.document.Field. >>>> =A0import org.apache.lucene.document.Field.Store; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Term; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>>> =A0import org.apache.lucene.queryParser.ParseException; >>>> =A0import org.apache.lucene.queryParser.QueryParser; >>>> =A0import org.apache.lucene.search.BooleanQuery; >>>> @@ -80,7 +81,6 @@ import org.apache.lucene.search.spans.Sp >>>> =A0import org.apache.lucene.store.Directory; >>>> =A0import org.apache.lucene.store.RAMDirectory; >>>> =A0import org.apache.lucene.util.LuceneTestCase; >>>> -import org.apache.lucene.util.Version; >>>> =A0import org.w3c.dom.Element; >>>> =A0import org.w3c.dom.NodeList; >>>> >>>> @@ -89,8 +89,6 @@ import org.w3c.dom.NodeList; >>>> =A0* >>>> =A0*/ >>>> =A0public class HighlighterTest extends BaseTokenStreamTestCase implem= ents Formatter { >>>> - =A0// TODO: change to CURRENT, does not work because posIncr: >>>> - =A0static final Version TEST_VERSION =3D TEST_VERSION_CURRENT; >>>> >>>> =A0 private IndexReader reader; >>>> =A0 static final String FIELD_NAME =3D "contents"; >>>> @@ -99,7 +97,7 @@ public class HighlighterTest extends Bas >>>> =A0 RAMDirectory ramDir; >>>> =A0 public IndexSearcher searcher =3D null; >>>> =A0 int numHighlights =3D 0; >>>> - =A0final Analyzer analyzer =3D new StandardAnalyzer(TEST_VERSION); >>>> + =A0final Analyzer analyzer =3D new StandardAnalyzer(TEST_VERSION_CUR= RENT); >>>> =A0 TopDocs hits; >>>> >>>> =A0 String[] texts =3D { >>>> @@ -120,7 +118,7 @@ public class HighlighterTest extends Bas >>>> >>>> =A0 public void testQueryScorerHits() throws Exception { >>>> =A0 =A0 Analyzer analyzer =3D new SimpleAnalyzer(TEST_VERSION_CURRENT)= ; >>>> - =A0 =A0QueryParser qp =3D new QueryParser(TEST_VERSION, FIELD_NAME, = analyzer); >>>> + =A0 =A0QueryParser qp =3D new QueryParser(TEST_VERSION_CURRENT, FIEL= D_NAME, analyzer); >>>> =A0 =A0 query =3D qp.parse("\"very long\""); >>>> =A0 =A0 searcher =3D new IndexSearcher(ramDir, true); >>>> =A0 =A0 TopDocs hits =3D searcher.search(query, 10); >>>> @@ -150,7 +148,7 @@ public class HighlighterTest extends Bas >>>> >>>> =A0 =A0 String s1 =3D "I call our world Flatland, not because we call = it so,"; >>>> >>>> - =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION, FIELD_NA= ME, new StandardAnalyzer(TEST_VERSION)); >>>> + =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION_CURRENT, = FIELD_NAME, new StandardAnalyzer(TEST_VERSION_CURRENT)); >>>> >>>> =A0 =A0 // Verify that a query against the default field results in te= xt being >>>> =A0 =A0 // highlighted >>>> @@ -182,7 +180,7 @@ public class HighlighterTest extends Bas >>>> =A0 =A0*/ >>>> =A0 private static String highlightField(Query query, String fieldName= , String text) >>>> =A0 =A0 =A0 throws IOException, InvalidTokenOffsetsException { >>>> - =A0 =A0TokenStream tokenStream =3D new StandardAnalyzer(TEST_VERSION= ).tokenStream(fieldName, new StringReader(text)); >>>> + =A0 =A0TokenStream tokenStream =3D new StandardAnalyzer(TEST_VERSION= _CURRENT).tokenStream(fieldName, new StringReader(text)); >>>> =A0 =A0 // Assuming "", "" used to highlight >>>> =A0 =A0 SimpleHTMLFormatter formatter =3D new SimpleHTMLFormatter(); >>>> =A0 =A0 QueryScorer scorer =3D new QueryScorer(query, fieldName, FIELD= _NAME); >>>> @@ -228,7 +226,7 @@ public class HighlighterTest extends Bas >>>> =A0 =A0 String q =3D "(" + f1c + ph1 + " OR " + f2c + ph1 + ") AND (" = + f1c + ph2 >>>> =A0 =A0 =A0 =A0 + " OR " + f2c + ph2 + ")"; >>>> =A0 =A0 Analyzer analyzer =3D new WhitespaceAnalyzer(TEST_VERSION_CURR= ENT); >>>> - =A0 =A0QueryParser qp =3D new QueryParser(TEST_VERSION, f1, analyzer= ); >>>> + =A0 =A0QueryParser qp =3D new QueryParser(TEST_VERSION_CURRENT, f1, = analyzer); >>>> =A0 =A0 Query query =3D qp.parse(q); >>>> >>>> =A0 =A0 QueryScorer scorer =3D new QueryScorer(query, f1); >>>> @@ -678,7 +676,7 @@ public class HighlighterTest extends Bas >>>> =A0 =A0 =A0 =A0 // Need to explicitly set the QueryParser property to = use TermRangeQuery >>>> =A0 =A0 =A0 =A0 // rather >>>> =A0 =A0 =A0 =A0 // than RangeFilters >>>> - =A0 =A0 =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION, = FIELD_NAME, analyzer); >>>> + =A0 =A0 =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION_C= URRENT, FIELD_NAME, analyzer); >>>> =A0 =A0 =A0 =A0 parser.setMultiTermRewriteMethod(MultiTermQuery.SCORIN= G_BOOLEAN_QUERY_REWRITE); >>>> =A0 =A0 =A0 =A0 query =3D parser.parse(queryString); >>>> =A0 =A0 =A0 =A0 doSearching(query); >>>> @@ -1028,7 +1026,7 @@ public class HighlighterTest extends Bas >>>> =A0 =A0 =A0 =A0 String srchkey =3D "football"; >>>> >>>> =A0 =A0 =A0 =A0 String s =3D "football-soccer in the euro 2004 footie = competition"; >>>> - =A0 =A0 =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION, = "bookid", analyzer); >>>> + =A0 =A0 =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION_C= URRENT, "bookid", analyzer); >>>> =A0 =A0 =A0 =A0 Query query =3D parser.parse(srchkey); >>>> >>>> =A0 =A0 =A0 =A0 TokenStream tokenStream =3D analyzer.tokenStream(null,= new StringReader(s)); >>>> @@ -1154,13 +1152,13 @@ public class HighlighterTest extends Bas >>>> =A0 =A0 =A0 =A0 =A0 sb.append(stopWords.iterator().next()); >>>> =A0 =A0 =A0 =A0 } >>>> =A0 =A0 =A0 =A0 SimpleHTMLFormatter fm =3D new SimpleHTMLFormatter(); >>>> - =A0 =A0 =A0 =A0Highlighter hg =3D getHighlighter(query, "data", new = StandardAnalyzer(TEST_VERSION, stopWords).tokenStream( >>>> + =A0 =A0 =A0 =A0Highlighter hg =3D getHighlighter(query, "data", new = StandardAnalyzer(TEST_VERSION_CURRENT, stopWords).tokenStream( >>>> =A0 =A0 =A0 =A0 =A0 =A0 "data", new StringReader(sb.toString())), fm);= // new Highlighter(fm, >>>> =A0 =A0 =A0 =A0 // new >>>> =A0 =A0 =A0 =A0 // QueryTermScorer(query)); >>>> =A0 =A0 =A0 =A0 hg.setTextFragmenter(new NullFragmenter()); >>>> =A0 =A0 =A0 =A0 hg.setMaxDocCharsToAnalyze(100); >>>> - =A0 =A0 =A0 =A0match =3D hg.getBestFragment(new StandardAnalyzer(TES= T_VERSION, stopWords), "data", sb.toString()); >>>> + =A0 =A0 =A0 =A0match =3D hg.getBestFragment(new StandardAnalyzer(TES= T_VERSION_CURRENT, stopWords), "data", sb.toString()); >>>> =A0 =A0 =A0 =A0 assertTrue("Matched text should be no more than 100 ch= ars in length ", match.length() < hg >>>> =A0 =A0 =A0 =A0 =A0 =A0 .getMaxDocCharsToAnalyze()); >>>> >>>> @@ -1171,7 +1169,7 @@ public class HighlighterTest extends Bas >>>> =A0 =A0 =A0 =A0 // + whitespace) >>>> =A0 =A0 =A0 =A0 sb.append(" "); >>>> =A0 =A0 =A0 =A0 sb.append(goodWord); >>>> - =A0 =A0 =A0 =A0match =3D hg.getBestFragment(new StandardAnalyzer(TES= T_VERSION, stopWords), "data", sb.toString()); >>>> + =A0 =A0 =A0 =A0match =3D hg.getBestFragment(new StandardAnalyzer(TES= T_VERSION_CURRENT, stopWords), "data", sb.toString()); >>>> =A0 =A0 =A0 =A0 assertTrue("Matched text should be no more than 100 ch= ars in length ", match.length() < hg >>>> =A0 =A0 =A0 =A0 =A0 =A0 .getMaxDocCharsToAnalyze()); >>>> =A0 =A0 =A0 } >>>> @@ -1192,11 +1190,11 @@ public class HighlighterTest extends Bas >>>> >>>> =A0 =A0 =A0 =A0 String text =3D "this is a text with searchterm in it"= ; >>>> =A0 =A0 =A0 =A0 SimpleHTMLFormatter fm =3D new SimpleHTMLFormatter(); >>>> - =A0 =A0 =A0 =A0Highlighter hg =3D getHighlighter(query, "text", new = StandardAnalyzer(TEST_VERSION, >>>> + =A0 =A0 =A0 =A0Highlighter hg =3D getHighlighter(query, "text", new = StandardAnalyzer(TEST_VERSION_CURRENT, >>>> =A0 =A0 =A0 =A0 =A0 =A0 stopWords).tokenStream("text", new StringReade= r(text)), fm); >>>> =A0 =A0 =A0 =A0 hg.setTextFragmenter(new NullFragmenter()); >>>> =A0 =A0 =A0 =A0 hg.setMaxDocCharsToAnalyze(36); >>>> - =A0 =A0 =A0 =A0String match =3D hg.getBestFragment(new StandardAnaly= zer(TEST_VERSION, stopWords), "text", text); >>>> + =A0 =A0 =A0 =A0String match =3D hg.getBestFragment(new StandardAnaly= zer(TEST_VERSION_CURRENT, stopWords), "text", text); >>>> =A0 =A0 =A0 =A0 assertTrue( >>>> =A0 =A0 =A0 =A0 =A0 =A0 "Matched text should contain remainder of text= after highlighted query ", >>>> =A0 =A0 =A0 =A0 =A0 =A0 match.endsWith("in it")); >>>> @@ -1213,9 +1211,9 @@ public class HighlighterTest extends Bas >>>> =A0 =A0 =A0 =A0 numHighlights =3D 0; >>>> =A0 =A0 =A0 =A0 // test to show how rewritten query can still be used >>>> =A0 =A0 =A0 =A0 searcher =3D new IndexSearcher(ramDir, true); >>>> - =A0 =A0 =A0 =A0Analyzer analyzer =3D new StandardAnalyzer(TEST_VERSI= ON); >>>> + =A0 =A0 =A0 =A0Analyzer analyzer =3D new StandardAnalyzer(TEST_VERSI= ON_CURRENT); >>>> >>>> - =A0 =A0 =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION, = FIELD_NAME, analyzer); >>>> + =A0 =A0 =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION_C= URRENT, FIELD_NAME, analyzer); >>>> =A0 =A0 =A0 =A0 Query query =3D parser.parse("JF? or Kenned*"); >>>> =A0 =A0 =A0 =A0 System.out.println("Searching with primitive query"); >>>> =A0 =A0 =A0 =A0 // forget to set this and... >>>> @@ -1326,7 +1324,9 @@ public class HighlighterTest extends Bas >>>> =A0 public void testMultiSearcher() throws Exception { >>>> =A0 =A0 // setup index 1 >>>> =A0 =A0 RAMDirectory ramDir1 =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter writer1 =3D new IndexWriter(ramDir1, new Standard= Analyzer(TEST_VERSION), true, IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter writer1 =3D new IndexWriter(ramDir1, new IndexWri= terConfig( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT).setAnalyzer(new StandardAnalyze= r( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT))); >>>> =A0 =A0 Document d =3D new Document(); >>>> =A0 =A0 Field f =3D new Field(FIELD_NAME, "multiOne", Field.Store.YES,= Field.Index.ANALYZED); >>>> =A0 =A0 d.add(f); >>>> @@ -1337,7 +1337,9 @@ public class HighlighterTest extends Bas >>>> >>>> =A0 =A0 // setup index 2 >>>> =A0 =A0 RAMDirectory ramDir2 =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter writer2 =3D new IndexWriter(ramDir2, new Standard= Analyzer(TEST_VERSION), true, IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter writer2 =3D new IndexWriter(ramDir2, new IndexWri= terConfig( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT).setAnalyzer(new StandardAnalyze= r( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT))); >>>> =A0 =A0 d =3D new Document(); >>>> =A0 =A0 f =3D new Field(FIELD_NAME, "multiTwo", Field.Store.YES, Field= .Index.ANALYZED); >>>> =A0 =A0 d.add(f); >>>> @@ -1350,7 +1352,7 @@ public class HighlighterTest extends Bas >>>> =A0 =A0 searchers[0] =3D new IndexSearcher(ramDir1, true); >>>> =A0 =A0 searchers[1] =3D new IndexSearcher(ramDir2, true); >>>> =A0 =A0 MultiSearcher multiSearcher =3D new MultiSearcher(searchers); >>>> - =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION, FIELD_NA= ME, new StandardAnalyzer(TEST_VERSION)); >>>> + =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION_CURRENT, = FIELD_NAME, new StandardAnalyzer(TEST_VERSION_CURRENT)); >>>> =A0 =A0 parser.setMultiTermRewriteMethod(MultiTermQuery.SCORING_BOOLEA= N_QUERY_REWRITE); >>>> =A0 =A0 query =3D parser.parse("multi*"); >>>> =A0 =A0 System.out.println("Searching for: " + query.toString(FIELD_NA= ME)); >>>> @@ -1384,7 +1386,7 @@ public class HighlighterTest extends Bas >>>> =A0 =A0 =A0 @Override >>>> =A0 =A0 =A0 public void run() throws Exception { >>>> =A0 =A0 =A0 =A0 String docMainText =3D "fred is one of the people"; >>>> - =A0 =A0 =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION, = FIELD_NAME, analyzer); >>>> + =A0 =A0 =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION_C= URRENT, FIELD_NAME, analyzer); >>>> =A0 =A0 =A0 =A0 Query query =3D parser.parse("fred category:people"); >>>> >>>> =A0 =A0 =A0 =A0 // highlighting respects fieldnames used in query >>>> @@ -1530,64 +1532,64 @@ public class HighlighterTest extends Bas >>>> =A0 =A0 =A0 =A0 Highlighter highlighter; >>>> =A0 =A0 =A0 =A0 String result; >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("foo"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("foo"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2()= , HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2(), s, 3= , "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("10"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("10"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2()= , HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2(), s, 3= , "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2()= , HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2(), s, 3= , "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("speed"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("speed"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2()= , HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2(), s, 3= , "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hispeed"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hispeed"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2()= , HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2(), s, 3= , "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi speed"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi speed"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2()= , HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2(), s, 3= , "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> =A0 =A0 =A0 =A0 // ///////////////// same tests, just put the bigger o= verlapping token >>>> =A0 =A0 =A0 =A0 // first >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("foo"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("foo"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2a(= ), HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2a(), s, = 3, "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("10"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("10"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2a(= ), HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2a(), s, = 3, "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2a(= ), HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2a(), s, = 3, "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("speed"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("speed"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2a(= ), HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2a(), s, = 3, "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hispeed"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hispeed"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2a(= ), HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2a(), s, = 3, "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> >>>> - =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION, "text", new W= hitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi speed"); >>>> + =A0 =A0 =A0 =A0query =3D new QueryParser(TEST_VERSION_CURRENT, "text= ", new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).parse("hi speed"); >>>> =A0 =A0 =A0 =A0 highlighter =3D getHighlighter(query, "text", getTS2a(= ), HighlighterTest.this); >>>> =A0 =A0 =A0 =A0 result =3D highlighter.getBestFragments(getTS2a(), s, = 3, "..."); >>>> =A0 =A0 =A0 =A0 assertEquals("Hi-Speed10 foo", result); >>>> @@ -1613,7 +1615,7 @@ public class HighlighterTest extends Bas >>>> =A0 } >>>> >>>> =A0 private void makeIndex() throws IOException { >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter( dir, a, MaxFieldLengt= h.LIMITED ); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWriterCo= nfig(TEST_VERSION_CURRENT)); >>>> =A0 =A0 writer.addDocument( doc( "t_text1", "random words for highligh= ting tests del" ) ); >>>> =A0 =A0 writer.addDocument( doc( "t_text1", "more random words for sec= ond field del" ) ); >>>> =A0 =A0 writer.addDocument( doc( "t_text1", "random words for highligh= ting tests del" ) ); >>>> @@ -1623,7 +1625,7 @@ public class HighlighterTest extends Bas >>>> =A0 } >>>> >>>> =A0 private void deleteDocument() throws IOException { >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter( dir, a, false, MaxFie= ldLength.LIMITED ); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWriterCo= nfig(TEST_VERSION_CURRENT).setOpenMode(OpenMode.APPEND)); >>>> =A0 =A0 writer.deleteDocuments( new Term( "t_text1", "del" ) ); >>>> =A0 =A0 // To see negative idf, keep comment the following line >>>> =A0 =A0 //writer.optimize(); >>>> @@ -1632,7 +1634,7 @@ public class HighlighterTest extends Bas >>>> >>>> =A0 private void searchIndex() throws IOException, ParseException, Inv= alidTokenOffsetsException { >>>> =A0 =A0 String q =3D "t_text1:random"; >>>> - =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION, =A0"t_te= xt1", a ); >>>> + =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION_CURRENT, = =A0"t_text1", a ); >>>> =A0 =A0 Query query =3D parser.parse( q ); >>>> =A0 =A0 IndexSearcher searcher =3D new IndexSearcher( dir, true ); >>>> =A0 =A0 // This scorer can return negative idf -> null fragment >>>> @@ -1686,7 +1688,7 @@ public class HighlighterTest extends Bas >>>> =A0 } >>>> >>>> =A0 public void doSearching(String queryString) throws Exception { >>>> - =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION, FIELD_NA= ME, analyzer); >>>> + =A0 =A0QueryParser parser =3D new QueryParser(TEST_VERSION_CURRENT, = FIELD_NAME, analyzer); >>>> =A0 =A0 parser.setEnablePositionIncrements(true); >>>> =A0 =A0 parser.setMultiTermRewriteMethod(MultiTermQuery.SCORING_BOOLEA= N_QUERY_REWRITE); >>>> =A0 =A0 query =3D parser.parse(queryString); >>>> @@ -1725,7 +1727,9 @@ public class HighlighterTest extends Bas >>>> =A0 protected void setUp() throws Exception { >>>> =A0 =A0 super.setUp(); >>>> =A0 =A0 ramDir =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter(ramDir, new StandardAn= alyzer(TEST_VERSION), true, IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(ramDir, new IndexWrite= rConfig( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT).setAnalyzer(new StandardAnalyze= r( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT))); >>>> =A0 =A0 for (int i =3D 0; i < texts.length; i++) { >>>> =A0 =A0 =A0 addDoc(writer, texts[i]); >>>> =A0 =A0 } >>>> >>>> Modified: lucene/java/trunk/contrib/instantiated/src/test/org/apache/l= ucene/store/instantiated/TestEmptyIndex.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiat= ed/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java?rev=3D= 921480&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/= store/instantiated/TestEmptyIndex.java (original) >>>> +++ lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/= store/instantiated/TestEmptyIndex.java Wed Mar 10 17:53:46 2010 >>>> @@ -16,9 +16,12 @@ >>>> >>>> =A0package org.apache.lucene.store.instantiated; >>>> >>>> -import junit.framework.TestCase; >>>> +import java.io.IOException; >>>> +import java.util.Arrays; >>>> + >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Term; >>>> =A0import org.apache.lucene.index.TermEnum; >>>> =A0import org.apache.lucene.search.IndexSearcher; >>>> @@ -26,11 +29,9 @@ import org.apache.lucene.search.TermQuer >>>> =A0import org.apache.lucene.search.TopDocs; >>>> =A0import org.apache.lucene.store.Directory; >>>> =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 { >>>> >>>> =A0 public void testSearch() throws Exception { >>>> >>>> @@ -60,7 +61,7 @@ public class TestEmptyIndex extends Test >>>> =A0 =A0 // make sure a Directory acts the same >>>> >>>> =A0 =A0 Directory d =3D new RAMDirectory(); >>>> - =A0 =A0new IndexWriter(d, null, true, IndexWriter.MaxFieldLength.UNL= IMITED).close(); >>>> + =A0 =A0new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT= )).close(); >>>> =A0 =A0 r =3D IndexReader.open(d, false); >>>> =A0 =A0 testNorms(r); >>>> =A0 =A0 r.close(); >>>> @@ -93,7 +94,7 @@ public class TestEmptyIndex extends Test >>>> =A0 =A0 // make sure a Directory acts the same >>>> >>>> =A0 =A0 Directory d =3D new RAMDirectory(); >>>> - =A0 =A0new IndexWriter(d, null, true, IndexWriter.MaxFieldLength.UNL= IMITED).close(); >>>> + =A0 =A0new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT= )).close(); >>>> =A0 =A0 r =3D IndexReader.open(d, false); >>>> =A0 =A0 termEnumTest(r); >>>> =A0 =A0 r.close(); >>>> >>>> Modified: lucene/java/trunk/contrib/instantiated/src/test/org/apache/l= ucene/store/instantiated/TestIndicesEquals.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiat= ed/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/= store/instantiated/TestIndicesEquals.java (original) >>>> +++ lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/= store/instantiated/TestIndicesEquals.java Wed Mar 10 17:53:46 2010 >>>> @@ -30,6 +30,7 @@ import org.apache.lucene.document.Docume >>>> =A0import org.apache.lucene.document.Field; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Payload; >>>> =A0import org.apache.lucene.index.Term; >>>> =A0import org.apache.lucene.index.TermDocs; >>>> @@ -60,7 +61,9 @@ public class TestIndicesEquals extends L >>>> =A0 =A0 RAMDirectory dir =3D new RAMDirectory(); >>>> >>>> =A0 =A0 // create dir data >>>> - =A0 =A0IndexWriter indexWriter =3D new IndexWriter(dir, new Standard= Analyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIMITED)= ; >>>> + =A0 =A0IndexWriter indexWriter =3D new IndexWriter(dir, new IndexWri= terConfig( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT).setAnalyzer(new StandardAnalyze= r( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT))); >>>> =A0 =A0 for (int i =3D 0; i < 20; i++) { >>>> =A0 =A0 =A0 Document document =3D new Document(); >>>> =A0 =A0 =A0 assembleDocument(document, i); >>>> @@ -84,7 +87,9 @@ public class TestIndicesEquals extends L >>>> =A0 =A0 InstantiatedIndex ii =3D new InstantiatedIndex(); >>>> >>>> =A0 =A0 // create dir data >>>> - =A0 =A0IndexWriter indexWriter =3D new IndexWriter(dir, new Standard= Analyzer(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIMITED)= ; >>>> + =A0 =A0IndexWriter indexWriter =3D new IndexWriter(dir, new IndexWri= terConfig( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT).setAnalyzer(new StandardAnalyze= r( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT))); >>>> =A0 =A0 for (int i =3D 0; i < 500; i++) { >>>> =A0 =A0 =A0 Document document =3D new Document(); >>>> =A0 =A0 =A0 assembleDocument(document, i); >>>> >>>> Modified: lucene/java/trunk/contrib/instantiated/src/test/org/apache/l= ucene/store/instantiated/TestSerialization.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiat= ed/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/= store/instantiated/TestSerialization.java (original) >>>> +++ lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/= store/instantiated/TestSerialization.java Wed Mar 10 17:53:46 2010 >>>> @@ -22,7 +22,7 @@ import org.apache.lucene.store.Directory >>>> =A0import org.apache.lucene.util.LuceneTestCase; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.document.Document; >>>> =A0import org.apache.lucene.document.Field; >>>> >>>> @@ -35,7 +35,7 @@ public class TestSerialization extends L >>>> >>>> =A0 =A0 Directory dir =3D new RAMDirectory(); >>>> >>>> - =A0 =A0IndexWriter iw =3D new IndexWriter(dir, new WhitespaceAnalyze= r(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter iw =3D new IndexWriter(dir, new IndexWriterConfig= (TEST_VERSION_CURRENT)); >>>> =A0 =A0 Document doc =3D new Document(); >>>> =A0 =A0 doc.add(new Field("foo", "bar rab abr bra rba", Field.Store.NO= , Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); >>>> =A0 =A0 doc.add(new Field("moo", "bar rab abr bra rba", Field.Store.YE= S, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS)); >>>> >>>> Modified: lucene/java/trunk/contrib/instantiated/src/test/org/apache/l= ucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/instantiat= ed/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnCon= structor.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/= store/instantiated/TestUnoptimizedReaderOnConstructor.java (original) >>>> +++ lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/= store/instantiated/TestUnoptimizedReaderOnConstructor.java Wed Mar 10 17:53= :46 2010 >>>> @@ -18,10 +18,11 @@ package org.apache.lucene.store.instanti >>>> =A0import java.io.IOException; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>>> =A0import org.apache.lucene.store.RAMDirectory; >>>> =A0import org.apache.lucene.store.Directory; >>>> =A0import org.apache.lucene.util.LuceneTestCase; >>>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>>> =A0import org.apache.lucene.document.Document; >>>> =A0import org.apache.lucene.document.Field; >>>> >>>> @@ -32,17 +33,17 @@ public class TestUnoptimizedReaderOnCons >>>> >>>> =A0 public void test() throws Exception { >>>> =A0 =A0 Directory dir =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter iw =3D new IndexWriter(dir, new WhitespaceAnalyze= r(TEST_VERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter iw =3D new IndexWriter(dir, new IndexWriterConfig= (TEST_VERSION_CURRENT)); >>>> =A0 =A0 addDocument(iw, "Hello, world!"); >>>> =A0 =A0 addDocument(iw, "All work and no play makes jack a dull boy"); >>>> =A0 =A0 iw.close(); >>>> >>>> - =A0 =A0iw =3D new IndexWriter(dir, new WhitespaceAnalyzer(TEST_VERSI= ON_CURRENT), false, IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0iw =3D new IndexWriter(dir, new IndexWriterConfig(TEST_VERSIO= N_CURRENT).setOpenMode(OpenMode.APPEND)); >>>> =A0 =A0 addDocument(iw, "Hello, tellus!"); >>>> =A0 =A0 addDocument(iw, "All work and no play makes danny a dull boy")= ; >>>> =A0 =A0 iw.close(); >>>> >>>> - =A0 =A0iw =3D new IndexWriter(dir, new WhitespaceAnalyzer(TEST_VERSI= ON_CURRENT), false, IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0iw =3D new IndexWriter(dir, new IndexWriterConfig(TEST_VERSIO= N_CURRENT).setOpenMode(OpenMode.APPEND)); >>>> =A0 =A0 addDocument(iw, "Hello, earth!"); >>>> =A0 =A0 addDocument(iw, "All work and no play makes wendy a dull girl"= ); >>>> =A0 =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/= java/lucli/LuceneMethods.java?rev=3D921480&r1=3D921479&r2=3D921480&view=3Dd= iff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=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 = Wed Mar 10 17:53:46 2010 >>>> @@ -42,9 +42,11 @@ import org.apache.lucene.document.Docume >>>> =A0import org.apache.lucene.document.Fieldable; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Term; >>>> =A0import org.apache.lucene.index.TermEnum; >>>> =A0import org.apache.lucene.index.IndexReader.FieldOption; >>>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>>> =A0import org.apache.lucene.queryParser.MultiFieldQueryParser; >>>> =A0import org.apache.lucene.queryParser.ParseException; >>>> =A0import org.apache.lucene.search.Collector; >>>> @@ -169,7 +171,9 @@ class LuceneMethods { >>>> >>>> =A0 =A0 public void optimize() throws IOException { >>>> =A0 =A0 //open the index writer. False: don't create a new one >>>> - =A0 =A0IndexWriter indexWriter =3D new IndexWriter(indexName, create= Analyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter indexWriter =3D new IndexWriter(indexName, new In= dexWriterConfig( >>>> + =A0 =A0 =A0 =A0Version.LUCENE_CURRENT).setAnalyzer(createAnalyzer())= .setOpenMode( >>>> + =A0 =A0 =A0 =A0OpenMode.APPEND)); >>>> =A0 =A0 message("Starting to optimize index."); >>>> =A0 =A0 long start =3D System.currentTimeMillis(); >>>> =A0 =A0 indexWriter.optimize(); >>>> >>>> Modified: lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/= index/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= =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/memory/src/test/org/apache/lucene/index/= memory/MemoryIndexTest.java (original) >>>> +++ lucene/java/trunk/contrib/memory/src/test/org/apache/lucene/index/= memory/MemoryIndexTest.java Wed Mar 10 17:53:46 2010 >>>> @@ -42,6 +42,7 @@ import org.apache.lucene.document.Field; >>>> =A0import org.apache.lucene.document.Fieldable; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.queryParser.ParseException; >>>> =A0import org.apache.lucene.queryParser.QueryParser; >>>> =A0import org.apache.lucene.search.Collector; >>>> @@ -410,7 +411,7 @@ public class MemoryIndexTest extends Bas >>>> =A0 =A0 RAMDirectory dir =3D new RAMDirectory(); >>>> =A0 =A0 IndexWriter writer =3D null; >>>> =A0 =A0 try { >>>> - =A0 =A0 =A0writer =3D new IndexWriter(dir, analyzer, true, IndexWrit= er.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0 =A0writer =3D new IndexWriter(dir, new IndexWriterConfig(TES= T_VERSION_CURRENT).setAnalyzer(analyzer)); >>>> =A0 =A0 =A0 writer.addDocument(doc); >>>> =A0 =A0 =A0 writer.optimize(); >>>> =A0 =A0 =A0 return dir; >>>> >>>> Modified: lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/in= dex/MultiPassIndexSplitter.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/j= ava/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=3D921480&r1=3D9= 21479&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/Mu= ltiPassIndexSplitter.java (original) >>>> +++ lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/index/Mu= ltiPassIndexSplitter.java Wed Mar 10 17:53:46 2010 >>>> @@ -21,11 +21,11 @@ import java.io.File; >>>> =A0import java.io.IOException; >>>> =A0import java.util.ArrayList; >>>> >>>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>>> =A0import org.apache.lucene.store.Directory; >>>> =A0import org.apache.lucene.store.FSDirectory; >>>> =A0import org.apache.lucene.util.OpenBitSet; >>>> +import org.apache.lucene.util.Version; >>>> >>>> =A0/** >>>> =A0* This tool splits input index into multiple equal parts. The metho= d employed >>>> @@ -88,8 +88,7 @@ public class MultiPassIndexSplitter { >>>> =A0 =A0 =A0 =A0 =A0 } >>>> =A0 =A0 =A0 =A0 } >>>> =A0 =A0 =A0 } >>>> - =A0 =A0 =A0IndexWriter w =3D new IndexWriter(outputs[i], new Whitesp= aceAnalyzer(), >>>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0true, MaxFieldLength.UNLIMITED); >>>> + =A0 =A0 =A0IndexWriter w =3D new IndexWriter(outputs[i], new IndexWr= iterConfig(Version.LUCENE_CURRENT).setOpenMode(OpenMode.CREATE)); >>>> =A0 =A0 =A0 System.err.println("Writing part " + (i + 1) + " ..."); >>>> =A0 =A0 =A0 w.addIndexes(new IndexReader[]{input}); >>>> =A0 =A0 =A0 w.close(); >>>> >>>> Modified: lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/mi= sc/IndexMergeTool.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/j= ava/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/Ind= exMergeTool.java (original) >>>> +++ lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/misc/Ind= exMergeTool.java Wed Mar 10 17:53:46 2010 >>>> @@ -17,9 +17,11 @@ package org.apache.lucene.misc; >>>> =A0 */ >>>> >>>> =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; >>>> =A0import org.apache.lucene.store.Directory; >>>> =A0import org.apache.lucene.store.FSDirectory; >>>> +import org.apache.lucene.util.Version; >>>> >>>> =A0import java.io.File; >>>> =A0import java.io.IOException; >>>> @@ -36,7 +38,8 @@ public class IndexMergeTool { >>>> =A0 =A0 } >>>> =A0 =A0 FSDirectory mergedIndex =3D FSDirectory.open(new File(args[0])= ); >>>> >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter(mergedIndex, new =A0Si= mpleAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(mergedIndex, new Index= WriterConfig( >>>> + =A0 =A0 =A0 =A0Version.LUCENE_CURRENT).setOpenMode(OpenMode.CREATE))= ; >>>> >>>> =A0 =A0 Directory[] indexes =3D new Directory[args.length - 1]; >>>> =A0 =A0 for (int i =3D 1; i < args.length; i++) { >>>> >>>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/in= dex/TestFieldNormModifier.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/t= est/org/apache/lucene/index/TestFieldNormModifier.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/Te= stFieldNormModifier.java (original) >>>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Te= stFieldNormModifier.java Wed Mar 10 17:53:46 2010 >>>> @@ -23,7 +23,6 @@ import java.util.Arrays; >>>> =A0import org.apache.lucene.analysis.SimpleAnalyzer; >>>> =A0import org.apache.lucene.document.Document; >>>> =A0import org.apache.lucene.document.Field; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> =A0import org.apache.lucene.search.Collector; >>>> =A0import org.apache.lucene.search.DefaultSimilarity; >>>> =A0import org.apache.lucene.search.IndexSearcher; >>>> @@ -58,7 +57,9 @@ public class TestFieldNormModifier exten >>>> =A0 @Override >>>> =A0 protected void setUp() throws Exception { >>>> =A0 =A0 super.setUp(); >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter(store, new SimpleAnaly= zer(TEST_VERSION_CURRENT), true, MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(store, new IndexWriter= Config( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT).setAnalyzer(new SimpleAnalyzer( >>>> + =A0 =A0 =A0 =A0TEST_VERSION_CURRENT))); >>>> >>>> =A0 =A0 for (int i =3D 0; i < NUM_DOCS; i++) { >>>> =A0 =A0 =A0 Document d =3D new Document(); >>>> >>>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/in= dex/TestIndexSplitter.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/t= est/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/Te= stIndexSplitter.java (original) >>>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Te= stIndexSplitter.java Wed Mar 10 17:53:46 2010 >>>> @@ -18,9 +18,8 @@ package org.apache.lucene.index; >>>> >>>> =A0import java.io.File; >>>> >>>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>>> =A0import org.apache.lucene.document.Document; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> +import org.apache.lucene.index.IndexWriterConfig.OpenMode; >>>> =A0import org.apache.lucene.store.FSDirectory; >>>> =A0import org.apache.lucene.util.LuceneTestCase; >>>> =A0import org.apache.lucene.util._TestUtil; >>>> @@ -35,7 +34,7 @@ public class TestIndexSplitter extends L >>>> =A0 =A0 _TestUtil.rmDir(destDir); >>>> =A0 =A0 destDir.mkdirs(); >>>> =A0 =A0 FSDirectory fsDir =3D FSDirectory.open(dir); >>>> - =A0 =A0IndexWriter iw =3D new IndexWriter(fsDir, new WhitespaceAnaly= zer(TEST_VERSION_CURRENT), true, MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter iw =3D new IndexWriter(fsDir, new IndexWriterConf= ig(TEST_VERSION_CURRENT).setOpenMode(OpenMode.CREATE)); >>>> =A0 =A0 for (int x=3D0; x < 100; x++) { >>>> =A0 =A0 =A0 Document doc =3D TestIndexWriterReader.createDocument(x, "= index", 5); >>>> =A0 =A0 =A0 iw.addDocument(doc); >>>> >>>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/in= dex/TestMultiPassIndexSplitter.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/t= est/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/Te= stMultiPassIndexSplitter.java (original) >>>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Te= stMultiPassIndexSplitter.java Wed Mar 10 17:53:46 2010 >>>> @@ -16,10 +16,8 @@ package org.apache.lucene.index; >>>> =A0* limitations under the License. >>>> =A0*/ >>>> >>>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>>> =A0import org.apache.lucene.document.Document; >>>> =A0import org.apache.lucene.document.Field; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> =A0import org.apache.lucene.store.Directory; >>>> =A0import org.apache.lucene.store.RAMDirectory; >>>> =A0import org.apache.lucene.util.LuceneTestCase; >>>> @@ -32,8 +30,7 @@ public class TestMultiPassIndexSplitter >>>> =A0 protected void setUp() throws Exception { >>>> =A0 =A0 super.setUp(); >>>> =A0 =A0 RAMDirectory dir =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter w =3D new IndexWriter(dir, new WhitespaceAnalyzer= (TEST_VERSION_CURRENT), true, >>>> - =A0 =A0 =A0 =A0 =A0 =A0MaxFieldLength.LIMITED); >>>> + =A0 =A0IndexWriter w =3D new IndexWriter(dir, new IndexWriterConfig(= TEST_VERSION_CURRENT)); >>>> =A0 =A0 Document doc; >>>> =A0 =A0 for (int i =3D 0; i < NUM_DOCS; i++) { >>>> =A0 =A0 =A0 doc =3D new Document(); >>>> >>>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/in= dex/TestTermVectorAccessor.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/t= est/org/apache/lucene/index/TestTermVectorAccessor.java?rev=3D921480&r1=3D9= 21479&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/Te= stTermVectorAccessor.java (original) >>>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/index/Te= stTermVectorAccessor.java Wed Mar 10 17:53:46 2010 >>>> @@ -28,7 +28,7 @@ public class TestTermVectorAccessor exte >>>> =A0 public void test() throws Exception { >>>> >>>> =A0 =A0 Directory dir =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter iw =3D new IndexWriter(dir, new StandardAnalyzer(= TEST_VERSION_CURRENT, Collections.emptySet()), true, IndexWriter.MaxFieldLe= ngth.UNLIMITED); >>>> + =A0 =A0IndexWriter iw =3D new IndexWriter(dir, new IndexWriterConfig= (TEST_VERSION_CURRENT).setAnalyzer(new StandardAnalyzer(TEST_VERSION_CURREN= T, Collections.emptySet()))); >>>> >>>> =A0 =A0 Document doc; >>>> >>>> >>>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/mi= sc/ChainedFilterTest.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/t= est/org/apache/lucene/misc/ChainedFilterTest.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/misc/Cha= inedFilterTest.java (original) >>>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/misc/Cha= inedFilterTest.java Wed Mar 10 17:53:46 2010 >>>> @@ -20,13 +20,11 @@ package org.apache.lucene.misc; >>>> =A0import java.util.Calendar; >>>> =A0import java.util.GregorianCalendar; >>>> >>>> -import org.apache.lucene.analysis.Analyzer; >>>> -import org.apache.lucene.analysis.WhitespaceAnalyzer; >>>> =A0import org.apache.lucene.document.Document; >>>> =A0import org.apache.lucene.document.Field; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Term; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> =A0import org.apache.lucene.search.BooleanClause; >>>> =A0import org.apache.lucene.search.BooleanQuery; >>>> =A0import org.apache.lucene.search.CachingWrapperFilter; >>>> @@ -58,8 +56,7 @@ public class ChainedFilterTest extends L >>>> =A0 protected void setUp() throws Exception { >>>> =A0 =A0 super.setUp(); >>>> =A0 =A0 directory =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter writer =3D >>>> - =A0 =A0 =A0 new IndexWriter(directory, new WhitespaceAnalyzer(TEST_V= ERSION_CURRENT), true, IndexWriter.MaxFieldLength.UNLIMITED); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(directory, new IndexWr= iterConfig(TEST_VERSION_CURRENT)); >>>> >>>> =A0 =A0 Calendar cal =3D new GregorianCalendar(); >>>> =A0 =A0 cal.clear(); >>>> @@ -187,9 +184,7 @@ public class ChainedFilterTest extends L >>>> >>>> =A0 public void testWithCachingFilter() throws Exception { >>>> =A0 =A0 Directory dir =3D new RAMDirectory(); >>>> - =A0 =A0Analyzer analyzer =3D new WhitespaceAnalyzer(TEST_VERSION_CUR= RENT); >>>> - >>>> - =A0 =A0IndexWriter writer =3D new IndexWriter(dir, analyzer, true, M= axFieldLength.LIMITED); >>>> + =A0 =A0IndexWriter writer =3D new IndexWriter(dir, new IndexWriterCo= nfig(TEST_VERSION_CURRENT)); >>>> =A0 =A0 writer.close(); >>>> >>>> =A0 =A0 Searcher searcher =3D new IndexSearcher(dir, true); >>>> >>>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/mi= sc/TestLengthNormModifier.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/t= est/org/apache/lucene/misc/TestLengthNormModifier.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/misc/Tes= tLengthNormModifier.java (original) >>>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/misc/Tes= tLengthNormModifier.java Wed Mar 10 17:53:46 2010 >>>> @@ -19,14 +19,13 @@ package org.apache.lucene.misc; >>>> >>>> =A0import java.io.IOException; >>>> >>>> -import org.apache.lucene.analysis.SimpleAnalyzer; >>>> =A0import org.apache.lucene.document.Document; >>>> =A0import org.apache.lucene.document.Field; >>>> =A0import org.apache.lucene.index.FieldNormModifier; >>>> =A0import org.apache.lucene.index.IndexReader; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.index.Term; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> =A0import org.apache.lucene.search.Collector; >>>> =A0import org.apache.lucene.search.DefaultSimilarity; >>>> =A0import org.apache.lucene.search.IndexSearcher; >>>> @@ -61,7 +60,7 @@ public class TestLengthNormModifier exte >>>> =A0 =A0 @Override >>>> =A0 =A0 protected void setUp() throws Exception { >>>> =A0 =A0 =A0 super.setUp(); >>>> - =A0 =A0 =A0 IndexWriter writer =3D new IndexWriter(store, new Simple= Analyzer(TEST_VERSION_CURRENT), true, MaxFieldLength.UNLIMITED); >>>> + =A0 =A0 =A0 IndexWriter writer =3D new IndexWriter(store, new IndexW= riterConfig(TEST_VERSION_CURRENT)); >>>> >>>> =A0 =A0 =A0 =A0for (int i =3D 0; i < NUM_DOCS; i++) { >>>> =A0 =A0 =A0 =A0 =A0 =A0Document d =3D new Document(); >>>> >>>> Modified: lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/qu= eryParser/complexPhrase/TestComplexPhraseQuery.java >>>> URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/misc/src/t= est/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/queryPar= ser/complexPhrase/TestComplexPhraseQuery.java (original) >>>> +++ lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/queryPar= ser/complexPhrase/TestComplexPhraseQuery.java Wed Mar 10 17:53:46 2010 >>>> @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.standa >>>> =A0import org.apache.lucene.document.Document; >>>> =A0import org.apache.lucene.document.Field; >>>> =A0import org.apache.lucene.index.IndexWriter; >>>> -import org.apache.lucene.index.IndexWriter.MaxFieldLength; >>>> +import org.apache.lucene.index.IndexWriterConfig; >>>> =A0import org.apache.lucene.queryParser.QueryParser; >>>> =A0import org.apache.lucene.search.IndexSearcher; >>>> =A0import org.apache.lucene.search.Query; >>>> @@ -113,7 +113,7 @@ public class TestComplexPhraseQuery exte >>>> =A0 protected void setUp() throws Exception { >>>> =A0 =A0 super.setUp(); >>>> =A0 =A0 RAMDirectory rd =3D new RAMDirectory(); >>>> - =A0 =A0IndexWriter w =3D new IndexWriter(rd, analyzer, MaxFieldLengt= h.UNLIMITED); >>>> + =A0 =A0IndexWriter w =3D new IndexWriter(rd, new IndexWriterConfig(T= EST_VERSION_CURRENT).setAnalyzer(analyzer)); >>>> =A0 =A0 for (int i =3D 0; i < docsContent.length; i++) { >>>> =A0 =A0 =A0 Document doc =3D new Document(); >>>> =A0 =A0 =A0 doc.add(new Field("name", docsContent[i].name, Field.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 >> >> > > > > -- > 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