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/06/10 20:27:17 UTC
svn commit: r1348639 [1/8] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneou...
Author: mikemccand
Date: Sun Jun 10 18:27:08 2012
New Revision: 1348639
URL: http://svn.apache.org/viewvc?rev=1348639&view=rev
Log:
LUCENE-4101: add ctors create stored or not-stored variants of indexed fields
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/DoubleField.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/FloatField.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/IntField.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/LongField.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/StringField.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/TextField.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestDemo.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearch.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrash.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFlex.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollback.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNot.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java
lucene/dev/branches/branch_4x/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java
lucene/dev/branches/branch_4x/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java
lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java
lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java
lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java
lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java
lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java
lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java
lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
lucene/dev/branches/branch_4x/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/branch_4x/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
lucene/dev/branches/branch_4x/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/branches/branch_4x/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
lucene/dev/branches/branch_4x/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java
lucene/dev/branches/branch_4x/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
lucene/dev/branches/branch_4x/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java
lucene/dev/branches/branch_4x/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
lucene/dev/branches/branch_4x/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
lucene/dev/branches/branch_4x/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java
lucene/dev/branches/branch_4x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
lucene/dev/branches/branch_4x/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java
lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
lucene/dev/branches/branch_4x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
lucene/dev/branches/branch_4x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
lucene/dev/branches/branch_4x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java
lucene/dev/branches/branch_4x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java
lucene/dev/branches/branch_4x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java
lucene/dev/branches/branch_4x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/util/NumericFieldInfo.java
lucene/dev/branches/branch_4x/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
lucene/dev/branches/branch_4x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java
lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java Sun Jun 10 18:27:08 2012
@@ -4,6 +4,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.standard.ClassicAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
@@ -263,12 +264,12 @@ public class TestClassicAnalyzer extends
// This produces a too-long term:
String contents = "abc xyz x" + bigTerm + " another term";
- doc.add(new TextField("content", contents));
+ doc.add(new TextField("content", contents, Field.Store.NO));
writer.addDocument(doc);
// Make sure we can add another normal document
doc = new Document();
- doc.add(new TextField("content", "abc bbb ccc"));
+ doc.add(new TextField("content", "abc bbb ccc", Field.Store.NO));
writer.addDocument(doc);
writer.close();
@@ -300,7 +301,7 @@ public class TestClassicAnalyzer extends
// Make sure we can add a document with exactly the
// maximum length term, and search on that term:
doc = new Document();
- doc.add(new TextField("content", bigTerm));
+ doc.add(new TextField("content", bigTerm, Field.Store.NO));
ClassicAnalyzer sa = new ClassicAnalyzer(TEST_VERSION_CURRENT);
sa.setMaxTokenLength(100000);
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, sa));
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java Sun Jun 10 18:27:08 2012
@@ -53,8 +53,8 @@ public class TestKeywordAnalyzer extends
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
- doc.add(new Field("partnum", "Q36", StringField.TYPE_STORED));
- doc.add(new Field("description", "Illidium Space Modulator", TextField.TYPE_STORED));
+ doc.add(new StringField("partnum", "Q36", Field.Store.YES));
+ doc.add(new TextField("description", "Illidium Space Modulator", Field.Store.YES));
writer.addDocument(doc);
writer.close();
@@ -89,10 +89,10 @@ public class TestKeywordAnalyzer extends
RAMDirectory dir = new RAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new KeywordAnalyzer()));
Document doc = new Document();
- doc.add(new Field("partnum", "Q36", TextField.TYPE_STORED));
+ doc.add(new TextField("partnum", "Q36", Field.Store.YES));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("partnum", "Q37", TextField.TYPE_STORED));
+ doc.add(new TextField("partnum", "Q37", Field.Store.YES));
writer.addDocument(doc);
writer.close();
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java Sun Jun 10 18:27:08 2012
@@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -58,7 +58,7 @@ public class TestLimitTokenCountAnalyzer
for(int i=0;i<10000;i++)
b.append(" a");
b.append(" x");
- doc.add(newField("field", b.toString(), TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", b.toString(), Field.Store.NO));
writer.addDocument(doc);
writer.close();
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java Sun Jun 10 18:27:08 2012
@@ -49,8 +49,8 @@ public class QueryAutoStopWordAnalyzerTe
Document doc = new Document();
String variedFieldValue = variedFieldValues[i % variedFieldValues.length];
String repetitiveFieldValue = repetitiveFieldValues[i % repetitiveFieldValues.length];
- doc.add(new Field("variedField", variedFieldValue, TextField.TYPE_STORED));
- doc.add(new Field("repetitiveField", repetitiveFieldValue, TextField.TYPE_STORED));
+ doc.add(new TextField("variedField", variedFieldValue, Field.Store.YES));
+ doc.add(new TextField("repetitiveField", repetitiveFieldValue, Field.Store.YES));
writer.addDocument(doc);
}
writer.close();
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java Sun Jun 10 18:27:08 2012
@@ -62,15 +62,15 @@ public class ShingleAnalyzerWrapperTest
Document doc;
doc = new Document();
- doc.add(new Field("content", "please divide this sentence into shingles", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "please divide this sentence into shingles", Field.Store.YES));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("content", "just another test sentence", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "just another test sentence", Field.Store.YES));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("content", "a sentence which contains no test", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "a sentence which contains no test", Field.Store.YES));
writer.addDocument(doc);
writer.close();
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Sun Jun 10 18:27:08 2012
@@ -93,7 +93,7 @@ public class TestTeeSinkTokenFilter exte
TokenStream tokenStream = analyzer.tokenStream("field", new StringReader("abcd "));
TeeSinkTokenFilter tee = new TeeSinkTokenFilter(tokenStream);
TokenStream sink = tee.newSinkTokenStream();
- FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.setStoreTermVectors(true);
ft.setStoreTermVectorOffsets(true);
ft.setStoreTermVectorPositions(true);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java Sun Jun 10 18:27:08 2012
@@ -69,9 +69,9 @@ public class UIMABaseAnalyzerTest extend
// add the first doc
Document doc = new Document();
String dummyTitle = "this is a dummy title ";
- doc.add(new Field("title", dummyTitle, TextField.TYPE_STORED));
+ doc.add(new TextField("title", dummyTitle, Field.Store.YES));
String dummyContent = "there is some content written here";
- doc.add(new Field("contents", dummyContent, TextField.TYPE_STORED));
+ doc.add(new TextField("contents", dummyContent, Field.Store.YES));
writer.addDocument(doc, analyzer);
writer.commit();
@@ -90,9 +90,9 @@ public class UIMABaseAnalyzerTest extend
// add a second doc
doc = new Document();
String dogmasTitle = "dogmas";
- doc.add(new Field("title", dogmasTitle, TextField.TYPE_STORED));
+ doc.add(new TextField("title", dogmasTitle, Field.Store.YES));
String dogmasContents = "white men can't jump";
- doc.add(new Field("contents", dogmasContents, TextField.TYPE_STORED));
+ doc.add(new TextField("contents", dogmasContents, Field.Store.YES));
writer.addDocument(doc, analyzer);
writer.commit();
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Sun Jun 10 18:27:08 2012
@@ -114,11 +114,11 @@ public class DocMaker implements Closeab
fields.put(BODY_FIELD, new Field(BODY_FIELD, "", bodyFt));
fields.put(TITLE_FIELD, new Field(TITLE_FIELD, "", ft));
fields.put(DATE_FIELD, new Field(DATE_FIELD, "", ft));
- fields.put(ID_FIELD, new Field(ID_FIELD, "", StringField.TYPE_STORED));
+ fields.put(ID_FIELD, new StringField(ID_FIELD, "", Field.Store.YES));
fields.put(NAME_FIELD, new Field(NAME_FIELD, "", ft));
- numericFields.put(DATE_MSEC_FIELD, new LongField(DATE_MSEC_FIELD, 0L));
- numericFields.put(TIME_SEC_FIELD, new IntField(TIME_SEC_FIELD, 0));
+ numericFields.put(DATE_MSEC_FIELD, new LongField(DATE_MSEC_FIELD, 0L, Field.Store.NO));
+ numericFields.put(TIME_SEC_FIELD, new IntField(TIME_SEC_FIELD, 0, Field.Store.NO));
doc = new Document();
} else {
@@ -157,16 +157,16 @@ public class DocMaker implements Closeab
if (f == null) {
switch(type) {
case INT:
- f = new IntField(name, 0);
+ f = new IntField(name, 0, Field.Store.NO);
break;
case LONG:
- f = new LongField(name, 0L);
+ f = new LongField(name, 0L, Field.Store.NO);
break;
case FLOAT:
- f = new FloatField(name, 0.0F);
+ f = new FloatField(name, 0.0F, Field.Store.NO);
break;
case DOUBLE:
- f = new DoubleField(name, 0.0);
+ f = new DoubleField(name, 0.0, Field.Store.NO);
break;
default:
assert false;
@@ -432,7 +432,7 @@ public class DocMaker implements Closeab
boolean termVecPositions = config.get("doc.term.vector.positions", false);
boolean termVecOffsets = config.get("doc.term.vector.offsets", false);
- valType = new FieldType(TextField.TYPE_UNSTORED);
+ valType = new FieldType(TextField.TYPE_NOT_STORED);
valType.setStored(stored);
valType.setTokenized(tokenized);
valType.setOmitNorms(!norms);
@@ -441,7 +441,7 @@ public class DocMaker implements Closeab
valType.setStoreTermVectorOffsets(termVecOffsets);
valType.freeze();
- bodyValType = new FieldType(TextField.TYPE_UNSTORED);
+ bodyValType = new FieldType(TextField.TYPE_NOT_STORED);
bodyValType.setStored(bodyStored);
bodyValType.setTokenized(bodyTokenized);
bodyValType.setOmitNorms(!bodyNorms);
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java Sun Jun 10 18:27:08 2012
@@ -33,6 +33,7 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.benchmark.byTask.utils.StreamUtils.Type;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
/** Tests the functionality of {@link WriteLineDocTask}. */
@@ -44,9 +45,9 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new StringField(BODY_FIELD, "body"));
- doc.add(new StringField(TITLE_FIELD, "title"));
- doc.add(new StringField(DATE_FIELD, "date"));
+ doc.add(new StringField(BODY_FIELD, "body", Field.Store.NO));
+ doc.add(new StringField(TITLE_FIELD, "title", Field.Store.NO));
+ doc.add(new StringField(DATE_FIELD, "date", Field.Store.NO));
return doc;
}
@@ -58,9 +59,9 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new StringField(BODY_FIELD, "body\r\ntext\ttwo"));
- doc.add(new StringField(TITLE_FIELD, "title\r\ntext"));
- doc.add(new StringField(DATE_FIELD, "date\r\ntext"));
+ doc.add(new StringField(BODY_FIELD, "body\r\ntext\ttwo", Field.Store.NO));
+ doc.add(new StringField(TITLE_FIELD, "title\r\ntext", Field.Store.NO));
+ doc.add(new StringField(DATE_FIELD, "date\r\ntext", Field.Store.NO));
return doc;
}
@@ -71,8 +72,8 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new StringField(TITLE_FIELD, "title"));
- doc.add(new StringField(DATE_FIELD, "date"));
+ doc.add(new StringField(TITLE_FIELD, "title", Field.Store.NO));
+ doc.add(new StringField(DATE_FIELD, "date", Field.Store.NO));
return doc;
}
}
@@ -82,8 +83,8 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new StringField(BODY_FIELD, "body"));
- doc.add(new StringField(DATE_FIELD, "date"));
+ doc.add(new StringField(BODY_FIELD, "body", Field.Store.NO));
+ doc.add(new StringField(DATE_FIELD, "date", Field.Store.NO));
return doc;
}
}
@@ -93,7 +94,7 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new StringField(DATE_FIELD, "date"));
+ doc.add(new StringField(DATE_FIELD, "date", Field.Store.NO));
return doc;
}
}
@@ -104,7 +105,7 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new StringField(DATE_FIELD, "date"));
+ doc.add(new StringField(DATE_FIELD, "date", Field.Store.NO));
return doc;
}
}
@@ -124,9 +125,9 @@ public class WriteLineDocTaskTest extend
public Document makeDocument() throws Exception {
Document doc = new Document();
String name = Thread.currentThread().getName();
- doc.add(new StringField(BODY_FIELD, "body_" + name));
- doc.add(new StringField(TITLE_FIELD, "title_" + name));
- doc.add(new StringField(DATE_FIELD, "date_" + name));
+ doc.add(new StringField(BODY_FIELD, "body_" + name, Field.Store.NO));
+ doc.add(new StringField(TITLE_FIELD, "title_" + name, Field.Store.NO));
+ doc.add(new StringField(DATE_FIELD, "date_" + name, Field.Store.NO));
return doc;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/DoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/DoubleField.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/DoubleField.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/DoubleField.java Sun Jun 10 18:27:08 2012
@@ -30,14 +30,14 @@ import org.apache.lucene.util.NumericUti
* for efficient range filtering and sorting. Here's an example usage:
*
* <pre>
- * document.add(new DoubleField(name, 6.0));
+ * document.add(new DoubleField(name, 6.0, Field.Store.NO));
* </pre>
*
* For optimal performance, re-use the <code>DoubleField</code> and
* {@link Document} instance for more than one document:
*
* <pre>
- * DoubleField field = new DoubleField(name, 0.0);
+ * DoubleField field = new DoubleField(name, 0.0, Field.Store.NO);
* Document document = new Document();
* document.add(field);
*
@@ -59,10 +59,6 @@ import org.apache.lucene.util.NumericUti
* {@link org.apache.lucene.search.SortField.Type#DOUBLE}. <code>DoubleField</code>
* values can also be loaded directly from {@link FieldCache}.</p>
*
- * <p>By default, a <code>DoubleField</code>'s value is not stored but
- * is indexed for range filtering and sorting. You can use
- * {@link StoredField} to also store the value.
- *
* <p>You may add the same field name as an <code>DoubleField</code> to
* the same document more than once. Range querying and
* filtering will be the logical OR of all values; so a range query
@@ -118,21 +114,32 @@ import org.apache.lucene.util.NumericUti
public final class DoubleField extends Field {
- public static final FieldType TYPE = new FieldType();
+ public static final FieldType TYPE_NOT_STORED = new FieldType();
+ static {
+ TYPE_NOT_STORED.setIndexed(true);
+ TYPE_NOT_STORED.setTokenized(true);
+ TYPE_NOT_STORED.setOmitNorms(true);
+ TYPE_NOT_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_NOT_STORED.setNumericType(FieldType.NumericType.DOUBLE);
+ TYPE_NOT_STORED.freeze();
+ }
+
+ public static final FieldType TYPE_STORED = new FieldType();
static {
- TYPE.setIndexed(true);
- TYPE.setTokenized(true);
- TYPE.setOmitNorms(true);
- TYPE.setIndexOptions(IndexOptions.DOCS_ONLY);
- TYPE.setNumericType(FieldType.NumericType.DOUBLE);
- TYPE.freeze();
+ TYPE_STORED.setIndexed(true);
+ TYPE_STORED.setTokenized(true);
+ TYPE_STORED.setOmitNorms(true);
+ TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_STORED.setNumericType(FieldType.NumericType.DOUBLE);
+ TYPE_STORED.setStored(true);
+ TYPE_STORED.freeze();
}
- /** Creates an LongField with the provided value
+ /** Creates a stored or un-stored DoubleField with the provided value
* and default <code>precisionStep</code> {@link
* NumericUtils#PRECISION_STEP_DEFAULT} (4). */
- public DoubleField(String name, double value) {
- super(name, TYPE);
+ public DoubleField(String name, double value, Store stored) {
+ super(name, stored == Store.YES ? TYPE_STORED : TYPE_NOT_STORED);
fieldsData = Double.valueOf(value);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java Sun Jun 10 18:27:08 2012
@@ -496,17 +496,8 @@ public class Field implements IndexableF
throw new IllegalArgumentException("Field must have either TokenStream, String, Reader or Number value");
}
-
- //
- // Deprecated transition API below:
- //
-
- /** Specifies whether and how a field should be stored.
- *
- * @deprecated This is here only to ease transition from
- * the pre-4.0 APIs. */
- @Deprecated
+ /** Specifies whether a field's value should be stored. */
public static enum Store {
/** Store the original field value in the index. This is useful for short texts
@@ -514,20 +505,16 @@ public class Field implements IndexableF
* value is stored in its original form, i.e. no analyzer is used before it is
* stored.
*/
- YES {
- @Override
- public boolean isStored() { return true; }
- },
-
- /** Do not store the field value in the index. */
- NO {
- @Override
- public boolean isStored() { return false; }
- };
+ YES,
- public abstract boolean isStored();
+ /** Do not store the field's value in the index. */
+ NO
}
+ //
+ // Deprecated transition API below:
+ //
+
/** Specifies whether and how a field should be indexed.
*
* @deprecated This is here only to ease transition from
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/FloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/FloatField.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/FloatField.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/FloatField.java Sun Jun 10 18:27:08 2012
@@ -30,14 +30,14 @@ import org.apache.lucene.util.NumericUti
* for efficient range filtering and sorting. Here's an example usage:
*
* <pre>
- * document.add(new FloatField(name, 6.0F));
+ * document.add(new FloatField(name, 6.0F, Field.Store.NO));
* </pre>
*
* For optimal performance, re-use the <code>FloatField</code> and
* {@link Document} instance for more than one document:
*
* <pre>
- * FloatField field = new FloatField(name, 0.0F);
+ * FloatField field = new FloatField(name, 0.0F, Field.Store.NO);
* Document document = new Document();
* document.add(field);
*
@@ -59,10 +59,6 @@ import org.apache.lucene.util.NumericUti
* {@link org.apache.lucene.search.SortField.Type#FLOAT}. <code>FloatField</code>
* values can also be loaded directly from {@link FieldCache}.</p>
*
- * <p>By default, a <code>FloatField</code>'s value is not stored but
- * is indexed for range filtering and sorting. You can use
- * {@link StoredField} to also store the value.
- *
* <p>You may add the same field name as an <code>FloatField</code> to
* the same document more than once. Range querying and
* filtering will be the logical OR of all values; so a range query
@@ -118,21 +114,32 @@ import org.apache.lucene.util.NumericUti
public final class FloatField extends Field {
- public static final FieldType TYPE = new FieldType();
+ public static final FieldType TYPE_NOT_STORED = new FieldType();
+ static {
+ TYPE_NOT_STORED.setIndexed(true);
+ TYPE_NOT_STORED.setTokenized(true);
+ TYPE_NOT_STORED.setOmitNorms(true);
+ TYPE_NOT_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_NOT_STORED.setNumericType(FieldType.NumericType.FLOAT);
+ TYPE_NOT_STORED.freeze();
+ }
+
+ public static final FieldType TYPE_STORED = new FieldType();
static {
- TYPE.setIndexed(true);
- TYPE.setTokenized(true);
- TYPE.setOmitNorms(true);
- TYPE.setIndexOptions(IndexOptions.DOCS_ONLY);
- TYPE.setNumericType(FieldType.NumericType.FLOAT);
- TYPE.freeze();
+ TYPE_STORED.setIndexed(true);
+ TYPE_STORED.setTokenized(true);
+ TYPE_STORED.setOmitNorms(true);
+ TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_STORED.setNumericType(FieldType.NumericType.FLOAT);
+ TYPE_STORED.setStored(true);
+ TYPE_STORED.freeze();
}
- /** Creates an LongField with the provided value
+ /** Creates a stored or un-stored FloatField with the provided value
* and default <code>precisionStep</code> {@link
* NumericUtils#PRECISION_STEP_DEFAULT} (4). */
- public FloatField(String name, float value) {
- super(name, TYPE);
+ public FloatField(String name, float value, Store stored) {
+ super(name, stored == Store.YES ? TYPE_STORED : TYPE_NOT_STORED);
fieldsData = Float.valueOf(value);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/IntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/IntField.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/IntField.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/IntField.java Sun Jun 10 18:27:08 2012
@@ -30,14 +30,14 @@ import org.apache.lucene.util.NumericUti
* for efficient range filtering and sorting. Here's an example usage:
*
* <pre>
- * document.add(new IntField(name, 6));
+ * document.add(new IntField(name, 6, Field.Store.NO));
* </pre>
*
* For optimal performance, re-use the <code>IntField</code> and
* {@link Document} instance for more than one document:
*
* <pre>
- * IntField field = new IntField(name, 6);
+ * IntField field = new IntField(name, 6, Field.Store.NO);
* Document document = new Document();
* document.add(field);
*
@@ -59,10 +59,6 @@ import org.apache.lucene.util.NumericUti
* {@link org.apache.lucene.search.SortField.Type#INT}. <code>IntField</code>
* values can also be loaded directly from {@link FieldCache}.</p>
*
- * <p>By default, a <code>IntField</code>'s value is not stored but
- * is indexed for range filtering and sorting. You can use
- * {@link StoredField} to also store the value.
- *
* <p>You may add the same field name as an <code>IntField</code> to
* the same document more than once. Range querying and
* filtering will be the logical OR of all values; so a range query
@@ -118,21 +114,32 @@ import org.apache.lucene.util.NumericUti
public final class IntField extends Field {
- public static final FieldType TYPE = new FieldType();
+ public static final FieldType TYPE_NOT_STORED = new FieldType();
+ static {
+ TYPE_NOT_STORED.setIndexed(true);
+ TYPE_NOT_STORED.setTokenized(true);
+ TYPE_NOT_STORED.setOmitNorms(true);
+ TYPE_NOT_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_NOT_STORED.setNumericType(FieldType.NumericType.INT);
+ TYPE_NOT_STORED.freeze();
+ }
+
+ public static final FieldType TYPE_STORED = new FieldType();
static {
- TYPE.setIndexed(true);
- TYPE.setTokenized(true);
- TYPE.setOmitNorms(true);
- TYPE.setIndexOptions(IndexOptions.DOCS_ONLY);
- TYPE.setNumericType(FieldType.NumericType.INT);
- TYPE.freeze();
+ TYPE_STORED.setIndexed(true);
+ TYPE_STORED.setTokenized(true);
+ TYPE_STORED.setOmitNorms(true);
+ TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_STORED.setNumericType(FieldType.NumericType.INT);
+ TYPE_STORED.setStored(true);
+ TYPE_STORED.freeze();
}
- /** Creates an IntField with the provided value
+ /** Creates a stored or un-stored IntField with the provided value
* and default <code>precisionStep</code> {@link
* NumericUtils#PRECISION_STEP_DEFAULT} (4). */
- public IntField(String name, int value) {
- super(name, TYPE);
+ public IntField(String name, int value, Store stored) {
+ super(name, stored == Store.YES ? TYPE_STORED : TYPE_NOT_STORED);
fieldsData = Integer.valueOf(value);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/LongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/LongField.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/LongField.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/LongField.java Sun Jun 10 18:27:08 2012
@@ -30,14 +30,14 @@ import org.apache.lucene.util.NumericUti
* for efficient range filtering and sorting. Here's an example usage:
*
* <pre>
- * document.add(new LongField(name, 6L));
+ * document.add(new LongField(name, 6L, Field.Store.NO));
* </pre>
*
* For optimal performance, re-use the <code>LongField</code> and
* {@link Document} instance for more than one document:
*
* <pre>
- * LongField field = new LongField(name, 0L);
+ * LongField field = new LongField(name, 0L, Field.Store.NO);
* Document document = new Document();
* document.add(field);
*
@@ -69,10 +69,6 @@ import org.apache.lucene.util.NumericUti
* {@link org.apache.lucene.search.SortField.Type#LONG}. <code>LongField</code>
* values can also be loaded directly from {@link FieldCache}.</p>
*
- * <p>By default, a <code>LongField</code>'s value is not stored but
- * is indexed for range filtering and sorting. You can use
- * {@link StoredField} to also store the value.
- *
* <p>You may add the same field name as an <code>LongField</code> to
* the same document more than once. Range querying and
* filtering will be the logical OR of all values; so a range query
@@ -128,21 +124,32 @@ import org.apache.lucene.util.NumericUti
public final class LongField extends Field {
- public static final FieldType TYPE = new FieldType();
+ public static final FieldType TYPE_NOT_STORED = new FieldType();
+ static {
+ TYPE_NOT_STORED.setIndexed(true);
+ TYPE_NOT_STORED.setTokenized(true);
+ TYPE_NOT_STORED.setOmitNorms(true);
+ TYPE_NOT_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_NOT_STORED.setNumericType(FieldType.NumericType.LONG);
+ TYPE_NOT_STORED.freeze();
+ }
+
+ public static final FieldType TYPE_STORED = new FieldType();
static {
- TYPE.setIndexed(true);
- TYPE.setTokenized(true);
- TYPE.setOmitNorms(true);
- TYPE.setIndexOptions(IndexOptions.DOCS_ONLY);
- TYPE.setNumericType(FieldType.NumericType.LONG);
- TYPE.freeze();
+ TYPE_STORED.setIndexed(true);
+ TYPE_STORED.setTokenized(true);
+ TYPE_STORED.setOmitNorms(true);
+ TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_STORED.setNumericType(FieldType.NumericType.LONG);
+ TYPE_STORED.setStored(true);
+ TYPE_STORED.freeze();
}
- /** Creates an LongField with the provided value
+ /** Creates a stored or un-stored LongField with the provided value
* and default <code>precisionStep</code> {@link
* NumericUtils#PRECISION_STEP_DEFAULT} (4). */
- public LongField(String name, long value) {
- super(name, TYPE);
+ public LongField(String name, long value, Store stored) {
+ super(name, stored == Store.YES ? TYPE_STORED : TYPE_NOT_STORED);
fieldsData = Long.valueOf(value);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/StringField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/StringField.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/StringField.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/StringField.java Sun Jun 10 18:27:08 2012
@@ -23,38 +23,34 @@ import org.apache.lucene.index.FieldInfo
* String value is indexed as a single token. For example
* this might be used for a 'country' field or an 'id'
* field, or any field that you intend to use for sorting
- * or access through the field cache.
- *
- * <p/>This field's value is not stored by default; use the
- * {@link StringField#TYPE_STORED} type (pass it to <code>new
- * Field</code>) to store the value. */
+ * or access through the field cache. */
public final class StringField extends Field {
/** Indexed, not tokenized, omits norms, indexes
* DOCS_ONLY, not stored. */
- public static final FieldType TYPE_UNSTORED = new FieldType();
+ public static final FieldType TYPE_NOT_STORED = new FieldType();
/** Indexed, not tokenized, omits norms, indexes
* DOCS_ONLY, stored */
public static final FieldType TYPE_STORED = new FieldType();
static {
- TYPE_UNSTORED.setIndexed(true);
- TYPE_UNSTORED.setOmitNorms(true);
- TYPE_UNSTORED.setIndexOptions(IndexOptions.DOCS_ONLY);
- TYPE_UNSTORED.freeze();
+ TYPE_NOT_STORED.setIndexed(true);
+ TYPE_NOT_STORED.setOmitNorms(true);
+ TYPE_NOT_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_NOT_STORED.freeze();
TYPE_STORED.setIndexed(true);
- TYPE_STORED.setStored(true);
TYPE_STORED.setOmitNorms(true);
TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY);
+ TYPE_STORED.setStored(true);
TYPE_STORED.freeze();
}
- /** Creates a new un-stored StringField */
- public StringField(String name, String value) {
- super(name, value, TYPE_UNSTORED);
+ /** Creates a new StringField. */
+ public StringField(String name, String value, Store stored) {
+ super(name, value, stored == Store.YES ? TYPE_STORED : TYPE_NOT_STORED);
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/TextField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/TextField.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/TextField.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/TextField.java Sun Jun 10 18:27:08 2012
@@ -23,45 +23,41 @@ import org.apache.lucene.analysis.TokenS
/** A field that is indexed and tokenized, without term
* vectors. For example this would be used on a 'body'
- * field, that contains the bulk of a document's text.
- *
- * This field's value is not stored by default; use the
- * {@link TextField#TYPE_STORED} type (pass it to <code>new
- * Field</code>) to store the value. */
+ * field, that contains the bulk of a document's text. */
public final class TextField extends Field {
/* Indexed, tokenized, not stored. */
- public static final FieldType TYPE_UNSTORED = new FieldType();
+ public static final FieldType TYPE_NOT_STORED = new FieldType();
/* Indexed, tokenized, stored. */
public static final FieldType TYPE_STORED = new FieldType();
static {
- TYPE_UNSTORED.setIndexed(true);
- TYPE_UNSTORED.setTokenized(true);
- TYPE_UNSTORED.freeze();
+ TYPE_NOT_STORED.setIndexed(true);
+ TYPE_NOT_STORED.setTokenized(true);
+ TYPE_NOT_STORED.freeze();
TYPE_STORED.setIndexed(true);
- TYPE_STORED.setStored(true);
TYPE_STORED.setTokenized(true);
+ TYPE_STORED.setStored(true);
TYPE_STORED.freeze();
}
// TODO: add sugar for term vectors...?
- /** Creates a new un-stored TextField */
- public TextField(String name, Reader reader) {
- super(name, reader, TextField.TYPE_UNSTORED);
+ /** Creates a new TextField with Reader value. */
+ public TextField(String name, Reader reader, Store store) {
+ super(name, reader, store == Store.YES ? TYPE_STORED : TYPE_NOT_STORED);
}
- /** Creates a new un-stored TextField */
- public TextField(String name, String value) {
- super(name, value, TextField.TYPE_UNSTORED);
+ /** Creates a new TextField with String value. */
+ public TextField(String name, String value, Store store) {
+ super(name, value, store == Store.YES ? TYPE_STORED : TYPE_NOT_STORED);
}
- /** Creates a new un-stored TextField */
+ /** Creates a new un-stored TextField with TokenStream value. */
public TextField(String name, TokenStream stream) {
- super(name, stream, TextField.TYPE_UNSTORED);
+ super(name, stream, TYPE_NOT_STORED);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestDemo.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestDemo.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestDemo.java Sun Jun 10 18:27:08 2012
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
@@ -50,7 +50,7 @@ public class TestDemo extends LuceneTest
Document doc = new Document();
String longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
String text = "This is the text to be indexed. " + longTerm;
- doc.add(newField("fieldname", text, TextField.TYPE_STORED));
+ doc.add(newTextField("fieldname", text, Field.Store.YES));
iwriter.addDocument(doc);
iwriter.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java Sun Jun 10 18:27:08 2012
@@ -69,12 +69,12 @@ public class TestExternalCodecs extends
);
Document doc = new Document();
// uses default codec:
- doc.add(newField("field1", "this field uses the standard codec as the test", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field1", "this field uses the standard codec as the test", Field.Store.NO));
// uses pulsing codec:
- Field field2 = newField("field2", "this field uses the pulsing codec as the test", TextField.TYPE_UNSTORED);
+ Field field2 = newTextField("field2", "this field uses the pulsing codec as the test", Field.Store.NO);
doc.add(field2);
- Field idField = newField("id", "", StringField.TYPE_UNSTORED);
+ Field idField = newStringField("id", "", Field.Store.NO);
doc.add(idField);
for(int i=0;i<NUM_DOCS;i++) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java Sun Jun 10 18:27:08 2012
@@ -33,7 +33,6 @@ import org.apache.lucene.index.MergePoli
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
/**
* Holds tests cases to verify external APIs are accessible
@@ -91,7 +90,7 @@ public class TestMergeSchedulerExternal
dir.failOn(new FailOnlyOnMerge());
Document doc = new Document();
- Field idField = newField("id", "", StringField.TYPE_STORED);
+ Field idField = newStringField("id", "", Field.Store.YES);
doc.add(idField);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearch.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearch.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearch.java Sun Jun 10 18:27:08 2012
@@ -86,8 +86,8 @@ public class TestSearch extends LuceneTe
};
for (int j = 0; j < docs.length; j++) {
Document d = new Document();
- d.add(newField("contents", docs[j], TextField.TYPE_STORED));
- d.add(newField("id", ""+j, StringField.TYPE_UNSTORED));
+ d.add(newTextField("contents", docs[j], Field.Store.YES));
+ d.add(newStringField("id", ""+j, Field.Store.NO));
writer.addDocument(d);
}
writer.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java Sun Jun 10 18:27:08 2012
@@ -82,8 +82,8 @@ public class TestSearchForDuplicates ext
for (int j = 0; j < MAX_DOCS; j++) {
Document d = new Document();
- d.add(newField(PRIORITY_FIELD, HIGH_PRIORITY, TextField.TYPE_STORED));
- d.add(newField(ID_FIELD, Integer.toString(j), TextField.TYPE_STORED));
+ d.add(newTextField(PRIORITY_FIELD, HIGH_PRIORITY, Field.Store.YES));
+ d.add(newTextField(ID_FIELD, Integer.toString(j), Field.Store.YES));
writer.addDocument(d);
}
writer.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java Sun Jun 10 18:27:08 2012
@@ -311,7 +311,7 @@ public class TestSurrogates extends Luce
uniqueTerms.add(term);
fieldTerms.add(new Term(field, term));
Document doc = new Document();
- doc.add(newField(field, term, StringField.TYPE_UNSTORED));
+ doc.add(newStringField(field, term, Field.Store.NO));
w.addDocument(doc);
}
uniqueTermCount += uniqueTerms.size();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java Sun Jun 10 18:27:08 2012
@@ -27,6 +27,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.codecs.FieldInfosReader;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
@@ -194,7 +195,7 @@ public class TestTermInfosReaderIndex ex
for (int i = 0; i < NUMBER_OF_DOCUMENTS; i++) {
Document document = new Document();
for (int f = 0; f < NUMBER_OF_FIELDS; f++) {
- document.add(newField("field" + f, getText(), StringField.TYPE_UNSTORED));
+ document.add(newStringField("field" + f, getText(), Field.Store.NO));
}
writer.addDocument(document);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java Sun Jun 10 18:27:08 2012
@@ -29,7 +29,6 @@ import org.apache.lucene.codecs.simplete
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
@@ -71,7 +70,7 @@ public class TestPerFieldPostingsFormat
private void addDocs(IndexWriter writer, int numDocs) throws IOException {
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa", Field.Store.NO));
writer.addDocument(doc);
}
}
@@ -79,7 +78,7 @@ public class TestPerFieldPostingsFormat
private void addDocs2(IndexWriter writer, int numDocs) throws IOException {
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- doc.add(newField("content", "bbb", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "bbb", Field.Store.NO));
writer.addDocument(doc);
}
}
@@ -87,8 +86,8 @@ public class TestPerFieldPostingsFormat
private void addDocs3(IndexWriter writer, int numDocs) throws IOException {
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- doc.add(newField("content", "ccc", TextField.TYPE_UNSTORED));
- doc.add(newField("id", "" + i, StringField.TYPE_STORED));
+ doc.add(newTextField("content", "ccc", Field.Store.NO));
+ doc.add(newStringField("id", "" + i, Field.Store.YES));
writer.addDocument(doc);
}
}
@@ -250,7 +249,7 @@ public class TestPerFieldPostingsFormat
for (int j = 0; j < docsPerRound; j++) {
final Document doc = new Document();
for (int k = 0; k < num; k++) {
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setTokenized(random().nextBoolean());
customType.setOmitNorms(random().nextBoolean());
Field field = newField("" + k, _TestUtil
@@ -307,7 +306,7 @@ public class TestPerFieldPostingsFormat
iwc.setCodec(codec);
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwc);
Document doc = new Document();
- FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
// turn on vectors for the checkindex cross-check
ft.setStoreTermVectors(true);
ft.setStoreTermVectorOffsets(true);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java Sun Jun 10 18:27:08 2012
@@ -31,7 +31,6 @@ import org.apache.lucene.index.CheckInde
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.store.Directory;
@@ -51,7 +50,7 @@ public class TestPulsingReuse extends Lu
RandomIndexWriter iw = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setCodec(cp));
Document doc = new Document();
- doc.add(new Field("foo", "a b b c c c d e f g g h i i j j k", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("foo", "a b b c c c d e f g g h i i j j k", Field.Store.NO));
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
iw.close();
@@ -90,7 +89,7 @@ public class TestPulsingReuse extends Lu
RandomIndexWriter iw = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setCodec(cp));
Document doc = new Document();
- doc.add(new Field("foo", "a b b c c c d e f g g g h i i j j k l l m m m", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("foo", "a b b c c c d e f g g g h i i j j k l l m m m", Field.Store.NO));
// note: the reuse is imperfect, here we would have 4 enums (lost reuse when we get an enum for 'm')
// this is because we only track the 'last' enum we reused (not all).
// but this seems 'good enough' for now.
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/document/TestDocument.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/document/TestDocument.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/document/TestDocument.java Sun Jun 10 18:27:08 2012
@@ -134,7 +134,7 @@ public class TestDocument extends Lucene
FieldType ft = new FieldType();
ft.setStored(true);
new Field("name", "value", ft); // okay
- new StringField("name", "value"); // okay
+ new StringField("name", "value", Field.Store.NO); // okay
try {
new Field("name", "value", new FieldType());
fail();
@@ -206,16 +206,16 @@ public class TestDocument extends Lucene
Document doc = new Document();
FieldType stored = new FieldType();
stored.setStored(true);
- doc.add(new Field("keyword", "test1", StringField.TYPE_STORED));
- doc.add(new Field("keyword", "test2", StringField.TYPE_STORED));
- doc.add(new Field("text", "test1", TextField.TYPE_STORED));
- doc.add(new Field("text", "test2", TextField.TYPE_STORED));
+ doc.add(new StringField("keyword", "test1", Field.Store.YES));
+ doc.add(new StringField("keyword", "test2", Field.Store.YES));
+ doc.add(new TextField("text", "test1", Field.Store.YES));
+ doc.add(new TextField("text", "test2", Field.Store.YES));
doc.add(new Field("unindexed", "test1", stored));
doc.add(new Field("unindexed", "test2", stored));
doc
- .add(new TextField("unstored", "test1"));
+ .add(new TextField("unstored", "test1", Field.Store.NO));
doc
- .add(new TextField("unstored", "test2"));
+ .add(new TextField("unstored", "test2", Field.Store.NO));
return doc;
}
@@ -250,10 +250,10 @@ public class TestDocument extends Lucene
public void testFieldSetValue() throws Exception {
- Field field = new Field("id", "id1", StringField.TYPE_STORED);
+ Field field = new StringField("id", "id1", Field.Store.YES);
Document doc = new Document();
doc.add(field);
- doc.add(new Field("keyword", "test", StringField.TYPE_STORED));
+ doc.add(new StringField("keyword", "test", Field.Store.YES));
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
@@ -367,14 +367,14 @@ public class TestDocument extends Lucene
iwc.setMergePolicy(newLogMergePolicy());
IndexWriter iw = new IndexWriter(dir, iwc);
Document doc = new Document();
- doc.add(new Field("field1", "sometext", StringField.TYPE_STORED));
- doc.add(new TextField("field2", "sometext"));
- doc.add(new StringField("foo", "bar"));
+ doc.add(new StringField("field1", "sometext", Field.Store.YES));
+ doc.add(new TextField("field2", "sometext", Field.Store.NO));
+ doc.add(new StringField("foo", "bar", Field.Store.NO));
iw.addDocument(doc); // add an 'ok' document
try {
doc = new Document();
// try to boost with norms omitted
- StringField field = new StringField("foo", "baz");
+ StringField field = new StringField("foo", "baz", Field.Store.NO);
field.setBoost(5.0f);
doc.add(field);
iw.addDocument(doc);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java Sun Jun 10 18:27:08 2012
@@ -60,7 +60,7 @@ public class Test2BPostings extends Luce
}
Document doc = new Document();
- FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.setOmitNorms(true);
ft.setIndexOptions(IndexOptions.DOCS_ONLY);
Field field = new Field("field", new MyTokenStream(), ft);