lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r831094 [1/8] - in /lucene/java/branches/flex_1458: ./ contrib/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/ contrib/analyzers/common/src/java/org/apache/l...
Date Thu, 29 Oct 2009 21:29:56 GMT
Author: markrmiller
Date: Thu Oct 29 21:29:47 2009
New Revision: 831094

URL: http://svn.apache.org/viewvc?rev=831094&view=rev
Log:
merge up to r830800

Added:
    lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java
      - copied unchanged from r830804, lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/AnalyzerUtil.java
    lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java
      - copied unchanged from r830804, lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymMap.java
    lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java
      - copied unchanged from r830804, lucene/java/trunk/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynonymTokenFilter.java
    lucene/java/branches/flex_1458/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java
      - copied unchanged from r830804, lucene/java/trunk/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/index.29.cfs.zip
      - copied unchanged from r830804, lucene/java/trunk/src/test/org/apache/lucene/index/index.29.cfs.zip
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/index.29.nocfs.zip
      - copied unchanged from r830804, lucene/java/trunk/src/test/org/apache/lucene/index/index.29.nocfs.zip
Removed:
    lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/AnalyzerUtil.java
    lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/SynonymMap.java
    lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/SynonymTokenFilter.java
    lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucene/index/memory/TestSynonymTokenFilter.java
    lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucene/index/memory/testSynonyms.txt
Modified:
    lucene/java/branches/flex_1458/   (props changed)
    lucene/java/branches/flex_1458/CHANGES.txt
    lucene/java/branches/flex_1458/common-build.xml
    lucene/java/branches/flex_1458/contrib/   (props changed)
    lucene/java/branches/flex_1458/contrib/CHANGES.txt   (contents, props changed)
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
    lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
    lucene/java/branches/flex_1458/contrib/collation/src/test/org/apache/lucene/collation/CollationTestBase.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/   (props changed)
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
    lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
    lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/PatternAnalyzer.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/LengthNormModifier.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/precedence/FastCharStream.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParserTokenManager.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/overview.html
    lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java
    lucene/java/branches/flex_1458/contrib/wordnet/src/java/org/apache/lucene/wordnet/package.html
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/ASCIIFoldingFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/BaseCharFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/CachingTokenFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/CharArraySet.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/CharFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/CharReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/CharTokenizer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/KeywordAnalyzer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/KeywordTokenizer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/LengthFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/LetterTokenizer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/LowerCaseFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/MappingCharFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/PerFieldAnalyzerWrapper.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/PorterStemFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/PorterStemmer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/SimpleAnalyzer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/StopAnalyzer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/StopFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/TeeSinkTokenFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Token.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/TokenFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/TokenStream.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/WhitespaceAnalyzer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/WhitespaceTokenizer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/standard/StandardFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/document/AbstractField.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/document/DateTools.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/document/Document.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/document/Field.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ByteSliceReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/CompoundFileReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocFieldConsumers.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocFieldConsumersPerField.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocFieldConsumersPerThread.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocFieldProcessor.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocFieldProcessorPerThread.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocInverter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocInverterPerField.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocInverterPerThread.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocumentsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FieldInfo.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FieldInfos.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FieldSortedTermVectorMapper.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FieldsReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FieldsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FilterIndexReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FreqProxTermsWriterPerThread.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexCommit.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexFileDeleter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LogDocMergePolicy.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LogMergePolicy.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiLevelSkipListReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultipleTermPositions.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/NormsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/NormsWriterPerField.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/NormsWriterPerThread.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ParallelReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Payload.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/PositionBasedTermVectorMapper.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ReadOnlyDirectoryReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ReadOnlySegmentReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/ReusableStringReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfo.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentInfos.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentMergeQueue.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentTermVector.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SerialMergeScheduler.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SortedTermVectorMapper.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/StoredFieldsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorEntry.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorOffsetInfo.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorsReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerThread.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermsHash.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermsHashPerField.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermsHashPerThread.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/messages/MessageImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/BooleanClause.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/BooleanQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/BooleanScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/BooleanScorer2.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingSpanFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingWrapperFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ComplexExplanation.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ConjunctionScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ConstantScoreQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DefaultSimilarity.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/DocIdSet.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ExactPhraseScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Explanation.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCache.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldComparator.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldDoc.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldValueHitQueue.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredDocIdSet.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/HitQueue.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/IndexSearcher.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiPhraseQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiSearcher.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ParallelMultiSearcher.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PhraseQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PhraseQueue.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PhraseScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PrefixFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PrefixQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PrefixTermEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Query.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/QueryTermVector.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ReqExclScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ReqOptSumScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ScoreDoc.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Scorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Searchable.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Searcher.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Similarity.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/SimilarityDelegator.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Sort.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/SortField.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/SpanQueryFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeTermEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TimeLimitingCollector.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TopFieldCollector.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TopScoreDocCollector.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/WildcardTermEnum.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/ByteFieldSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/CustomScoreQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/FieldCacheSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/FieldScoreQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/FloatFieldSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/IntFieldSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/MultiValueSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/OrdFieldSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/ShortFieldSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/ValueSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/ValueSourceQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/AveragePayloadFunction.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/MaxPayloadFunction.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/MinPayloadFunction.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/PayloadFunction.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/SpanQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/SpanScorer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/SpanWeight.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/spans/TermSpans.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/BufferedIndexInput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/BufferedIndexOutput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/ChecksumIndexInput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/ChecksumIndexOutput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/FSDirectory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/FileSwitchDirectory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/IndexInput.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/LockStressTest.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/MMapDirectory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NIOFSDirectory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NativeFSLockFactory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NoLockFactory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/RAMDirectory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/RAMInputStream.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/RAMOutputStream.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/SimpleFSDirectory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/SimpleFSLockFactory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/VerifyingLockFactory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AttributeImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AttributeSource.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AverageGuessMemoryModel.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/BitVector.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/DocIdBitSet.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/OpenBitSet.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/OpenBitSetIterator.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/Parameter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SortedVIntList.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java   (props changed)
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java   (props changed)
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (contents, props changed)
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestSegmentMerger.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/JustCompileSearch.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestBooleanScorer.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermScorer.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java

