You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/01/18 16:09:51 UTC
svn commit: r1435177 [2/2] - in /lucene/dev/branches/lucene4547:
lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/
lucene/codecs/src/java/org/apache/lucene/codecs/memory/
lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/
lucene/codecs/s...
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java Fri Jan 18 15:09:50 2013
@@ -757,13 +757,13 @@ public abstract class TFIDFSimilarity ex
@Override
public final ExactSimScorer exactSimScorer(SimWeight stats, AtomicReaderContext context) throws IOException {
IDFStats idfstats = (IDFStats) stats;
- return new ExactTFIDFDocScorer(idfstats, context.reader().simpleNormValues(idfstats.field));
+ return new ExactTFIDFDocScorer(idfstats, context.reader().getNormValues(idfstats.field));
}
@Override
public final SloppySimScorer sloppySimScorer(SimWeight stats, AtomicReaderContext context) throws IOException {
IDFStats idfstats = (IDFStats) stats;
- return new SloppyTFIDFDocScorer(idfstats, context.reader().simpleNormValues(idfstats.field));
+ return new SloppyTFIDFDocScorer(idfstats, context.reader().getNormValues(idfstats.field));
}
// TODO: we can specialize these for omitNorms up front, but we should test that it doesn't confuse stupid hotspot.
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/TestDemoDocValue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/TestDemoDocValue.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/TestDemoDocValue.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/TestDemoDocValue.java Fri Jan 18 15:09:50 2013
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.codecs.SimpleDocValuesFormat;
+import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.lucene41.Lucene41Codec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -708,11 +708,11 @@ public class TestDemoDocValue extends Lu
// we don't use RandomIndexWriter because it might add more docvalues than we expect !!!!1
IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
// TODO: Fix the CFS/suffixing of Lucene41DocValues so it actually works with this
- final SimpleDocValuesFormat fast = SimpleDocValuesFormat.forName("Memory");
- final SimpleDocValuesFormat slow = SimpleDocValuesFormat.forName("SimpleText");
+ final DocValuesFormat fast = DocValuesFormat.forName("Memory");
+ final DocValuesFormat slow = DocValuesFormat.forName("SimpleText");
iwc.setCodec(new Lucene41Codec() {
@Override
- public SimpleDocValuesFormat getDocValuesFormatForField(String field) {
+ public DocValuesFormat getDocValuesFormatForField(String field) {
if ("dv1".equals(field)) {
return fast;
} else {
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java Fri Jan 18 15:09:50 2013
@@ -64,7 +64,7 @@ public class TestCustomNorms extends Luc
writer.commit();
writer.close();
AtomicReader open = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
- NumericDocValues norms = open.simpleNormValues(floatTestField);
+ NumericDocValues norms = open.getNormValues(floatTestField);
assertNotNull(norms);
for (int i = 0; i < open.maxDoc(); i++) {
StoredDocument document = open.document(i);
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java Fri Jan 18 15:09:50 2013
@@ -565,8 +565,8 @@ public void testFilesOpenClose() throws
// check norms
for(FieldInfo fieldInfo : fieldInfos1) {
String curField = fieldInfo.name;
- NumericDocValues norms1 = MultiSimpleDocValues.simpleNormValues(index1, curField);
- NumericDocValues norms2 = MultiSimpleDocValues.simpleNormValues(index2, curField);
+ NumericDocValues norms1 = MultiDocValues.getNormValues(index1, curField);
+ NumericDocValues norms2 = MultiDocValues.getNormValues(index2, curField);
if (norms1 != null && norms2 != null) {
// todo: generalize this (like TestDuelingCodecs assert)
for (int i = 0; i < index1.maxDoc(); i++) {
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java Fri Jan 18 15:09:50 2013
@@ -862,7 +862,7 @@ public class TestDocValuesIndexing exten
}
w.commit();
IndexReader reader = w.getReader();
- SortedDocValues docValues = MultiSimpleDocValues.simpleSortedValues(reader, "field");
+ SortedDocValues docValues = MultiDocValues.getSortedValues(reader, "field");
int[] sort = hash.sort(BytesRef.getUTF8SortedAsUnicodeComparator());
BytesRef expected = new BytesRef();
BytesRef actual = new BytesRef();
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java Fri Jan 18 15:09:50 2013
@@ -97,7 +97,7 @@ public class TestDocumentWriter extends
// omitNorms is true
for (FieldInfo fi : reader.getFieldInfos()) {
if (fi.isIndexed()) {
- assertTrue(fi.omitsNorms() == (reader.simpleNormValues(fi.name) == null));
+ assertTrue(fi.omitsNorms() == (reader.getNormValues(fi.name) == null));
}
}
reader.close();
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java Fri Jan 18 15:09:50 2013
@@ -528,8 +528,8 @@ public class TestDuelingCodecs extends L
for (String field : leftFields) {
// nocommit cutover to per-segment comparison
- NumericDocValues leftNorms = MultiSimpleDocValues.simpleNormValues(leftReader, field);
- NumericDocValues rightNorms = MultiSimpleDocValues.simpleNormValues(rightReader, field);
+ NumericDocValues leftNorms = MultiDocValues.getNormValues(leftReader, field);
+ NumericDocValues rightNorms = MultiDocValues.getNormValues(rightReader, field);
if (leftNorms != null && rightNorms != null) {
assertDocValues(leftReader.maxDoc(), leftNorms, rightNorms);
} else {
@@ -617,8 +617,8 @@ public class TestDuelingCodecs extends L
for (String field : leftFields) {
{
- NumericDocValues leftValues = MultiSimpleDocValues.simpleNumericValues(leftReader, field);
- NumericDocValues rightValues = MultiSimpleDocValues.simpleNumericValues(rightReader, field);
+ NumericDocValues leftValues = MultiDocValues.getNumericValues(leftReader, field);
+ NumericDocValues rightValues = MultiDocValues.getNumericValues(rightReader, field);
if (leftValues != null && rightValues != null) {
assertDocValues(leftReader.maxDoc(), leftValues, rightValues);
} else {
@@ -628,8 +628,8 @@ public class TestDuelingCodecs extends L
}
{
- BinaryDocValues leftValues = MultiSimpleDocValues.simpleBinaryValues(leftReader, field);
- BinaryDocValues rightValues = MultiSimpleDocValues.simpleBinaryValues(rightReader, field);
+ BinaryDocValues leftValues = MultiDocValues.getBinaryValues(leftReader, field);
+ BinaryDocValues rightValues = MultiDocValues.getBinaryValues(rightReader, field);
if (leftValues != null && rightValues != null) {
BytesRef scratchLeft = new BytesRef();
BytesRef scratchRight = new BytesRef();
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java Fri Jan 18 15:09:50 2013
@@ -67,7 +67,7 @@ public class TestMaxTermFrequency extend
}
public void test() throws Exception {
- NumericDocValues fooNorms = MultiSimpleDocValues.simpleNormValues(reader, "foo");
+ NumericDocValues fooNorms = MultiDocValues.getNormValues(reader, "foo");
for (int i = 0; i < reader.maxDoc(); i++) {
assertEquals(expected.get(i).intValue(), fooNorms.get(i) & 0xff);
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java Fri Jan 18 15:09:50 2013
@@ -83,12 +83,12 @@ public class TestNorms extends LuceneTes
IndexReader reader = writer.getReader();
writer.close();
- NumericDocValues fooNorms = MultiSimpleDocValues.simpleNormValues(reader, "foo");
+ NumericDocValues fooNorms = MultiDocValues.getNormValues(reader, "foo");
for (int i = 0; i < reader.maxDoc(); i++) {
assertEquals(0, fooNorms.get(i));
}
- NumericDocValues barNorms = MultiSimpleDocValues.simpleNormValues(reader, "bar");
+ NumericDocValues barNorms = MultiDocValues.getNormValues(reader, "bar");
for (int i = 0; i < reader.maxDoc(); i++) {
assertEquals(1, barNorms.get(i));
}
@@ -101,7 +101,7 @@ public class TestNorms extends LuceneTes
Directory dir = newFSDirectory(_TestUtil.getTempDir("TestNorms.testMaxByteNorms"));
buildIndex(dir);
AtomicReader open = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
- NumericDocValues normValues = open.simpleNormValues(byteTestField);
+ NumericDocValues normValues = open.getNormValues(byteTestField);
assertNotNull(normValues);
for (int i = 0; i < open.maxDoc(); i++) {
StoredDocument document = open.document(i);
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java Fri Jan 18 15:09:50 2013
@@ -290,12 +290,12 @@ public class TestOmitNorms extends Lucen
IndexReader ir1 = riw.getReader();
// todo: generalize
- NumericDocValues norms1 = MultiSimpleDocValues.simpleNormValues(ir1, field);
+ NumericDocValues norms1 = MultiDocValues.getNormValues(ir1, field);
// fully merge and validate MultiNorms against single segment.
riw.forceMerge(1);
DirectoryReader ir2 = riw.getReader();
- NumericDocValues norms2 = getOnlySegmentReader(ir2).simpleNormValues(field);
+ NumericDocValues norms2 = getOnlySegmentReader(ir2).getNormValues(field);
if (norms1 == null) {
assertNull(norms2);
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java Fri Jan 18 15:09:50 2013
@@ -178,11 +178,11 @@ public class TestSegmentReader extends L
for (int i=0; i<DocHelper.fields.length; i++) {
IndexableField f = DocHelper.fields[i];
if (f.fieldType().indexed()) {
- assertEquals(reader.simpleNormValues(f.name()) != null, !f.fieldType().omitNorms());
- assertEquals(reader.simpleNormValues(f.name()) != null, !DocHelper.noNorms.containsKey(f.name()));
- if (reader.simpleNormValues(f.name()) == null) {
+ assertEquals(reader.getNormValues(f.name()) != null, !f.fieldType().omitNorms());
+ assertEquals(reader.getNormValues(f.name()) != null, !DocHelper.noNorms.containsKey(f.name()));
+ if (reader.getNormValues(f.name()) == null) {
// test for norms of null
- NumericDocValues norms = MultiSimpleDocValues.simpleNormValues(reader, f.name());
+ NumericDocValues norms = MultiDocValues.getNormValues(reader, f.name());
assertNull(norms);
}
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java Fri Jan 18 15:09:50 2013
@@ -69,7 +69,7 @@ public class TestUniqueTermCount extends
}
public void test() throws Exception {
- NumericDocValues fooNorms = MultiSimpleDocValues.simpleNormValues(reader, "foo");
+ NumericDocValues fooNorms = MultiDocValues.getNormValues(reader, "foo");
assertNotNull(fooNorms);
for (int i = 0; i < reader.maxDoc(); i++) {
assertEquals(expected.get(i).longValue(), fooNorms.get(i));
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java Fri Jan 18 15:09:50 2013
@@ -77,8 +77,8 @@ public class TestSimilarityProvider exte
// sanity check of norms writer
// TODO: generalize
AtomicReader slow = new SlowCompositeReaderWrapper(reader);
- NumericDocValues fooNorms = slow.simpleNormValues("foo");
- NumericDocValues barNorms = slow.simpleNormValues("bar");
+ NumericDocValues fooNorms = slow.getNormValues("foo");
+ NumericDocValues barNorms = slow.getNormValues("bar");
for (int i = 0; i < slow.maxDoc(); i++) {
assertFalse(fooNorms.get(i) == barNorms.get(i));
}
Modified: lucene/dev/branches/lucene4547/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/lucene4547/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Fri Jan 18 15:09:50 2013
@@ -1148,7 +1148,7 @@ public class MemoryIndex {
private Similarity cachedSimilarity;
@Override
- public NumericDocValues simpleNormValues(String field) {
+ public NumericDocValues getNormValues(String field) {
if (fieldInfos.get(field).omitsNorms())
return null;
NumericDocValues norms = cachedNormValues;
Modified: lucene/dev/branches/lucene4547/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/lucene4547/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Fri Jan 18 15:09:50 2013
@@ -177,8 +177,8 @@ public class MemoryIndexTest extends Bas
if (iwTerms == null) {
assertNull(memTerms);
} else {
- NumericDocValues normValues = competitor.simpleNormValues(field);
- NumericDocValues memNormValues = memIndexReader.simpleNormValues(field);
+ NumericDocValues normValues = competitor.getNormValues(field);
+ NumericDocValues memNormValues = memIndexReader.getNormValues(field);
if (normValues != null) {
// mem idx always computes norms on the fly
assertNotNull(memNormValues);
Modified: lucene/dev/branches/lucene4547/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java (original)
+++ lucene/dev/branches/lucene4547/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java Fri Jan 18 15:09:50 2013
@@ -62,7 +62,7 @@ public class NormValueSource extends Val
if (similarity == null) {
throw new UnsupportedOperationException("requires a TFIDFSimilarity (such as DefaultSimilarity)");
}
- final NumericDocValues norms = readerContext.reader().simpleNormValues(field);
+ final NumericDocValues norms = readerContext.reader().getNormValues(field);
if (norms == null) {
return new ConstDoubleDocValues(0.0, this);
Modified: lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java (original)
+++ lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java Fri Jan 18 15:09:50 2013
@@ -132,8 +132,8 @@ public final class FieldFilterAtomicRead
}
@Override
- public NumericDocValues simpleNormValues(String field) throws IOException {
- return hasField(field) ? super.simpleNormValues(field) : null;
+ public NumericDocValues getNormValues(String field) throws IOException {
+ return hasField(field) ? super.getNormValues(field) : null;
}
@Override
Modified: lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java (original)
+++ lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java Fri Jan 18 15:09:50 2013
@@ -28,7 +28,7 @@ import java.util.Random;
import java.util.Set;
import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.SimpleDocValuesFormat;
+import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.asserting.AssertingPostingsFormat;
import org.apache.lucene.codecs.lucene41.Lucene41Codec;
import org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat;
@@ -45,7 +45,7 @@ import org.apache.lucene.codecs.mocksep.
import org.apache.lucene.codecs.nestedpulsing.NestedPulsingPostingsFormat;
import org.apache.lucene.codecs.pulsing.Pulsing41PostingsFormat;
import org.apache.lucene.codecs.simpletext.SimpleTextPostingsFormat;
-import org.apache.lucene.codecs.simpletext.SimpleTextSimpleDocValuesFormat;
+import org.apache.lucene.codecs.simpletext.SimpleTextDocValuesFormat;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
@@ -63,7 +63,7 @@ public class RandomCodec extends Lucene4
private List<PostingsFormat> formats = new ArrayList<PostingsFormat>();
/** Shuffled list of docvalues formats to use for new mappings */
- private List<SimpleDocValuesFormat> dvFormats = new ArrayList<SimpleDocValuesFormat>();
+ private List<DocValuesFormat> dvFormats = new ArrayList<DocValuesFormat>();
/** unique set of format names this codec knows about */
public Set<String> formatNames = new HashSet<String>();
@@ -76,7 +76,7 @@ public class RandomCodec extends Lucene4
// otherwise DWPT's .toString() calls that iterate over the map can
// cause concurrentmodificationexception if indexwriter's infostream is on
private Map<String,PostingsFormat> previousMappings = Collections.synchronizedMap(new HashMap<String,PostingsFormat>());
- private Map<String,SimpleDocValuesFormat> previousDVMappings = Collections.synchronizedMap(new HashMap<String,SimpleDocValuesFormat>());
+ private Map<String,DocValuesFormat> previousDVMappings = Collections.synchronizedMap(new HashMap<String,DocValuesFormat>());
private final int perFieldSeed;
@Override
@@ -96,11 +96,11 @@ public class RandomCodec extends Lucene4
}
@Override
- public SimpleDocValuesFormat getDocValuesFormatForField(String name) {
- SimpleDocValuesFormat codec = previousDVMappings.get(name);
+ public DocValuesFormat getDocValuesFormatForField(String name) {
+ DocValuesFormat codec = previousDVMappings.get(name);
if (codec == null) {
codec = dvFormats.get(Math.abs(perFieldSeed ^ name.hashCode()) % dvFormats.size());
- if (codec instanceof SimpleTextSimpleDocValuesFormat && perFieldSeed % 5 != 0) {
+ if (codec instanceof SimpleTextDocValuesFormat && perFieldSeed % 5 != 0) {
// make simpletext rarer, choose again
codec = dvFormats.get(Math.abs(perFieldSeed ^ name.toUpperCase(Locale.ROOT).hashCode()) % dvFormats.size());
}
@@ -143,7 +143,7 @@ public class RandomCodec extends Lucene4
addDocValues(avoidCodecs,
new DiskDocValuesFormat(),
- new SimpleTextSimpleDocValuesFormat(),
+ new SimpleTextDocValuesFormat(),
new MemoryDocValuesFormat());
Collections.shuffle(formats, random);
@@ -167,8 +167,8 @@ public class RandomCodec extends Lucene4
}
}
- private final void addDocValues(Set<String> avoidCodecs, SimpleDocValuesFormat... docvalues) {
- for (SimpleDocValuesFormat d : docvalues) {
+ private final void addDocValues(Set<String> avoidCodecs, DocValuesFormat... docvalues) {
+ for (DocValuesFormat d : docvalues) {
if (!avoidCodecs.contains(d.getName())) {
dvFormats.add(d);
dvFormatNames.add(d.getName());
Modified: lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Fri Jan 18 15:09:50 2013
@@ -36,7 +36,7 @@ import org.apache.lucene.analysis.util.T
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.SimpleDocValuesFormat;
+import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.analysis.util.WordlistLoader;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.handler.admin.CoreAdminHandler;
@@ -179,7 +179,7 @@ public class SolrResourceLoader implemen
void reloadLuceneSPI() {
// Codecs:
PostingsFormat.reloadPostingsFormats(this.classLoader);
- SimpleDocValuesFormat.reloadDocValuesFormats(this.classLoader);
+ DocValuesFormat.reloadDocValuesFormats(this.classLoader);
Codec.reloadCodecs(this.classLoader);
// Analysis:
CharFilterFactory.reloadCharFilters(this.classLoader);
Modified: lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/TestDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/TestDocSet.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/TestDocSet.java (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/TestDocSet.java Fri Jan 18 15:09:50 2013
@@ -403,7 +403,7 @@ public class TestDocSet extends LuceneTe
}
@Override
- public NumericDocValues simpleNormValues(String field) {
+ public NumericDocValues getNormValues(String field) {
return null;
}
Modified: lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java?rev=1435177&r1=1435176&r2=1435177&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java (original)
+++ lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java Fri Jan 18 15:09:50 2013
@@ -333,9 +333,9 @@ public class DocumentBuilderTest extends
DefaultSimilarity sim = (DefaultSimilarity) searcher.getSimilarity();
- NumericDocValues titleNorms = reader.simpleNormValues("title");
- NumericDocValues fooNorms = reader.simpleNormValues("foo_t");
- NumericDocValues textNorms = reader.simpleNormValues("text");
+ NumericDocValues titleNorms = reader.getNormValues("title");
+ NumericDocValues fooNorms = reader.getNormValues("foo_t");
+ NumericDocValues textNorms = reader.getNormValues("text");
assertEquals(expectedNorm(sim, 2, TITLE_BOOST * DOC_BOOST),
titleNorms.get(docid));