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/12/07 11:52:05 UTC
svn commit: r1643659 [1/7] - in /lucene/dev/branches/lucene6005/lucene: ./
analysis/common/src/test/org/apache/lucene/analysis/core/
analysis/icu/src/test/org/apache/lucene/collation/
backward-codecs/src/test/org/apache/lucene/index/ benchmark/src/java...
Author: mikemccand
Date: Sun Dec 7 10:52:03 2014
New Revision: 1643659
URL: http://svn.apache.org/r1643659
Log:
LUCENE-6005: checkpoint
Added:
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java
- copied, changed from r1642843, lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document2StoredFieldVisitor.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/SortKeyComparator.java (with props)
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/LeftZeroPadTermRangeFilter.java (with props)
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/LeftZeroPadTermRangeQuery.java (with props)
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/HalfFloat.java
- copied, changed from r1642843, lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/HalfFloat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestBigInteger.java (with props)
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
- copied, changed from r1642536, 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/util/TestNumericUtils.java (with props)
Removed:
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/document/Document2StoredFieldVisitor.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/HalfFloat.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/NumericType.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/test/org/apache/lucene/analysis/TestNumericTokenStream.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestDocument2.java
Modified:
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java
lucene/dev/branches/lucene6005/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.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/tasks/SearchTravRetLoadFieldSelectorTask.java
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/lucene6005/lucene/common-build.xml
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DateTools.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document.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/document/HalfFloatComparator.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/FreqProxFields.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexReader.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/MultiDocValues.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/MultiTerms.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermsHash.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.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/FieldComparator.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/Query.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SortedNumericSelector.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/BytesRef.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/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/TestDemoParallelLeafReader.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/TestFieldsReader.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.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/TestManyFields.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/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/search/BaseTestRangeFilter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.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/TestMultiValuedNumericRangeQuery.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeFilter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.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/xmlparser/FormBasedXmlQueryDemo.java
lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java
lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java
lucene/dev/branches/lucene6005/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
lucene/dev/branches/lucene6005/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/lucene6005/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.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/FieldCacheImpl.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/TestFieldCacheWithThreads.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/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
lucene/dev/branches/lucene6005/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilderFactory.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanFilterBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DuplicateFilterBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FilteredQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeFilterBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.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/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java
lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeQueryBuilder.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeFilter.java
lucene/dev/branches/lucene6005/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedTermRangeQuery.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/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/prefix/TestTermQueryPrefixGridStrategy.java
lucene/dev/branches/lucene6005/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/branches/lucene6005/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java Sun Dec 7 10:52:03 2014
@@ -17,7 +17,6 @@ package org.apache.lucene.analysis.core;
* limitations under the License.
*/
-import org.apache.lucene.analysis.NumericTokenStream;
import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
import org.apache.lucene.analysis.util.TokenFilterFactory;
@@ -43,23 +42,6 @@ public class TestTypeTokenFilterFactory
assertTrue("types Size: " + types.size() + " is not: " + 4, types.size() == 4);
}
- public void testCreationWithBlackList() throws Exception {
- TokenFilterFactory factory = tokenFilterFactory("Type",
- "types", "stoptypes-1.txt, stoptypes-2.txt");
- NumericTokenStream input = new NumericTokenStream();
- input.setIntValue(123);
- factory.create(input);
- }
-
- public void testCreationWithWhiteList() throws Exception {
- TokenFilterFactory factory = tokenFilterFactory("Type",
- "types", "stoptypes-1.txt, stoptypes-2.txt",
- "useWhitelist", "true");
- NumericTokenStream input = new NumericTokenStream();
- input.setIntValue(123);
- factory.create(input);
- }
-
public void testMissingTypesParameter() throws Exception {
try {
tokenFilterFactory("Type");
Modified: lucene/dev/branches/lucene6005/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java Sun Dec 7 10:52:03 2014
@@ -104,7 +104,7 @@ public class TestICUCollationDocValuesFi
String end = TestUtil.randomSimpleString(random());
BytesRef lowerVal = new BytesRef(collator.getCollationKey(start).toByteArray());
BytesRef upperVal = new BytesRef(collator.getCollationKey(end).toByteArray());
- Query query = new ConstantScoreQuery(DocValuesRangeFilter.newBytesRefRange("collated", lowerVal, upperVal, true, true));
+ Query query = new ConstantScoreQuery(DocValuesRangeFilter.newBytesRefRange("collated", lowerVal, upperVal, true, true, null));
doTestRanges(is, start, end, query, collator);
}
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=1643659&r1=1643658&r2=1643659&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 Sun Dec 7 10:52:03 2014
@@ -42,7 +42,6 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.NumericRangeQuery;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.BaseDirectoryWrapper;
@@ -1015,7 +1014,9 @@ public class TestBackwardsCompatibility
verifyUsesDefaultCodec(dir, name);
}
}
-
+
+ // nocommit put back
+ /*
public void testNumericFields() throws Exception {
for (String name : oldNames) {
@@ -1060,6 +1061,7 @@ public class TestBackwardsCompatibility
reader.close();
}
}
+ */
private int checkAllSegmentsUpgraded(Directory dir) throws IOException {
final SegmentInfos infos = SegmentInfos.readLatestCommit(dir);
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java Sun Dec 7 10:52:03 2014
@@ -23,7 +23,7 @@ import java.util.StringTokenizer;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Document2StoredFieldVisitor;
+import org.apache.lucene.document.DocumentStoredFieldVisitor;
import org.apache.lucene.index.IndexReader;
/**
@@ -58,7 +58,7 @@ public class SearchTravRetLoadFieldSelec
if (fieldsToLoad == null) {
return ir.document(id);
} else {
- Document2StoredFieldVisitor visitor = new Document2StoredFieldVisitor(ir.getFieldTypes(), fieldsToLoad);
+ DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(ir.getFieldTypes(), fieldsToLoad);
ir.document(id, visitor);
return visitor.getDocument();
}
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Sun Dec 7 10:52:03 2014
@@ -844,14 +844,11 @@ public final class MemoryPostingsFormat
@Override
public BytesRef next() throws IOException {
- //System.out.println("te.next");
current = fstEnum.next();
if (current == null) {
- //System.out.println(" END");
return null;
}
didDecode = false;
- //System.out.println(" term=" + field.name + ":" + current.input.utf8ToString());
return current.input;
}
Modified: lucene/dev/branches/lucene6005/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/common-build.xml?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene6005/lucene/common-build.xml Sun Dec 7 10:52:03 2014
@@ -167,7 +167,7 @@
<!-- nocommit put back
<property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial -Xlint:-options -Xdoclint:all/protected -Xdoclint:-html -Xdoclint:-missing"/>
-->
- <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial -Xlint:-options"/>
+ <property name="javac.args" value=""/>
<property name="javadoc.link" value="http://download.oracle.com/javase/8/docs/api/"/>
<property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
<property name="javadoc.packagelist.dir" location="${common.dir}/tools/javadoc"/>
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java Sun Dec 7 10:52:03 2014
@@ -99,9 +99,10 @@ public abstract class FieldsConsumer imp
docBase += maxDoc;
}
- Fields mergedFields = new MappedMultiFields(mergeState,
- new MultiFields(fields.toArray(Fields.EMPTY_ARRAY),
- slices.toArray(ReaderSlice.EMPTY_ARRAY)));
+ MultiFields mf = new MultiFields(fields.toArray(Fields.EMPTY_ARRAY),
+ slices.toArray(ReaderSlice.EMPTY_ARRAY));
+ mf.setFieldTypes(mergeState.fieldTypes);
+ Fields mergedFields = new MappedMultiFields(mergeState, mf);
write(mergedFields);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java Sun Dec 7 10:52:03 2014
@@ -20,7 +20,7 @@ import java.io.Closeable;
import java.io.IOException;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Document2StoredFieldVisitor;
+import org.apache.lucene.document.DocumentStoredFieldVisitor;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexableField;
@@ -98,7 +98,7 @@ public abstract class StoredFieldsWriter
// on the fly?
// NOTE: it's very important to first assign to doc then pass it to
// fieldsWriter.addDocument; see LUCENE-1282
- Document2StoredFieldVisitor visitor = new Document2StoredFieldVisitor(null);
+ DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(null);
storedFieldsReader.visitDocument(docID, visitor);
Document doc = visitor.getDocument();
addDocument(doc, mergeState.mergeFieldInfos);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java Sun Dec 7 10:52:03 2014
@@ -24,7 +24,7 @@ import org.apache.lucene.codecs.CodecUti
import org.apache.lucene.codecs.StoredFieldsReader;
import org.apache.lucene.codecs.StoredFieldsWriter;
import org.apache.lucene.codecs.compressing.CompressingStoredFieldsReader.ChunkIterator;
-import org.apache.lucene.document.Document2StoredFieldVisitor;
+import org.apache.lucene.document.DocumentStoredFieldVisitor;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
@@ -360,7 +360,7 @@ public final class CompressingStoredFiel
storedFieldsReader.checkIntegrity();
}
for (int i = nextLiveDoc(0, liveDocs, maxDoc); i < maxDoc; i = nextLiveDoc(i + 1, liveDocs, maxDoc)) {
- Document2StoredFieldVisitor visitor = new Document2StoredFieldVisitor(mergeState.fieldTypes);
+ DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(mergeState.fieldTypes);
storedFieldsReader.visitDocument(i, visitor);
addDocument(visitor.getDocument(), mergeState.mergeFieldInfos);
++docCount;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DateTools.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DateTools.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DateTools.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DateTools.java Sun Dec 7 10:52:03 2014
@@ -17,7 +17,6 @@ package org.apache.lucene.document;
* limitations under the License.
*/
-import org.apache.lucene.search.NumericRangeQuery; // for javadocs
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.TermRangeQuery;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document.java?rev=1643659&r1=1643658&r2=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document.java Sun Dec 7 10:52:03 2014
@@ -37,6 +37,8 @@ import org.apache.lucene.index.IndexOpti
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.IndexableFieldType;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.HalfFloat;
+import org.apache.lucene.util.NumericUtils;
// nocommit clearly spell out which field defaults to what settings, e.g. that atom is not sorted by default
@@ -150,19 +152,19 @@ public class Document implements Iterabl
switch (fieldType.valueType) {
case INT:
- return getReusedBinaryTokenStream(intToBytes(((Number) value).intValue()), reuse);
+ return getReusedBinaryTokenStream(NumericUtils.intToBytes(((Number) value).intValue()), reuse);
case HALF_FLOAT:
- return getReusedBinaryTokenStream(halfFloatToSortableBytes(((Number) value).floatValue()), reuse);
+ return getReusedBinaryTokenStream(NumericUtils.halfFloatToBytes(((Number) value).floatValue()), reuse);
case FLOAT:
- return getReusedBinaryTokenStream(floatToSortableBytes(((Number) value).floatValue()), reuse);
+ return getReusedBinaryTokenStream(NumericUtils.floatToBytes(((Number) value).floatValue()), reuse);
case LONG:
- return getReusedBinaryTokenStream(longToBytes(((Number) value).longValue()), reuse);
+ return getReusedBinaryTokenStream(NumericUtils.longToBytes(((Number) value).longValue()), reuse);
case DOUBLE:
- return getReusedBinaryTokenStream(doubleToSortableBytes(((Number) value).doubleValue()), reuse);
+ return getReusedBinaryTokenStream(NumericUtils.doubleToBytes(((Number) value).doubleValue()), reuse);
case BIG_INT:
- return getReusedBinaryTokenStream(new BytesRef(((BigInteger) value).toByteArray()), reuse);
+ return getReusedBinaryTokenStream(NumericUtils.bigIntToBytes(((BigInteger) value)), reuse);
case DATE:
- return getReusedBinaryTokenStream(longToBytes(((Date) value).getTime()), reuse);
+ return getReusedBinaryTokenStream(NumericUtils.longToBytes(((Date) value).getTime()), reuse);
case ATOM:
if (fieldType.minTokenLength != null) {
if (value instanceof String) {
@@ -285,30 +287,17 @@ public class Document implements Iterabl
case LONG:
return (Number) value;
case HALF_FLOAT:
- int shortBits = HalfFloat.floatToIntBits((Float) value);
+ short shortBits = HalfFloat.floatToShortBits((Float) value);
// nocommit different from other numerics:
- shortBits = sortableHalfFloatBits(shortBits);
- assert shortBits >= 0 && shortBits <= Short.MAX_VALUE;
- return Integer.valueOf(shortBits);
+ shortBits = NumericUtils.sortableHalfFloatBits(shortBits);
+ // nocommit
+ //assert shortBits >= Short.MIN_VALUE && shortBits <= Short.MAX_VALUE: "shortBits=" + shortBits;
+ return Short.valueOf(shortBits);
//return Integer.valueOf(Float.floatToRawIntBits((Float) value));
case FLOAT:
- // nocommit i shouldn't do sortableFloatBits? but why does ot TestSortedNumericSortField.testFloat fail?
- int intBits = Float.floatToIntBits((Float) value);
- if (fieldType.multiValued) {
- // nocommit this is weird?
- intBits = sortableFloatBits(intBits);
- }
- return Integer.valueOf(intBits);
- //return Integer.valueOf(Float.floatToRawIntBits((Float) value));
+ return Integer.valueOf(NumericUtils.floatToInt((Float) value));
case DOUBLE:
- // nocommit i shouldn't do sortableDoubleBits?
- long longBits = Double.doubleToLongBits((Double) value);
- if (fieldType.multiValued) {
- // nocommit this is weird?
- longBits = sortableDoubleBits(longBits);
- }
- return Long.valueOf(longBits);
- //return Long.valueOf(Double.doubleToRawLongBits((Double) value));
+ return Long.valueOf(NumericUtils.doubleToLong((Double) value));
case DATE:
return Long.valueOf(((Date) value).getTime());
case BOOLEAN:
@@ -371,7 +360,7 @@ public class Document implements Iterabl
return new BytesRef(bytes);
} else if (fieldType.valueType == FieldTypes.ValueType.INET_ADDRESS) {
return new BytesRef(((InetAddress) value).getAddress());
- } else if (fieldType.valueType == FieldTypes.ValueType.BIG_INT) {
+ } else if (fieldType.valueType == FieldTypes.ValueType.BIG_INT) {
return new BytesRef(((BigInteger) value).toByteArray());
} else if (value instanceof BytesRef) {
return (BytesRef) value;
@@ -601,6 +590,26 @@ public class Document implements Iterabl
// nocommit throw exc if this field was already indexed/dvd?
/** Default: store this value. */
+ // nocommit testme, or remove?
+ public void addStoredLong(String fieldName, long value) {
+ if (changeSchema) {
+ fieldTypes.recordStoredValueType(fieldName, FieldTypes.ValueType.LONG);
+ }
+ fields.add(new FieldValue(fieldName, value));
+ }
+
+ // nocommit throw exc if this field was already indexed/dvd?
+ /** Default: store this value. */
+ // nocommit testme, or remove?
+ public void addStoredFloat(String fieldName, float value) {
+ if (changeSchema) {
+ fieldTypes.recordStoredValueType(fieldName, FieldTypes.ValueType.FLOAT);
+ }
+ fields.add(new FieldValue(fieldName, value));
+ }
+
+ // nocommit throw exc if this field was already indexed/dvd?
+ /** Default: store this value. */
public void addStoredDouble(String fieldName, double value) {
if (changeSchema) {
fieldTypes.recordStoredValueType(fieldName, FieldTypes.ValueType.DOUBLE);
@@ -728,6 +737,10 @@ public class Document implements Iterabl
/** Default: support for range filtering/querying and sorting (using numeric doc values). */
public void addBigInteger(String fieldName, BigInteger value) {
+ if (value.compareTo(BigInteger.ZERO) < 0) {
+ // nocommit can we fix this...
+ throw new IllegalArgumentException("field=\"" + fieldName + "\": value must be non-negative; got " + value);
+ }
if (changeSchema) {
fieldTypes.recordValueType(fieldName, FieldTypes.ValueType.BIG_INT);
}
@@ -843,161 +856,6 @@ public class Document implements Iterabl
}
}
- // nocommit public just for TestBlockJoin ...
- public static BytesRef intToBytes(int v) {
- int sortableBits = v ^ 0x80000000;
- BytesRef token = new BytesRef(4);
- token.length = 4;
- int index = 3;
- while (index >= 0) {
- token.bytes[index] = (byte) (sortableBits & 0xff);
- index--;
- sortableBits >>>= 8;
- }
- return token;
- }
-
- public static BytesRef shortToBytes(short v) {
- int sortableBits = v ^ 0x8000;
- BytesRef token = new BytesRef(2);
- token.length = 2;
- int index = 1;
- while (index >= 0) {
- token.bytes[index] = (byte) (sortableBits & 0xff);
- index--;
- sortableBits >>>= 8;
- }
- return token;
- }
-
- public static BytesRef floatToSortableBytes(float value) {
- return intToBytes(sortableFloatBits(Float.floatToIntBits(value)));
- }
-
- public static BytesRef halfFloatToSortableBytes(float value) {
- return shortToBytes((short) sortableHalfFloatBits(HalfFloat.floatToIntBits(value)));
- }
-
- public static int floatToSortableInt(float value) {
- return sortableFloatBits(Float.floatToIntBits(value));
- }
-
- /** Converts numeric DV field back to double. */
- public static double sortableLongToDouble(long v) {
- return Double.longBitsToDouble(sortableDoubleBits(v));
- }
-
- /** Converts numeric DV field back to double. */
- public static double longToDouble(long v) {
- return Double.longBitsToDouble(v);
- }
-
- /** Converts numeric DV field back to float. */
- public static float sortableIntToFloat(int v) {
- return Float.intBitsToFloat(sortableFloatBits(v));
- }
-
- /** Converts numeric DV field back to float. */
- public static float intToFloat(int v) {
- return Float.intBitsToFloat(v);
- }
-
- /** Converts numeric DV field back to float. */
- public static float sortableShortToFloat(short v) {
- return HalfFloat.intBitsToFloat(sortableHalfFloatBits(v));
- }
-
- // nocommit move elsewhere?
- public static int bytesToInt(BytesRef bytes) {
- if (bytes.length != 4) {
- throw new IllegalArgumentException("incoming bytes should be length=4; got length=" + bytes.length);
- }
- int sortableBits = 0;
- for(int i=0;i<4;i++) {
- sortableBits = (sortableBits << 8) | bytes.bytes[bytes.offset + i] & 0xff;
- }
-
- return sortableBits ^ 0x80000000;
- }
-
- // nocommit move elsewhere?
- public static int bytesToShort(BytesRef bytes) {
- if (bytes.length != 2) {
- throw new IllegalArgumentException("incoming bytes should be length=2; got length=" + bytes.length);
- }
- int sortableBits = 0;
- for(int i=0;i<2;i++) {
- sortableBits = (sortableBits << 8) | bytes.bytes[bytes.offset + i] & 0xff;
- }
-
- return sortableBits ^ 0x8000;
- }
-
- public static BytesRef longToBytes(long v) {
- long sortableBits = v ^ 0x8000000000000000L;
- BytesRef token = new BytesRef(8);
- token.length = 8;
- int index = 7;
- while (index >= 0) {
- token.bytes[index] = (byte) (sortableBits & 0xff);
- index--;
- sortableBits >>>= 8;
- }
- return token;
- }
-
- public static BytesRef doubleToSortableBytes(double value) {
- return longToBytes(sortableDoubleBits(Double.doubleToLongBits(value)));
- }
-
- public static long doubleToSortableLong(double value) {
- return sortableDoubleBits(Double.doubleToLongBits(value));
- }
-
- // nocommit move elsewhere?
- public static long bytesToLong(BytesRef bytes) {
- if (bytes.length != 8) {
- throw new IllegalArgumentException("incoming bytes should be length=8; got length=" + bytes.length);
- }
- long sortableBits = 0;
- for(int i=0;i<8;i++) {
- sortableBits = (sortableBits << 8) | bytes.bytes[bytes.offset + i] & 0xff;
- }
-
- return sortableBits ^ 0x8000000000000000L;
- }
-
- // nocommit move elsewhere?
- public static float bytesToFloat(BytesRef bytes) {
- return Float.intBitsToFloat(sortableFloatBits(bytesToInt(bytes)));
- }
-
- // nocommit move elsewhere?
- public static float bytesToHalfFloat(BytesRef bytes) {
- return HalfFloat.intBitsToFloat(sortableHalfFloatBits(bytesToShort(bytes)));
- }
-
- // nocommit move elsewhere?
- public static double bytesToDouble(BytesRef bytes) {
- return Double.longBitsToDouble(sortableDoubleBits(bytesToLong(bytes)));
- }
-
- /** Converts IEEE 754 representation of a double to sortable order (or back to the original) */
- public static long sortableDoubleBits(long bits) {
- return bits ^ (bits >> 63) & 0x7fffffffffffffffL;
- }
-
- /** Converts IEEE 754 representation of a float to sortable order (or back to the original) */
- public static int sortableFloatBits(int bits) {
- return bits ^ (bits >> 31) & 0x7fffffff;
- }
-
- /** Converts IEEE 754 representation of a half float to sortable order (or back to the original) */
- // nocommit short?
- public static int sortableHalfFloatBits(int bits) {
- return bits ^ (bits >> 15) & 0x7fff;
- }
-
public Boolean getBoolean(String fieldName) {
// nocommit can we assert this is a known field and that its type is correct?
FieldValue fieldValue = getFirstFieldValue(fieldName);
Copied: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java (from r1642843, lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document2StoredFieldVisitor.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java?p2=lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java&p1=lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document2StoredFieldVisitor.java&r1=1642843&r2=1643659&rev=1643659&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/Document2StoredFieldVisitor.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java Sun Dec 7 10:52:03 2014
@@ -38,7 +38,7 @@ import org.apache.lucene.util.BytesRef;
*
* @lucene.experimental */
-public class Document2StoredFieldVisitor extends StoredFieldVisitor {
+public class DocumentStoredFieldVisitor extends StoredFieldVisitor {
private final Document doc;
private final Set<String> fieldsToAdd;
private final FieldTypes fieldTypes;
@@ -47,14 +47,14 @@ public class Document2StoredFieldVisitor
* Load only fields named in the provided <code>Set<String></code>.
* @param fieldsToAdd Set of fields to load, or <code>null</code> (all fields).
*/
- public Document2StoredFieldVisitor(FieldTypes fieldTypes, Set<String> fieldsToAdd) {
+ public DocumentStoredFieldVisitor(FieldTypes fieldTypes, Set<String> fieldsToAdd) {
doc = new Document(fieldTypes, false);
this.fieldTypes = fieldTypes;
this.fieldsToAdd = fieldsToAdd;
}
/** Load only fields named in the provided fields. */
- public Document2StoredFieldVisitor(FieldTypes fieldTypes, String... fields) {
+ public DocumentStoredFieldVisitor(FieldTypes fieldTypes, String... fields) {
doc = new Document(fieldTypes, false);
this.fieldTypes = fieldTypes;
fieldsToAdd = new HashSet<>(fields.length);
@@ -64,7 +64,7 @@ public class Document2StoredFieldVisitor
}
/** Load all stored fields. */
- public Document2StoredFieldVisitor(FieldTypes fieldTypes) {
+ public DocumentStoredFieldVisitor(FieldTypes fieldTypes) {
doc = new Document(fieldTypes, false);
this.fieldTypes = fieldTypes;
this.fieldsToAdd = null;