You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/08/18 15:35:17 UTC
svn commit: r1374578 [1/3] - in /lucene/dev/branches/pforcodec_3892: ./
dev-tools/ dev-tools/eclipse/ lucene/ lucene/analysis/
lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/tes...
Author: mikemccand
Date: Sat Aug 18 13:35:11 2012
New Revision: 1374578
URL: http://svn.apache.org/viewvc?rev=1374578&view=rev
Log:
LUCENE-3892: merge trunk
Added:
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java
- copied unchanged from r1374573, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/update/MemOutputStream.java
- copied unchanged from r1374573, lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/MemOutputStream.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test-files/exampledocs/
- copied from r1374573, lucene/dev/trunk/solr/core/src/test-files/exampledocs/
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
- copied unchanged from r1374573, lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java
- copied unchanged from r1374573, lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/util/TestFastWriter.java
- copied unchanged from r1374573, lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestFastWriter.java
lucene/dev/branches/pforcodec_3892/solr/licenses/ant-1.8.2.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/ant-1.8.2.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/ant-LICENSE-ASL.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/ant-LICENSE-ASL.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/ant-NOTICE.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/ant-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/ant-junit-1.8.2.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/ant-junit-1.8.2.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/ant-junit-LICENSE-ASL.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/ant-junit-LICENSE-ASL.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/ant-junit-NOTICE.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/ant-junit-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/commons-compress-1.4.1.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/commons-compress-1.4.1.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/fontbox-1.7.0.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/fontbox-1.7.0.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/isoparser-1.0-RC-1.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-1.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/isoparser-1.0-RC-LICENSE-ASL.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-LICENSE-ASL.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/isoparser-1.0-RC-NOTICE.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/jempbox-1.7.0.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/jempbox-1.7.0.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/junit-4.10.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/junit-4.10.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/junit-LICENSE-CPL.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/junit-LICENSE-CPL.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/junit-NOTICE.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/junit-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/junit4-ant-2.0.0.rc5.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/junit4-ant-2.0.0.rc5.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/junit4-ant-LICENSE-ASL.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/junit4-ant-LICENSE-ASL.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/junit4-ant-NOTICE.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/junit4-ant-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/juniversalchardet-1.0.3.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/juniversalchardet-1.0.3.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/juniversalchardet-LICENSE-MPL.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/juniversalchardet-LICENSE-MPL.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/juniversalchardet-NOTICE.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/juniversalchardet-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/pdfbox-1.7.0.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/pdfbox-1.7.0.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/poi-3.8.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/poi-3.8.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/poi-ooxml-3.8.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/poi-ooxml-3.8.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/poi-scratchpad-3.8.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/poi-scratchpad-3.8.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/randomizedtesting-runner-2.0.0.rc5.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.0.0.rc5.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/randomizedtesting-runner-LICENSE-ASL.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/randomizedtesting-runner-LICENSE-ASL.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/randomizedtesting-runner-NOTICE.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/randomizedtesting-runner-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/tika-core-1.2.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/tika-core-1.2.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/tika-parsers-1.2.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/tika-parsers-1.2.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/xz-1.0.jar.sha1
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/xz-1.0.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/xz-LICENSE-PD.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/xz-LICENSE-PD.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/xz-NOTICE.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/licenses/xz-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/test-framework/README.txt
- copied unchanged from r1374573, lucene/dev/trunk/solr/test-framework/README.txt
lucene/dev/branches/pforcodec_3892/solr/test-framework/lib/ (props changed)
- copied from r1374573, lucene/dev/trunk/solr/test-framework/lib/
Removed:
lucene/dev/branches/pforcodec_3892/solr/licenses/apache-mime4j-core-0.7.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/apache-mime4j-dom-0.7.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/commons-compress-1.3.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/fontbox-1.6.0.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/isoparser-1.0-beta-5.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/isoparser-LICENSE-ASL.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/isoparser-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/javassist-3.6.0.GA.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/jempbox-1.6.0.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/pdfbox-1.6.0.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/poi-3.8-beta5.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/poi-ooxml-3.8-beta5.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/poi-ooxml-schemas-3.8-beta5.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/poi-scratchpad-3.8-beta5.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/scannotation-1.0.2.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/tika-core-1.1.jar.sha1
lucene/dev/branches/pforcodec_3892/solr/licenses/tika-parsers-1.1.jar.sha1
Modified:
lucene/dev/branches/pforcodec_3892/ (props changed)
lucene/dev/branches/pforcodec_3892/dev-tools/ (props changed)
lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath
lucene/dev/branches/pforcodec_3892/lucene/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/pforcodec_3892/lucene/analysis/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java
lucene/dev/branches/pforcodec_3892/lucene/build.xml (contents, props changed)
lucene/dev/branches/pforcodec_3892/lucene/core/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/BlockTermState.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntStreamFactory.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergeState.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentReadState.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentWriteState.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldCache.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/SortField.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/store/RAMFile.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/util/FuzzySet.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/util/fst/Util.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
lucene/dev/branches/pforcodec_3892/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractDistinctValuesCollector.java
lucene/dev/branches/pforcodec_3892/lucene/grouping/src/java/org/apache/lucene/search/grouping/CollectedSearchGroup.java
lucene/dev/branches/pforcodec_3892/lucene/module-build.xml (contents, props changed)
lucene/dev/branches/pforcodec_3892/lucene/queries/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java
lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40ords/Lucene40WithOrds.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntFactory.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/English.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/RollingBuffer.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleFieldCacheSanity.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleStoreClassName.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java
lucene/dev/branches/pforcodec_3892/solr/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/pforcodec_3892/solr/NOTICE.txt (contents, props changed)
lucene/dev/branches/pforcodec_3892/solr/build.xml
lucene/dev/branches/pforcodec_3892/solr/common-build.xml (contents, props changed)
lucene/dev/branches/pforcodec_3892/solr/contrib/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/contrib/extraction/ivy.xml
lucene/dev/branches/pforcodec_3892/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
lucene/dev/branches/pforcodec_3892/solr/core/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/update/TransactionLog.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/util/FastWriter.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
lucene/dev/branches/pforcodec_3892/solr/example/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/pforcodec_3892/solr/example/solr/solr.xml
lucene/dev/branches/pforcodec_3892/solr/licenses/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/licenses/commons-compress-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/fontbox-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/jempbox-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/pdfbox-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/tika-core-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/licenses/tika-parsers-NOTICE.txt
lucene/dev/branches/pforcodec_3892/solr/solrj/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java
lucene/dev/branches/pforcodec_3892/solr/test-framework/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/test-framework/build.xml
lucene/dev/branches/pforcodec_3892/solr/test-framework/ivy.xml
lucene/dev/branches/pforcodec_3892/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
lucene/dev/branches/pforcodec_3892/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath Sat Aug 18 13:35:11 2012
@@ -1,126 +1,126 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="lucene/core/src/java"/>
- <classpathentry kind="src" path="lucene/core/src/resources"/>
- <classpathentry kind="src" path="lucene/core/src/test"/>
- <classpathentry kind="src" path="lucene/demo/src/java"/>
- <classpathentry kind="src" path="lucene/demo/src/resources"/>
- <classpathentry kind="src" path="lucene/demo/src/test"/>
- <classpathentry kind="src" path="lucene/highlighter/src/java"/>
- <classpathentry kind="src" path="lucene/highlighter/src/test"/>
- <classpathentry kind="src" path="lucene/memory/src/java"/>
- <classpathentry kind="src" path="lucene/memory/src/test"/>
- <classpathentry kind="src" path="lucene/misc/src/java"/>
- <classpathentry kind="src" path="lucene/misc/src/test"/>
- <classpathentry kind="src" path="lucene/sandbox/src/java"/>
- <classpathentry kind="src" path="lucene/sandbox/src/test"/>
- <classpathentry kind="src" path="lucene/test-framework/src/java"/>
+ <classpathentry kind="src" path="lucene/core/src/java"/>
+ <classpathentry kind="src" path="lucene/core/src/resources"/>
+ <classpathentry kind="src" path="lucene/core/src/test"/>
+ <classpathentry kind="src" path="lucene/demo/src/java"/>
+ <classpathentry kind="src" path="lucene/demo/src/resources"/>
+ <classpathentry kind="src" path="lucene/demo/src/test"/>
+ <classpathentry kind="src" path="lucene/highlighter/src/java"/>
+ <classpathentry kind="src" path="lucene/highlighter/src/test"/>
+ <classpathentry kind="src" path="lucene/memory/src/java"/>
+ <classpathentry kind="src" path="lucene/memory/src/test"/>
+ <classpathentry kind="src" path="lucene/misc/src/java"/>
+ <classpathentry kind="src" path="lucene/misc/src/test"/>
+ <classpathentry kind="src" path="lucene/sandbox/src/java"/>
+ <classpathentry kind="src" path="lucene/sandbox/src/test"/>
+ <classpathentry kind="src" path="lucene/test-framework/src/java"/>
<classpathentry kind="src" output="bin/tests-framework" path="lucene/test-framework/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/common/src/java"/>
- <classpathentry kind="src" output="bin/analysis-common" path="lucene/analysis/common/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/common/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/icu/src/java"/>
- <classpathentry kind="src" output="bin/analysis-icu" path="lucene/analysis/icu/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/icu/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/kuromoji/src/java"/>
- <classpathentry kind="src" output="bin/analysis-kuromoji" path="lucene/analysis/kuromoji/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/kuromoji/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/phonetic/src/java"/>
- <classpathentry kind="src" output="bin/analysis-phonetic" path="lucene/analysis/phonetic/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/phonetic/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/smartcn/src/java"/>
- <classpathentry kind="src" output="bin/analysis-smartcn" path="lucene/analysis/smartcn/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/smartcn/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/stempel/src/java"/>
- <classpathentry kind="src" output="bin/analysis-stempel" path="lucene/analysis/stempel/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/stempel/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/morfologik/src/java"/>
- <classpathentry kind="src" output="bin/analysis-morfologik" path="lucene/analysis/morfologik/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/morfologik/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/uima/src/java"/>
- <classpathentry kind="src" output="bin/analysis-uima" path="lucene/analysis/uima/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/uima/src/test"/>
- <classpathentry kind="src" path="lucene/benchmark/src/java"/>
- <classpathentry kind="src" path="lucene/benchmark/src/test"/>
- <classpathentry excluding="src" including="conf/**" kind="src" path="lucene/benchmark"/>
- <classpathentry kind="src" path="lucene/facet/src/java"/>
- <classpathentry kind="src" path="lucene/facet/src/examples"/>
- <classpathentry kind="src" path="lucene/facet/src/test"/>
- <classpathentry kind="src" path="lucene/grouping/src/java"/>
- <classpathentry kind="src" path="lucene/grouping/src/test"/>
- <classpathentry kind="src" path="lucene/join/src/java"/>
- <classpathentry kind="src" path="lucene/join/src/test"/>
- <classpathentry kind="src" path="lucene/queries/src/java"/>
- <classpathentry kind="src" path="lucene/queries/src/test"/>
- <classpathentry kind="src" path="lucene/queryparser/src/java"/>
- <classpathentry kind="src" path="lucene/queryparser/src/resources"/>
- <classpathentry kind="src" path="lucene/queryparser/src/test"/>
- <classpathentry kind="src" path="lucene/suggest/src/java"/>
- <classpathentry kind="src" path="lucene/suggest/src/test"/>
- <classpathentry kind="src" path="lucene/spatial/src/java"/>
- <classpathentry kind="src" path="lucene/spatial/src/test"/>
- <classpathentry kind="src" path="lucene/spatial/src/test-files"/>
- <classpathentry kind="lib" path="lucene/spatial/lib/spatial4j-0.2.jar"/>
- <classpathentry kind="src" path="solr/core/src/java"/>
- <classpathentry kind="src" path="solr/core/src/test"/>
- <classpathentry kind="src" path="solr/core/src/test-files"/>
- <classpathentry kind="src" path="solr/solrj/src/java"/>
- <classpathentry kind="src" path="solr/solrj/src/test"/>
- <classpathentry kind="src" path="solr/solrj/src/test-files"/>
- <classpathentry kind="src" path="solr/test-framework/src/java"/>
- <classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
- <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test"/>
- <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/clustering/src/java"/>
- <classpathentry kind="src" path="solr/contrib/clustering/src/test"/>
- <classpathentry kind="src" path="solr/contrib/clustering/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/java"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/java"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/extraction/src/java"/>
- <classpathentry kind="src" path="solr/contrib/extraction/src/test"/>
- <classpathentry kind="src" path="solr/contrib/extraction/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/langid/src/java"/>
- <classpathentry kind="src" path="solr/contrib/langid/src/resources"/>
- <classpathentry kind="src" path="solr/contrib/langid/src/test"/>
- <classpathentry kind="src" path="solr/contrib/langid/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/uima/src/java"/>
- <classpathentry kind="src" path="solr/contrib/uima/src/resources"/>
- <classpathentry kind="src" path="solr/contrib/uima/src/test"/>
- <classpathentry kind="src" path="solr/contrib/uima/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/velocity/src/java"/>
- <classpathentry kind="src" path="solr/contrib/velocity/src/test"/>
- <classpathentry kind="src" path="solr/contrib/velocity/src/test-files"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/ant-1.8.2.jar"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/ant-junit-1.8.2.jar"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
- <classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.6.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
- <classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.3.jar"/>
- <classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-cli-1.2.jar"/>
- <classpathentry kind="lib" path="solr/lib/httpclient-4.1.3.jar"/>
- <classpathentry kind="lib" path="solr/lib/httpcore-4.1.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/httpmime-4.1.3.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-io-2.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
- <classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
- <classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
- <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
- <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.6.jar"/>
+ <classpathentry kind="src" path="lucene/analysis/common/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-common" path="lucene/analysis/common/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/common/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/icu/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-icu" path="lucene/analysis/icu/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/icu/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/kuromoji/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-kuromoji" path="lucene/analysis/kuromoji/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/kuromoji/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/phonetic/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-phonetic" path="lucene/analysis/phonetic/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/phonetic/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/smartcn/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-smartcn" path="lucene/analysis/smartcn/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/smartcn/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/stempel/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-stempel" path="lucene/analysis/stempel/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/stempel/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/morfologik/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-morfologik" path="lucene/analysis/morfologik/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/morfologik/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/uima/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-uima" path="lucene/analysis/uima/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/uima/src/test"/>
+ <classpathentry kind="src" path="lucene/benchmark/src/java"/>
+ <classpathentry kind="src" path="lucene/benchmark/src/test"/>
+ <classpathentry excluding="src" including="conf/**" kind="src" path="lucene/benchmark"/>
+ <classpathentry kind="src" path="lucene/facet/src/java"/>
+ <classpathentry kind="src" path="lucene/facet/src/examples"/>
+ <classpathentry kind="src" path="lucene/facet/src/test"/>
+ <classpathentry kind="src" path="lucene/grouping/src/java"/>
+ <classpathentry kind="src" path="lucene/grouping/src/test"/>
+ <classpathentry kind="src" path="lucene/join/src/java"/>
+ <classpathentry kind="src" path="lucene/join/src/test"/>
+ <classpathentry kind="src" path="lucene/queries/src/java"/>
+ <classpathentry kind="src" path="lucene/queries/src/test"/>
+ <classpathentry kind="src" path="lucene/queryparser/src/java"/>
+ <classpathentry kind="src" path="lucene/queryparser/src/resources"/>
+ <classpathentry kind="src" path="lucene/queryparser/src/test"/>
+ <classpathentry kind="src" path="lucene/suggest/src/java"/>
+ <classpathentry kind="src" path="lucene/suggest/src/test"/>
+ <classpathentry kind="src" path="lucene/spatial/src/java"/>
+ <classpathentry kind="src" path="lucene/spatial/src/test"/>
+ <classpathentry kind="src" path="lucene/spatial/src/test-files"/>
+ <classpathentry kind="lib" path="lucene/spatial/lib/spatial4j-0.2.jar"/>
+ <classpathentry kind="src" path="solr/core/src/java"/>
+ <classpathentry kind="src" path="solr/core/src/test"/>
+ <classpathentry kind="src" path="solr/core/src/test-files"/>
+ <classpathentry kind="src" path="solr/solrj/src/java"/>
+ <classpathentry kind="src" path="solr/solrj/src/test"/>
+ <classpathentry kind="src" path="solr/solrj/src/test-files"/>
+ <classpathentry kind="src" path="solr/test-framework/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/clustering/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/clustering/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/clustering/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/extraction/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/extraction/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/extraction/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/langid/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/langid/src/resources"/>
+ <classpathentry kind="src" path="solr/contrib/langid/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/langid/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/resources"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/velocity/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/velocity/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/velocity/src/test-files"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/ant-1.8.2.jar"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/ant-junit-1.8.2.jar"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
+ <classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.6.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
+ <classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.3.jar"/>
+ <classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-cli-1.2.jar"/>
+ <classpathentry kind="lib" path="solr/lib/httpclient-4.1.3.jar"/>
+ <classpathentry kind="lib" path="solr/lib/httpcore-4.1.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/httpmime-4.1.3.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-io-2.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
+ <classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
+ <classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
+ <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
+ <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.6.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.2.v20120308.jar"/>
@@ -133,47 +133,57 @@
<classpathentry kind="lib" path="solr/example/lib/jetty-webapp-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-xml-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/servlet-api-3.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-math-0.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/commons-compress-1.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.6.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/jempbox-1.6.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/netcdf-4.2-min.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/pdfbox-1.6.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-3.8-beta5.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-3.8-beta5.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta5.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-scratchpad-3.8-beta5.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/rome-0.9.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/tagsoup-1.2.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-1.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-1.1-20120112.jar"/>
- <classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.7.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/Tagger-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-tools-2.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-math-0.3.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/dom4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/netcdf-4.2-min.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/rome-0.9.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/tagsoup-1.2.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-1.1-20120112.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.7.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/Tagger-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-tools-2.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar"/>
- <classpathentry kind="output" path="bin/other"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/commons-compress-1.4.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.7.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/icu4j-49.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/isoparser-1.0-RC-1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/jdom-1.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/jempbox-1.7.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/juniversalchardet-1.0.3.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/pdfbox-1.7.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-3.8.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-3.8.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-schemas-3.8.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-scratchpad-3.8.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-1.2.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.2.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/vorbis-java-core-0.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/vorbis-java-tika-0.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/xz-1.0.jar"/>
+ <classpathentry kind="output" path="bin/other"/>
</classpath>
Modified: lucene/dev/branches/pforcodec_3892/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/CHANGES.txt?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/CHANGES.txt Sat Aug 18 13:35:11 2012
@@ -75,6 +75,14 @@ Bug Fixes
encoders / stemmers via the ResourceLoader now instead of Class.forName().
Solr users should now no longer have to embed these in its war. (David Smiley)
+* SOLR-3737: StempelPolishStemFilterFactory loaded its stemmer table incorrectly.
+ Also, ensure immutability and use only one instance of this table in RAM (lazy
+ loaded) since its quite large. (sausarkar, Steven Rowe, Robert Muir)
+
+* LUCENE-4310: MappingCharFilter was failing to match input strings
+ containing non-BMP Unicode characters. (Dawid Weiss, Robert Muir,
+ Mike McCandless)
+
Build
* LUCENE-3985: Upgrade to randomizedtesting 2.0.0. Added support for
Modified: lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java Sat Aug 18 13:35:11 2012
@@ -111,9 +111,8 @@ public class NormalizeCharMap {
final org.apache.lucene.util.fst.Builder<CharsRef> builder = new org.apache.lucene.util.fst.Builder<CharsRef>(FST.INPUT_TYPE.BYTE2, outputs);
final IntsRef scratch = new IntsRef();
for(Map.Entry<String,String> ent : pendingPairs.entrySet()) {
- builder.add(Util.toUTF32(ent.getKey(), scratch),
+ builder.add(Util.toUTF16(ent.getKey(), scratch),
new CharsRef(ent.getValue()));
-
}
map = builder.finish();
pendingPairs.clear();
Modified: lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java Sat Aug 18 13:35:11 2012
@@ -33,6 +33,7 @@ import org.apache.lucene.analysis.CharFi
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.util.UnicodeUtil;
import org.apache.lucene.util._TestUtil;
public class TestMappingCharFilter extends BaseTokenStreamTestCase {
@@ -55,6 +56,11 @@ public class TestMappingCharFilter exten
builder.add( "empty", "" );
+ // BMP (surrogate pair):
+ builder.add(UnicodeUtil.newString(new int[] {0x1D122}, 0, 1), "fclef");
+
+ builder.add("\uff01", "full-width-exclamation");
+
normMap = builder.build();
}
@@ -128,6 +134,18 @@ public class TestMappingCharFilter exten
assertTokenStreamContents(ts, new String[0], new int[]{}, new int[]{}, 5);
}
+ public void testNonBMPChar() throws Exception {
+ CharFilter cs = new MappingCharFilter( normMap, new StringReader( UnicodeUtil.newString(new int[] {0x1D122}, 0, 1) ) );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
+ assertTokenStreamContents(ts, new String[]{"fclef"}, new int[]{0}, new int[]{2}, 2);
+ }
+
+ public void testFullWidthChar() throws Exception {
+ CharFilter cs = new MappingCharFilter( normMap, new StringReader( "\uff01") );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
+ assertTokenStreamContents(ts, new String[]{"full-width-exclamation"}, new int[]{0}, new int[]{1}, 1);
+ }
+
//
// 1111111111222
// 01234567890123456789012
Modified: lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java Sat Aug 18 13:35:11 2012
@@ -59,6 +59,13 @@ public final class PolishAnalyzer extend
}
/**
+ * Returns an unmodifiable instance of the default stemmer table.
+ */
+ public static Trie getDefaultTable() {
+ return DefaultsHolder.DEFAULT_TABLE;
+ }
+
+ /**
* Atomically loads the DEFAULT_STOP_SET in a lazy fashion once the outer class
* accesses the static final set the first time.;
*/
Modified: lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java Sat Aug 18 13:35:11 2012
@@ -17,28 +17,17 @@ package org.apache.lucene.analysis.stemp
* limitations under the License.
*/
-import java.io.IOException;
-
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.pl.PolishAnalyzer;
import org.apache.lucene.analysis.stempel.StempelFilter;
import org.apache.lucene.analysis.stempel.StempelStemmer;
-import org.apache.lucene.analysis.util.ResourceLoader;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
-import org.egothor.stemmer.Trie;
/**
* Factory for {@link StempelFilter} using a Polish stemming table.
*/
-public class StempelPolishStemFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
- private Trie stemmer = null;
- private static final String STEMTABLE = "/org/apache/lucene/analysis/pl/stemmer_20000.tbl";
-
+public class StempelPolishStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
- return new StempelFilter(input, new StempelStemmer(stemmer));
- }
-
- public void inform(ResourceLoader loader) throws IOException {
- stemmer = StempelStemmer.load(loader.openResource(STEMTABLE));
+ return new StempelFilter(input, new StempelStemmer(PolishAnalyzer.getDefaultTable()));
}
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java Sat Aug 18 13:35:11 2012
@@ -332,7 +332,7 @@ public class Trie {
* @param key the key
* @param cmd the patch command
*/
- public void add(CharSequence key, CharSequence cmd) {
+ void add(CharSequence key, CharSequence cmd) {
if (key == null || cmd == null) {
return;
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java Sat Aug 18 13:35:11 2012
@@ -22,7 +22,6 @@ import java.io.StringReader;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
-import org.apache.lucene.analysis.util.ClasspathResourceLoader;
/**
* Tests for {@link StempelPolishStemFilterFactory}
@@ -31,7 +30,6 @@ public class TestStempelPolishStemFilter
public void testBasics() throws Exception {
StringReader document = new StringReader("studenta studenci");
StempelPolishStemFilterFactory factory = new StempelPolishStemFilterFactory();
- factory.inform(new ClasspathResourceLoader(getClass()));
TokenStream ts = factory.create(new WhitespaceTokenizer(TEST_VERSION_CURRENT, document));
assertTokenStreamContents(ts,
new String[] { "student", "student" });
Modified: lucene/dev/branches/pforcodec_3892/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/build.xml?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/build.xml (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/build.xml Sat Aug 18 13:35:11 2012
@@ -234,10 +234,10 @@
<check-missing-javadocs dir="build/docs/analyzers-stempel" level="class"/>
<check-missing-javadocs dir="build/docs/analyzers-uima" level="class"/>
<check-missing-javadocs dir="build/docs/benchmark" level="class"/>
- <!-- core: problems -->
+ <check-missing-javadocs dir="build/docs/core" level="class"/>
<check-missing-javadocs dir="build/docs/demo" level="class"/>
<check-missing-javadocs dir="build/docs/facet" level="class"/>
- <!-- grouping: problems -->
+ <check-missing-javadocs dir="build/docs/grouping" level="class"/>
<!-- highlighter: problems -->
<check-missing-javadocs dir="build/docs/join" level="class"/>
<check-missing-javadocs dir="build/docs/memory" level="class"/>
@@ -247,7 +247,7 @@
<check-missing-javadocs dir="build/docs/sandbox" level="class"/>
<!-- spatial: problems -->
<check-missing-javadocs dir="build/docs/suggest" level="class"/>
- <!-- test-framework: problems -->
+ <check-missing-javadocs dir="build/docs/test-framework" level="class"/>
</sequential>
</target>
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/BlockTermState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/BlockTermState.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/BlockTermState.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/BlockTermState.java Sat Aug 18 13:35:11 2012
@@ -26,11 +26,15 @@ import org.apache.lucene.index.TermState
* terms dict.
*/
public class BlockTermState extends OrdTermState {
- public int docFreq; // how many docs have this term
- public long totalTermFreq; // total number of occurrences of this term
+ /** how many docs have this term */
+ public int docFreq;
+ /** total number of occurrences of this term */
+ public long totalTermFreq;
- public int termBlockOrd; // the term's ord in the current block
- public long blockFilePointer; // fp into the terms dict primary file (_X.tim) that holds this term
+ /** the term's ord in the current block */
+ public int termBlockOrd;
+ /** fp into the terms dict primary file (_X.tim) that holds this term */
+ public long blockFilePointer;
@Override
public void copyFrom(TermState _other) {
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java Sat Aug 18 13:35:11 2012
@@ -36,7 +36,7 @@ import org.apache.lucene.util.MathUtil;
*/
public abstract class MultiLevelSkipListReader {
- // the maximum number of skip levels possible for this index
+ /** the maximum number of skip levels possible for this index */
protected int maxNumberOfSkipLevels;
// number of levels in this skip list
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java Sat Aug 18 13:35:11 2012
@@ -52,7 +52,7 @@ import org.apache.lucene.util.MathUtil;
*/
public abstract class MultiLevelSkipListWriter {
- // number of levels in this skip list
+ /** number of levels in this skip list */
protected int numberOfSkipLevels;
// the skip interval in the list with level = 0
@@ -93,8 +93,8 @@ public abstract class MultiLevelSkipList
}
}
+ /** creates new buffers or empties the existing ones */
protected void resetSkip() {
- // creates new buffers or empties the existing ones
if (skipBuffer == null) {
init();
} else {
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Sat Aug 18 13:35:11 2012
@@ -1796,7 +1796,7 @@ public class DirectPostingsFormat extend
}
// Docs + freqs:
- public final static class HighFreqDocsEnum extends DocsEnum {
+ private final static class HighFreqDocsEnum extends DocsEnum {
private int[] docIDs;
private int[] freqs;
private final Bits liveDocs;
@@ -1969,7 +1969,7 @@ public class DirectPostingsFormat extend
}
// TODO: specialize offsets and not
- public final static class HighFreqDocsAndPositionsEnum extends DocsAndPositionsEnum {
+ private final static class HighFreqDocsAndPositionsEnum extends DocsAndPositionsEnum {
private int[] docIDs;
private int[] freqs;
private int[][] positions;
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java Sat Aug 18 13:35:11 2012
@@ -36,7 +36,7 @@ public abstract class IntIndexInput impl
public abstract Index index() throws IOException;
- // TODO: -- can we simplify this?
+ /** Records a single skip-point in the {@link IntIndexInput.Reader}. */
public abstract static class Index {
public abstract void read(DataInput indexIn, boolean absolute) throws IOException;
@@ -50,6 +50,7 @@ public abstract class IntIndexInput impl
public abstract Index clone();
}
+ /** Reads int values. */
public abstract static class Reader {
/** Reads next single int */
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java Sat Aug 18 13:35:11 2012
@@ -38,6 +38,7 @@ public abstract class IntIndexOutput imp
* >= 0. */
public abstract void write(int v) throws IOException;
+ /** Records a single skip-point in the IndexOutput. */
public abstract static class Index {
/** Internally records the current location */
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntStreamFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntStreamFactory.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntStreamFactory.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntStreamFactory.java Sat Aug 18 13:35:11 2012
@@ -22,8 +22,15 @@ import org.apache.lucene.store.IOContext
import java.io.IOException;
-/** @lucene.experimental */
+/** Provides int reader and writer to specified files.
+ *
+ * @lucene.experimental */
public abstract class IntStreamFactory {
+ /** Create an {@link IntIndexInput} on the provided
+ * fileName. */
public abstract IntIndexInput openInput(Directory dir, String fileName, IOContext context) throws IOException;
+
+ /** Create an {@link IntIndexOutput} on the provided
+ * fileName. */
public abstract IntIndexOutput createOutput(Directory dir, String fileName, IOContext context) throws IOException;
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java Sat Aug 18 13:35:11 2012
@@ -119,10 +119,13 @@ public class DocTermOrds {
protected final String field;
protected int numTermsInField;
- protected long termInstances; // total number of references to term numbers
+ /** total number of references to term numbers */
+ protected long termInstances;
private long memsz;
- protected int total_time; // total time to uninvert the field
- protected int phase1_time; // time for phase1 of the uninvert process
+ /** total time to uninvert the field */
+ protected int total_time;
+ /** time for phase1 of the uninvert process */
+ protected int phase1_time;
protected int[] index;
protected byte[][] tnums = new byte[256][];
@@ -234,7 +237,7 @@ public class DocTermOrds {
protected void setActualDocFreq(int termNum, int df) throws IOException {
}
- // Call this only once (if you subclass!)
+ /** Call this only once (if you subclass!) */
protected void uninvert(final AtomicReader reader, final BytesRef termPrefix) throws IOException {
//System.out.println("DTO uninvert field=" + field + " prefix=" + termPrefix);
final long startTime = System.currentTimeMillis();
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java Sat Aug 18 13:35:11 2012
@@ -267,11 +267,11 @@ public class FieldInfos implements Itera
return addOrUpdateInternal(name, -1, isIndexed, storeTermVector, omitNorms, storePayloads, indexOptions, docValues, normType);
}
- // NOTE: this method does not carry over termVector
- // booleans nor docValuesType; the indexer chain
- // (TermVectorsConsumerPerField, DocFieldProcessor) must
- // set these fields when they succeed in consuming
- // the document:
+ /** NOTE: this method does not carry over termVector
+ * booleans nor docValuesType; the indexer chain
+ * (TermVectorsConsumerPerField, DocFieldProcessor) must
+ * set these fields when they succeed in consuming
+ * the document */
public FieldInfo addOrUpdate(String name, IndexableFieldType fieldType) {
// TODO: really, indexer shouldn't even call this
// method (it's only called from DocFieldProcessor);
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java Sat Aug 18 13:35:11 2012
@@ -243,6 +243,10 @@ public abstract class MergePolicy implem
}
}
+ /** Thrown when a merge was explicity aborted because
+ * {@link IndexWriter#close(boolean)} was called with
+ * <code>false</code>. Normally this exception is
+ * privately caught and suppresed by {@link IndexWriter}. */
public static class MergeAbortedException extends IOException {
public MergeAbortedException() {
super("merge is aborted");
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergeState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergeState.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergeState.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergeState.java Sat Aug 18 13:35:11 2012
@@ -29,6 +29,9 @@ import org.apache.lucene.util.packed.Pac
* @lucene.experimental */
public class MergeState {
+ /**
+ * Remaps docids around deletes during merge
+ */
public static abstract class DocMap {
private final Bits liveDocs;
@@ -197,6 +200,9 @@ public class MergeState {
public SegmentReader[] matchingSegmentReaders;
public int matchedCount;
+ /**
+ * Class for recording units of work when merging segments.
+ */
public static class CheckAbort {
private double workCount;
private final MergePolicy.OneMerge merge;
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java Sat Aug 18 13:35:11 2012
@@ -43,7 +43,7 @@ import org.apache.lucene.util.packed.Pac
* @lucene.experimental
* @lucene.internal
*/
-public class MultiDocValues extends DocValues {
+class MultiDocValues extends DocValues {
private static DocValuesPuller DEFAULT_PULLER = new DocValuesPuller();
private static final DocValuesPuller NORMS_PULLER = new DocValuesPuller() {
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java Sat Aug 18 13:35:11 2012
@@ -143,6 +143,8 @@ public final class MultiDocsAndPositions
}
// TODO: implement bulk read more efficiently than super
+ /** Holds a {@link DocsAndPositionsEnum} along with the
+ * corresponding {@link ReaderSlice}. */
public final static class EnumWithSlice {
public DocsAndPositionsEnum docsAndPositionsEnum;
public ReaderSlice slice;
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java Sat Aug 18 13:35:11 2012
@@ -122,6 +122,8 @@ public final class MultiDocsEnum extends
}
// TODO: implement bulk read more efficiently than super
+ /** Holds a {@link DocsEnum} along with the
+ * corresponding {@link ReaderSlice}. */
public final static class EnumWithSlice {
public DocsEnum docsEnum;
public ReaderSlice slice;
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java Sat Aug 18 13:35:11 2012
@@ -133,7 +133,8 @@ public final class SegmentInfos implemen
// or wrote; this is normally the same as generation except if
// there was an IOException that had interrupted a commit
- public Map<String,String> userData = Collections.<String,String>emptyMap(); // Opaque Map<String, String> that user can specify during IndexWriter.commit
+ /** Opaque Map<String, String> that user can specify during IndexWriter.commit */
+ public Map<String,String> userData = Collections.<String,String>emptyMap();
private List<SegmentInfoPerCommit> segments = new ArrayList<SegmentInfoPerCommit>();
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentReadState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentReadState.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentReadState.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentReadState.java Sat Aug 18 13:35:11 2012
@@ -30,11 +30,11 @@ public class SegmentReadState {
public final FieldInfos fieldInfos;
public final IOContext context;
- // NOTE: if this is < 0, that means "defer terms index
- // load until needed". But if the codec must load the
- // terms index on init (preflex is the only once currently
- // that must do so), then it should negate this value to
- // get the app's terms divisor:
+ /** NOTE: if this is < 0, that means "defer terms index
+ * load until needed". But if the codec must load the
+ * terms index on init (preflex is the only once currently
+ * that must do so), then it should negate this value to
+ * get the app's terms divisor */
public int termsIndexDivisor;
public final String segmentSuffix;
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentWriteState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentWriteState.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentWriteState.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SegmentWriteState.java Sat Aug 18 13:35:11 2012
@@ -33,11 +33,11 @@ public class SegmentWriteState {
public final FieldInfos fieldInfos;
public int delCountOnFlush;
- // Deletes to apply while we are flushing the segment. A
- // Term is enrolled in here if it was deleted at one
- // point, and it's mapped to the docIDUpto, meaning any
- // docID < docIDUpto containing this term should be
- // deleted.
+ /** Deletes to apply while we are flushing the segment. A
+ * Term is enrolled in here if it was deleted at one
+ * point, and it's mapped to the docIDUpto, meaning any
+ * docID < docIDUpto containing this term should be
+ * deleted. */
public final BufferedDeletes segDeletes;
// Lazily created:
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java Sat Aug 18 13:35:11 2012
@@ -32,6 +32,9 @@ import org.apache.lucene.util.PriorityQu
import org.apache.lucene.util.packed.PackedInts;
/**
+ * Utility class for merging SortedBytes DocValues
+ * instances.
+ *
* @lucene.internal
*/
public final class SortedBytesMergeUtils {
@@ -54,7 +57,14 @@ public final class SortedBytesMergeUtils
}
return new MergeContext(comp, mergeDocCount, size, type);
}
-
+ /**
+ * Encapsulates contextual information about the merge.
+ * This class holds document id to ordinal mappings, offsets for
+ * variable length values and the comparator to sort the merged
+ * bytes.
+ *
+ * @lucene.internal
+ */
public static final class MergeContext {
private final Comparator<BytesRef> comp;
private final BytesRef missingValue = new BytesRef();
@@ -169,10 +179,36 @@ public final class SortedBytesMergeUtils
return merger.currentOrd;
}
+ /**
+ * Implementation of this interface consume the merged bytes with their
+ * corresponding ordinal and byte offset. The offset is the byte offset in
+ * target sorted source where the currently merged {@link BytesRef} instance
+ * should be stored at.
+ */
public static interface BytesRefConsumer {
+
+ /**
+ * Consumes a single {@link BytesRef}. The provided {@link BytesRef}
+ * instances are strictly increasing with respect to the used
+ * {@link Comparator} used for merging
+ *
+ * @param ref
+ * the {@link BytesRef} to consume
+ * @param ord
+ * the ordinal of the given {@link BytesRef} in the merge target
+ * @param offset
+ * the byte offset of the given {@link BytesRef} in the merge
+ * target
+ * @throws IOException
+ * if an {@link IOException} occurs
+ */
public void consume(BytesRef ref, int ord, long offset) throws IOException;
}
+ /**
+ * A simple {@link BytesRefConsumer} that writes the merged {@link BytesRef}
+ * instances sequentially to an {@link IndexOutput}.
+ */
public static final class IndexOutputBytesRefConsumer implements BytesRefConsumer {
private final IndexOutput datOut;
@@ -186,7 +222,15 @@ public final class SortedBytesMergeUtils
currentMergedBytes.length);
}
}
-
+
+ /**
+ * {@link RecordMerger} merges a list of {@link SortedSourceSlice} lazily by
+ * consuming the sorted source records one by one and de-duplicates records
+ * that are shared across slices. The algorithm is based on a lazy priority queue
+ * that prevents reading merge sources into heap memory.
+ *
+ * @lucene.internal
+ */
private static final class RecordMerger {
private final MergeQueue queue;
private final SortedSourceSlice[] top;
@@ -231,6 +275,12 @@ public final class SortedBytesMergeUtils
}
}
+ /**
+ * {@link SortedSourceSlice} represents a single {@link SortedSource} merge candidate.
+ * It encapsulates ordinal and pre-calculated target doc id to ordinal mappings.
+ * This class also holds state private to the merge process.
+ * @lucene.internal
+ */
public static class SortedSourceSlice {
final SortedSource source;
final int readerIdx;
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldCache.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldCache.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldCache.java Sat Aug 18 13:35:11 2012
@@ -45,6 +45,9 @@ import org.apache.lucene.util.packed.Pac
*/
public interface FieldCache {
+ /**
+ * Placeholder indicating creation of this cache is currently in-progress.
+ */
public static final class CreationPlaceholder {
Object value;
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java Sat Aug 18 13:35:11 2012
@@ -194,6 +194,9 @@ public abstract class FieldComparator<T>
* than the provided value. */
public abstract int compareDocToValue(int doc, T value) throws IOException;
+ /**
+ * Base FieldComparator class for numeric types
+ */
public static abstract class NumericComparator<T extends Number> extends FieldComparator<T> {
protected final T missingValue;
protected final String field;
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java?rev=1374578&r1=1374577&r2=1374578&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java Sat Aug 18 13:35:11 2012
@@ -33,6 +33,10 @@ import org.apache.lucene.util.PriorityQu
*/
public abstract class FieldValueHitQueue<T extends FieldValueHitQueue.Entry> extends PriorityQueue<T> {
+ /**
+ * Extension of ScoreDoc to also store the
+ * {@link FieldComparator} slot.
+ */
public static class Entry extends ScoreDoc {
public int slot;