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 2014/11/27 12:34:48 UTC
svn commit: r1642110 [1/12] - in /lucene/dev/branches/lucene6005/lucene:
analysis/uima/src/test/org/apache/lucene/analysis/uima/
backward-codecs/src/test/org/apache/lucene/index/
benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ benchmark/sr...
Author: mikemccand
Date: Thu Nov 27 11:34:43 2014
New Revision: 1642110
URL: http://svn.apache.org/r1642110
Log:
LUCENE-6005: checkpoint
Added:
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeFilter.java (with props)
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/SingleTokenWithPayloadTokenStream.java (with props)
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocsText.java (with props)
Removed:
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DoubleField.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/FloatField.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/IntField.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/LongField.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java
Modified:
lucene/dev/branches/lucene6005/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
lucene/dev/branches/lucene6005/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.java
lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
lucene/dev/branches/lucene6005/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java
lucene/dev/branches/lucene6005/lucene/classification/src/test/org/apache/lucene/classification/utils/DataSplitterTest.java
lucene/dev/branches/lucene6005/lucene/classification/src/test/org/apache/lucene/classification/utils/DocToDoubleVectorUtilsTest.java
lucene/dev/branches/lucene6005/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/NumericTokenStream.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/BinaryTokenStream.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document2.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/FieldTypes.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TrackingIndexWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeFilter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/NumericRangeFilter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermRangeFilter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestDocument2.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestField.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestAbuseSchema.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfMemory.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTerms.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java
lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java
lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java
lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java
lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/DrillDownQuery.java
lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
lucene/dev/branches/lucene6005/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
lucene/dev/branches/lucene6005/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/lucene6005/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/lucene6005/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/dev/branches/lucene6005/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java
lucene/dev/branches/lucene6005/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
lucene/dev/branches/lucene6005/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/branches/lucene6005/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java
lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
lucene/dev/branches/lucene6005/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/NumberRangePrefixTreeStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxValueSource.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java
lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpStrategyTestCase.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/serialized/SerializedStrategyTest.java
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java
lucene/dev/branches/lucene6005/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
lucene/dev/branches/lucene6005/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/document/LowSchemaField.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
Modified: lucene/dev/branches/lucene6005/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java Thu Nov 27 11:34:43 2014
@@ -75,7 +75,7 @@ public class UIMABaseAnalyzerTest extend
doc.add(new TextField("title", dummyTitle, Field.Store.YES));
String dummyContent = "there is some content written here";
doc.add(new TextField("contents", dummyContent, Field.Store.YES));
- writer.addDocument(doc, analyzer);
+ writer.addDocument(doc);
writer.commit();
// try the search over the first doc
@@ -96,7 +96,7 @@ public class UIMABaseAnalyzerTest extend
doc.add(new TextField("title", dogmasTitle, Field.Store.YES));
String dogmasContents = "white men can't jump";
doc.add(new TextField("contents", dogmasContents, Field.Store.YES));
- writer.addDocument(doc, analyzer);
+ writer.addDocument(doc);
writer.commit();
directoryReader.close();
Modified: lucene/dev/branches/lucene6005/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/lucene6005/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Thu Nov 27 11:34:43 2014
@@ -44,8 +44,6 @@ import org.apache.lucene.document.Double
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.FloatDocValuesField;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.LongField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.SortedNumericDocValuesField;
@@ -141,7 +139,7 @@ public class TestBackwardsCompatibility
IndexWriterConfig conf = new IndexWriterConfig(analyzer)
.setMergePolicy(mp).setUseCompoundFile(false);
IndexWriter writer = new IndexWriter(dir, conf);
- LineFileDocs docs = new LineFileDocs(null, true);
+ LineFileDocs docs = new LineFileDocs(writer, null);
for(int i=0;i<50;i++) {
writer.addDocument(docs.nextDoc());
}
@@ -875,8 +873,9 @@ public class TestBackwardsCompatibility
doc.add(new Field("content2", "here is more content with aaa aaa aaa", customType2));
doc.add(new Field("fie\u2C77ld", "field with non-ascii name", customType2));
// add numeric fields, to test if flex preserves encoding
- doc.add(new IntField("trieInt", id, Field.Store.NO));
- doc.add(new LongField("trieLong", (long) id, Field.Store.NO));
+ // nocommit get these into back compat index
+ //doc.add(new IntField("trieInt", id, Field.Store.NO));
+ //doc.add(new LongField("trieLong", (long) id, Field.Store.NO));
// add docvalues fields
doc.add(new NumericDocValuesField("dvByte", (byte) id));
byte bytes[] = new byte[] {
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java Thu Nov 27 11:34:43 2014
@@ -15,8 +15,9 @@ package org.apache.lucene.benchmark.byTa
* limitations under the License.
*/
-import org.apache.lucene.search.Query;
import org.apache.lucene.benchmark.byTask.utils.Config;
+import org.apache.lucene.document.FieldTypes;
+import org.apache.lucene.search.Query;
/**
* Abstract base query maker.
@@ -33,12 +34,11 @@ public abstract class AbstractQueryMaker
qnum = 0;
}
- protected abstract Query[] prepareQueries() throws Exception;
+ protected abstract Query[] prepareQueries(FieldTypes fieldTypes) throws Exception;
@Override
public void setConfig(Config config) throws Exception {
this.config = config;
- queries = prepareQueries();
}
@Override
@@ -55,7 +55,10 @@ public abstract class AbstractQueryMaker
}
@Override
- public Query makeQuery() throws Exception {
+ public Query makeQuery(FieldTypes fieldTypes) throws Exception {
+ if (queries == null) {
+ queries = prepareQueries(fieldTypes);
+ }
return queries[nextQnum()];
}
@@ -71,7 +74,7 @@ public abstract class AbstractQueryMaker
* @see org.apache.lucene.benchmark.byTask.feeds.QueryMaker#makeQuery(int)
*/
@Override
- public Query makeQuery(int size) throws Exception {
+ public Query makeQuery(FieldTypes fieldTypes, int size) throws Exception {
throw new Exception(this+".makeQuery(int size) is not supported!");
}
}
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Thu Nov 27 11:34:43 2014
@@ -34,16 +34,15 @@ import java.util.TimeZone;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.lucene.benchmark.byTask.utils.Config;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType.NumericType;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.LongField;
-import org.apache.lucene.document.FloatField;
-import org.apache.lucene.document.DoubleField;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.IndexWriter;
/**
* Creates {@link Document} objects. Uses a {@link ContentSource} to generate
@@ -73,8 +72,6 @@ import org.apache.lucene.document.TextFi
* stored with offsets (default <b>false</b>).
* <li><b>doc.store.body.bytes</b> - specifies whether to store the raw bytes of
* the document's content in the document (default <b>false</b>).
- * <li><b>doc.reuse.fields</b> - specifies whether Field and Document objects
- * should be reused (default <b>true</b>).
* <li><b>doc.index.props</b> - specifies whether the properties returned by
* <li><b>doc.random.id.limit</b> - if specified, docs will be assigned random
* IDs from 0 to this limit. This is useful with UpdateDoc
@@ -93,92 +90,10 @@ public class DocMaker implements Closeab
private int updateDocIDLimit;
/**
- * Document state, supports reuse of field instances
- * across documents (see <code>reuseFields</code> parameter).
+ * Document state.
*/
protected static class DocState {
-
- private final Map<String,Field> fields;
- private final Map<String,Field> numericFields;
- private final boolean reuseFields;
- final Document doc;
DocData docData = new DocData();
-
- public DocState(boolean reuseFields, FieldType ft, FieldType bodyFt) {
-
- this.reuseFields = reuseFields;
-
- if (reuseFields) {
- fields = new HashMap<>();
- numericFields = new HashMap<>();
-
- // Initialize the map with the default fields.
- 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 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, Field.Store.NO));
- numericFields.put(TIME_SEC_FIELD, new IntField(TIME_SEC_FIELD, 0, Field.Store.NO));
-
- doc = new Document();
- } else {
- numericFields = null;
- fields = null;
- doc = null;
- }
- }
-
- /**
- * Returns a field corresponding to the field name. If
- * <code>reuseFields</code> was set to true, then it attempts to reuse a
- * Field instance. If such a field does not exist, it creates a new one.
- */
- Field getField(String name, FieldType ft) {
- if (!reuseFields) {
- return new Field(name, "", ft);
- }
-
- Field f = fields.get(name);
- if (f == null) {
- f = new Field(name, "", ft);
- fields.put(name, f);
- }
- return f;
- }
-
- Field getNumericField(String name, NumericType type) {
- Field f;
- if (reuseFields) {
- f = numericFields.get(name);
- } else {
- f = null;
- }
-
- if (f == null) {
- switch(type) {
- case INT:
- f = new IntField(name, 0, Field.Store.NO);
- break;
- case LONG:
- f = new LongField(name, 0L, Field.Store.NO);
- break;
- case FLOAT:
- f = new FloatField(name, 0.0F, Field.Store.NO);
- break;
- case DOUBLE:
- f = new DoubleField(name, 0.0, Field.Store.NO);
- break;
- default:
- throw new AssertionError("Cannot get here");
- }
- if (reuseFields) {
- numericFields.put(name, f);
- }
- }
- return f;
- }
}
private boolean storeBytes = false;
@@ -193,7 +108,7 @@ public class DocMaker implements Closeab
}
// leftovers are thread local, because it is unsafe to share residues between threads
- private ThreadLocal<LeftOver> leftovr = new ThreadLocal<>();
+ private ThreadLocal<LeftOver> leftover = new ThreadLocal<>();
private ThreadLocal<DocState> docState = new ThreadLocal<>();
private ThreadLocal<DateUtil> dateParsers = new ThreadLocal<>();
@@ -208,14 +123,14 @@ public class DocMaker implements Closeab
protected Config config;
- protected FieldType valType;
- protected FieldType bodyValType;
-
protected ContentSource source;
protected boolean reuseFields;
protected boolean indexProperties;
-
+ private boolean tokenized;
+ private boolean bodyTokenized;
+
private final AtomicInteger numDocsCreated = new AtomicInteger();
+ private IndexWriter schemaApplied;
public DocMaker() {
}
@@ -223,17 +138,12 @@ public class DocMaker implements Closeab
// create a doc
// use only part of the body, modify it to keep the rest (or use all if size==0).
// reset the docdata properties so they are not added more than once.
- private Document createDocument(DocData docData, int size, int cnt) throws UnsupportedEncodingException {
+ private Document2 createDocument(IndexWriter w, DocData docData, int size, int cnt) throws UnsupportedEncodingException {
+ applySchema(w);
final DocState ds = getDocState();
- final Document doc = reuseFields ? ds.doc : new Document();
- doc.clear();
+ final Document2 doc = w.newDocument();
- // Set ID_FIELD
- FieldType ft = new FieldType(valType);
- ft.setStored(true);
-
- Field idField = ds.getField(ID_FIELD, ft);
int id;
if (r != null) {
id = r.nextInt(updateDocIDLimit);
@@ -243,16 +153,21 @@ public class DocMaker implements Closeab
id = numDocsCreated.getAndIncrement();
}
}
- idField.setStringValue(Integer.toString(id));
- doc.add(idField);
+ if (tokenized) {
+ doc.addLargeText(ID_FIELD, Integer.toString(id));
+ } else {
+ doc.addAtom(ID_FIELD, Integer.toString(id));
+ }
// Set NAME_FIELD
String name = docData.getName();
if (name == null) name = "";
name = cnt < 0 ? name : name + "_" + cnt;
- Field nameField = ds.getField(NAME_FIELD, valType);
- nameField.setStringValue(name);
- doc.add(nameField);
+ if (tokenized) {
+ doc.addLargeText(NAME_FIELD, name);
+ } else {
+ doc.addAtom(NAME_FIELD, name);
+ }
// Set DATE_FIELD
DateUtil util = dateParsers.get();
@@ -269,31 +184,30 @@ public class DocMaker implements Closeab
} else {
dateString = "";
}
- Field dateStringField = ds.getField(DATE_FIELD, valType);
- dateStringField.setStringValue(dateString);
- doc.add(dateStringField);
+ if (tokenized) {
+ doc.addLargeText(DATE_FIELD, dateString);
+ } else {
+ doc.addAtom(DATE_FIELD, dateString);
+ }
if (date == null) {
// just set to right now
date = new Date();
}
- Field dateField = ds.getNumericField(DATE_MSEC_FIELD, NumericType.LONG);
- dateField.setLongValue(date.getTime());
- doc.add(dateField);
+ doc.addLong(DATE_MSEC_FIELD, date.getTime());
util.cal.setTime(date);
final int sec = util.cal.get(Calendar.HOUR_OF_DAY)*3600 + util.cal.get(Calendar.MINUTE)*60 + util.cal.get(Calendar.SECOND);
-
- Field timeSecField = ds.getNumericField(TIME_SEC_FIELD, NumericType.INT);
- timeSecField.setIntValue(sec);
- doc.add(timeSecField);
+ doc.addLong(TIME_SEC_FIELD, sec);
// Set TITLE_FIELD
String title = docData.getTitle();
- Field titleField = ds.getField(TITLE_FIELD, valType);
- titleField.setStringValue(title == null ? "" : title);
- doc.add(titleField);
+ if (tokenized) {
+ doc.addShortText(TITLE_FIELD, title == null ? "" : title);
+ } else {
+ doc.addAtom(TITLE_FIELD, title == null ? "" : title);
+ }
String body = docData.getBody();
if (body != null && body.length() > 0) {
@@ -312,14 +226,14 @@ public class DocMaker implements Closeab
bdy = body.substring(0, size); // use part
docData.setBody(body.substring(size)); // some left
}
- Field bodyField = ds.getField(BODY_FIELD, bodyValType);
- bodyField.setStringValue(bdy);
- doc.add(bodyField);
+ if (bodyTokenized) {
+ doc.addLargeText(BODY_FIELD, bdy);
+ } else {
+ doc.addAtom(BODY_FIELD, bdy);
+ }
if (storeBytes) {
- Field bytesField = ds.getField(BYTES_FIELD, StringField.TYPE_STORED);
- bytesField.setBytesValue(bdy.getBytes(StandardCharsets.UTF_8));
- doc.add(bytesField);
+ doc.addBinary(BYTES_FIELD, bdy.getBytes(StandardCharsets.UTF_8));
}
}
@@ -327,9 +241,11 @@ public class DocMaker implements Closeab
Properties props = docData.getProps();
if (props != null) {
for (final Map.Entry<Object,Object> entry : props.entrySet()) {
- Field f = ds.getField((String) entry.getKey(), valType);
- f.setStringValue((String) entry.getValue());
- doc.add(f);
+ if (tokenized) {
+ doc.addLargeText((String) entry.getKey(), (String) entry.getValue());
+ } else {
+ doc.addAtom((String) entry.getKey(), (String) entry.getValue());
+ }
}
docData.setProps(null);
}
@@ -340,13 +256,13 @@ public class DocMaker implements Closeab
}
private void resetLeftovers() {
- leftovr.set(null);
+ leftover.set(null);
}
protected DocState getDocState() {
DocState ds = docState.get();
if (ds == null) {
- ds = new DocState(reuseFields, valType, bodyValType);
+ ds = new DocState();
docState.set(ds);
}
return ds;
@@ -369,10 +285,10 @@ public class DocMaker implements Closeab
* <code>reuseFields</code> was set to true, it will reuse {@link Document}
* and {@link Field} instances.
*/
- public Document makeDocument() throws Exception {
+ public Document2 makeDocument(IndexWriter w) throws Exception {
resetLeftovers();
DocData docData = source.getNextDocData(getDocState().docData);
- Document doc = createDocument(docData, 0, -1);
+ Document2 doc = createDocument(w, docData, 0, -1);
return doc;
}
@@ -380,8 +296,8 @@ public class DocMaker implements Closeab
* Same as {@link #makeDocument()}, only this method creates a document of the
* given size input by <code>size</code>.
*/
- public Document makeDocument(int size) throws Exception {
- LeftOver lvr = leftovr.get();
+ public Document2 makeDocument(IndexWriter w, int size) throws Exception {
+ LeftOver lvr = leftover.get();
if (lvr == null || lvr.docdata == null || lvr.docdata.getBody() == null
|| lvr.docdata.getBody().length() == 0) {
resetLeftovers();
@@ -395,13 +311,13 @@ public class DocMaker implements Closeab
cnt = 0;
dd.setBody(dd2.getBody() + dd.getBody());
}
- Document doc = createDocument(dd, size, cnt);
+ Document2 doc = createDocument(w, dd, size, cnt);
if (dd.getBody() == null || dd.getBody().length() == 0) {
resetLeftovers();
} else {
if (lvr == null) {
lvr = new LeftOver();
- leftovr.set(lvr);
+ leftover.set(lvr);
}
lvr.docdata = dd;
lvr.cnt = ++cnt;
@@ -418,43 +334,101 @@ public class DocMaker implements Closeab
numDocsCreated.set(0);
resetLeftovers();
}
-
- /** Set the configuration parameters of this doc maker. */
- public void setConfig(Config config, ContentSource source) {
- this.config = config;
- this.source = source;
+
+ private void applySchema(IndexWriter w) {
+ if (schemaApplied == w) {
+ return;
+ }
+ schemaApplied = w;
boolean stored = config.get("doc.stored", false);
boolean bodyStored = config.get("doc.body.stored", stored);
- boolean tokenized = config.get("doc.tokenized", true);
- boolean bodyTokenized = config.get("doc.body.tokenized", tokenized);
boolean norms = config.get("doc.tokenized.norms", false);
boolean bodyNorms = config.get("doc.body.tokenized.norms", true);
boolean termVec = config.get("doc.term.vector", false);
boolean termVecPositions = config.get("doc.term.vector.positions", false);
boolean termVecOffsets = config.get("doc.term.vector.offsets", false);
-
- valType = new FieldType(TextField.TYPE_NOT_STORED);
- valType.setStored(stored);
- valType.setTokenized(tokenized);
- valType.setOmitNorms(!norms);
- valType.setStoreTermVectors(termVec);
- valType.setStoreTermVectorPositions(termVecPositions);
- valType.setStoreTermVectorOffsets(termVecOffsets);
- valType.freeze();
-
- bodyValType = new FieldType(TextField.TYPE_NOT_STORED);
- bodyValType.setStored(bodyStored);
- bodyValType.setTokenized(bodyTokenized);
- bodyValType.setOmitNorms(!bodyNorms);
- bodyValType.setStoreTermVectors(termVec);
- bodyValType.setStoreTermVectorPositions(termVecPositions);
- bodyValType.setStoreTermVectorOffsets(termVecOffsets);
- bodyValType.freeze();
+ tokenized = config.get("doc.tokenized", true);
+ bodyTokenized = config.get("doc.body.tokenized", tokenized);
+ if (bodyTokenized == false) {
+ bodyNorms = false;
+ }
+
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableExistsFilters();
+
+ for(String fieldName : new String[] {ID_FIELD,
+ NAME_FIELD,
+ DATE_FIELD,
+ TITLE_FIELD}) {
+ if (stored) {
+ fieldTypes.enableStored(fieldName);
+ } else {
+ fieldTypes.disableStored(fieldName);
+ }
+
+ if (norms) {
+ fieldTypes.enableNorms(fieldName);
+ } else {
+ fieldTypes.disableNorms(fieldName);
+ }
+
+ if (termVec) {
+ fieldTypes.enableTermVectors(fieldName);
+ if (termVecPositions) {
+ fieldTypes.enableTermVectorPositions(fieldName);
+ } else {
+ fieldTypes.disableTermVectorPositions(fieldName);
+ }
+ if (termVecOffsets) {
+ fieldTypes.enableTermVectorOffsets(fieldName);
+ } else {
+ fieldTypes.disableTermVectorOffsets(fieldName);
+ }
+ } else {
+ fieldTypes.disableTermVectors(fieldName);
+ }
+ }
+
+ if (bodyStored) {
+ fieldTypes.enableStored(BODY_FIELD);
+ } else {
+ fieldTypes.disableStored(BODY_FIELD);
+ }
+
+ if (bodyNorms) {
+ fieldTypes.enableNorms(BODY_FIELD);
+ } else {
+ fieldTypes.disableNorms(BODY_FIELD);
+ }
+
+ if (termVec) {
+ fieldTypes.enableTermVectors(BODY_FIELD);
+ if (termVecPositions) {
+ fieldTypes.enableTermVectorPositions(BODY_FIELD);
+ } else {
+ fieldTypes.disableTermVectorPositions(BODY_FIELD);
+ }
+ if (termVecOffsets) {
+ fieldTypes.enableTermVectorOffsets(BODY_FIELD);
+ } else {
+ fieldTypes.disableTermVectorOffsets(BODY_FIELD);
+ }
+ } else {
+ fieldTypes.disableTermVectors(BODY_FIELD);
+ }
+ }
+
+ /** Set the configuration parameters of this doc maker. */
+ public void setConfig(Config config, ContentSource source) {
+ this.config = config;
+ this.source = source;
storeBytes = config.get("doc.store.body.bytes", false);
- reuseFields = config.get("doc.reuse.fields", true);
+ if (config.get("doc.reuse.fields", false)) {
+ throw new IllegalStateException("field reuse is no longer supported");
+ }
// In a multi-rounds run, it is important to reset DocState since settings
// of fields may change between rounds, and this is the only way to reset
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java Thu Nov 27 11:34:43 2014
@@ -23,6 +23,8 @@ import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.MultiTermQuery;
@@ -32,7 +34,6 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
-import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
/**
* A QueryMaker that uses common and uncommon actual Wikipedia queries for
@@ -122,7 +123,7 @@ public class EnwikiQueryMaker extends Ab
}
@Override
- protected Query[] prepareQueries() throws Exception {
+ protected Query[] prepareQueries(FieldTypes fieldTypes) throws Exception {
// analyzer (default is standard analyzer)
Analyzer anlzr = NewAnalyzerTask.createAnalyzer(config.get("analyzer", StandardAnalyzer.class.getName()));
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java Thu Nov 27 11:34:43 2014
@@ -1,12 +1,5 @@
package org.apache.lucene.benchmark.byTask.feeds;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
-import org.apache.lucene.util.IOUtils;
-
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -15,6 +8,14 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
+import org.apache.lucene.document.FieldTypes;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.util.IOUtils;
+
/**
* Copyright 2004 The Apache Software Foundation
* <p/>
@@ -49,7 +50,7 @@ public class FileBasedQueryMaker extends
@Override
- protected Query[] prepareQueries() throws Exception {
+ protected Query[] prepareQueries(FieldTypes fieldTypes) throws Exception {
Analyzer anlzr = NewAnalyzerTask.createAnalyzer(config.get("analyzer",
"org.apache.lucene.analysis.standard.StandardAnalyzer"));
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java Thu Nov 27 11:34:43 2014
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
import org.apache.lucene.benchmark.byTask.utils.Config;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
import com.ibm.icu.text.RuleBasedNumberFormat;
@@ -40,12 +41,12 @@ public class LongToEnglishQueryMaker imp
RuleBasedNumberFormat.SPELLOUT);
@Override
- public Query makeQuery(int size) throws Exception {
+ public Query makeQuery(FieldTypes fieldTypes, int size) throws Exception {
throw new UnsupportedOperationException();
}
@Override
- public synchronized Query makeQuery() throws Exception {
+ public synchronized Query makeQuery(FieldTypes fieldTypes) throws Exception {
return parser.parse("" + rnbf.format(getNextCounter()) + "");
}
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java Thu Nov 27 11:34:43 2014
@@ -18,8 +18,9 @@ package org.apache.lucene.benchmark.byTa
*/
-import org.apache.lucene.search.Query;
import org.apache.lucene.benchmark.byTask.utils.Config;
+import org.apache.lucene.document.FieldTypes;
+import org.apache.lucene.search.Query;
/**
@@ -32,13 +33,13 @@ public interface QueryMaker {
* @param size the size of the query - number of terms, etc.
* @exception Exception if cannot make the query, or if size>0 was specified but this feature is not supported.
*/
- public Query makeQuery (int size) throws Exception;
+ public Query makeQuery(FieldTypes fieldTypes, int size) throws Exception;
/** Create the next query */
- public Query makeQuery () throws Exception;
+ public Query makeQuery(FieldTypes fieldTypes) throws Exception;
/** Set the properties */
- public void setConfig (Config config) throws Exception;
+ public void setConfig(Config config) throws Exception;
/** Reset inputs so that the test run would behave, input wise, as if it just started. */
public void resetInputs();
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java Thu Nov 27 11:34:43 2014
@@ -17,7 +17,13 @@ package org.apache.lucene.benchmark.byTa
* limitations under the License.
*/
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
@@ -26,11 +32,6 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
-import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
/**
@@ -102,7 +103,7 @@ public class ReutersQueryMaker extends A
}
@Override
- protected Query[] prepareQueries() throws Exception {
+ protected Query[] prepareQueries(FieldTypes fieldTypes) throws Exception {
// analyzer (default is standard analyzer)
Analyzer anlzr= NewAnalyzerTask.createAnalyzer(config.get("analyzer",
"org.apache.lucene.analysis.standard.StandardAnalyzer"));
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java Thu Nov 27 11:34:43 2014
@@ -17,16 +17,17 @@ package org.apache.lucene.benchmark.byTa
* limitations under the License.
*/
+import java.util.ArrayList;
+
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
-
-import java.util.ArrayList;
/**
* A QueryMaker that makes queries for a collection created
@@ -42,7 +43,7 @@ public class SimpleQueryMaker extends Ab
* @throws Exception if cannot prepare the queries.
*/
@Override
- protected Query[] prepareQueries() throws Exception {
+ protected Query[] prepareQueries(FieldTypes fieldTypes) throws Exception {
// analyzer (default is standard analyzer)
Analyzer anlzr= NewAnalyzerTask.createAnalyzer(config.get("analyzer",
"org.apache.lucene.analysis.standard.StandardAnalyzer"));
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java Thu Nov 27 11:34:43 2014
@@ -20,6 +20,7 @@ package org.apache.lucene.benchmark.byTa
import java.util.ArrayList;
import java.util.StringTokenizer;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
@@ -33,7 +34,7 @@ public class SimpleSloppyPhraseQueryMake
* @see org.apache.lucene.benchmark.byTask.feeds.SimpleQueryMaker#prepareQueries()
*/
@Override
- protected Query[] prepareQueries() throws Exception {
+ protected Query[] prepareQueries(FieldTypes fieldTypes) throws Exception {
// extract some 100 words from doc text to an array
String words[];
ArrayList<String> w = new ArrayList<>();
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java Thu Nov 27 11:34:43 2014
@@ -17,23 +17,26 @@ package org.apache.lucene.benchmark.byTa
* limitations under the License.
*/
-import com.spatial4j.core.context.SpatialContext;
-import com.spatial4j.core.context.SpatialContextFactory;
-import com.spatial4j.core.shape.Point;
-import com.spatial4j.core.shape.Shape;
+import java.util.AbstractMap;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
import org.apache.lucene.benchmark.byTask.utils.Config;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexableField;
import org.apache.lucene.spatial.SpatialStrategy;
import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy;
import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTreeFactory;
-
-import java.util.AbstractMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.context.SpatialContextFactory;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.Shape;
/**
* Indexes spatial data according to a configured {@link SpatialStrategy} with optional
@@ -162,23 +165,20 @@ public class SpatialDocMaker extends Doc
}
@Override
- public Document makeDocument() throws Exception {
+ public Document2 makeDocument(IndexWriter w) throws Exception {
DocState docState = getDocState();
- Document doc = super.makeDocument();
+ Document2 doc = super.makeDocument(w);
// Set SPATIAL_FIELD from body
DocData docData = docState.docData;
// makeDocument() resets docState.getBody() so we can't look there; look in Document
- String shapeStr = doc.getField(DocMaker.BODY_FIELD).stringValue();
+ String shapeStr = doc.getString(DocMaker.BODY_FIELD);
Shape shape = makeShapeFromString(strategy, docData.getName(), shapeStr);
if (shape != null) {
shape = shapeConverter.convert(shape);
- //index
- for (Field f : strategy.createIndexableFields(shape)) {
- doc.add(f);
- }
+ strategy.addFields(doc, shape);
}
return doc;
@@ -197,7 +197,7 @@ public class SpatialDocMaker extends Doc
}
@Override
- public Document makeDocument(int size) throws Exception {
+ public Document2 makeDocument(IndexWriter w, int size) throws Exception {
//TODO consider abusing the 'size' notion to number of shapes per document
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java Thu Nov 27 11:34:43 2014
@@ -17,8 +17,12 @@ package org.apache.lucene.benchmark.byTa
* limitations under the License.
*/
-import com.spatial4j.core.shape.Shape;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
import org.apache.lucene.benchmark.byTask.utils.Config;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queries.CustomScoreQuery;
import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource;
@@ -29,10 +33,7 @@ import org.apache.lucene.search.QueryWra
import org.apache.lucene.spatial.SpatialStrategy;
import org.apache.lucene.spatial.query.SpatialArgs;
import org.apache.lucene.spatial.query.SpatialOperation;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
+import com.spatial4j.core.shape.Shape;
/**
* Reads spatial data from the body field docs from an internally created {@link LineDocSource}.
@@ -64,7 +65,7 @@ public class SpatialFileQueryMaker exten
}
@Override
- protected Query[] prepareQueries() throws Exception {
+ protected Query[] prepareQueries(FieldTypes fieldTypes) throws Exception {
final int maxQueries = config.get("query.file.maxQueries", 1000);
Config srcConfig = new Config(new Properties());
srcConfig.set("docs.file", config.get("query.file", null));
@@ -82,7 +83,7 @@ public class SpatialFileQueryMaker exten
Shape shape = SpatialDocMaker.makeShapeFromString(strategy, docData.getName(), docData.getBody());
if (shape != null) {
shape = shapeConverter.convert(shape);
- queries.add(makeQueryFromShape(shape));
+ queries.add(makeQueryFromShape(fieldTypes, shape));
} else {
i--;//skip
}
@@ -95,20 +96,19 @@ public class SpatialFileQueryMaker exten
return queries.toArray(new Query[queries.size()]);
}
-
- protected Query makeQueryFromShape(Shape shape) {
+ protected Query makeQueryFromShape(FieldTypes fieldTypes, Shape shape) {
SpatialArgs args = new SpatialArgs(operation, shape);
if (!Double.isNaN(distErrPct))
args.setDistErrPct(distErrPct);
if (score) {
ValueSource valueSource = strategy.makeDistanceValueSource(shape.getCenter());
- return new CustomScoreQuery(strategy.makeQuery(args), new FunctionQuery(valueSource));
+ return new CustomScoreQuery(strategy.makeQuery(fieldTypes, args), new FunctionQuery(valueSource));
} else {
//strategy.makeQuery() could potentially score (isn't well defined) so instead we call
// makeFilter() and wrap
- Filter filter = strategy.makeFilter(args);
+ Filter filter = strategy.makeFilter(fieldTypes, args);
if (filter instanceof QueryWrapperFilter) {
return ((QueryWrapperFilter)filter).getQuery();
} else {
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java Thu Nov 27 11:34:43 2014
@@ -21,7 +21,9 @@ import java.util.Locale;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.IndexWriter;
/**
* Add a document, optionally of a certain size.
@@ -36,29 +38,6 @@ public class AddDocTask extends PerfTask
private int docSize = 0;
- /**
- * volatile data passed between setup(), doLogic(), tearDown().
- * the doc is created at setup() and added at doLogic().
- */
- protected Document doc = null;
-
- @Override
- public void setup() throws Exception {
- super.setup();
- DocMaker docMaker = getRunData().getDocMaker();
- if (docSize > 0) {
- doc = docMaker.makeDocument(docSize);
- } else {
- doc = docMaker.makeDocument();
- }
- }
-
- @Override
- public void tearDown() throws Exception {
- doc = null;
- super.tearDown();
- }
-
@Override
protected String getLogMessage(int recsCount) {
return String.format(Locale.ROOT, "added %9d docs",recsCount);
@@ -66,7 +45,19 @@ public class AddDocTask extends PerfTask
@Override
public int doLogic() throws Exception {
- getRunData().getIndexWriter().addDocument(doc);
+ Document2 doc;
+ DocMaker docMaker = getRunData().getDocMaker();
+ IndexWriter iw = getRunData().getIndexWriter();
+ if (docSize > 0) {
+ doc = docMaker.makeDocument(iw, docSize);
+ } else {
+ doc = docMaker.makeDocument(iw);
+ }
+ final String docID = doc.getString(DocMaker.ID_FIELD);
+ if (docID == null) {
+ throw new IllegalStateException("document must define the docid field");
+ }
+ iw.addDocument(doc);
return 1;
}
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java Thu Nov 27 11:34:43 2014
@@ -73,14 +73,17 @@ public class AddFacetedDocTask extends A
@Override
public int doLogic() throws Exception {
+ // nocommit fixme
+ /*
if (config != null) {
List<FacetField> facets = new ArrayList<>();
getRunData().getFacetSource().getNextFacets(facets);
for(FacetField ff : facets) {
- doc.add(ff);
+ doc.addIndexableField(ff);
}
doc = config.build(getRunData().getTaxonomyWriter(), doc);
}
+ */
return super.doLogic();
}
}
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java Thu Nov 27 11:34:43 2014
@@ -195,6 +195,7 @@ public class CreateIndexTask extends Per
}
}
IndexWriter writer = new IndexWriter(runData.getDirectory(), iwc);
+ writer.getFieldTypes().disableExistsFilters();
return writer;
}
}
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Thu Nov 27 11:34:43 2014
@@ -108,7 +108,7 @@ public abstract class ReadTask extends P
if (withSearch()) {
res++;
- Query q = queryMaker.makeQuery();
+ Query q = queryMaker.makeQuery(searcher.getIndexReader().getFieldTypes());
Sort sort = getSort();
TopDocs hits = null;
final int numHits = numHits();
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java Thu Nov 27 11:34:43 2014
@@ -25,14 +25,14 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DoubleField;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.FloatField;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.LongField;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.store.RAMDirectory;
/**
* Simple task to test performance of tokenizers. It just
@@ -47,52 +47,50 @@ public class ReadTokensTask extends Perf
private int totalTokenCount = 0;
- // volatile data passed between setup(), doLogic(), tearDown().
- private Document doc = null;
-
- @Override
- public void setup() throws Exception {
- super.setup();
- DocMaker docMaker = getRunData().getDocMaker();
- doc = docMaker.makeDocument();
- }
-
@Override
protected String getLogMessage(int recsCount) {
return "read " + recsCount + " docs; " + totalTokenCount + " tokens";
}
- @Override
- public void tearDown() throws Exception {
- doc = null;
- super.tearDown();
+ private IndexWriter privateWriter;
+
+ private IndexWriter getPrivateWriter() throws Exception {
+ if (privateWriter == null) {
+ RAMDirectory dir = new RAMDirectory();
+ privateWriter = new IndexWriter(dir, new IndexWriterConfig(getRunData().getAnalyzer()));
+ }
+ return privateWriter;
}
@Override
public int doLogic() throws Exception {
+ DocMaker docMaker = getRunData().getDocMaker();
+ IndexWriter iw = getRunData().getIndexWriter();
+ if (iw == null) {
+ iw = getPrivateWriter();
+ }
+ Document2 doc = docMaker.makeDocument(iw);
+
List<IndexableField> fields = doc.getFields();
- Analyzer analyzer = getRunData().getAnalyzer();
+ Analyzer analyzer = iw.getFieldTypes().getIndexAnalyzer();
int tokenCount = 0;
for(final IndexableField field : fields) {
- if (!((FieldType) field.fieldType()).tokenized() ||
- field instanceof IntField ||
- field instanceof LongField ||
- field instanceof FloatField ||
- field instanceof DoubleField) {
- continue;
- }
+ if (field.name().equals(DocMaker.BODY_FIELD) ||
+ field.name().equals(DocMaker.DATE_FIELD) ||
+ field.name().equals(DocMaker.TITLE_FIELD)) {
- final TokenStream stream = field.tokenStream(analyzer, null);
- // reset the TokenStream to the first token
- stream.reset();
-
- TermToBytesRefAttribute termAtt = stream.getAttribute(TermToBytesRefAttribute.class);
- while(stream.incrementToken()) {
- termAtt.fillBytesRef();
- tokenCount++;
+ final TokenStream stream = field.tokenStream(analyzer, null);
+ // reset the TokenStream to the first token
+ stream.reset();
+
+ TermToBytesRefAttribute termAtt = stream.getAttribute(TermToBytesRefAttribute.class);
+ while(stream.incrementToken()) {
+ termAtt.fillBytesRef();
+ tokenCount++;
+ }
+ stream.end();
+ stream.close();
}
- stream.end();
- stream.close();
}
totalTokenCount += tokenCount;
return tokenCount;
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java Thu Nov 27 11:34:43 2014
@@ -19,9 +19,10 @@ package org.apache.lucene.benchmark.byTa
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.Term;
/**
* Update a document, using IndexWriter.updateDocument,
@@ -37,33 +38,20 @@ public class UpdateDocTask extends PerfT
private int docSize = 0;
- // volatile data passed between setup(), doLogic(), tearDown().
- private Document doc = null;
-
@Override
- public void setup() throws Exception {
- super.setup();
+ public int doLogic() throws Exception {
+ Document2 doc;
DocMaker docMaker = getRunData().getDocMaker();
+ IndexWriter iw = getRunData().getIndexWriter();
if (docSize > 0) {
- doc = docMaker.makeDocument(docSize);
+ doc = docMaker.makeDocument(iw, docSize);
} else {
- doc = docMaker.makeDocument();
+ doc = docMaker.makeDocument(iw);
}
- }
-
- @Override
- public void tearDown() throws Exception {
- doc = null;
- super.tearDown();
- }
-
- @Override
- public int doLogic() throws Exception {
- final String docID = doc.get(DocMaker.ID_FIELD);
+ final String docID = doc.getString(DocMaker.ID_FIELD);
if (docID == null) {
throw new IllegalStateException("document must define the docid field");
}
- final IndexWriter iw = getRunData().getIndexWriter();
iw.updateDocument(new Term(DocMaker.ID_FIELD, docID), doc);
return 1;
}
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java Thu Nov 27 11:34:43 2014
@@ -12,6 +12,7 @@ import java.nio.file.Paths;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
import org.apache.lucene.benchmark.byTask.utils.StreamUtils;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
@@ -62,7 +63,7 @@ public class WriteEnwikiLineDocTask exte
}
@Override
- protected PrintWriter lineFileOut(Document doc) {
+ protected PrintWriter lineFileOut(Document2 doc) {
IndexableField titleField = doc.getField(DocMaker.TITLE_FIELD);
if (titleField!=null && titleField.stringValue().startsWith("Category:")) {
return categoryLineFileOut;
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java Thu Nov 27 11:34:43 2014
@@ -32,8 +32,12 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.benchmark.byTask.utils.StreamUtils;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.store.RAMDirectory;
/**
* A task which writes documents, one line per document. Each line is in the
@@ -155,10 +159,24 @@ public class WriteLineDocTask extends Pe
protected String getLogMessage(int recsCount) {
return "Wrote " + recsCount + " line docs";
}
+
+ private IndexWriter privateWriter;
+
+ private IndexWriter getPrivateWriter() throws Exception {
+ if (privateWriter == null) {
+ RAMDirectory dir = new RAMDirectory();
+ privateWriter = new IndexWriter(dir, new IndexWriterConfig(null));
+ }
+ return privateWriter;
+ }
@Override
public int doLogic() throws Exception {
- Document doc = docSize > 0 ? docMaker.makeDocument(docSize) : docMaker.makeDocument();
+ IndexWriter iw = getRunData().getIndexWriter();
+ if (iw == null) {
+ iw = getPrivateWriter();
+ }
+ Document2 doc = docSize > 0 ? docMaker.makeDocument(iw,docSize) : docMaker.makeDocument(iw);
Matcher matcher = threadNormalizer.get();
if (matcher == null) {
@@ -193,7 +211,7 @@ public class WriteLineDocTask extends Pe
* Selects output line file by written doc.
* Default: original output line file.
*/
- protected PrintWriter lineFileOut(Document doc) {
+ protected PrintWriter lineFileOut(Document2 doc) {
return lineFileOut;
}
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java Thu Nov 27 11:34:43 2014
@@ -30,7 +30,11 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.feeds.EnwikiContentSource;
import org.apache.lucene.benchmark.byTask.feeds.NoMoreDataException;
import org.apache.lucene.benchmark.byTask.utils.Config;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.IOUtils;
/**
@@ -89,17 +93,23 @@ public class ExtractWikipedia {
}
public void extract() throws Exception {
- Document doc = null;
+ Document2 doc = null;
System.out.println("Starting Extraction");
long start = System.currentTimeMillis();
+ RAMDirectory dir = new RAMDirectory();
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(null));
try {
- while ((doc = docMaker.makeDocument()) != null) {
- create(doc.get(DocMaker.ID_FIELD), doc.get(DocMaker.TITLE_FIELD), doc
- .get(DocMaker.DATE_FIELD), doc.get(DocMaker.BODY_FIELD));
+ while ((doc = docMaker.makeDocument(iw)) != null) {
+ create(doc.getString(DocMaker.ID_FIELD),
+ doc.getString(DocMaker.TITLE_FIELD),
+ doc.getString(DocMaker.DATE_FIELD),
+ doc.getString(DocMaker.BODY_FIELD));
}
} catch (NoMoreDataException e) {
//continue
}
+ iw.close();
+ dir.close();
long finish = System.currentTimeMillis();
System.out.println("Extraction took " + (finish - start) + " ms");
}
@@ -150,4 +160,4 @@ public class ExtractWikipedia {
System.err.println("--discardImageOnlyDocs tells the extractor to skip Wiki docs that contain only images");
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Thu Nov 27 11:34:43 2014
@@ -57,6 +57,7 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.TestUtil;
+import org.junit.Ignore;
/**
* Test very simply that perf tasks - simple algorithms - are doing what they should.
@@ -508,7 +509,7 @@ public class TestPerfTasksLogic extends
reader.close();
// Make sure they are the same
- assertEquals(totalTokenCount1, totalTokenCount2);
+ assertEquals(totalTokenCount2, totalTokenCount1);
}
/**
@@ -761,6 +762,8 @@ public class TestPerfTasksLogic extends
/**
* Test indexing with facets tasks.
*/
+ // nocommit fixme
+ @Ignore
public void testIndexingWithFacets() throws Exception {
// 1. alg definition (required in every "logic" test)
String algLines[] = {
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java Thu Nov 27 11:34:43 2014
@@ -34,10 +34,11 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.tasks.TaskSequence;
import org.apache.lucene.benchmark.byTask.utils.Algorithm;
import org.apache.lucene.benchmark.byTask.utils.Config;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.search.Query;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
+import org.apache.lucene.util.LuceneTestCase;
import conf.ConfLoader;
@@ -105,7 +106,7 @@ public class TestPerfTasksParse extends
public static class MockQueryMaker extends AbstractQueryMaker {
@Override
- protected Query[] prepareQueries() throws Exception {
+ protected Query[] prepareQueries(FieldTypes fieldTypes) throws Exception {
return new Query[0];
}
}