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 2011/08/04 18:55:57 UTC
svn commit: r1153925 [1/8] - in /lucene/dev/branches/fieldtype:
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/ve...
Author: mikemccand
Date: Thu Aug 4 16:54:58 2011
New Revision: 1153925
URL: http://svn.apache.org/viewvc?rev=1153925&view=rev
Log:
LUCENE-2308: cutover to new Doc/Field/FieldType API
Removed:
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document2/
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/document2/
Modified:
lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java
lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java
lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java
lucene/dev/branches/fieldtype/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelector.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorVisitor.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelector.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelectorResult.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelectorVisitor.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/LoadFirstFieldSelector.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/MapFieldSelector.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/SetBasedFieldSelector.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribFieldsReader.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribIndexReader.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribParallelReader.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestLazyBug.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/search/TestThreadSafe.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/TestSlowCollationMethods.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
lucene/dev/branches/fieldtype/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/package.html
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttribute.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttribute.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/ParametricRangeQueryNodeProcessor.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
lucene/dev/branches/fieldtype/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java
lucene/dev/branches/fieldtype/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
lucene/dev/branches/fieldtype/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java
lucene/dev/branches/fieldtype/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java
lucene/dev/branches/fieldtype/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java
lucene/dev/branches/fieldtype/lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java
lucene/dev/branches/fieldtype/lucene/contrib/xml-query-parser/src/demo/java/org/apache/lucene/xmlparser/webdemo/FormBasedXmlQueryDemo.java
lucene/dev/branches/fieldtype/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
lucene/dev/branches/fieldtype/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/analysis/TokenStream.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document/AbstractField.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document/Document.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document/Field.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document/Fieldable.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document/NumericField.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/document/package.html
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/index/Document2StoredFieldVisitor.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/index/DocumentStoredFieldVisitor.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/index/IndexableField.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/index/StoredFieldVisitor.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/search/FieldCache.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/search/NumericRangeFilter.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/search/NumericRangeQuery.java
lucene/dev/branches/fieldtype/lucene/src/java/org/apache/lucene/util/NumericUtils.java
lucene/dev/branches/fieldtype/lucene/src/test-framework/org/apache/lucene/index/DocHelper.java
lucene/dev/branches/fieldtype/lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java
lucene/dev/branches/fieldtype/lucene/src/test-framework/org/apache/lucene/util/LineFileDocs.java
lucene/dev/branches/fieldtype/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/fieldtype/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestDemo.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestSearch.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestCrash.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDoc.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestFlex.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderDelete.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderOnDiskFull.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestLongPostings.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestMultiFields.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestPerFieldCodecSupport.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestRollback.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/TestTransactions.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDateSort.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestExplanations.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestNot.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcard.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestLockFactory.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestMultiMMap.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java
lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java
lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
lucene/dev/branches/fieldtype/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java
lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/fieldtype/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java
lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/core/QuerySenderListener.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/CSVResponseWriter.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/TextResponseWriter.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BinaryField.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/PointType.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/AddUpdateCommand.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/DocumentBuilder.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/UpdateHandler.java
lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/util/SolrPluginUtils.java
lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/BasicFunctionalityTest.java
lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/schema/DateFieldTest.java
lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/search/TestSort.java
lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java
lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java
lucene/dev/branches/fieldtype/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
Modified: lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java Thu Aug 4 16:54:58 2011
@@ -19,11 +19,11 @@ package org.apache.lucene.demo;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.NumericField;
-import org.apache.lucene.document2.StringField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java Thu Aug 4 16:54:58 2011
@@ -26,7 +26,7 @@ import java.util.Date;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -175,7 +175,7 @@ public class SearchFiles {
continue;
}
- Document doc = searcher.doc2(hits[i].doc);
+ Document doc = searcher.doc(hits[i].doc);
String path = doc.get("path");
if (path != null) {
System.out.println((i+1) + ". " + path);
Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java Thu Aug 4 16:54:58 2011
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermFreqVector;
import org.apache.lucene.index.TermPositionVector;
@@ -270,7 +270,7 @@ public class TokenSources {
// convenience method
public static TokenStream getTokenStream(IndexReader reader, int docId,
String field, Analyzer analyzer) throws IOException {
- Document doc = reader.document2(docId);
+ Document doc = reader.document(docId);
return getTokenStream(doc, field, analyzer);
}
Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java Thu Aug 4 16:54:58 2011
@@ -21,9 +21,9 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.StoredFieldVisitor;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Thu Aug 4 16:54:58 2011
@@ -26,10 +26,10 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Thu Aug 4 16:54:58 2011
@@ -42,11 +42,11 @@ import org.apache.lucene.analysis.Tokeni
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.NumericField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -112,7 +112,7 @@ public class HighlighterTest extends Bas
for (int i = 0; i < hits.scoreDocs.length; i++) {
- Document doc = searcher.doc2(hits.scoreDocs[i].doc);
+ Document doc = searcher.doc(hits.scoreDocs[i].doc);
String storedField = doc.get(FIELD_NAME);
TokenStream stream = TokenSources.getAnyTokenStream(searcher
@@ -185,7 +185,7 @@ public class HighlighterTest extends Bas
Highlighter highlighter = new Highlighter(scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME,
new StringReader(text));
highlighter.setTextFragmenter(new SimpleFragmenter(40));
@@ -234,7 +234,7 @@ public class HighlighterTest extends Bas
Highlighter highlighter = new Highlighter(this, scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
highlighter.setTextFragmenter(new SimpleFragmenter(40));
@@ -256,7 +256,7 @@ public class HighlighterTest extends Bas
highlighter = new Highlighter(this, scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
highlighter.setTextFragmenter(new SimpleFragmenter(40));
@@ -278,7 +278,7 @@ public class HighlighterTest extends Bas
highlighter = new Highlighter(this, scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
highlighter.setTextFragmenter(new SimpleFragmenter(40));
@@ -303,7 +303,7 @@ public class HighlighterTest extends Bas
Highlighter highlighter = new Highlighter(this, scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
highlighter.setTextFragmenter(new SimpleFragmenter(40));
@@ -327,7 +327,7 @@ public class HighlighterTest extends Bas
Highlighter highlighter = new Highlighter(this, scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
highlighter.setTextFragmenter(new SimpleFragmenter(40));
@@ -352,7 +352,7 @@ public class HighlighterTest extends Bas
Highlighter highlighter = new Highlighter(this, scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(NUMERIC_FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(NUMERIC_FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
highlighter.setTextFragmenter(new SimpleFragmenter(40));
@@ -375,7 +375,7 @@ public class HighlighterTest extends Bas
highlighter.setTextFragmenter(new SimpleFragmenter(40));
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
String result = highlighter.getBestFragments(tokenStream, text, maxNumFragmentsRequired,
@@ -393,7 +393,7 @@ public class HighlighterTest extends Bas
int maxNumFragmentsRequired = 2;
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
@@ -418,7 +418,7 @@ public class HighlighterTest extends Bas
Highlighter highlighter = new Highlighter(this, scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
highlighter.setTextFragmenter(new SimpleSpanFragmenter(scorer, 5));
@@ -437,7 +437,7 @@ public class HighlighterTest extends Bas
highlighter = new Highlighter(this, scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
highlighter.setTextFragmenter(new SimpleSpanFragmenter(scorer, 20));
@@ -459,7 +459,7 @@ public class HighlighterTest extends Bas
Highlighter highlighter = new Highlighter(this,scorer);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME,new StringReader(text));
highlighter.setTextFragmenter(new SimpleFragmenter(40));
@@ -530,7 +530,7 @@ public class HighlighterTest extends Bas
highlighter.setTextFragmenter(new SimpleFragmenter(40));
int maxNumFragmentsRequired = 2;
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
String result = highlighter.getBestFragments(tokenStream, text, maxNumFragmentsRequired,
@@ -688,7 +688,7 @@ public class HighlighterTest extends Bas
hits = searcher.search(query, null, 1000);
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(HighlighterTest.FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(HighlighterTest.FIELD_NAME);
int maxNumFragmentsRequired = 2;
String fragmentSeparator = "...";
QueryScorer scorer;
@@ -716,7 +716,7 @@ public class HighlighterTest extends Bas
numHighlights = 0;
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(HighlighterTest.FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(HighlighterTest.FIELD_NAME);
int maxNumFragmentsRequired = 2;
String fragmentSeparator = "...";
QueryScorer scorer;
@@ -744,7 +744,7 @@ public class HighlighterTest extends Bas
numHighlights = 0;
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(HighlighterTest.FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(HighlighterTest.FIELD_NAME);
int maxNumFragmentsRequired = 2;
String fragmentSeparator = "...";
QueryScorer scorer;
@@ -908,7 +908,7 @@ public class HighlighterTest extends Bas
doSearching("Kennedy");
numHighlights = 0;
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
Highlighter highlighter = getHighlighter(query, FIELD_NAME, tokenStream,
@@ -922,7 +922,7 @@ public class HighlighterTest extends Bas
numHighlights = 0;
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
Highlighter highlighter = getHighlighter(query, FIELD_NAME, tokenStream,
HighlighterTest.this);
@@ -933,7 +933,7 @@ public class HighlighterTest extends Bas
numHighlights = 0;
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
Highlighter highlighter = getHighlighter(query, FIELD_NAME, tokenStream,
@@ -1041,7 +1041,7 @@ public class HighlighterTest extends Bas
// new Highlighter(HighlighterTest.this, new QueryTermScorer(query));
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
Highlighter highlighter = getHighlighter(query, FIELD_NAME, tokenStream,
HighlighterTest.this);
@@ -1064,7 +1064,7 @@ public class HighlighterTest extends Bas
doSearching("Kennedy");
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
Highlighter highlighter = getHighlighter(query, FIELD_NAME, tokenStream,
@@ -1216,7 +1216,7 @@ public class HighlighterTest extends Bas
int maxNumFragmentsRequired = 3;
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
Highlighter highlighter = getHighlighter(query, FIELD_NAME, tokenStream, HighlighterTest.this, false);
@@ -1568,7 +1568,7 @@ public class HighlighterTest extends Bas
TopDocs hits = searcher.search(query, null, 10);
for( int i = 0; i < hits.totalHits; i++ ){
- Document doc = searcher.doc2( hits.scoreDocs[i].doc );
+ Document doc = searcher.doc( hits.scoreDocs[i].doc );
String result = h.getBestFragment( a, "t_text1", doc.get( "t_text1" ));
if (VERBOSE) System.out.println("result:" + result);
assertEquals("more <B>random</B> words for second field", result);
@@ -1631,7 +1631,7 @@ public class HighlighterTest extends Bas
public void assertExpectedHighlightCount(final int maxNumFragmentsRequired,
final int expectedHighlights) throws Exception {
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
@@ -1864,7 +1864,7 @@ final class SynonymTokenizer extends Tok
throws Exception {
for (int i = 0; i < hits.totalHits; i++) {
- String text = searcher.doc2(hits.scoreDocs[i].doc).get(HighlighterTest.FIELD_NAME);
+ String text = searcher.doc(hits.scoreDocs[i].doc).get(HighlighterTest.FIELD_NAME);
int maxNumFragmentsRequired = 2;
String fragmentSeparator = "...";
Scorer scorer = null;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Thu Aug 4 16:54:58 2011
@@ -26,10 +26,10 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java Thu Aug 4 16:54:58 2011
@@ -28,10 +28,10 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java Thu Aug 4 16:54:58 2011
@@ -17,10 +17,10 @@ package org.apache.lucene.search.vectorh
* limitations under the License.
*/
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java Thu Aug 4 16:54:58 2011
@@ -16,7 +16,7 @@ package org.apache.lucene.store.instanti
* limitations under the License.
*/
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import java.util.List;
import java.util.Map;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java Thu Aug 4 16:54:58 2011
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.MultiNorms;
@@ -189,7 +189,7 @@ public class InstantiatedIndex
} else {
InstantiatedDocument document = new InstantiatedDocument();
// copy stored fields from source reader
- Document sourceDocument = sourceIndexReader.document2(i);
+ Document sourceDocument = sourceIndexReader.document(i);
for (IndexableField field : sourceDocument) {
if (fields == null || fields.contains(field.name())) {
document.getDocument().add(field);
Modified: lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java Thu Aug 4 16:54:58 2011
@@ -29,7 +29,7 @@ import java.util.Map;
import java.util.Set;
import java.util.Comparator;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.store.Directory;
@@ -272,7 +272,7 @@ public class InstantiatedIndexReader ext
*/
@Override
- public Document document2(int n) throws IOException {
+ public Document document(int n) throws IOException {
return getIndex().getDocumentsByNumber()[n].getDocument();
}
Modified: lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java Thu Aug 4 16:54:58 2011
@@ -36,7 +36,7 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java Thu Aug 4 16:54:58 2011
@@ -27,10 +27,10 @@ import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.MultiNorms;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java Thu Aug 4 16:54:58 2011
@@ -18,9 +18,9 @@ package org.apache.lucene.store.instanti
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.StringField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java Thu Aug 4 16:54:58 2011
@@ -24,8 +24,8 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
/**
* @since 2009-mar-30 13:15:49
Modified: lucene/dev/branches/fieldtype/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Thu Aug 4 16:54:58 2011
@@ -34,7 +34,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInvertState;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Thu Aug 4 16:54:58 2011
@@ -29,9 +29,9 @@ import org.apache.lucene.analysis.BaseTo
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.queryParser.QueryParser;
Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelector.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelector.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelector.java Thu Aug 4 16:54:58 2011
@@ -1,5 +1,8 @@
package org.apache.lucene.document;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+
/**
* Copyright 2004 The Apache Software Foundation
*
Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorVisitor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorVisitor.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorVisitor.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorVisitor.java Thu Aug 4 16:54:58 2011
@@ -20,9 +20,17 @@ import java.io.IOException;
import java.io.Reader;
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.document.BinaryField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.NumericField.DataType;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldReaderException;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.BytesRef;
@@ -59,7 +67,7 @@ public class FieldSelectorVisitor extend
case LOAD_AND_BREAK:
final byte[] b = new byte[numBytes];
in.readBytes(b, 0, b.length);
- doc.add(new Field(fieldInfo.name, b));
+ doc.add(new BinaryField(fieldInfo.name, b));
return accept != FieldSelectorResult.LOAD;
case LAZY_LOAD:
case LATENT:
@@ -85,8 +93,11 @@ public class FieldSelectorVisitor extend
case LOAD_AND_BREAK:
final byte[] b = new byte[numUTF8Bytes];
in.readBytes(b, 0, b.length);
- Field.TermVector termVector = Field.TermVector.toTermVector(fieldInfo.storeTermVector, fieldInfo.storeOffsetWithTermVector, fieldInfo.storePositionWithTermVector);
- doc.add(new Field(fieldInfo.name, false, new String(b, "UTF-8"), Field.Store.YES, Field.Index.ANALYZED, termVector));
+ FieldType ft = new FieldType(TextField.TYPE_STORED);
+ ft.setStoreTermVectors(fieldInfo.storeTermVector);
+ ft.setStoreTermVectorOffsets(fieldInfo.storeOffsetWithTermVector);
+ ft.setStoreTermVectorPositions(fieldInfo.storePositionWithTermVector);
+ doc.add(new Field(fieldInfo.name, ft, new String(b, "UTF-8")));
return accept != FieldSelectorResult.LOAD;
case LAZY_LOAD:
case LATENT:
@@ -106,27 +117,41 @@ public class FieldSelectorVisitor extend
@Override
public boolean intField(FieldInfo fieldInfo, int value) throws IOException {
- return addNumericField(fieldInfo, new NumericField(fieldInfo.name, Field.Store.YES, fieldInfo.isIndexed).setIntValue(value));
+ FieldType ft = new FieldType(NumericField.TYPE_STORED);
+ ft.setIndexed(fieldInfo.isIndexed);
+ ft.setOmitNorms(fieldInfo.omitNorms);
+ ft.setOmitTermFreqAndPositions(fieldInfo.omitTermFreqAndPositions);
+ return addNumericField(fieldInfo, new NumericField(fieldInfo.name, ft).setIntValue(value));
}
@Override
- public boolean longField(FieldInfo fieldInfo, long value) throws IOException {
- return addNumericField(fieldInfo, new NumericField(fieldInfo.name, Field.Store.YES, fieldInfo.isIndexed).setLongValue(value));
+ public boolean longField(FieldInfo fieldInfo, long value) throws IOException {
+ FieldType ft = new FieldType(NumericField.TYPE_STORED);
+ ft.setIndexed(fieldInfo.isIndexed);
+ ft.setOmitNorms(fieldInfo.omitNorms);
+ ft.setOmitTermFreqAndPositions(fieldInfo.omitTermFreqAndPositions);
+ return addNumericField(fieldInfo, new NumericField(fieldInfo.name, ft).setLongValue(value));
}
@Override
public boolean floatField(FieldInfo fieldInfo, float value) throws IOException {
- return addNumericField(fieldInfo, new NumericField(fieldInfo.name, Field.Store.YES, fieldInfo.isIndexed).setFloatValue(value));
+ FieldType ft = new FieldType(NumericField.TYPE_STORED);
+ ft.setIndexed(fieldInfo.isIndexed);
+ ft.setOmitNorms(fieldInfo.omitNorms);
+ ft.setOmitTermFreqAndPositions(fieldInfo.omitTermFreqAndPositions);
+ return addNumericField(fieldInfo, new NumericField(fieldInfo.name, ft).setFloatValue(value));
}
@Override
public boolean doubleField(FieldInfo fieldInfo, double value) throws IOException {
- return addNumericField(fieldInfo, new NumericField(fieldInfo.name, Field.Store.YES, fieldInfo.isIndexed).setDoubleValue(value));
+ FieldType ft = new FieldType(NumericField.TYPE_STORED);
+ ft.setIndexed(fieldInfo.isIndexed);
+ ft.setOmitNorms(fieldInfo.omitNorms);
+ ft.setOmitTermFreqAndPositions(fieldInfo.omitTermFreqAndPositions);
+ return addNumericField(fieldInfo, new NumericField(fieldInfo.name, ft).setDoubleValue(value));
}
private boolean addNumericField(FieldInfo fieldInfo, NumericField f) {
- f.setOmitNorms(fieldInfo.omitNorms);
- f.setOmitTermFreqAndPositions(fieldInfo.omitTermFreqAndPositions);
doc.add(f);
final FieldSelectorResult accept = selector.accept(fieldInfo.name);
switch (accept) {
@@ -147,19 +172,25 @@ public class FieldSelectorVisitor extend
}
private void addFieldLazy(IndexInput in, FieldInfo fi, boolean binary, boolean cacheResult, int numBytes) throws IOException {
- final AbstractField f;
+ final IndexableField f;
final long pointer = in.getFilePointer();
// Need to move the pointer ahead by toRead positions
in.seek(pointer+numBytes);
+ FieldType ft = new FieldType();
+ ft.setStored(true);
+ ft.setOmitNorms(fi.omitNorms);
+ ft.setOmitTermFreqAndPositions(fi.omitTermFreqAndPositions);
+ ft.setLazy(true);
+
if (binary) {
- f = new LazyField(in, fi.name, Field.Store.YES, numBytes, pointer, binary, cacheResult);
+ f = new LazyField(in, fi.name, ft, numBytes, pointer, binary, cacheResult);
} else {
- Field.TermVector termVector = Field.TermVector.toTermVector(fi.storeTermVector, fi.storeOffsetWithTermVector, fi.storePositionWithTermVector);
- f = new LazyField(in, fi.name, Field.Store.YES, Field.Index.ANALYZED, termVector, numBytes, pointer, binary, cacheResult);
+ ft.setStoreTermVectors(fi.storeTermVector);
+ ft.setStoreTermVectorOffsets(fi.storeOffsetWithTermVector);
+ ft.setStoreTermVectorPositions(fi.storePositionWithTermVector);
+ f = new LazyField(in, fi.name, ft, numBytes, pointer, binary, cacheResult);
}
- f.setOmitNorms(fi.omitNorms);
- f.setOmitTermFreqAndPositions(fi.omitTermFreqAndPositions);
doc.add(f);
}
@@ -172,33 +203,21 @@ public class FieldSelectorVisitor extend
sizebytes[1] = (byte) (numBytes>>>16);
sizebytes[2] = (byte) (numBytes>>> 8);
sizebytes[3] = (byte) numBytes ;
- doc.add(new Field(fi.name, sizebytes));
+ doc.add(new BinaryField(fi.name, sizebytes));
}
/**
* A Lazy field implementation that defers loading of fields until asked for, instead of when the Document is
* loaded.
*/
- private static class LazyField extends AbstractField {
+ private static class LazyField extends Field {
private int toRead;
private long pointer;
private final boolean cacheResult;
private final IndexInput in;
- public LazyField(IndexInput in, String name, Field.Store store, int toRead, long pointer, boolean isBinary, boolean cacheResult) {
- super(name, store, Field.Index.NO, Field.TermVector.NO);
- this.in = in;
- this.toRead = toRead;
- this.pointer = pointer;
- this.isBinary = isBinary;
- this.cacheResult = cacheResult;
- if (isBinary)
- binaryLength = toRead;
- lazy = true;
- }
-
- public LazyField(IndexInput in, String name, Field.Store store, Field.Index index, Field.TermVector termVector, int toRead, long pointer, boolean isBinary, boolean cacheResult) {
- super(name, store, index, termVector);
+ public LazyField(IndexInput in, String name, FieldType ft, int toRead, long pointer, boolean isBinary, boolean cacheResult) {
+ super(name, ft);
this.in = in;
this.toRead = toRead;
this.pointer = pointer;
@@ -206,14 +225,15 @@ public class FieldSelectorVisitor extend
this.cacheResult = cacheResult;
if (isBinary)
binaryLength = toRead;
- lazy = true;
}
- public Number getNumericValue() {
+ @Override
+ public Number numericValue() {
return null;
}
- public org.apache.lucene.document2.NumericField.DataType getDataType() {
+ @Override
+ public DataType numericDataType() {
return null;
}
Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java Thu Aug 4 16:54:58 2011
@@ -18,6 +18,8 @@ package org.apache.lucene.document;
import java.util.Set;
+import org.apache.lucene.document.Field;
+
/**
* Declare what fields to load normally and what fields to load lazily
*
Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelector.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelector.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelector.java Thu Aug 4 16:54:58 2011
@@ -1,33 +0,0 @@
-package org.apache.lucene.document2;
-
-/**
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Similar to a {@link java.io.FileFilter}, the FieldSelector allows one to make decisions about
- * what Fields get loaded on a {@link Document} by {@link FieldSelectorVisitor}
- *
- **/
-public interface FieldSelector {
-
- /**
- *
- * @param fieldName the field to accept or reject
- * @return an instance of {@link FieldSelectorResult}
- * if the {@link Field} named <code>fieldName</code> should be loaded.
- */
- FieldSelectorResult accept(String fieldName);
-}
Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelectorResult.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelectorResult.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelectorResult.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document2/FieldSelectorResult.java Thu Aug 4 16:54:58 2011
@@ -1,76 +0,0 @@
-package org.apache.lucene.document2;
-
-/**
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Provides information about what should be done with this Field
- *
- **/
-public enum FieldSelectorResult {
-
- /**
- * Load this {@link Field} every time the {@link Document} is loaded, reading in the data as it is encountered.
- * {@link Document#getField(String)} and {@link Document#getFieldable(String)} should not return null.
- *<p/>
- * {@link Document#add(Fieldable)} should be called by the Reader.
- */
- LOAD,
-
- /**
- * Lazily load this {@link Field}. This means the {@link Field} is valid, but it may not actually contain its data until
- * invoked. {@link Document#getField(String)} SHOULD NOT BE USED. {@link Document#getFieldable(String)} is safe to use and should
- * return a valid instance of a {@link Fieldable}.
- *<p/>
- * {@link Document#add(Fieldable)} should be called by the Reader.
- */
- LAZY_LOAD,
-
- /**
- * Do not load the {@link Field}. {@link Document#getField(String)} and {@link Document#getFieldable(String)} should return null.
- * {@link Document#add(Fieldable)} is not called.
- * <p/>
- * {@link Document#add(Fieldable)} should not be called by the Reader.
- */
- NO_LOAD,
-
- /**
- * Load this field as in the {@link #LOAD} case, but immediately return from {@link Field} loading for the {@link Document}. Thus, the
- * Document may not have its complete set of Fields. {@link Document#getField(String)} and {@link Document#getFieldable(String)} should
- * both be valid for this {@link Field}
- * <p/>
- * {@link Document#add(Fieldable)} should be called by the Reader.
- */
- LOAD_AND_BREAK,
-
- /** Expert: Load the size of this {@link Field} rather than its value.
- * Size is measured as number of bytes required to store the field == bytes for a binary or any compressed value, and 2*chars for a String value.
- * The size is stored as a binary value, represented as an int in a byte[], with the higher order byte first in [0]
- */
- SIZE,
-
- /** Expert: Like {@link #SIZE} but immediately break from the field loading loop, i.e., stop loading further fields, after the size is loaded */
- SIZE_AND_BREAK,
-
- /**
- * Lazily load this {@link Field}, but do not cache the result. This means the {@link Field} is valid, but it may not actually contain its data until
- * invoked. {@link Document#getField(String)} SHOULD NOT BE USED. {@link Document#getFieldable(String)} is safe to use and should
- * return a valid instance of a {@link Fieldable}.
- *<p/>
- * {@link Document#add(Fieldable)} should be called by the Reader.
- */
- LATENT
-}