Propchange: lucene/java/branches/flex_1458/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 29 21:29:47 2009
@@ -1,4 +1,4 @@
 /lucene/java/branches/lucene_2_4:748824
-/lucene/java/branches/lucene_2_9:817269-818600,829134
+/lucene/java/branches/lucene_2_9:817269-818600,829134,829881
 /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336
-/lucene/java/trunk:824912-825292,827043-829438
+/lucene/java/trunk:824912-825292,827043-830804

Modified: lucene/java/branches/flex_1458/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/CHANGES.txt?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/CHANGES.txt Thu Oct 29 21:29:47 2009
@@ -12,6 +12,28 @@
 
 Changes in runtime behavior
 
+* LUCENE-1677: Remove the system property to set SegmentReader class
+  implementation.  (Uwe Schindler)
+
+* LUCENE-1960: As a consequence of the removal of Field.Store.COMPRESS,
+  support for this type of fields was removed. Lucene 3.0 is still able
+  to read indexes with compressed fields, but as soon as merges occur
+  or the index is optimized, all compressed fields are decompressed
+  and converted to Field.Store.YES. Because of this, indexes with
+  compressed fields can suddenly get larger. Also the first merge with
+  decompression cannot be done in raw mode, it is therefore slower.
+  This change has no effect for code that uses such old indexes,
+  they behave as before (fields are automatically decompressed
+  during read). Indexes converted to Lucene 3.0 format cannot be read
+  anymore with previous versions.
+  It is recommended to optimize your indexes after upgrading to convert
+  to the new format and decompress all fields.
+  If you want compressed fields, you can use CompressionTools, that
+  creates compressed byte[] to be added as binary stored field. This
+  cannot be done automatically, as you also have to decompress such
+  fields when reading. You have to reindex to do that.
+  (Michael Busch, Uwe Schindler)
+
 API Changes
 
 * LUCENE-1257, ...: Port to Java 1.5 [not yet finished].
@@ -100,6 +122,13 @@
   of 2.9) enablePositionIncrements to true to match
   StandardAnalyzer's 2.9 default (Uwe Schindler, Mike McCandless)
 
+* LUCENE-1973: Un-deprecate IndexSearcher.setDefaultFieldSortScoring,
+  to allow controlling per-IndexSearcher whether scores are computed
+  when sorting by field.  (Uwe Schindler, Mike McCandless)
+  
+* LUCENE-2011: Remove deprecated Scorer.explain(int).
+  (Uwe Schindler, Mark Miller)
+   
 Bug fixes
 
 * LUCENE-1951: When the text provided to WildcardQuery has no wildcard
@@ -140,6 +169,9 @@
 
 Documentation
 
+* LUCENE-2008: Javadoc improvements for TokenStream/Tokenizer/Token
+  (Luke Nezda via Mike McCandless)
+
 Build
 
 * LUCENE-486: Remove test->demo dependencies. (Michael Busch)

Modified: lucene/java/branches/flex_1458/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/common-build.xml?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/common-build.xml (original)
+++ lucene/java/branches/flex_1458/common-build.xml Thu Oct 29 21:29:47 2009
@@ -42,7 +42,7 @@
   <property name="Name" value="Lucene"/>
   <property name="dev.version" value="3.0-dev"/>
   <property name="version" value="${dev.version}"/>
-  <property name="compatibility.tag" value="flex_1458_2_9_back_compat_tests_20091015"/>
+  <property name="compatibility.tag" value="flex_1458_2_9_back_compat_tests_20091029"/>
   <property name="spec.version" value="${version}"/>	
   <property name="year" value="2000-${current.year}"/>
   <property name="final.name" value="lucene-${name}-${version}"/>

Propchange: lucene/java/branches/flex_1458/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 29 21:29:47 2009
@@ -0,0 +1,4 @@
+/lucene/java/branches/lucene_2_4/contrib:748824
+/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881
+/lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-821336
+/lucene/java/trunk/contrib:824912-825292,827043-830804

Modified: lucene/java/branches/flex_1458/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/CHANGES.txt?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/contrib/CHANGES.txt Thu Oct 29 21:29:47 2009
@@ -43,6 +43,9 @@
 
  * LUCENE-1953: FastVectorHighlighter: small fragCharSize can cause
    StringIndexOutOfBoundsException. (Koji Sekiguchi)
+   
+ * LUCENE-1929: Highlighter throws exception on NumericRangeQuery.
+   (Mark Miller, Uwe Schindler)
 
  * LUCENE-2001: Wordnet Syns2Index incorrectly parses synonyms that
    contain a single quote. (Parag H. Dave via Robert Muir)
@@ -86,6 +89,9 @@
 
 Build
 
+ * LUCENE-1904: Moved wordnet-based synonym support from contrib/memory
+   into contrib/wordnet.  (Robert Muir)
+
 Test Cases
 ======================= Release 2.9.0 2009-09-23 =======================
 

Propchange: lucene/java/branches/flex_1458/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 29 21:29:47 2009
@@ -0,0 +1,4 @@
+/lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
+/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881
+/lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt:818601-821336
+/lucene/java/trunk/contrib/CHANGES.txt:829439-830804

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java Thu Oct 29 21:29:47 2009
@@ -31,6 +31,7 @@
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.WordlistLoader;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;  // for javadoc
 import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
 import org.apache.lucene.util.Version;

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java Thu Oct 29 21:29:47 2009
@@ -25,6 +25,7 @@
 import org.apache.lucene.analysis.WordlistLoader;
 import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;  // for javadoc
 import org.apache.lucene.util.Version;
 
 import java.io.*;

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java Thu Oct 29 21:29:47 2009
@@ -33,6 +33,7 @@
 import org.apache.lucene.analysis.WordlistLoader;
 import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;  // for javadoc
 import org.apache.lucene.util.Version;
 
 /**

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java Thu Oct 29 21:29:47 2009
@@ -22,6 +22,7 @@
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;  // for javadoc
 import org.apache.lucene.util.Version;
 
 import java.io.IOException;

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java Thu Oct 29 21:29:47 2009
@@ -25,6 +25,7 @@
 import org.apache.lucene.analysis.WordlistLoader;
 import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;  // for javadoc
 import org.apache.lucene.util.Version;
 
 import java.io.File;

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java Thu Oct 29 21:29:47 2009
@@ -23,6 +23,7 @@
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;  // for javadoc
 import org.apache.lucene.util.Version;
 
 import java.io.File;

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java Thu Oct 29 21:29:47 2009
@@ -25,6 +25,7 @@
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;  // for javadoc
 import org.apache.lucene.util.Version;
 
 /**

Modified: lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt Thu Oct 29 21:29:47 2009
@@ -4,6 +4,11 @@
 
 $Id:$
 
+10/28/2009
+  LUCENE-1994: Fix thread safety of EnwikiContentSource and DocMaker
+  when doc.reuse.fields is false.  Also made docs.reuse.fields=true
+  thread safe.  (Mark Miller, Shai Erera, Mike McCandless)
+
 8/4/2009
   LUCENE-1770: Add EnwikiQueryMaker (Mark Miller)
 

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java Thu Oct 29 21:29:47 2009
@@ -20,7 +20,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Iterator;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
@@ -64,8 +63,8 @@
   private DocMaker docMaker;
   
   // we use separate (identical) instances for each "read" task type, so each can iterate the quries separately.
-  private HashMap readTaskQueryMaker;
-  private Class qmkrClass;
+  private HashMap<Class<? extends ReadTask>,QueryMaker> readTaskQueryMaker;
+  private Class<? extends QueryMaker> qmkrClass;
 
   private IndexReader indexReader;
   private IndexSearcher indexSearcher;
@@ -80,12 +79,12 @@
     analyzer = NewAnalyzerTask.createAnalyzer(config.get("analyzer",
         "org.apache.lucene.analysis.standard.StandardAnalyzer"));
     // doc maker
-    docMaker = (DocMaker) Class.forName(config.get("doc.maker",
-        "org.apache.lucene.benchmark.byTask.feeds.DocMaker")).newInstance();
+    docMaker = Class.forName(config.get("doc.maker",
+        "org.apache.lucene.benchmark.byTask.feeds.DocMaker")).asSubclass(DocMaker.class).newInstance();
     docMaker.setConfig(config);
     // query makers
-    readTaskQueryMaker = new HashMap();
-    qmkrClass = Class.forName(config.get("query.maker","org.apache.lucene.benchmark.byTask.feeds.SimpleQueryMaker"));
+    readTaskQueryMaker = new HashMap<Class<? extends ReadTask>,QueryMaker>();
+    qmkrClass = Class.forName(config.get("query.maker","org.apache.lucene.benchmark.byTask.feeds.SimpleQueryMaker")).asSubclass(QueryMaker.class);
 
     // index stuff
     reinit(false);
@@ -239,9 +238,8 @@
 
   public void resetInputs() throws IOException {
     docMaker.resetInputs();
-    Iterator it = readTaskQueryMaker.values().iterator();
-    while (it.hasNext()) {
-      ((QueryMaker) it.next()).resetInputs();
+    for (final QueryMaker queryMaker : readTaskQueryMaker.values()) {
+      queryMaker.resetInputs();
     }
   }
 
@@ -251,11 +249,11 @@
   synchronized public QueryMaker getQueryMaker(ReadTask readTask) {
     // mapping the query maker by task class allows extending/adding new search/read tasks
     // without needing to modify this class.
-    Class readTaskClass = readTask.getClass();
-    QueryMaker qm = (QueryMaker) readTaskQueryMaker.get(readTaskClass);
+    Class<? extends ReadTask> readTaskClass = readTask.getClass();
+    QueryMaker qm = readTaskQueryMaker.get(readTaskClass);
     if (qm == null) {
       try {
-        qm = (QueryMaker) qmkrClass.newInstance();
+        qm = qmkrClass.newInstance();
         qm.setConfig(config);
       } catch (Exception e) {
         throw new RuntimeException(e);

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java Thu Oct 29 21:29:47 2009
@@ -57,7 +57,7 @@
   
   private static final int BZIP = 0;
   private static final int OTHER = 1;
-  private static final Map extensionToType = new HashMap();
+  private static final Map<String,Integer> extensionToType = new HashMap<String,Integer>();
   static {
     extensionToType.put(".bz2", Integer.valueOf(BZIP));
     extensionToType.put(".bzip", Integer.valueOf(BZIP));
@@ -93,7 +93,7 @@
    * a given directory. The collected {@link File} instances are stored in the
    * given <code>files</code>.
    */
-  protected final void collectFiles(File dir, ArrayList files) {
+  protected final void collectFiles(File dir, ArrayList<File> files) {
     if (!dir.canRead()) {
       return;
     }
@@ -125,7 +125,7 @@
     int idx = fileName.lastIndexOf('.');
     int type = OTHER;
     if (idx != -1) {
-      Integer typeInt = (Integer) extensionToType.get(fileName.substring(idx));
+      Integer typeInt = extensionToType.get(fileName.substring(idx));
       if (typeInt != null) {
         type = typeInt.intValue();
       }

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java Thu Oct 29 21:29:47 2009
@@ -51,13 +51,12 @@
     ParsePosition pos;
   }
   
-  public static class Iterator implements java.util.Iterator {
+  public static class Iterator implements java.util.Iterator<File> {
 
-    static class Comparator implements java.util.Comparator {
-      public int compare(Object _a, Object _b) {
+    static class Comparator implements java.util.Comparator<File> {
+      public int compare(File _a, File _b) {
         String a = _a.toString();
         String b = _b.toString();
-
         int diff = a.length() - b.length();
 
         if (diff > 0) {
@@ -79,7 +78,7 @@
 
     int count = 0;
 
-    Stack stack = new Stack();
+    Stack<File> stack = new Stack<File>();
 
     /* this seems silly ... there must be a better way ...
        not that this is good, but can it matter? */
@@ -94,10 +93,10 @@
       if (stack.empty()) {
         return;
       }
-      if (!((File)stack.peek()).isDirectory()) {
+      if (!(stack.peek()).isDirectory()) {
         return;
       }
-      File f = (File)stack.pop();
+      File f = stack.pop();
       push(f);
     }
 
@@ -133,10 +132,10 @@
       return stack.size() > 0;
     }
     
-    public Object next() {
+    public File next() {
       assert hasNext();
       count++;
-      Object object = stack.pop();
+      File object = stack.pop();
       // System.err.println("pop " + object);
       find();
       return object;
@@ -148,7 +147,7 @@
 
   }
   
-  private ThreadLocal dateFormat = new ThreadLocal();
+  private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<DateFormatInfo>();
   private File dataDir = null;
   private int iteration = 0;
   private Iterator inputFiles = null;
@@ -156,7 +155,7 @@
   // get/initiate a thread-local simple date format (must do so 
   // because SimpleDateFormat is not thread-safe).
   private DateFormatInfo getDateFormatInfo() {
-    DateFormatInfo dfi = (DateFormatInfo) dateFormat.get();
+    DateFormatInfo dfi = dateFormat.get();
     if (dfi == null) {
       dfi = new DateFormatInfo();
       dfi.pos = new ParsePosition(0);
@@ -191,7 +190,7 @@
         inputFiles = new Iterator(dataDir);
         iteration++;
       }
-      f = (File) inputFiles.next();
+      f = inputFiles.next();
       // System.err.println(f);
       name = f.getCanonicalPath()+"_"+iteration;
     }

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Thu Oct 29 21:29:47 2009
@@ -20,10 +20,8 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Map.Entry;
 import java.util.Random;
 
 import org.apache.lucene.benchmark.byTask.utils.Config;
@@ -79,7 +77,7 @@
 
   static class DocState {
     
-    private final Map fields;
+    private final Map<String,Field> fields;
     private final boolean reuseFields;
     final Document doc;
     DocData docData = new DocData();
@@ -89,7 +87,7 @@
       this.reuseFields = reuseFields;
       
       if (reuseFields) {
-        fields =  new HashMap();
+        fields =  new HashMap<String,Field>();
         
         // Initialize the map with the default fields.
         fields.put(BODY_FIELD, new Field(BODY_FIELD, "", store, bodyIndex, termVector));
@@ -115,7 +113,7 @@
         return new Field(name, "", store, index, termVector);
       }
       
-      Field f = (Field) fields.get(name);
+      Field f = fields.get(name);
       if (f == null) {
         f = new Field(name, "", store, index, termVector);
         fields.put(name, f);
@@ -128,8 +126,8 @@
   private boolean storeBytes = false;
 
   // leftovers are thread local, because it is unsafe to share residues between threads
-  private ThreadLocal leftovr = new ThreadLocal();
-  private ThreadLocal docState = new ThreadLocal();
+  private ThreadLocal<LeftOver> leftovr = new ThreadLocal<LeftOver>();
+  private ThreadLocal<DocState> docState = new ThreadLocal<DocState>();
 
   public static final String BODY_FIELD = "body";
   public static final String TITLE_FIELD = "doctitle";
@@ -147,7 +145,6 @@
   
   protected ContentSource source;
   protected boolean reuseFields;
-  protected DocState localDocState;
   protected boolean indexProperties;
   
   private int lastPrintedNumUniqueTexts = 0;
@@ -161,7 +158,7 @@
   // reset the docdata properties so they are not added more than once.
   private Document createDocument(DocData docData, int size, int cnt) throws UnsupportedEncodingException {
 
-    final DocState ds = reuseFields ? getDocState() : localDocState;
+    final DocState ds = getDocState();
     final Document doc = reuseFields ? ds.doc : new Document();
     doc.getFields().clear();
     
@@ -224,8 +221,7 @@
     if (indexProperties) {
       Properties props = docData.getProps();
       if (props != null) {
-        for (Iterator iterator = props.entrySet().iterator(); iterator.hasNext();) {
-          Entry entry = (Entry) iterator.next();
+        for (final Map.Entry<Object,Object> entry : props.entrySet()) {
           Field f = ds.getField((String) entry.getKey(), storeVal, indexVal, termVecVal);
           f.setValue((String) entry.getValue());
           doc.add(f);
@@ -243,9 +239,9 @@
   }
 
   protected DocState getDocState() {
-    DocState ds = (DocState) docState.get();
+    DocState ds = docState.get();
     if (ds == null) {
-      ds = new DocState(true, storeVal, indexVal, bodyIndexVal, termVecVal);
+      ds = new DocState(reuseFields, storeVal, indexVal, bodyIndexVal, termVecVal);
       docState.set(ds);
     }
     return ds;
@@ -289,7 +285,7 @@
    */
   public Document makeDocument() throws Exception {
     resetLeftovers();
-    DocData docData = source.getNextDocData(reuseFields ? getDocState().docData : localDocState.docData);
+    DocData docData = source.getNextDocData(getDocState().docData);
     Document doc = createDocument(docData, 0, -1);
     return doc;
   }
@@ -299,12 +295,12 @@
    * given size input by <code>size</code>.
    */
   public Document makeDocument(int size) throws Exception {
-    LeftOver lvr = (LeftOver) leftovr.get();
+    LeftOver lvr = leftovr.get();
     if (lvr == null || lvr.docdata == null || lvr.docdata.getBody() == null
         || lvr.docdata.getBody().length() == 0) {
       resetLeftovers();
     }
-    DocData docData = reuseFields ? getDocState().docData : localDocState.docData;
+    DocData docData = getDocState().docData;
     DocData dd = (lvr == null ? source.getNextDocData(docData) : lvr.docdata);
     int cnt = (lvr == null ? 0 : lvr.cnt);
     while (dd.getBody() == null || dd.getBody().length() < size) {
@@ -371,7 +367,7 @@
     this.config = config;
     try {
       String sourceClass = config.get("content.source", "org.apache.lucene.benchmark.byTask.feeds.SingleDocSource");
-      source = (ContentSource) Class.forName(sourceClass).newInstance();
+      source = Class.forName(sourceClass).asSubclass(ContentSource.class).newInstance();
       source.setConfig(config);
     } catch (Exception e) {
       // Should not get here. Throw runtime exception.
@@ -407,14 +403,11 @@
     storeBytes = config.get("doc.store.body.bytes", false);
     
     reuseFields = config.get("doc.reuse.fields", true);
-    if (!reuseFields) {
-      localDocState = new DocState(false, storeVal, indexVal, bodyIndexVal, termVecVal);
-    } else {
-      // In a multi-rounds run, it is important to reset DocState since settings
-      // of fields may change between rounds, and this is the only way to reset
-      // the cache of all threads.
-      docState = new ThreadLocal();
-    }
+
+    // In a multi-rounds run, it is important to reset DocState since settings
+    // of fields may change between rounds, and this is the only way to reset
+    // the cache of all threads.
+    docState = new ThreadLocal<DocState>();
     
     indexProperties = config.get("doc.index.props", false);
 

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java Thu Oct 29 21:29:47 2009
@@ -220,7 +220,7 @@
     }
   }
 
-  private static final Map ELEMENTS = new HashMap();
+  private static final Map<String,Integer> ELEMENTS = new HashMap<String,Integer>();
   private static final int TITLE = 0;
   private static final int DATE = TITLE + 1;
   private static final int BODY = DATE + 1;
@@ -248,7 +248,7 @@
    * the element qualified name over and over.
    */
   private final static int getElementType(String elem) {
-    Integer val = (Integer) ELEMENTS.get(elem);
+    Integer val = ELEMENTS.get(elem);
     return val == null ? -1 : val.intValue();
   }
   
@@ -266,7 +266,7 @@
     }
   }
   
-  public DocData getNextDocData(DocData docData) throws NoMoreDataException, IOException {
+  public synchronized DocData getNextDocData(DocData docData) throws NoMoreDataException, IOException {
     String[] tuple = parser.next();
     docData.clear();
     docData.setName(tuple[ID]);

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java Thu Oct 29 21:29:47 2009
@@ -18,11 +18,6 @@
  */
 
 import org.apache.lucene.benchmark.byTask.utils.Config;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field.TermVector;
 
 /**
  * A {@link DocMaker} which reads the English Wikipedia dump. Uses

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java Thu Oct 29 21:29:47 2009
@@ -92,9 +92,9 @@
    * @param a analyzer to use when parsing queries
    * @return array of Lucene queries
    */
-  private static Query[] createQueries(List qs, Analyzer a) {
+  private static Query[] createQueries(List<Object> qs, Analyzer a) {
     QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD, a);
-    List queries = new ArrayList();
+    List<Object> queries = new ArrayList<Object>();
     for (int i = 0; i < qs.size(); i++) {
       try {
 
@@ -119,14 +119,14 @@
       }
     }
 
-    return (Query[]) queries.toArray(new Query[0]);
+    return queries.toArray(new Query[0]);
   }
 
   protected Query[] prepareQueries() throws Exception {
     // analyzer (default is standard analyzer)
     Analyzer anlzr = NewAnalyzerTask.createAnalyzer(config.get("analyzer", StandardAnalyzer.class.getName()));
 
-    List queryList = new ArrayList(20);
+    List<Object> queryList = new ArrayList<Object>(20);
     queryList.addAll(Arrays.asList(STANDARD_QUERIES));
     if(!config.get("enwikiQueryMaker.disableSpanQueries", false))
       queryList.addAll(Arrays.asList(getPrebuiltQueries(DocMaker.BODY_FIELD)));

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java Thu Oct 29 21:29:47 2009
@@ -51,7 +51,7 @@
     String defaultField = config.get("file.query.maker.default.field", DocMaker.BODY_FIELD);
     QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, defaultField, anlzr);
 
-    List qq = new ArrayList();
+    List<Query> qq = new ArrayList<Query>();
     String fileName = config.get("file.query.maker.file", null);
     if (fileName != null)
     {
@@ -94,7 +94,6 @@
       }
       
     }
-    Query [] result = (Query[]) qq.toArray(new Query[qq.size()]) ;
-    return result;
+    return qq.toArray(new Query[qq.size()]) ;
   }
 }

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java Thu Oct 29 21:29:47 2009
@@ -47,9 +47,9 @@
     ParsePosition pos;
   }
 
-  private ThreadLocal dateFormat = new ThreadLocal();
+  private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<DateFormatInfo>();
   private File dataDir = null;
-  private ArrayList inputFiles = new ArrayList();
+  private ArrayList<File> inputFiles = new ArrayList<File>();
   private int nextFile = 0;
   private int iteration = 0;
   
@@ -69,7 +69,7 @@
   }
 
   private synchronized DateFormatInfo getDateFormatInfo() {
-    DateFormatInfo dfi = (DateFormatInfo) dateFormat.get();
+    DateFormatInfo dfi = dateFormat.get();
     if (dfi == null) {
       dfi = new DateFormatInfo();
       // date format: 30-MAR-1987 14:22:36.87
@@ -105,7 +105,7 @@
         nextFile = 0;
         iteration++;
       }
-      f = (File) inputFiles.get(nextFile++);
+      f = inputFiles.get(nextFile++);
       name = f.getCanonicalPath() + "_" + iteration;
     }
 

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java Thu Oct 29 21:29:47 2009
@@ -72,9 +72,9 @@
    * @param a  analyzer to use when parsing queries
    * @return array of Lucene queries
    */
-  private static Query[] createQueries(List qs, Analyzer a) {
+  private static Query[] createQueries(List<Object> qs, Analyzer a) {
     QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD, a);
-    List queries = new ArrayList();
+    List<Object> queries = new ArrayList<Object>();
     for (int i = 0; i < qs.size(); i++)  {
       try {
         
@@ -99,7 +99,7 @@
       }
     }
     
-    return (Query[]) queries.toArray(new Query[0]);
+    return queries.toArray(new Query[0]);
   }
   
   protected Query[] prepareQueries() throws Exception {
@@ -107,7 +107,7 @@
     Analyzer anlzr= NewAnalyzerTask.createAnalyzer(config.get("analyzer",
     "org.apache.lucene.analysis.standard.StandardAnalyzer")); 
     
-    List queryList = new ArrayList(20);
+    List<Object> queryList = new ArrayList<Object>(20);
     queryList.addAll(Arrays.asList(STANDARD_QUERIES));
     queryList.addAll(Arrays.asList(getPrebuiltQueries(DocMaker.BODY_FIELD)));
     return createQueries(queryList, anlzr);

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java Thu Oct 29 21:29:47 2009
@@ -48,7 +48,7 @@
         "org.apache.lucene.analysis.standard.StandardAnalyzer")); 
     
     QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD,anlzr);
-    ArrayList qq = new ArrayList();
+    ArrayList<Query> qq = new ArrayList<Query>();
     Query q1 = new TermQuery(new Term(DocMaker.ID_FIELD,"doc2"));
     qq.add(q1);
     Query q2 = new TermQuery(new Term(DocMaker.BODY_FIELD,"simple"));
@@ -64,7 +64,7 @@
     qq.add(qp.parse("\"synthetic text\"~3"));
     qq.add(qp.parse("zoom*"));
     qq.add(qp.parse("synth*"));
-    return (Query []) qq.toArray(new Query[0]);
+    return  qq.toArray(new Query[0]);
   }
 
 }

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java Thu Oct 29 21:29:47 2009
@@ -35,15 +35,15 @@
   protected Query[] prepareQueries() throws Exception {
     // extract some 100 words from doc text to an array
     String words[];
-    ArrayList w = new ArrayList();
+    ArrayList<String> w = new ArrayList<String>();
     StringTokenizer st = new StringTokenizer(SingleDocSource.DOC_TEXT);
     while (st.hasMoreTokens() && w.size()<100) {
       w.add(st.nextToken());
     }
-    words = (String[]) w.toArray(new String[0]);
+    words = w.toArray(new String[0]);
 
     // create queries (that would find stuff) with varying slops
-    ArrayList queries = new ArrayList(); 
+    ArrayList<Query> queries = new ArrayList<Query>(); 
     for (int slop=0; slop<8; slop++) {
       for (int qlen=2; qlen<6; qlen++) {
         for (int wd=0; wd<words.length-qlen-slop; wd++) {
@@ -76,7 +76,7 @@
         }
       }
     }
-    return (Query[]) queries.toArray(new Query[0]);
+    return queries.toArray(new Query[0]);
   }
 
 }

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java Thu Oct 29 21:29:47 2009
@@ -76,11 +76,11 @@
        "EEE MMM dd kk:mm:ss yyyy",  	  // Tue Dec 09 16:45:08 2003
   };
 
-  private ThreadLocal dateFormats = new ThreadLocal();
-  private ThreadLocal trecDocReader = new ThreadLocal();
-  private ThreadLocal trecDocBuffer = new ThreadLocal();
+  private ThreadLocal<DateFormatInfo> dateFormats = new ThreadLocal<DateFormatInfo>();
+  private ThreadLocal<StringBufferReader> trecDocReader = new ThreadLocal<StringBufferReader>();
+  private ThreadLocal<StringBuffer> trecDocBuffer = new ThreadLocal<StringBuffer>();
   private File dataDir = null;
-  private ArrayList inputFiles = new ArrayList();
+  private ArrayList<File> inputFiles = new ArrayList<File>();
   private int nextFile = 0;
   private int rawDocSize;
 
@@ -93,7 +93,7 @@
   HTMLParser htmlParser;
   
   private DateFormatInfo getDateFormatInfo() {
-    DateFormatInfo dfi = (DateFormatInfo) dateFormats.get();
+    DateFormatInfo dfi = dateFormats.get();
     if (dfi == null) {
       dfi = new DateFormatInfo();
       dfi.dfs = new SimpleDateFormat[DATE_FORMATS.length];
@@ -108,7 +108,7 @@
   }
 
   private StringBuffer getDocBuffer() {
-    StringBuffer sb = (StringBuffer) trecDocBuffer.get();
+    StringBuffer sb = trecDocBuffer.get();
     if (sb == null) {
       sb = new StringBuffer();
       trecDocBuffer.set(sb);
@@ -117,7 +117,7 @@
   }
   
   private Reader getTrecDocReader(StringBuffer docBuffer) {
-    StringBufferReader r = (StringBufferReader) trecDocReader.get();
+    StringBufferReader r = trecDocReader.get();
     if (r == null) {
       r = new StringBufferReader(docBuffer);
       trecDocReader.set(r);
@@ -177,7 +177,7 @@
         nextFile = 0;
         iteration++;
       }
-      File f = (File) inputFiles.get(nextFile++);
+      File f = inputFiles.get(nextFile++);
       if (verbose) {
         System.out.println("opening: " + f + " length: " + f.length());
       }
@@ -330,7 +330,7 @@
     try {
       String parserClassName = config.get("html.parser",
           "org.apache.lucene.benchmark.byTask.feeds.DemoHTMLParser");
-      htmlParser = (HTMLParser) Class.forName(parserClassName).newInstance();
+      htmlParser = Class.forName(parserClassName).asSubclass(HTMLParser.class).newInstance();
     } catch (Exception e) {
       // Should not get here. Throw runtime exception.
       throw new RuntimeException(e);

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java Thu Oct 29 21:29:47 2009
@@ -42,7 +42,7 @@
       throw new IllegalArgumentException("content.source must be defined");
     }
     try {
-      source = (ContentSource) Class.forName(sourceClass).newInstance();
+      source = Class.forName(sourceClass).asSubclass(ContentSource.class).newInstance();
       source.setConfig(config);
       source.resetInputs();
     } catch (Exception e) {

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java Thu Oct 29 21:29:47 2009
@@ -61,7 +61,7 @@
     final String mergeScheduler = config.get("merge.scheduler",
                                              "org.apache.lucene.index.ConcurrentMergeScheduler");
     try {
-      writer.setMergeScheduler((MergeScheduler) Class.forName(mergeScheduler).newInstance());
+      writer.setMergeScheduler(Class.forName(mergeScheduler).asSubclass(MergeScheduler.class).newInstance());
     } catch (Exception e) {
       throw new RuntimeException("unable to instantiate class '" + mergeScheduler + "' as merge scheduler", e);
     }
@@ -69,7 +69,7 @@
     final String mergePolicy = config.get("merge.policy",
                                           "org.apache.lucene.index.LogByteSizeMergePolicy");
     try {
-      writer.setMergePolicy((MergePolicy) Class.forName(mergePolicy).getConstructor(new Class[] { IndexWriter.class }).newInstance(new Object[] { writer }));
+      writer.setMergePolicy(Class.forName(mergePolicy).asSubclass(MergePolicy.class).getConstructor(IndexWriter.class).newInstance(writer));
     } catch (Exception e) {
       throw new RuntimeException("unable to instantiate class '" + mergePolicy + "' as merge policy", e);
     }
@@ -106,7 +106,7 @@
     IndexDeletionPolicy indexDeletionPolicy = null;
     RuntimeException err = null;
     try {
-      indexDeletionPolicy = ((IndexDeletionPolicy) Class.forName(deletionPolicyName).newInstance());
+      indexDeletionPolicy = Class.forName(deletionPolicyName).asSubclass(IndexDeletionPolicy.class).newInstance();
     } catch (IllegalAccessException iae) {
       err = new RuntimeException("unable to instantiate class '" + deletionPolicyName + "' as IndexDeletionPolicy");
       err.initCause(iae);

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java Thu Oct 29 21:29:47 2009
@@ -41,7 +41,7 @@
 
   public void setParams(String params) {
     super.setParams(params);
-    maxNumSegments = (int) Double.valueOf(params).intValue();
+    maxNumSegments = Double.valueOf(params).intValue();
   }
 
   public boolean supportsParams() {

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java Thu Oct 29 21:29:47 2009
@@ -25,8 +25,6 @@
 import java.util.List;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
@@ -50,7 +48,7 @@
 
   private int roundNumber = 0;
   private Properties props;
-  private HashMap valByRound = new HashMap();
+  private HashMap<String,Object> valByRound = new HashMap<String,Object>();
   private HashMap<String,String> colForValByRound = new HashMap<String,String>();
   private String algorithmText;
 
@@ -247,8 +245,7 @@
     // log changes in values
     if (valByRound.size()>0) {
       sb.append(": ");
-      for (Iterator iter = valByRound.keySet().iterator(); iter.hasNext();) {
-        String name = (String) iter.next();
+      for (final String name : valByRound.keySet()) {
         Object a = valByRound.get(name);
         if (a instanceof int[]) {
           int ai[] = (int[]) a;

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Thu Oct 29 21:29:47 2009
@@ -41,6 +41,8 @@
 import org.apache.lucene.index.LogDocMergePolicy;
 import org.apache.lucene.index.TermFreqVector;
 import org.apache.lucene.store.Directory;
+import org.apache.lucene.search.FieldCache.StringIndex;
+import org.apache.lucene.search.FieldCache;
 
 import junit.framework.TestCase;
 
@@ -269,6 +271,42 @@
     ir.close();
   }
 
+  // LUCENE-1994: test thread safety of SortableSingleDocMaker
+  public void testDocMakerThreadSafety() throws Exception {
+    // 1. alg definition (required in every "logic" test)
+    String algLines[] = {
+        "# ----- properties ",
+        "content.source=org.apache.lucene.benchmark.byTask.feeds.SortableSingleDocSource",
+        "doc.term.vector=false",
+        "log.step.AddDoc=10000",
+        "content.source.forever=true",
+        "directory=RAMDirectory",
+        "doc.reuse.fields=false",
+        "doc.stored=false",
+        "doc.tokenized=false",
+        "doc.index.props=true",
+        "# ----- alg ",
+        "CreateIndex",
+        "[ { AddDoc > : 2500 ] : 4",
+        "CloseIndex",
+    };
+    
+    // 2. we test this value later
+    CountingSearchTestTask.numSearches = 0;
+    
+    // 3. execute the algorithm  (required in every "logic" test)
+    Benchmark benchmark = execBenchmark(algLines);
+
+    IndexReader r = IndexReader.open(benchmark.getRunData().getDirectory(), true);
+    StringIndex idx = FieldCache.DEFAULT.getStringIndex(r, "country");
+    final int maxDoc = r.maxDoc();
+    assertEquals(10000, maxDoc);
+    for(int i=0;i<10000;i++) {
+      assertNotNull("doc " + i + " has null country", idx.lookup[idx.order[i]]);
+    }
+    r.close();
+  }
+
   /**
    * Test Parallel Doc Maker logic (for LUCENE-940)
    */

Modified: lucene/java/branches/flex_1458/contrib/collation/src/test/org/apache/lucene/collation/CollationTestBase.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/collation/src/test/org/apache/lucene/collation/CollationTestBase.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/collation/src/test/org/apache/lucene/collation/CollationTestBase.java (original)
+++ lucene/java/branches/flex_1458/contrib/collation/src/test/org/apache/lucene/collation/CollationTestBase.java Thu Oct 29 21:29:47 2009
@@ -87,7 +87,7 @@
 
     AnalyzingQueryParser aqp = new AnalyzingQueryParser(Version.LUCENE_CURRENT, "content", analyzer);
     aqp.setLowercaseExpandedTerms(false);
-    aqp.setUseOldRangeQuery(false);
+
     // Unicode order would include U+0633 in [ U+062F - U+0698 ], but Farsi
     // orders the U+0698 character before the U+0633 character, so the single
     // index Term below should NOT be returned by a TermRangeQuery
@@ -104,14 +104,6 @@
     result = is.search(aqp.parse("[ \u0633 TO \u0638 ]"), null, 1000).scoreDocs;
     assertEquals("The index Term should be included.", 1, result.length);
 
-    // Test Old TermRangeQuery
-    aqp.setUseOldRangeQuery(true);
-    result = is.search(aqp.parse("[ \u062F TO \u0698 ]"), null, 1000).scoreDocs;
-    assertEquals("The index Term should not be included.", 0, result.length);
-
-    result = is.search(aqp.parse("[ \u0633 TO \u0638 ]"), null, 1000).scoreDocs;
-    assertEquals("The index Term should be included.", 1, result.length);
-
     is.close();
   }
   

Modified: lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java?rev=831094&r1=831093&r2=831094&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java (original)
+++ lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java Thu Oct 29 21:29:47 2009
@@ -184,7 +184,7 @@
 		TextFragment[] frag =getBestTextFragments(tokenStream,text, true,maxNumFragments);
 
 		//Get text
-		ArrayList fragTexts = new ArrayList();
+		ArrayList<String> fragTexts = new ArrayList<String>();
 		for (int i = 0; i < frag.length; i++)
 		{
 			if ((frag[i] != null) && (frag[i].getScore() > 0))
@@ -192,7 +192,7 @@
 				fragTexts.add(frag[i].toString());
 			}
 		}
-		return (String[]) fragTexts.toArray(new String[0]);
+		return fragTexts.toArray(new String[0]);
 	}
 
 
@@ -214,7 +214,7 @@
 		int maxNumFragments)
 		throws IOException, InvalidTokenOffsetsException
 	{
-		ArrayList docFrags = new ArrayList();
+		ArrayList<TextFragment> docFrags = new ArrayList<TextFragment>();
 		StringBuilder newText=new StringBuilder();
 		
 	    TermAttribute termAtt = tokenStream.addAttribute(TermAttribute.class);
@@ -320,9 +320,9 @@
 			currentFrag.textEndPos = newText.length();
 
 			//sort the most relevant sections of the text
-			for (Iterator i = docFrags.iterator(); i.hasNext();)
+			for (Iterator<TextFragment> i = docFrags.iterator(); i.hasNext();)
 			{
-				currentFrag = (TextFragment) i.next();
+				currentFrag = i.next();
 
 				//If you are running with a version of Lucene before 11th Sept 03
 				// you do not have PriorityQueue.insert() - so uncomment the code below
@@ -349,14 +349,14 @@
 			TextFragment frag[] = new TextFragment[fragQueue.size()];
 			for (int i = frag.length - 1; i >= 0; i--)
 			{
-				frag[i] = (TextFragment) fragQueue.pop();
+				frag[i] = fragQueue.pop();
 			}
 
 			//merge any contiguous fragments to improve readability
 			if(mergeContiguousFragments)
 			{
 				mergeContiguousFragments(frag);
-				ArrayList fragTexts = new ArrayList();
+				ArrayList<TextFragment> fragTexts = new ArrayList<TextFragment>();
 				for (int i = 0; i < frag.length; i++)
 				{
 					if ((frag[i] != null) && (frag[i].getScore() > 0))
@@ -364,7 +364,7 @@
 						fragTexts.add(frag[i]);
 					}
 				}
-				frag= (TextFragment[]) fragTexts.toArray(new TextFragment[0]);
+				frag= fragTexts.toArray(new TextFragment[0]);
 			}
 
 			return frag;
@@ -567,17 +567,15 @@
         this.encoder = encoder;
     }
 }
-class FragmentQueue extends PriorityQueue
+class FragmentQueue extends PriorityQueue<TextFragment>
 {
 	public FragmentQueue(int size)
 	{
 		initialize(size);
 	}
 
-	public final boolean lessThan(Object a, Object b)
+	public final boolean lessThan(TextFragment fragA, TextFragment fragB)
 	{
-		TextFragment fragA = (TextFragment) a;
-		TextFragment fragB = (TextFragment) b;
 		if (fragA.getScore() == fragB.getScore())
 			return fragA.fragNum > fragB.fragNum;
 		else



Mime
View raw message